Skip to content

chore(deps): update fcitx5-rime digest to d589911 #125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 26, 2025
Merged

chore(deps): update fcitx5-rime digest to d589911 #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1d53bfd
chore(deps): update fcitx5-rime digest to d589911
renovate[bot] May 25, 2025
defe5d3
update patch
eagleoflqj May 26, 2025
9dc18af
patch uses std fs
eagleoflqj May 26, 2025
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-rime
Open in desktop
Submodule fcitx5-rime updated 20 files
+5 −10 CMakeLists.txt
+10 −22 po/ca.po
+10 −22 po/da.po
+10 −22 po/de.po
+10 −22 po/fcitx5-rime.pot
+10 −22 po/he.po
+10 −22 po/ja.po
+10 −22 po/ko.po
+10 −22 po/ru.po
+10 −22 po/tr.po
+27 −39 po/vi.po
+10 −22 po/zh_CN.po
+11 −24 po/zh_TW.po
+0 −2 src/rimeaction.cpp
+0 −9 src/rimecandidate.cpp
+1 −8 src/rimecandidate.h
+38 −93 src/rimeengine.cpp
+12 −22 src/rimeengine.h
+2 −4 src/rimestate.cpp
+0 −2 src/rimestate.h
14 changes: 7 additions & 7 deletions patches/rime.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
diff --git a/src/rimeengine.cpp b/src/rimeengine.cpp
index b335069..ca08611 100644
index cdaaa3d..4295375 100644
--- a/src/rimeengine.cpp
+++ b/src/rimeengine.cpp
@@ -46,6 +46,7 @@
@@ -47,6 +47,7 @@
#include <unordered_map>
#include <utility>
#include <vector>
+#include <emscripten.h>

FCITX_DEFINE_LOG_CATEGORY(rime_log, "rime");

@@ -299,13 +300,26 @@ void RimeEngine::rimeStart(bool fullcheck) {
@@ -287,13 +288,26 @@ void RimeEngine::rimeStart(bool fullcheck) {

fcitx_rime_traits.modules = nullptr;
#endif

+ bool autoDeploy = false;
if (firstRun_) {
api_->setup(&fcitx_rime_traits);
firstRun_ = false;
+ if (!EM_ASM_INT(return fcitx.isWorker)) {
+ autoDeploy = !fs::isreg(stringutils::joinPath(userDir, "build/default.yaml"));
+ autoDeploy = !fs::isreg(userDir / "build/default.yaml");
+ }
}
api_->initialize(&fcitx_rime_traits);
Expand All @@ -38,7 +38,7 @@ index b335069..ca08611 100644

if (!api_->is_maintenance_mode()) {
updateAppOptions();
@@ -582,12 +596,13 @@ void RimeEngine::notify(RimeSessionId session, const std::string &messageType,
@@ -521,12 +535,13 @@ void RimeEngine::notify(RimeSessionId session, const std::string &messageType,
bool blockMessage = false;
if (messageType == "deploy") {
tipId = "fcitx-rime-deploy";
Expand All @@ -53,7 +53,7 @@ index b335069..ca08611 100644
if (!api_->is_maintenance_mode()) {
if (needRefreshAppOption_) {
api_->deploy_config_file("fcitx5.yaml", "config_version");
@@ -602,6 +617,7 @@ void RimeEngine::notify(RimeSessionId session, const std::string &messageType,
@@ -541,6 +556,7 @@ void RimeEngine::notify(RimeSessionId session, const std::string &messageType,
needRefreshAppOption_ = false;
message = _("Rime has encountered an error. "
"See log for details.");
Expand Down
Loading