Skip to content

emscripten 4.0.9; standardpaths #117

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 1 commit into from
May 20, 2025
Merged

emscripten 4.0.9; standardpaths #117

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 .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
workflow_dispatch:

env:
MOZC_SHA: 1621842243c0f43fca77697aba523fb698e865bd
MOZC_SHA: 18c59459ad4f5a3aa53b825e122d38eceffd744c

jobs:
lint:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/js.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
build:
runs-on: ubuntu-24.04
env:
EMSCRIPTEN_VERSION: '4.0.8'
EMSCRIPTEN_VERSION: '4.0.9'
steps:
- uses: actions/checkout@v4
with:
Expand Down
16 changes: 8 additions & 8 deletions patches/chinese-addons.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f94df13..73b2c6a 100644
index f0d9f86..32a032c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,7 +80,6 @@ fcitx5_add_i18n_definition()
@@ -71,7 +71,6 @@ fcitx5_add_i18n_definition()
add_subdirectory(modules)
add_subdirectory(im)
add_subdirectory(po)
Expand All @@ -11,10 +11,10 @@ index f94df13..73b2c6a 100644
if (ENABLE_GUI)
add_subdirectory(gui)
diff --git a/im/pinyin/pinyin.cpp b/im/pinyin/pinyin.cpp
index 38dd43c..63eb024 100644
index 78fc52c..f5d1d64 100644
--- a/im/pinyin/pinyin.cpp
+++ b/im/pinyin/pinyin.cpp
@@ -671,8 +671,7 @@ std::string PinyinEngine::evaluateCustomPhrase(InputContext *inputContext,
@@ -674,8 +674,7 @@ std::string PinyinEngine::evaluateCustomPhrase(InputContext *inputContext,

PinyinEngine::PinyinEngine(Instance *instance)
: instance_(instance),
Expand All @@ -24,7 +24,7 @@ index 38dd43c..63eb024 100644
ime_ = std::make_unique<libime::PinyinIME>(
std::make_unique<libime::PinyinDictionary>(),
std::make_unique<libime::UserLanguageModel>(
@@ -830,25 +829,18 @@ void PinyinEngine::loadDict(const std::string &fullPath,
@@ -833,25 +832,18 @@ void PinyinEngine::loadDict(const std::string &fullPath,
}
ime_->dict()->addEmptyDict();
PINYIN_DEBUG() << "Loading pinyin dict " << fullPath;
Expand Down Expand Up @@ -63,10 +63,10 @@ index 38dd43c..63eb024 100644

void PinyinEngine::loadBuiltInDict() {
diff --git a/im/pinyin/pinyin.h b/im/pinyin/pinyin.h
index db10dd3..7ca0b20 100644
index b0fb7d6..d9ddea7 100644
--- a/im/pinyin/pinyin.h
+++ b/im/pinyin/pinyin.h
@@ -450,7 +450,6 @@ private:
@@ -459,7 +459,6 @@ private:
std::unique_ptr<HandlerTableEntry<EventHandler>> event_;
CustomPhraseDict customPhrase_;
SymbolDict symbols_;
Expand All @@ -75,7 +75,7 @@ index db10dd3..7ca0b20 100644
std::list<std::unique_ptr<TaskToken>> tasks_;

diff --git a/modules/pinyinhelper/stroke.cpp b/modules/pinyinhelper/stroke.cpp
index 38baeb1..d3c0b20 100644
index 9bb26ed..a3fe3ab 100644
--- a/modules/pinyinhelper/stroke.cpp
+++ b/modules/pinyinhelper/stroke.cpp
@@ -34,11 +34,11 @@ namespace fcitx {
Expand Down
Loading