Skip to content

Commit 3b0dea1

Browse files
authored
emscripten 4.0.13; include librime warning log for rime=4 (#165)
1 parent 8b2edd9 commit 3b0dea1

File tree

4 files changed

+27
-4
lines changed

4 files changed

+27
-4
lines changed

.github/workflows/js.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
build:
1313
runs-on: ubuntu-24.04
1414
env:
15-
EMSCRIPTEN_VERSION: '4.0.12'
15+
EMSCRIPTEN_VERSION: '4.0.13'
1616
steps:
1717
- uses: actions/checkout@v5
1818
with:
@@ -25,6 +25,11 @@ jobs:
2525
path: fcitx5-mozc/mozc
2626
ref: ${{ inputs.mozc_sha }}
2727

28+
- uses: actions/checkout@v5
29+
with:
30+
repository: emscripten-core/emsdk
31+
path: emsdk
32+
2833
- uses: actions/setup-python@v5
2934
with:
3035
python-version: '3.13'
@@ -43,9 +48,8 @@ jobs:
4348
tar xjf fcitx5-js-dev.tar.bz2 -C build/js/usr
4449
4550
- name: Install emsdk
51+
working-directory: emsdk
4652
run: |
47-
git clone https://github.com/emscripten-core/emsdk
48-
cd emsdk
4953
./emsdk install ${{ env.EMSCRIPTEN_VERSION }}
5054
./emsdk activate ${{ env.EMSCRIPTEN_VERSION }}
5155
@@ -54,7 +58,8 @@ jobs:
5458
. emsdk/emsdk_env.sh
5559
git apply --directory=libime patches/libime.patch
5660
git apply --directory=fcitx5-chinese-addons patches/chinese-addons.patch
57-
git apply --directory=fcitx5-rime patches/rime.patch
61+
git apply --directory=fcitx5-rime patches/rime.log.patch
62+
git apply --directory=fcitx5-rime patches/rime.js.patch
5863
emcmake cmake -B build/js -G Ninja -DCMAKE_BUILD_TYPE=Release
5964
cmake --build build/js
6065
./scripts/install.sh js

.github/workflows/macos.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ jobs:
6666
GOARCH: ${{ matrix.goarch }}
6767
run: |
6868
git apply --directory=libime patches/libime.patch
69+
git apply --directory=fcitx5-rime patches/rime.log.patch
6970
cmake -B build/macos-${{ matrix.arch }} -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }}
7071
cmake --build build/macos-${{ matrix.arch }}
7172
./scripts/install.sh macos ${{ matrix.arch }}
File renamed without changes.

patches/rime.log.patch

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
diff --git a/src/rimeengine.cpp b/src/rimeengine.cpp
2+
index cdaaa3d..eaef05a 100644
3+
--- a/src/rimeengine.cpp
4+
+++ b/src/rimeengine.cpp
5+
@@ -275,9 +275,11 @@ void RimeEngine::rimeStart(bool fullcheck) {
6+
break;
7+
case Error:
8+
case Warn:
9+
- case Info:
10+
fcitx_rime_traits.min_log_level = 2;
11+
break;
12+
+ case Info:
13+
+ fcitx_rime_traits.min_log_level = 1;
14+
+ break;
15+
case Debug:
16+
default:
17+
// Rime info is too noisy.

0 commit comments

Comments
 (0)