emscripten 4.0.13; sync fcitx5 for iso-codes (#65)

Author: eagleoflqj

.github/workflows/ci.yml

@@ -34,7 +34,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     needs: lint
     env:
-      EMSCRIPTEN_VERSION: '4.0.12'
+      EMSCRIPTEN_VERSION: '4.0.13'
     strategy:
       fail-fast: false
       matrix:
@@ -47,6 +47,11 @@ jobs:
         with:
           submodules: recursive
 
+      - uses: actions/checkout@v5
+        with:
+          repository: emscripten-core/emsdk
+          path: emsdk
+
       - uses: actions/setup-node@v4
         with:
           node-version: 24.x
@@ -74,9 +79,8 @@ jobs:
           pnpm --prefix=fcitx5-webview i
 
       - name: Install emsdk
+        working-directory: emsdk
         run: |
-          git clone https://github.com/emscripten-core/emsdk
-          cd emsdk
           ./emsdk install ${{ env.EMSCRIPTEN_VERSION }}
           ./emsdk activate ${{ env.EMSCRIPTEN_VERSION }}
 

CMakeLists.txt

@@ -58,8 +58,7 @@ option(ENABLE_LIBUUID "" OFF)
 option(BUILD_SPELL_DICT "" OFF)
 option(BUILD_PREVIEW "" OFF)
 
-# Override iso-codes paths and xkb default rules file
-set(ISOCODES_ISO3166_JSON "${CMAKE_INSTALL_PREFIX}/share/iso-codes/json/iso_3166-1.json")
+# Override iso-codes path and xkb default rules file
 set(ISOCODES_ISO639_JSON "${CMAKE_INSTALL_PREFIX}/share/iso-codes/json/iso_639-3.json")
 set(XKEYBOARDCONFIG_XKBBASE "${CMAKE_INSTALL_PREFIX}/share/xkeyboard-config-2")
 set(XKEYBOARDCONFIG_DATADIR "${CMAKE_INSTALL_PREFIX}/share")

fcitx5

@@ -41,7 +41,6 @@ if (RIME_ONLY)
 else()
     list(APPEND EXE_LINK_OPTIONS
         "--preload-file ${PREBUILDER_SHARE_DIR}/xkeyboard-config-2@/usr/share/xkeyboard-config-2"
-        "--preload-file ${PROJECT_BINARY_DIR}/sysroot${ISOCODES_ISO3166_JSON}@${ISOCODES_ISO3166_JSON}"
         "--preload-file ${PROJECT_BINARY_DIR}/sysroot${ISOCODES_ISO639_JSON}@${ISOCODES_ISO639_JSON}"
         "--preload-file ${INSTALL_SHARE_DIR}/locale@/usr/share/locale"
         "--preload-file ${INSTALL_SHARE_DIR}/fcitx5@/usr/share/fcitx5"