update fcitx5; switch prebuilder

Author: eagleoflqj

.github/workflows/ci.yml

@@ -40,7 +40,7 @@ jobs:
             nlohmann-json \
             extra-cmake-modules
           IOS_PLATFORM=SIMULATOR ./scripts/install-deps.sh
-          wget https://github.com/fcitx-contrib/fcitx5-macos-prebuilder/releases/download/latest/marisa-$(uname -m).tar.bz2
+          wget https://github.com/fcitx-contrib/fcitx5-prebuilder/releases/download/macos/marisa-$(uname -m).tar.bz2
           sudo tar xjvf marisa-$(uname -m).tar.bz2 -C /usr/local bin/marisa-build
 
       - name: Build

CMakeLists.txt

@@ -127,14 +127,15 @@ if (RIME)
         "${PREBUILDER_LIB_DIR}/libmarisa.a"
         "${PREBUILDER_LIB_DIR}/libopencc.a"
         "${PREBUILDER_LIB_DIR}/libglog.a"
+        "${PREBUILDER_LIB_DIR}/liblua.a"
     )
     add_library(Rime_static STATIC IMPORTED)
     set_target_properties(Rime_static PROPERTIES
         IMPORTED_LOCATION "${PREBUILDER_LIB_DIR}/librime.a"
         INTERFACE_INCLUDE_DIRECTORIES "${PREBUILDER_INCLUDE_DIR}"
         INTERFACE_LINK_LIBRARIES "${Rime_dependencies}"
     )
-    set(RIME_TARGET Rime_static)
+    set(RIME_TARGET $<LINK_LIBRARY:WHOLE_ARCHIVE,Rime_static>)
     set(Rime_VERSION "1.12")
 
     add_definitions(-DRIME)

common/common.cpp

@@ -1,7 +1,6 @@
 #include "common.h"
 #include "../engines/fcitx5-hallelujah/src/factory.h"
-#include "../engines/fcitx5-rime/src/rimefactory.h"
-#include "../fcitx5/src/modules/spell/spell.h"
+#include "../fcitx5/src/lib/fcitx/addoninstance.h"
 #include "../iosfrontend/iosfrontend.h"
 #include "../iosnotifications/iosnotifications.h"
 #include "../uipanel/uipanel.h"
@@ -12,10 +11,6 @@
 
 #ifdef HALLELUJAH
 fcitx::HallelujahFactory HallelujahFactory;
-fcitx::SpellModuleFactory SpellModuleFactory;
-#endif
-#ifdef RIME
-fcitx::RimeEngineFactory RimeFactory;
 #endif
 
 namespace fs = std::filesystem;
@@ -26,23 +21,24 @@ static fcitx::UIPanelFactory UIPanelFactory;
 
 static fcitx::StaticAddonRegistry addons = {
 #ifdef HALLELUJAH
-    std::make_pair<std::string, fcitx::AddonFactory *>("spell",
-                                                       &SpellModuleFactory),
+    std::make_pair<std::string, fcitx::AddonFactory *>("hallelujah",
+                                                       &HallelujahFactory),
 #endif
     std::make_pair<std::string, fcitx::AddonFactory *>("iosfrontend",
                                                        &IosFrontendFactory),
     std::make_pair<std::string, fcitx::AddonFactory *>(
         "notifications", &IosNotificationsFactory),
     std::make_pair<std::string, fcitx::AddonFactory *>("uipanel",
                                                        &UIPanelFactory),
+};
+
 #ifdef HALLELUJAH
-    std::make_pair<std::string, fcitx::AddonFactory *>("hallelujah",
-                                                       &HallelujahFactory),
+FCITX_IMPORT_ADDON_FACTORY(addons, spell);
 #endif
+
 #ifdef RIME
-    std::make_pair<std::string, fcitx::AddonFactory *>("rime", &RimeFactory),
+FCITX_IMPORT_ADDON_FACTORY(addons, rime);
 #endif
-};
 
 std::unique_ptr<fcitx::Instance> instance;
 std::unique_ptr<fcitx::EventDispatcher> dispatcher;

engines/fcitx5-rime

@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3c7bc877..12612326 100644
+index 0d219a51..21695937 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -224,9 +224,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DI

fcitx5

@@ -14,7 +14,7 @@ index 78ef79b..c4abccd 100644
  install(TARGETS rime DESTINATION "${CMAKE_INSTALL_LIBDIR}/fcitx5")
  fcitx5_translate_desktop_file(rime.conf.in rime.conf)
 diff --git a/src/rimeengine.cpp b/src/rimeengine.cpp
-index 49fc5b8..b3212fa 100644
+index b335069..a65a123 100644
 --- a/src/rimeengine.cpp
 +++ b/src/rimeengine.cpp
 @@ -47,6 +47,8 @@
@@ -23,9 +23,9 @@ index 49fc5b8..b3212fa 100644
 
 +#include "fcitxipc-swift.h"
 +
- FCITX_DEFINE_LOG_CATEGORY(rime, "rime");
+ FCITX_DEFINE_LOG_CATEGORY(rime_log, "rime");
 
- namespace fcitx {
+ namespace fcitx::rime {
 @@ -197,11 +199,17 @@ RimeEngine::RimeEngine(Instance *instance)
      deployAction_.setIcon("fcitx_rime_deploy");
      deployAction_.setShortText(_("Deploy"));

patches/fcitx5.patch

@@ -6,6 +6,7 @@ deps=(
   libintl
   librime
   libuv
+  lua
   marisa
   opencc
   yaml-cpp
@@ -22,7 +23,7 @@ fi
 
 for dep in "${deps[@]}"; do
   file=$dep$POSTFIX.tar.bz2
-  [[ -f cache/$file ]] || wget -P cache https://github.com/fcitx-contrib/fcitx5-ios-prebuilder/releases/download/latest/$file
+  [[ -f cache/$file ]] || wget -P cache https://github.com/fcitx-contrib/fcitx5-prebuilder/releases/download/ios/$file
   tar xjvf cache/$file -C $EXTRACT_DIR
 done