Update fcitx5 submodules and prebuilt

rocka · rocka · commit b227dba3020f · 2024-01-01T02:26:17.000+08:00
libevent -&gt; libuv
diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt
@@ -38,9 +38,9 @@ set(PREBUILT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../../../lib/fcitx5/src/main/cp
 set(fmt_DIR "${PREBUILT_DIR}/fmt/${ANDROID_ABI}/lib/cmake/fmt")
 find_package(fmt)
 
-# prebuilt libevent
-set(Libevent_DIR "${PREBUILT_DIR}/libevent/${ANDROID_ABI}/lib/cmake/libevent")
-find_package(Libevent)
+# prebuilt libuv
+set(libuv_DIR "${PREBUILT_DIR}/libuv/${ANDROID_ABI}/lib/cmake/libuv")
+find_package(libuv)
 
 # prebuilt boost
 list(APPEND CMAKE_FIND_ROOT_PATH "${PREBUILT_DIR}/boost/${ANDROID_ABI}/lib/cmake")
@@ -54,7 +54,7 @@ target_link_libraries(pinyin-customphrase PRIVATE fmt::fmt-header-only Fcitx5::U
 add_library(native-lib SHARED native-lib.cpp androidaddonloader/androidaddonloader.cpp)
 target_link_libraries(native-lib
         log
-        libevent::core
+        libuv::uv_a
         Fcitx5::Utils
         Fcitx5::Config
         Fcitx5::Core
diff --git a/app/src/main/cpp/native-lib.cpp b/app/src/main/cpp/native-lib.cpp
@@ -12,7 +12,7 @@
 
 #include <android/log.h>
 
-#include <event2/event.h>
+#include <uv.h>
 
 #include <fcitx/instance.h>
 #include <fcitx/addonmanager.h>
@@ -72,13 +72,13 @@ class Fcitx {
         return p_instance != nullptr && p_dispatcher != nullptr && p_frontend != nullptr;
     }
 
-    event_base *get_event_base() {
+    uv_loop_t *get_event_base() {
         fcitx::EventLoop &event_loop = p_instance->eventLoop();
-        return static_cast<event_base *>(event_loop.nativeHandle());
+        return static_cast<uv_loop_t *>(event_loop.nativeHandle());
     }
 
     int loopOnce() {
-        return event_base_loop(get_event_base(), EVLOOP_ONCE);
+        return uv_run(get_event_base(), UV_RUN_ONCE);
     }
 
     void startup(fcitx::AndroidLibraryDependency dependency,
@@ -421,7 +421,7 @@ class Fcitx {
 
     void exit() {
         // Make sure that the exec doesn't get blocked
-        event_base_loopexit(get_event_base(), nullptr);
+        uv_stop(get_event_base());
         // Normally, we would use exec to drive the event loop.
         // Since we are calling loopOnce in JVM repeatedly, we shouldn't have used this function.
         // However, exit events would lose chance to be called in this case.
diff --git a/lib/fcitx5-chinese-addons/src/main/cpp/fcitx5-chinese-addons b/lib/fcitx5-chinese-addons/src/main/cpp/fcitx5-chinese-addons
@@ -1 +1 @@
-Subproject commit 0f79e9be3778f2c5dd06e094c845234e49f98ed2
+Subproject commit d84878c8144c0304e2c97b7b3077dc5f2d31987b
diff --git a/lib/fcitx5/src/main/cpp/CMakeLists.txt b/lib/fcitx5/src/main/cpp/CMakeLists.txt
@@ -26,9 +26,10 @@ find_package(fmt)
 set(LibIntl_DIR "${PREBUILT_DIR}/libintl-lite/${ANDROID_ABI}/lib/cmake")
 find_package(LibIntl)
 
-# prebuilt libevent
-set(Libevent_DIR "${PREBUILT_DIR}/libevent/${ANDROID_ABI}/lib/cmake/libevent")
-find_package(Libevent)
+# prebuilt libuv
+set(libuv_DIR "${PREBUILT_DIR}/libuv/${ANDROID_ABI}/lib/cmake/libuv")
+find_package(libuv)
+set(LIBUV_TARGET libuv::uv_a)
 
 include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/Fcitx5AndroidInstallDirs.cmake")
 # LIBDATADIR is not a standard CMake install dir, defined in fcitx5/CMakeLists.txt#L169
diff --git a/lib/fcitx5/src/main/cpp/fcitx5 b/lib/fcitx5/src/main/cpp/fcitx5
@@ -1 +1 @@
-Subproject commit 64ae9d6d0e070d1f5657e7bb964f507afe6d7d10
+Subproject commit 560a9a53911143a924a9fa897882c85970d0df12
diff --git a/lib/fcitx5/src/main/cpp/prebuilt b/lib/fcitx5/src/main/cpp/prebuilt
@@ -1 +1 @@
-Subproject commit ecdc6c90f32daabcdafcaa50f91cc55586fbc311
+Subproject commit b664bd23746dfeb7cf22b1b3aa4c12b654afd9a7
diff --git a/lib/libime/src/main/cpp/libime b/lib/libime/src/main/cpp/libime
@@ -1 +1 @@
-Subproject commit 59ae4a3ab4becdab164f29af07c502096c745b94
+Subproject commit 51010b13b0d9ed02d3580cd168c4b81948c5c5a0
diff --git a/plugin/rime/src/main/cpp/fcitx5-rime b/plugin/rime/src/main/cpp/fcitx5-rime
@@ -1 +1 @@
-Subproject commit 9272fe6b14c9d7753fa18f001642fcdc4d067bd5
+Subproject commit 6500100cb9ba5da10a7c058ec8520f3d283b8743
diff --git a/plugin/rime/src/main/cpp/rime-stroke b/plugin/rime/src/main/cpp/rime-stroke
@@ -1 +1 @@
-Subproject commit e6c7608925009636577ff7469eecc870f1de18f3
+Subproject commit 65fdbbf2f9485cc907cb9a6d6b9210938a50f71e
