adapt xkeyboard-config-2.45 directory change (#53)

Author: eagleoflqj

.github/workflows/compare.yml

@@ -9,7 +9,7 @@ jobs:
     steps:
       - name: Install bsdtar
         run: |
-          sudo apt install -y libarchive-tools
+          sudo apt update && sudo apt install -y libarchive-tools
           sudo ln -sf /usr/bin/bsdtar /usr/bin/tar
 
       - name: Download artifact

entry/src/main/cpp/CMakeLists.txt

@@ -46,7 +46,7 @@ option(BUILD_SPELL_DICT "" 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")
 set(ISOCODES_ISO639_JSON "${CMAKE_INSTALL_PREFIX}/share/iso-codes/json/iso_639-3.json")
-set(XKEYBOARDCONFIG_XKBBASE "${CMAKE_INSTALL_PREFIX}/share/X11/xkb")
+set(XKEYBOARDCONFIG_XKBBASE "${CMAKE_INSTALL_PREFIX}/share/xkeyboard-config-2")
 set(XKEYBOARDCONFIG_DATADIR "${CMAKE_INSTALL_PREFIX}/share")
 
 add_subdirectory(fcitx5)

entry/src/main/cpp/src/fcitx.cpp

@@ -59,7 +59,7 @@ void setupEnv(const std::string &bundle, const std::string &resfile) {
     ::fs::path xdg_data_dirs = resfilePath / "usr" / "share";
     std::string fcitx_data_dirs = xdg_data_dirs / "fcitx5";
     std::string libime_model_dirs = resfilePath / "usr" / "lib" / "libime";
-    std::string xkb_config_root = xdg_data_dirs / "X11" / "xkb";
+    std::string xkb_config_root = xdg_data_dirs / "xkeyboard-config-2";
     setenv("XDG_DATA_DIRS", xdg_data_dirs.c_str(), 1);
     setenv("FCITX_DATA_DIRS", fcitx_data_dirs.c_str(), 1);
     setenv("LIBIME_MODEL_DIRS", libime_model_dirs.c_str(), 1);

scripts/install-deps.sh

@@ -39,7 +39,7 @@ for addon in "${addons[@]}"; do
   file=$addon-any.tar.bz2
   [[ -f cache/$file ]] || wget -P cache https://github.com/fcitx-contrib/fcitx5-plugins/releases/download/macos-latest/$file
   tar xf cache/$file -C $RES_EXTRACT_DIR lib || true
-  tar xf cache/$file -C $RES_EXTRACT_DIR share
+  tar xf cache/$file -C $RES_EXTRACT_DIR --exclude share/icons share # symlink extraction error on Windows
 done
 
 RAW_DIR=entry/src/main/resources/rawfile

scripts/postbuild.mjs

@@ -12,7 +12,7 @@ mkdirSync(isoJsonDir, { recursive: true })
 
 const commands = [
   ['cmake', '--install', buildDir, '--component', 'config'],
-  ['cp', '-r', `${prebuiltUsrDir}/share/X11`, destShareDir],
+  ['cp', '-r', `${prebuiltUsrDir}/share/xkeyboard-config-2`, destShareDir],
   ['cp', `${prebuiltUsrDir}/share/iso-codes/json/iso_3166-1.json`, isoJsonDir],
   ['cp', `${prebuiltUsrDir}/share/iso-codes/json/iso_639-3.json`, isoJsonDir],
 ]