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

Author: eagleoflqj

CMakeLists.txt

@@ -74,7 +74,7 @@ set(CMAKE_INSTALL_LIBDATADIR "${CMAKE_INSTALL_PREFIX}/lib")
 # 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)

assets/CMakeLists.txt

@@ -35,7 +35,7 @@ install(DIRECTORY "${PREBUILDER_SHARE_DIR}/iso-codes"
     DESTINATION "${CMAKE_INSTALL_PREFIX}/share"
 )
 
-install(DIRECTORY "${PREBUILDER_SHARE_DIR}/X11"
+install(DIRECTORY "${PREBUILDER_SHARE_DIR}/xkeyboard-config-2"
     DESTINATION "${CMAKE_INSTALL_PREFIX}/share"
 )
 

src/fcitx.cpp

@@ -139,8 +139,7 @@ void Fcitx::setupEnv() {
     setenv("FCITX_ADDON_DIRS", fcitx_addon_dirs.c_str(), 1);
     setenv("XDG_DATA_DIRS", xdg_data_dirs.c_str(), 1);
     setenv("LIBIME_MODEL_DIRS", libime_model_dirs.c_str(), 1);
-    setenv("XKB_CONFIG_EXTRA_PATH", APP_CONTENTS_PATH "/etc/xkb", 1);
-    setenv("XKB_CONFIG_ROOT", APP_CONTENTS_PATH "/share/X11/xkb", 1);
+    setenv("XKB_CONFIG_ROOT", APP_CONTENTS_PATH "/share/xkeyboard-config-2", 1);
 
     // Set LANGUAGE for libintl-lite.
     std::string val = current_locale;