drop libime patch

fcitx-contrib · Dec 22, 2024 · 4aa7b8b · 4aa7b8b
1 parent a74139a
commit 4aa7b8b
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 47 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -47,7 +47,6 @@ jobs:
         run: |
           git apply --directory=fcitx5 patches/fcitx5.patch
           git apply --directory=engines/libime/src/libime/core/kenlm patches/kenlm.patch
-          git apply --directory=engines/libime patches/libime.patch
           git apply --directory=engines/fcitx5-rime patches/rime.patch
           cmake -B build -G Xcode \
             -DURL_SCHEME=fcitx \

diff --git a/engines/fcitx5-chinese-addons b/engines/fcitx5-chinese-addons
diff --git a/engines/libime b/engines/libime
diff --git a/fcitx5 b/fcitx5
diff --git a/patches/libime.patch b/patches/libime.patch
diff --git a/scripts/check-validity.sh b/scripts/check-validity.sh
@@ -2,10 +2,15 @@ set -e
 
 has_dl=0
 
-executable=build/src/Release-iphonesimulator/Fcitx5.app/PlugIns/keyboard.appex/keyboard
+executables=(
+  build/src/Release-iphonesimulator/Fcitx5.app/Fcitx5
+  build/src/Release-iphonesimulator/Fcitx5.app/PlugIns/keyboard.appex/keyboard
+)
 
-if nm $executable | grep dlopen; then
-  has_dl=1
-fi
+for executable in "${executables[@]}"; do  
+  if nm $executable | grep dlopen; then
+    has_dl=1
+  fi
+done
 
 exit $has_dl
+12 −2		im/pinyin/pinyin.cpp
+56 −27		im/pinyin/pinyincandidate.cpp
+24 −7		im/pinyin/pinyincandidate.h
+17 −2		im/table/ime.h
+29 −5		im/table/state.cpp
+3 −0		im/table/state.h
+1 −1		test/CMakeLists.txt
+45 −3		test/testpinyin.cpp
+2 −1		CMakeLists.txt
+2 −2		src/libime/core/CMakeLists.txt
+55 −30		src/libime/core/datrie.cpp
+16 −0		src/libime/core/datrie.h
+1 −1		src/libime/pinyin/CMakeLists.txt
+8 −1		src/libime/pinyin/pinyincorrectionprofile.cpp
+10 −1		src/libime/pinyin/pinyincorrectionprofile.h
+13 −11		src/libime/pinyin/pinyindictionary.cpp
+13 −4		src/libime/pinyin/pinyindictionary.h
+334 −273		src/libime/pinyin/shuangpinprofile.cpp
+6 −0		src/libime/pinyin/shuangpinprofile.h
+1 −1		src/libime/table/CMakeLists.txt
+3 −2		src/libime/table/tablebaseddictionary.cpp
+20 −0		test/testpinyinencoder.cpp
+27 −1		test/testpinyinime_unit.cpp
+3 −2		test/testtrie.cpp
+1 −1		tools/CMakeLists.txt
+109 −88		po/ca.po
+109 −88		po/da.po
+109 −88		po/de.po
+109 −88		po/es.po
+109 −88		po/fcitx5.pot
+109 −88		po/fr.po
+109 −88		po/he.po
+114 −88		po/ja.po
+111 −90		po/ko.po
+108 −78		po/ru.po
+109 −88		po/vi.po
+109 −88		po/zh_CN.po
+99 −78		po/zh_TW.po
+5 −0		src/frontend/waylandim/appmonitor.cpp
+3 −0		src/frontend/waylandim/appmonitor.h
+7 −0		src/frontend/waylandim/plasmaappmonitor.cpp
+2 −0		src/frontend/waylandim/plasmaappmonitor.h
+7 −0		src/frontend/waylandim/virtualinputcontext.cpp
+5 −1		src/frontend/waylandim/virtualinputcontext.h
+13 −2		src/frontend/waylandim/waylandim.cpp
+30 −7		src/frontend/waylandim/waylandim.h
+1 −2		src/frontend/waylandim/waylandim_public.h
+24 −0		src/frontend/waylandim/waylandimserver.cpp
+12 −2		src/frontend/waylandim/waylandimserver.h
+9 −1		src/frontend/waylandim/waylandimserverbase.cpp
+6 −0		src/frontend/waylandim/waylandimserverbase.h
+49 −13		src/frontend/waylandim/waylandimserverv2.cpp
+17 −3		src/frontend/waylandim/waylandimserverv2.h
+9 −1		src/frontend/waylandim/wlrappmonitor.cpp
+6 −2		src/frontend/waylandim/wlrappmonitor.h
+31 −1		src/lib/fcitx/globalconfig.cpp
+26 −0		src/lib/fcitx/globalconfig.h
+12 −1		src/lib/fcitx/instance.cpp
+1 −0		src/lib/fcitx/instance_p.h
+0 −1		src/ui/classic/themes/default-dark/theme-dark.conf.in
+0 −1		src/ui/classic/themes/default/theme.conf.in
+3 −3		src/ui/classic/xcbinputwindow.cpp
+1 −0		test/CMakeLists.txt
+100 −26		test/testinstance.cpp