drop upstreamed patch

Author: eagleoflqj

.github/workflows/ci.yml

@@ -51,7 +51,7 @@ jobs:
           export EMCC_FORCE_STDLIBS=libc++
           export FCITX_DISTRIBUTION=fcitx5-js
           pushd fcitx5 && git apply ../patches/fcitx5.patch && popd
-          PKG_CONFIG_PATH="build/sysroot/usr/share/pkgconfig;build/sysroot/usr/lib/pkgconfig" emcmake cmake -B build -G Ninja \
+          emcmake cmake -B build -G Ninja \
             -DCMAKE_BUILD_TYPE=Release \
             -DCMAKE_FIND_ROOT_PATH="$(pwd)/build/sysroot/usr" \
             -DCMAKE_INSTALL_PREFIX=/usr

CMakeLists.txt

@@ -11,6 +11,8 @@ set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-sSIDE_MODULE")
 set(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "-sSIDE_MODULE")
 add_compile_options(-fPIC -fexceptions)
 
+set(ENV{PKG_CONFIG_PATH} "build/sysroot/usr/share/pkgconfig;build/sysroot/usr/lib/pkgconfig")
+
 set(fmt_DIR "build/sysroot/usr/lib/cmake/fmt")
 find_package(fmt REQUIRED)
 set(ECM_DIR "/usr/share/ECM/cmake")

fcitx5

@@ -1,37 +1,3 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ac1e1dcb..b4641520 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -36,6 +36,7 @@ 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)
-+option(BUILD_SPELL_DICT "Build en_dict.fscd for English spell check" On)
- set(NO_PREEDIT_APPS "gvim.*,wps.*,wpp.*,et.*" CACHE STRING "Disable preedit for follwing app by default.")
- 
- if (ENABLE_EMOJI)
-@@ -69,7 +70,7 @@ 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 LIBUV_TARGET AND NOT EMSCRIPTEN)
-         if (NOT (TARGET PkgConfig::LibUV))
-             pkg_check_modules(LibUV REQUIRED IMPORTED_TARGET "libuv")
-         endif()
-diff --git a/cmake/Fcitx5CompilerSettings.cmake b/cmake/Fcitx5CompilerSettings.cmake
-index 66136f0b..5e766d30 100644
---- a/cmake/Fcitx5CompilerSettings.cmake
-+++ b/cmake/Fcitx5CompilerSettings.cmake
-@@ -8,7 +8,7 @@ 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()
 diff --git a/src/lib/fcitx-config/CMakeLists.txt b/src/lib/fcitx-config/CMakeLists.txt
 index 85c9865b..3a995ca1 100644
 --- a/src/lib/fcitx-config/CMakeLists.txt
@@ -47,32 +13,10 @@ index 85c9865b..3a995ca1 100644
    )
  target_include_directories(Fcitx5Config PUBLIC
 diff --git a/src/lib/fcitx-utils/CMakeLists.txt b/src/lib/fcitx-utils/CMakeLists.txt
-index dd67e07d..21680660 100644
+index 15ad8c8a..5532dc33 100644
 --- a/src/lib/fcitx-utils/CMakeLists.txt
 +++ b/src/lib/fcitx-utils/CMakeLists.txt
-@@ -27,14 +27,18 @@ if (ENABLE_DBUS)
-     endif()
- endif()
- 
--if (NOT TARGET Systemd::Systemd)
-+if (TARGET Systemd::Systemd)
-   set(FCITX_UTILS_SOURCES
-     ${FCITX_UTILS_SOURCES}
--    event_libuv.cpp)
-+    event_sdevent.cpp)
-+elseif (EMSCRIPTEN)
-+  set(FCITX_UTILS_SOURCES
-+    ${FCITX_UTILS_SOURCES}
-+    event_js.cpp)
- else()
-   set(FCITX_UTILS_SOURCES
-     ${FCITX_UTILS_SOURCES}
--    event_sdevent.cpp)
-+    event_libuv.cpp)
- endif()
- 
- set(FCITX_UTILS_SOURCES
-@@ -121,8 +125,7 @@ ecm_setup_version(PROJECT
+@@ -127,8 +127,7 @@ ecm_setup_version(PROJECT
 
  add_library(Fcitx5Utils SHARED ${FCITX_UTILS_SOURCES})
  set_target_properties(Fcitx5Utils
@@ -82,173 +26,6 @@ index dd67e07d..21680660 100644
    EXPORT_NAME Utils
    )
  target_include_directories(Fcitx5Utils PUBLIC
-@@ -135,7 +138,7 @@ if(LIBKVM_FOUND)
- endif()
- 
- if (NOT TARGET Systemd::Systemd)
--    target_link_libraries(Fcitx5Utils PRIVATE ${LIBUV_TARGET})
-+    # target_link_libraries(Fcitx5Utils PRIVATE ${LIBUV_TARGET})
-     if (ENABLE_DBUS)
-         target_link_libraries(Fcitx5Utils PRIVATE PkgConfig::DBus)
-     endif()
-diff --git a/src/lib/fcitx-utils/endian_p.h b/src/lib/fcitx-utils/endian_p.h
-index d524dfa2..524a26fa 100644
---- a/src/lib/fcitx-utils/endian_p.h
-+++ b/src/lib/fcitx-utils/endian_p.h
-@@ -8,7 +8,7 @@
- #define _FCITX_UTILS_ENDIAN_P_H_
- 
- #include <cstdint>
--#if defined(__linux__) || defined(__GLIBC__)
-+#if defined(__linux__) || defined(__GLIBC__) || defined(__EMSCRIPTEN__)
- #include <endian.h>
- #elif defined(__APPLE__)
- 
-diff --git a/src/lib/fcitx-utils/event_js.cpp b/src/lib/fcitx-utils/event_js.cpp
-new file mode 100644
-index 00000000..68f7ee7f
---- /dev/null
-+++ b/src/lib/fcitx-utils/event_js.cpp
-@@ -0,0 +1,139 @@
-+#include <cassert>
-+#include <emscripten.h>
-+#include "event.h"
-+#include "log.h"
-+
-+namespace fcitx {
-+
-+template <typename Interface>
-+struct JSEventSourceBase : public Interface {
-+public:
-+    ~JSEventSourceBase() override {}
-+
-+    bool isEnabled() const override { return enabled_; }
-+
-+    void setEnabled(bool enabled) override { enabled_ = enabled; }
-+
-+    bool isOneShot() const override { return oneShot_; }
-+
-+    void setOneShot() override { oneShot_ = true; }
-+
-+private:
-+    bool enabled_ = false;
-+    bool oneShot_ = false;
-+};
-+
-+struct JSEventSource : public JSEventSourceBase<EventSource> {
-+    JSEventSource(EventCallback _callback)
-+        : callback_(std::make_shared<EventCallback>(std::move(_callback))) {}
-+
-+    std::shared_ptr<EventCallback> callback_;
-+};
-+
-+struct JSEventSourceIO : public JSEventSourceBase<EventSourceIO> {
-+    JSEventSourceIO(IOCallback _callback) {}
-+
-+    int fd() const override { return 0; }
-+
-+    void setFd(int fd) override {}
-+
-+    IOEventFlags events() const override { return IOEventFlag::In; }
-+
-+    void setEvents(IOEventFlags flags) override {}
-+
-+    IOEventFlags revents() const override { return IOEventFlag::In; }
-+};
-+
-+void TimeEventCallback(void *arg);
-+
-+struct JSEventSourceTime : public JSEventSourceBase<EventSourceTime> {
-+    JSEventSourceTime(TimeCallback _callback, uint64_t time, clockid_t clockid)
-+        : callback_(std::make_shared<TimeCallback>(std::move(_callback))),
-+          time_(time), clockid_(clockid) {
-+        assert(clockid == CLOCK_MONOTONIC);
-+        setOneShot();
-+    }
-+
-+    void setOneShot() override {
-+        int t = std::max<int64_t>(0, time_ - now(CLOCK_MONOTONIC)) / 1000;
-+        emscripten_async_call(TimeEventCallback, this, t);
-+    }
-+
-+    uint64_t time() const override { return time_; }
-+
-+    void setTime(uint64_t time) override { time_ = time; }
-+
-+    uint64_t accuracy() const override { return 0; }
-+
-+    void setAccuracy(uint64_t time) override {}
-+
-+    clockid_t clock() const override { return clockid_; }
-+
-+    std::shared_ptr<TimeCallback> callback_;
-+
-+private:
-+    uint64_t time_;
-+    clockid_t clockid_;
-+};
-+
-+void TimeEventCallback(void *arg) {
-+    auto source = static_cast<JSEventSourceTime *>(arg);
-+    (*source->callback_)(source, source->time());
-+}
-+
-+class EventLoopPrivate {
-+public:
-+    EventLoopPrivate() {}
-+
-+    ~EventLoopPrivate() {}
-+};
-+
-+EventLoop::EventLoop() : d_ptr(std::make_unique<EventLoopPrivate>()) {}
-+
-+EventLoop::~EventLoop() = default;
-+
-+const char *EventLoop::impl() { return "js-event"; }
-+
-+void *EventLoop::nativeHandle() { return nullptr; }
-+
-+bool EventLoop::exec() { return true; }
-+
-+void EventLoop::exit() {}
-+
-+std::unique_ptr<EventSourceIO> EventLoop::addIOEvent(int fd, IOEventFlags flags,
-+                                                     IOCallback callback) {
-+    FCITX_D();
-+    auto source = std::make_unique<JSEventSourceIO>(std::move(callback));
-+    return source;
-+}
-+
-+std::unique_ptr<EventSourceTime>
-+EventLoop::addTimeEvent(clockid_t clock, uint64_t usec, uint64_t accuracy,
-+                        TimeCallback callback) {
-+    auto source =
-+        std::make_unique<JSEventSourceTime>(std::move(callback), usec, clock);
-+    return source;
-+}
-+
-+std::unique_ptr<EventSource> EventLoop::addExitEvent(EventCallback callback) {
-+    FCITX_D();
-+    auto source = std::make_unique<JSEventSource>(std::move(callback));
-+    return source;
-+}
-+
-+std::unique_ptr<EventSource> EventLoop::addDeferEvent(EventCallback callback) {
-+    return addTimeEvent(
-+        CLOCK_MONOTONIC, now(CLOCK_MONOTONIC), 0,
-+        [callback = std::move(callback)](EventSourceTime *source, uint64_t) {
-+            return callback(source);
-+        });
-+}
-+
-+std::unique_ptr<EventSource> EventLoop::addPostEvent(EventCallback callback) {
-+    return addTimeEvent(
-+        CLOCK_MONOTONIC, now(CLOCK_MONOTONIC), 0,
-+        [callback = std::move(callback)](EventSourceTime *source, uint64_t) {
-+            return callback(source);
-+        });
-+}
-+} // namespace fcitx
 diff --git a/src/lib/fcitx/CMakeLists.txt b/src/lib/fcitx/CMakeLists.txt
 index df15dd57..36312bab 100644
 --- a/src/lib/fcitx/CMakeLists.txt
@@ -263,20 +40,3 @@ index df15dd57..36312bab 100644
    EXPORT_NAME Core
    )
  target_include_directories(Fcitx5Core PUBLIC
-diff --git a/src/modules/spell/CMakeLists.txt b/src/modules/spell/CMakeLists.txt
-index 094e1a58..ab1ce4df 100644
---- a/src/modules/spell/CMakeLists.txt
-+++ b/src/modules/spell/CMakeLists.txt
-@@ -17,6 +17,7 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/spell.conf" DESTINATION "${FCITX_INST
-         COMPONENT config)
- fcitx5_export_module(Spell TARGET spell BUILD_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}" HEADERS spell_public.h INSTALL)
- 
-+if (BUILD_SPELL_DICT)
-  set(DICT_COMP_SRC
-   comp_spell_dict.cpp
-   )
-@@ -46,3 +47,4 @@ add_custom_command(
-   "${SPELL_EN_DICT_SRC}" "${SPELL_EN_DICT}")
- add_custom_target(spell_en_dict ALL DEPENDS "${SPELL_EN_DICT}")
- install(FILES "${SPELL_EN_DICT}" DESTINATION "${FCITX_INSTALL_PKGDATADIR}/spell")
-+endif()

fcitx5-webview

@@ -4,6 +4,7 @@ add_executable(Fcitx5
     input_method.cpp
     config.cpp
     action.cpp
+    event_js.cpp
 )
 
 target_include_directories(Fcitx5 PRIVATE