Skip to content
This repository has been archived by the owner on Nov 30, 2024. It is now read-only.

update submodules #21

Merged
merged 1 commit into from
Apr 3, 2024
Merged

update submodules #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fcitx5-chinese-addons
Open in desktop
Submodule fcitx5-chinese-addons updated 13 files
+1 −1 CMakeLists.txt
+16 −0 im/pinyin/pinyin.cpp
+12 −1 im/pinyin/pinyin.h
+122 −110 po/ca.po
+122 −110 po/da.po
+122 −110 po/de.po
+122 −110 po/fcitx5-chinese-addons.pot
+106 −94 po/he.po
+122 −110 po/ja.po
+124 −112 po/ko.po
+122 −110 po/ru.po
+124 −112 po/zh_CN.po
+124 −112 po/zh_TW.po
2 changes: 1 addition & 1 deletion fcitx5-lua
Open in desktop
Submodule fcitx5-lua updated 1 files
+3 −3 .github/workflows/check.yml
2 changes: 1 addition & 1 deletion fcitx5-rime
Open in desktop
Submodule fcitx5-rime updated 4 files
+3 −3 .github/workflows/check.yml
+1 −1 CMakeLists.txt
+6 −12 src/rimecandidate.cpp
+4 −1 src/rimeengine.h
2 changes: 1 addition & 1 deletion fcitx5-skk
Open in desktop
Submodule fcitx5-skk updated 1 files
+3 −3 .github/workflows/check.yml
2 changes: 1 addition & 1 deletion fcitx5-thai
Open in desktop
Submodule fcitx5-thai updated 1 files
+3 −3 .github/workflows/check.yml
8 changes: 4 additions & 4 deletions patches/chinese-addons.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
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")

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<bool> preeditCursorPositionAtBeginning{
this, "PreeditCursorPositionAtBeginning",
_("Fix embedded preedit cursor at the beginning of the preedit"),
Expand Down
15 changes: 1 addition & 14 deletions patches/rime.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -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<bool> preeditCursorPositionAtBeginning{
this, "PreeditCursorPositionAtBeginning",
_("Fix embedded preedit cursor at the beginning of the preedit"),
- !isAndroid()};
+ false};
Option<bool> commitWhenDeactivate{
this, "Commit when deactivate",
_("Commit current text when deactivating"), true};