feat: update fcitx5 to

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.6.0)
-project(fcitx VERSION 5.1.10)
+project(fcitx VERSION 5.0.21)
 set(FCITX_VERSION ${PROJECT_VERSION})
 
 find_package(ECM REQUIRED 1.0.0)
@@ -31,7 +31,7 @@ option(ENABLE_DBUS "Enable DBus" On)
 option(ENABLE_DOC "Build doxygen" Off)
 option(ENABLE_SERVER "Build a fcitx as server, disable this option if you want to use fcitx as an embedded library." On)
 option(ENABLE_KEYBOARD "Enable key event translation with XKB and build keyboard engine" On)
-option(USE_SYSTEMD "Use systemd for event loop and dbus, will fallback to libuv/libdbus if not found." On)
+option(USE_SYSTEMD "Use systemd for event loop and dbus, will fallback to libevent/libdbus if not found." On)
 option(ENABLE_XDGAUTOSTART "Enable xdg autostart desktop file installation" On)
 option(USE_FLATPAK_ICON "Use flatpak icon name for desktop files" Off)
 option(ENABLE_EMOJI "Enable emoji module" On)
@@ -69,11 +69,14 @@ if (NOT TARGET Systemd::Systemd)
         pkg_get_variable(DBUS_SYSTEM_BUS_DEFAULT_ADDRESS "dbus-1" "system_bus_default_address")
     endif()
 
-    if (NOT LIBUV_TARGET)
-        if (NOT (TARGET PkgConfig::LibUV))
-            pkg_check_modules(LibUV REQUIRED IMPORTED_TARGET "libuv")
-        endif()
-        set(LIBUV_TARGET PkgConfig::LibUV)
+    if (NOT (TARGET libevent::core OR TARGET PkgConfig::LibEvent))
+        find_package(Libevent)
+    endif()
+    if (TARGET libevent::core)
+        set(LIBEVENT_TARGET libevent::core)
+    else()
+        pkg_check_modules(LibEvent REQUIRED IMPORTED_TARGET "libevent_core")
+        set(LIBEVENT_TARGET PkgConfig::LibEvent)
     endif()
 endif()
 
@@ -124,8 +127,8 @@ if (ENABLE_KEYBOARD)
     pkg_check_modules(JsonC REQUIRED IMPORTED_TARGET "json-c")
 
     set(DEFAULT_XKB_RULES_FILES "${XKEYBOARDCONFIG_XKBBASE}/rules/${DEFAULT_XKB_RULES}.xml")
-    if (NOT EXISTS "${DEFAULT_XKB_RULES_FILES}" AND NOT APPLE)
-        message(WARNING "Could not find default xkb rules file: ${DEFAULT_XKB_RULES_FILES}")
+    if (NOT EXISTS "${DEFAULT_XKB_RULES_FILES}")
+    message(FATAL_ERROR "Could not find default xkb rules file: ${DEFAULT_XKB_RULES_FILES}")
     endif()
 endif()
 
@@ -138,7 +141,7 @@ if (ENABLE_X11 OR ENABLE_WAYLAND)
 endif()
 
 if (ENABLE_WAYLAND)
-    set(REQUIRED_WAYLAND_COMPONENTS Client Cursor)
+    set(REQUIRED_WAYLAND_COMPONENTS Client)
     find_package(Wayland REQUIRED COMPONENTS ${REQUIRED_WAYLAND_COMPONENTS})
     find_package(WaylandScanner REQUIRED)
     find_package(WaylandProtocols REQUIRED)

cmake/Fcitx5CompilerSettings.cmake

@@ -7,11 +7,8 @@ set(CMAKE_C_STANDARD 99)
 
 set(CMAKE_C_FLAGS "-Wall -Wextra ${CMAKE_C_FLAGS}")
 set(CMAKE_CXX_FLAGS "-Wall -Wextra ${CMAKE_CXX_FLAGS}")
-
-if(NOT APPLE)
-    set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined -Wl,--as-needed ${CMAKE_SHARED_LINKER_FLAGS}")
-    set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined -Wl,--as-needed ${CMAKE_MODULE_LINKER_FLAGS}")
-endif()
+set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined -Wl,--as-needed ${CMAKE_SHARED_LINKER_FLAGS}")
+set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined -Wl,--as-needed ${CMAKE_MODULE_LINKER_FLAGS}")
 
 set(CMAKE_C_VISIBILITY_PRESET hidden)
 set(CMAKE_CXX_VISIBILITY_PRESET hidden)

cmake/FindIsoCodes.cmake

@@ -18,17 +18,13 @@ endif(ISOCODES_INCLUDE_DIR AND ISOCODES_LIBRARIES)
 find_package(PkgConfig)
 pkg_check_modules(PC_ISOCODES iso-codes)
 
-if(NOT DEFINED ISOCODES_ISO639_JSON)
-    find_file(ISOCODES_ISO639_JSON iso_639-3.json
-              HINTS "${PC_ISOCODES_PREFIX}/share/iso-codes/json/"
-            )
-endif()
+find_file(ISOCODES_ISO639_JSON iso_639-3.json
+          HINTS "${PC_ISOCODES_PREFIX}/share/iso-codes/json/"
+          )
 
-if(NOT DEFINED ISOCODES_ISO3166_JSON)
-    find_file(ISOCODES_ISO3166_JSON iso_3166-1.json
-              HINTS "${PC_ISOCODES_PREFIX}/share/iso-codes/json/"
-            )
-endif()
+find_file(ISOCODES_ISO3166_JSON iso_3166-1.json
+          HINTS "${PC_ISOCODES_PREFIX}/share/iso-codes/json/"
+          )
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(IsoCodes  DEFAULT_MSG  ISOCODES_ISO639_JSON ISOCODES_ISO3166_JSON)

cmake/FindXKeyboardConfig.cmake

@@ -2,12 +2,8 @@ find_package(PkgConfig)
 
 pkg_check_modules(PKG_XKEYBOARDCONFIG QUIET xkeyboard-config)
 
-if(NOT DEFINED XKEYBOARDCONFIG_XKBBASE)
-    pkg_get_variable(XKEYBOARDCONFIG_XKBBASE xkeyboard-config xkb_base)
-endif()
-if(NOT DEFINED XKEYBOARDCONFIG_DATADIR)
-    pkg_get_variable(XKEYBOARDCONFIG_DATADIR xkeyboard-config datadir)
-endif()
+pkg_get_variable(XKEYBOARDCONFIG_XKBBASE xkeyboard-config xkb_base)
+pkg_get_variable(XKEYBOARDCONFIG_DATADIR xkeyboard-config datadir)
 
 set(XKEYBOARDCONFIG_VERSION ${PKG_XKEYBOARDCONFIG_VERSION})
 mark_as_advanced(XKEYBOARDCONFIG_VERSION)

data/CMakeLists.txt

@@ -30,18 +30,3 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/fcitx5-diagnose" DESTINATION "${FCITX
 GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 
 install(DIRECTORY default DESTINATION "${FCITX_INSTALL_PKGDATADIR}" COMPONENT config)
-
-if (WAYLAND_FOUND AND ENABLE_X11)
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/20-fcitx-x11.in
-                   ${CMAKE_CURRENT_BINARY_DIR}/20-fcitx-x11 @ONLY)
-    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/20-fcitx-x11" DESTINATION "${CMAKE_INSTALL_FULL_SYSCONFDIR}/xdg/Xwayland-session.d" PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-endif()
-
-if (ENABLE_DBUS AND WAYLAND_FOUND)
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcitx5-wayland-launcher.desktop.in.in
-                   ${CMAKE_CURRENT_BINARY_DIR}/fcitx5-wayland-launcher.desktop.in @ONLY)
-    fcitx5_translate_desktop_file(${CMAKE_CURRENT_BINARY_DIR}/fcitx5-wayland-launcher.desktop.in
-                                  fcitx5-wayland-launcher.desktop)
-    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/fcitx5-wayland-launcher.desktop"
-            DESTINATION "${FCITX_INSTALL_DATADIR}/applications")
-endif()

data/fcitx5-configtool.sh

@@ -5,14 +5,14 @@
 
 export TEXTDOMAIN=fcitx5
 
-if command -v kdialog > /dev/null 2>&1; then
+if which kdialog > /dev/null 2>&1; then
     message() {
         kdialog --msgbox "$1"
     }
     error() {
         kdialog --error "$1"
     }
-elif command -v zenity > /dev/null 2>&1; then
+elif which zenity > /dev/null 2>&1; then
     message() {
         zenity --info --text="$1"
     }
@@ -28,7 +28,7 @@ else
     }
 fi
 
-if command -v gettext > /dev/null 2>&1; then
+if which gettext > /dev/null 2>&1; then
     _() {
         gettext "$@"
     }
@@ -108,21 +108,18 @@ detectDE() {
     if [ x"$DE" = x"gnome" ]; then
       # gnome-default-applications-properties is only available in GNOME 2.x
       # but not in GNOME 3.x
-      command -v gnome-default-applications-properties > /dev/null 2>&1  || DE="gnome3"
+      which gnome-default-applications-properties > /dev/null 2>&1  || DE="gnome3"
     fi
 }
 
 run_kde() {
-    if (systemsettings --list 2>/dev/null | grep ^kcm_fcitx5 > /dev/null 2>&1); then
-        exec systemsettings kcm_fcitx5
-    fi
     if (systemsettings5 --list 2>/dev/null | grep ^kcm_fcitx5 > /dev/null 2>&1); then
         exec systemsettings5 kcm_fcitx5
     fi
 }
 
 run_qt() {
-    if command -v fcitx5-config-qt > /dev/null 2>&1; then
+    if which fcitx5-config-qt > /dev/null 2>&1; then
         exec fcitx5-config-qt
     fi
     return 1
@@ -138,13 +135,13 @@ run_xdg() {
             ;;
     esac
 
-    if command="$(command -v xdg-open 2>/dev/null)"; then
+    if command="$(which xdg-open 2>/dev/null)"; then
         exec "$command" "$HOME/.config/fcitx5"
     fi
 }
 
 _which_cmdline() {
-    cmd="$(command -v "$1")" || return 1
+    cmd="$(which "$1")" || return 1
     shift
     echo "$cmd $*"
 }