diff --git a/fcitx5-chinese-addons b/fcitx5-chinese-addons index cd099d3..4208c4f 160000 --- a/fcitx5-chinese-addons +++ b/fcitx5-chinese-addons @@ -1 +1 @@ -Subproject commit cd099d3d19926c308dc5e2e584f8ee4c6f575064 +Subproject commit 4208c4f990914e01d3d0bad97437d8f6d22dc216 diff --git a/fcitx5-lua b/fcitx5-lua index b726314..4c6b486 160000 --- a/fcitx5-lua +++ b/fcitx5-lua @@ -1 +1 @@ -Subproject commit b726314902af7c4a1f3eb71bf75f2a80ebe112a9 +Subproject commit 4c6b48631af963a63f81e6b03c9d73320c538ea0 diff --git a/fcitx5-rime b/fcitx5-rime index a3d9880..7e9f570 160000 --- a/fcitx5-rime +++ b/fcitx5-rime @@ -1 +1 @@ -Subproject commit a3d98808fce7cdf4b9ff31e5af632c971705f197 +Subproject commit 7e9f570bd54a8d3798fb54ce0921b26062a51d39 diff --git a/fcitx5-skk b/fcitx5-skk index 389368d..af61407 160000 --- a/fcitx5-skk +++ b/fcitx5-skk @@ -1 +1 @@ -Subproject commit 389368da7ddee6f04b994f67df8697c75572a73c +Subproject commit af614077ed6b220627374f60b89cc24cede7b046 diff --git a/fcitx5-thai b/fcitx5-thai index 02fa8cf..4d65bda 160000 --- a/fcitx5-thai +++ b/fcitx5-thai @@ -1 +1 @@ -Subproject commit 02fa8cfe064aa6d32c2c13db99608b980a330a0d +Subproject commit 4d65bda1c51c854764fd881f8924707b8f5c081d diff --git a/patches/chinese-addons.patch b/patches/chinese-addons.patch index a4e9608..6ea6aaa 100644 --- a/patches/chinese-addons.patch +++ b/patches/chinese-addons.patch @@ -1,10 +1,10 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index b4efaf4..eeb9bad 100644 +index 433a71d..7efcd6b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,6 +65,8 @@ endif() find_package(Boost 1.61 REQUIRED COMPONENTS iostreams) - find_package(LibIMEPinyin 1.1.3 REQUIRED) + find_package(LibIMEPinyin 1.1.7 REQUIRED) find_package(LibIMETable 1.1.4 REQUIRED) +pkg_check_modules(ZSTD REQUIRED IMPORTED_TARGET "libzstd") +set(LIBIME_INSTALL_PKGDATADIR "../libime") @@ -12,10 +12,10 @@ index b4efaf4..eeb9bad 100644 if (ENABLE_CLOUDPINYIN) pkg_check_modules(Curl REQUIRED IMPORTED_TARGET "libcurl") diff --git a/im/pinyin/pinyin.h b/im/pinyin/pinyin.h -index 3522664..a5e0a5d 100644 +index b7971bf..219d476 100644 --- a/im/pinyin/pinyin.h +++ b/im/pinyin/pinyin.h -@@ -141,7 +141,7 @@ FCITX_CONFIGURATION( +@@ -152,7 +152,7 @@ FCITX_CONFIGURATION( Option preeditCursorPositionAtBeginning{ this, "PreeditCursorPositionAtBeginning", _("Fix embedded preedit cursor at the beginning of the preedit"), diff --git a/patches/rime.patch b/patches/rime.patch index e8e7b4e..a1aca25 100644 --- a/patches/rime.patch +++ b/patches/rime.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 24f4f51..e3224f3 100644 +index f6f9909..df779da 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,8 @@ find_package(PkgConfig REQUIRED) @@ -12,16 +12,3 @@ index 24f4f51..e3224f3 100644 endif() if ("${Rime_VERSION}" VERSION_LESS "1.7.0") -diff --git a/src/rimeengine.h b/src/rimeengine.h -index 5e016f7..520b83b 100644 ---- a/src/rimeengine.h -+++ b/src/rimeengine.h -@@ -59,7 +59,7 @@ FCITX_CONFIGURATION( - Option preeditCursorPositionAtBeginning{ - this, "PreeditCursorPositionAtBeginning", - _("Fix embedded preedit cursor at the beginning of the preedit"), -- !isAndroid()}; -+ false}; - Option commitWhenDeactivate{ - this, "Commit when deactivate", - _("Commit current text when deactivating"), true};