feat: update fcitx5 to 5.1.17-1

Author: deepin-community-bot[bot]

.clang-format

@@ -41,6 +41,7 @@ Standard:        Cpp11
 IndentWidth:     4
 TabWidth:        4
 UseTab:          Never
+LineEnding:      LF
 BreakBeforeBraces: Attach
 SpacesInParentheses: false
 SpacesInAngles:  false
@@ -51,6 +52,7 @@ SpaceBeforeAssignmentOperators: true
 ContinuationIndentWidth: 4
 CommentPragmas:  '^ IWYU pragma:'
 ForEachMacros:   [ Q_FOREACH, BOOST_FOREACH ]
+AttributeMacros: [ FCITXCORE_EXPORT, FCITXUTILS_EXPORT, FCITXCONFIG_EXPORT ]
 SpaceBeforeParens: ControlStatements
 DisableFormat:   false
 SortIncludes: true

.gitignore

@@ -0,0 +1,15 @@
+build*/
+.*
+!.git*
+.git/
+*.tar.*
+*.kdev4
+*.kate-swp
+*.orig
+tags
+astyle.sh
+cscope.*
+*.part
+XF86keysym.h
+keysymdef.h
+*~

CMakeLists.txt

@@ -1,5 +1,5 @@
-cmake_minimum_required(VERSION 3.6.0)
-project(fcitx VERSION 5.1.11)
+cmake_minimum_required(VERSION 3.13)
+project(fcitx VERSION 5.1.17)
 set(FCITX_VERSION ${PROJECT_VERSION})
 
 find_package(ECM REQUIRED 1.0.0)
@@ -16,11 +16,14 @@ include(WriteBasicConfigVersionFile)
 include(ECMUninstallTarget)
 include(src/lib/fcitx-utils/Fcitx5Macros.cmake)
 include(CheckSymbolExists)
+include(CheckIncludeFile)
+include(CheckCXXCompilerFlag)
 
 #######################################################################
 # Options
 #######################################################################
-option(ENABLE_TEST "Build Test" On)
+option(ENABLE_TESTING_ADDONS "Build testing frontend, im and ui addons" On)
+option(ENABLE_TEST "Build Test (Need ENABLE_TESTING_ADDONS=On)" On)
 option(ENABLE_COVERAGE "Build the project with gcov support (Need ENABLE_TEST=On)" Off)
 set(GCOV_TOOL "gcov" CACHE STRING "Path to gcov tool used by coverage.")
 set(DEFAULT_XKB_RULES "evdev" CACHE STRING "Xkb rules name")
@@ -31,12 +34,15 @@ 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 libuv/libdbus if not found. Only used when EVENT_LOOP_BACKEND is auto." 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)
 option(ENABLE_LIBUUID "Use libuuid for uuid generation" On)
-set(NO_PREEDIT_APPS "gvim.*,wps.*,wpp.*,et.*" CACHE STRING "Disable preedit for follwing app by default.")
+option(BUILD_SPELL_DICT "Build en_dict.fscd for English spell check" On)
+option(BUILD_SHARED_LIBS "Build library as shared libs" On)
+set(NO_PREEDIT_APPS "gvim.*,wps.*,wpp.*,et.*" CACHE STRING "Disable preedit for following app by default.")
+set(EVENT_LOOP_BACKEND "auto" CACHE STRING "Set the underlying event loop implementation, valid values are auto,systemd,libuv,none")
 
 if (ENABLE_EMOJI)
     find_package(ZLIB REQUIRED)
@@ -46,35 +52,67 @@ if ((ENABLE_WAYLAND OR ENABLE_X11) AND NOT ENABLE_KEYBOARD)
     message(FATAL_ERROR "X11 and Wayland require ENABLE_KEYBOARD to be set to ON.")
 endif ()
 
-
 #######################################################################
 # Find packages
 #######################################################################
 
 find_package(PkgConfig REQUIRED)
 
-if (USE_SYSTEMD)
-find_package(Systemd)
-endif ()
+set(CANDIDATE_EVENT_LOOP_BACKENDS)
 
-if (USE_FLATPAK_ICON)
-    set(FCITX_ICON_NAME "org.fcitx.Fcitx5")
-else()
-    set(FCITX_ICON_NAME "fcitx")
+if (EVENT_LOOP_BACKEND STREQUAL "auto")
+    if (USE_SYSTEMD)
+        list(APPEND CANDIDATE_EVENT_LOOP_BACKENDS systemd)
+    endif()
+
+    list(APPEND CANDIDATE_EVENT_LOOP_BACKENDS libuv)
+elseif (EVENT_LOOP_BACKEND STREQUAL "systemd")
+    list(APPEND CANDIDATE_EVENT_LOOP_BACKENDS systemd)
+elseif (EVENT_LOOP_BACKEND STREQUAL "libuv")
+    list(APPEND CANDIDATE_EVENT_LOOP_BACKENDS libuv)
+elseif (EVENT_LOOP_BACKEND STREQUAL "none")
+    list(APPEND CANDIDATE_EVENT_LOOP_BACKENDS none)
 endif()
 
-if (NOT TARGET Systemd::Systemd)
-    if (ENABLE_DBUS)
-        pkg_check_modules(DBus REQUIRED IMPORTED_TARGET "dbus-1")
-        pkg_get_variable(DBUS_SYSTEM_BUS_DEFAULT_ADDRESS "dbus-1" "system_bus_default_address")
-    endif()
+set(FCITX_EVENT_LOOP_BACKEND "")
+foreach(CANDIDATE_EVENT_LOOP_BACKEND IN LISTS CANDIDATE_EVENT_LOOP_BACKENDS)
+    if (CANDIDATE_EVENT_LOOP_BACKEND STREQUAL systemd)
+        find_package(Systemd)
+        if (TARGET Systemd::Systemd)
+            set(FCITX_EVENT_LOOP_BACKEND "systemd")
+            break()
+        endif()
+    elseif (CANDIDATE_EVENT_LOOP_BACKEND STREQUAL libuv)
+        if (NOT LIBUV_TARGET)
+            if (NOT (TARGET PkgConfig::LibUV))
+                pkg_check_modules(LibUV IMPORTED_TARGET "libuv")
+                set(LIBUV_TARGET PkgConfig::LibUV)
+            endif()
+        endif()
 
-    if (NOT LIBUV_TARGET)
-        if (NOT (TARGET PkgConfig::LibUV))
-            pkg_check_modules(LibUV REQUIRED IMPORTED_TARGET "libuv")
+        if (TARGET "${LIBUV_TARGET}")
+            set(FCITX_EVENT_LOOP_BACKEND "libuv")
+            break()
         endif()
-        set(LIBUV_TARGET PkgConfig::LibUV)
+    elseif (CANDIDATE_EVENT_LOOP_BACKEND STREQUAL none)
+        set(FCITX_EVENT_LOOP_BACKEND "none")
+        break()
     endif()
+endforeach()
+
+if (ENABLE_DBUS AND NOT (FCITX_EVENT_LOOP_BACKEND STREQUAL systemd))
+    pkg_check_modules(DBus REQUIRED IMPORTED_TARGET "dbus-1")
+    pkg_get_variable(DBUS_SYSTEM_BUS_DEFAULT_ADDRESS "dbus-1" "system_bus_default_address")
+endif()
+
+if (FCITX_EVENT_LOOP_BACKEND STREQUAL "")
+    message(FATAL_ERROR "Failed to find a valid event loop backend. Backends checked: ${CANDIDATE_EVENT_LOOP_BACKENDS}")
+endif()
+
+if (USE_FLATPAK_ICON)
+    set(FCITX_ICON_NAME "org.fcitx.Fcitx5")
+else()
+    set(FCITX_ICON_NAME "fcitx")
 endif()
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "BSD|DragonFly")
@@ -94,16 +132,6 @@ find_package(Pthread REQUIRED)
 find_package(Execinfo)
 find_package(Gettext REQUIRED)
 
-if (NOT (TARGET fmt::fmt OR TARGET fmt::fmt-header-only))
-    find_package(fmt REQUIRED)
-endif()
-
-if (TARGET fmt::fmt-header-only)
-  set(FMT_TARGET fmt::fmt-header-only)
-else()
-  set(FMT_TARGET fmt::fmt)
-endif ()
-
 set(REQUIRED_XKBCOMMON_COMPONENTS XKBCommon)
 if (ENABLE_X11)
     set(REQUIRED_XKBCOMMON_COMPONENTS ${REQUIRED_XKBCOMMON_COMPONENTS} X11)
@@ -121,7 +149,7 @@ if (ENABLE_KEYBOARD)
     find_package(XKBCommon REQUIRED COMPONENTS ${REQUIRED_XKBCOMMON_COMPONENTS})
     find_package(IsoCodes REQUIRED)
     find_package(XKeyboardConfig REQUIRED)
-    pkg_check_modules(JsonC REQUIRED IMPORTED_TARGET "json-c")
+    find_package(nlohmann_json)
 
     set(DEFAULT_XKB_RULES_FILES "${XKEYBOARDCONFIG_XKBBASE}/rules/${DEFAULT_XKB_RULES}.xml")
     if (NOT EXISTS "${DEFAULT_XKB_RULES_FILES}" AND NOT APPLE)
@@ -139,9 +167,9 @@ endif()
 
 if (ENABLE_WAYLAND)
     set(REQUIRED_WAYLAND_COMPONENTS Client Cursor)
-    find_package(Wayland REQUIRED COMPONENTS ${REQUIRED_WAYLAND_COMPONENTS})
+    find_package(Wayland 1.22 REQUIRED COMPONENTS ${REQUIRED_WAYLAND_COMPONENTS})
     find_package(WaylandScanner REQUIRED)
-    find_package(WaylandProtocols REQUIRED)
+    find_package(WaylandProtocols 1.39 REQUIRED)
     pkg_check_modules(Gio IMPORTED_TARGET gio-2.0)
 endif()
 
@@ -163,13 +191,19 @@ if(NOT CMAKE_INSTALL_LIBDATADIR)
   set(CMAKE_INSTALL_LIBDATADIR "${CMAKE_INSTALL_LIBDIR}" CACHE PATH "libdata root (LIBDIR)")
 endif()
 
-get_filename_component(CMAKE_INSTALL_FULL_LIBDATADIR "${CMAKE_INSTALL_LIBDATADIR}" ABSOLUTE)
+GNUInstallDirs_get_absolute_install_dir(CMAKE_INSTALL_FULL_LIBDATADIR CMAKE_INSTALL_LIBDATADIR LIBDATADIR)
 mark_as_advanced(CMAKE_INSTALL_LIBDATADIR)
 mark_as_advanced(CMAKE_INSTALL_FULL_LIBDATADIR)
 
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+
 include(Fcitx5CompilerSettings)
+check_cxx_compiler_flag(-Wno-deprecated-declarations HAVE_NO_DEPRECATED_DECLARATIONS)
 
 set(FCITX_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
+set(FCITX_INSTALL_SYSCONFDIR ${CMAKE_INSTALL_FULL_SYSCONFDIR})
 set(FCITX_INSTALL_INCLUDEDIR ${CMAKE_INSTALL_FULL_INCLUDEDIR})
 set(FCITX_INSTALL_LIBDIR ${CMAKE_INSTALL_FULL_LIBDIR})
 set(FCITX_INSTALL_LIBDATADIR ${CMAKE_INSTALL_FULL_LIBDATADIR})
@@ -181,18 +215,28 @@ set(FCITX_INSTALL_LOCALEDIR ${CMAKE_INSTALL_FULL_LOCALEDIR})
 set(FCITX_INSTALL_ADDONDIR "${CMAKE_INSTALL_FULL_LIBDIR}/fcitx5")
 set(FCITX_INSTALL_CMAKECONFIG_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/cmake")
 set(FCITX_INSTALL_MODULE_HEADER_DIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}/Fcitx5/Module/fcitx-module")
-# TODO mac/win
-set(FCITX_LIBRARY_SUFFIX ".so")
+
+if (WIN32)
+    set(FCITX_LIBRARY_SUFFIX ".dll")
+else()
+    set(FCITX_LIBRARY_SUFFIX ".so")
+endif()
 
 check_function_exists(pipe2 HAVE_PIPE2)
+check_include_file(sys/wait.h HAVE_SYS_WAIT_H)
+check_include_file(sys/mman.h HAVE_SYS_MMAN_H)
+check_include_file(sys/uio.h HAVE_SYS_UIO_H)
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 add_subdirectory(src)
 add_subdirectory(data)
 add_subdirectory(po)
-add_subdirectory(testing)
+
+if (ENABLE_TESTING_ADDONS)
+  add_subdirectory(testing)
+endif()
 
 #######################################################################
 # Test features

README.md

@@ -2,21 +2,51 @@ Next generation of fcitx
 ==========================
 Fcitx 5 is a generic input method framework released under LGPL-2.1+.
 
+# Resources
+
 [![Jenkins Build Status](https://img.shields.io/jenkins/s/https/jenkins.fcitx-im.org/job/fcitx5.svg)](https://jenkins.fcitx-im.org/job/fcitx5/)
 [![Coverity Scan Status](https://img.shields.io/coverity/scan/9063.svg)](https://scan.coverity.com/projects/fcitx-fcitx5)
 [![Documentation](https://codedocs.xyz/fcitx/fcitx5.svg)](https://codedocs.xyz/fcitx/fcitx5/)
 
 * Wiki: [https://fcitx-im.org/](https://fcitx-im.org/)
   - Registration require explicit approval due to the spam, please send an email to the mail list if you do not get approved.
 * Discussion:
-  - [fcitx [at] googlegroups.com](https://groups.google.com/g/fcitx)
-  - [https://github.com/fcitx/fcitx5/discussions](https://github.com/fcitx/fcitx5/discussions)
+  - Email: Send email to [fcitx@googlegroups.com](https://groups.google.com/g/fcitx)
+  - Github Discussions: [https://github.com/fcitx/fcitx5/discussions](https://github.com/fcitx/fcitx5/discussions)
+* Chat Group:
+  - Following methods are all bridged together, you can pick any that works.
   - Telegram: https://fcitx-im.org/telegram/captcha.html
   - IRC: [#fcitx [at] libera.chat](https://web.libera.chat/?channels=#fcitx)
+  - Matrix: fcitx on matrix.org
 * Bug report: [https://github.com/fcitx/fcitx5/issues](https://github.com/fcitx/fcitx5/issues)
   - You can always report any fcitx 5 issue here, it might be transfer to other repos later.
 * Translation: [https://explore.transifex.com/fcitx/](https://explore.transifex.com/fcitx/)
   - Do not send pull request for translation updates.
   - The translation will be automatically pushed to git repository nightly, but not vice versa.
+ 
+# Supported platform on Linux and BSD
+X11/Wayland
+
+For using input method under TTY, please check [fbterm](https://github.com/fcitx/fcitx5-fbterm/) or [tmux](https://github.com/wengxt/fcitx5-tmux), not all features are supported.
+ 
+# Quick start for Linux
+[Install Fcitx 5](https://fcitx-im.org/wiki/Install_Fcitx_5)
+
+Looking for Mac or Android?
+[Mac](https://github.com/fcitx-contrib/fcitx5-macos/)
+[Android](https://github.com/fcitx5-android/fcitx5-android)
+ 
+The main package (this repository) only contains keyboard layout engine.
+
+Coressponding input method engines need to be installed to support other languages (e.g. Chinese/Japanese/Korean).
+
+You may find the list of input method engines at [here](https://fcitx-im.org/wiki/Input_method_engines).
+
+# For developers
+[Compiling fcitx5](https://fcitx-im.org/wiki/Compiling_fcitx5)
+
+To write a input method (or addon) from scratch, check [Develop a simple input method](https://fcitx-im.org/wiki/Develop_an_simple_input_method)
+
+# Packaging status
 
-[![Packaging status](https://repology.org/badge/vertical-allrepos/fcitx5.svg)](https://repology.org/project/fcitx5/versions)
+[![Packaging status](https://repology.org/badge/vertical-allrepos/fcitx5.svg?columns=3)](https://repology.org/project/fcitx5/versions)

cmake/Fcitx5CompilerSettings.cmake

@@ -1,14 +1,14 @@
 
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_C_STANDARD_REQUIRED TRUE)
 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)
+if(NOT APPLE AND NOT EMSCRIPTEN)
     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()
@@ -23,6 +23,11 @@ if (POLICY CMP0063)
     cmake_policy(SET CMP0063 NEW)
 endif()
 
+if (POLICY CMP0067)
+    # make check_cxx_source_compiles honors CMAKE_CXX_STANDARD
+    cmake_policy(SET CMP0067 NEW)
+endif()
+
 if(ENABLE_COVERAGE)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-arcs -ftest-coverage")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage")

cmake/FindIsoCodes.cmake

@@ -24,13 +24,7 @@ if(NOT DEFINED ISOCODES_ISO639_JSON)
             )
 endif()
 
-if(NOT DEFINED ISOCODES_ISO3166_JSON)
-    find_file(ISOCODES_ISO3166_JSON iso_3166-1.json
-              HINTS "${PC_ISOCODES_PREFIX}/share/iso-codes/json/"
-            )
-endif()
-
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(IsoCodes  DEFAULT_MSG  ISOCODES_ISO639_JSON ISOCODES_ISO3166_JSON)
+find_package_handle_standard_args(IsoCodes  DEFAULT_MSG  ISOCODES_ISO639_JSON)
 
-mark_as_advanced(ISOCODES_ISO639_JSON ISOCODES_ISO3166_JSON)
+mark_as_advanced(ISOCODES_ISO639_JSON)

config.h.in

@@ -7,6 +7,8 @@
 #ifndef _FCITX5_CONFIG_H_IN_
 #define _FCITX5_CONFIG_H_IN_
 
+#define FCITX_INSTALL_PREFIX "@FCITX_INSTALL_PREFIX@"
+#define FCITX_INSTALL_SYSCONFDIR "@FCITX_INSTALL_SYSCONFDIR@"
 #define FCITX_INSTALL_LIBDIR "@FCITX_INSTALL_LIBDIR@"
 #define FCITX_INSTALL_LIBDATADIR "@FCITX_INSTALL_LIBDATADIR@"
 #define FCITX_INSTALL_LIBEXECDIR "@FCITX_INSTALL_LIBEXECDIR@"
@@ -19,7 +21,6 @@
 #define FCITX_VERSION_STRING "@FCITX_VERSION@"
 
 #define ISOCODES_ISO639_JSON "@ISOCODES_ISO639_JSON@"
-#define ISOCODES_ISO3166_JSON "@ISOCODES_ISO3166_JSON@"
 #define XKEYBOARDCONFIG_XKBBASE "@XKEYBOARDCONFIG_XKBBASE@"
 #define DEFAULT_XKB_RULES "@DEFAULT_XKB_RULES@"
 #define NO_PREEDIT_APPS "@NO_PREEDIT_APPS@"
@@ -44,6 +45,9 @@
 #define DBUS_SYSTEM_BUS_DEFAULT_ADDRESS "@DBUS_SYSTEM_BUS_DEFAULT_ADDRESS@"
 
 #cmakedefine HAVE_PIPE2
+#cmakedefine HAVE_SYS_WAIT_H
+#cmakedefine HAVE_SYS_MMAN_H
+#cmakedefine HAVE_SYS_UIO_H
 
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE