unlock dl

.github/workflows/ci.yml

@@ -24,7 +24,7 @@ jobs:
         run: |
           C:/msys64/usr/bin/pacman -Syu --noconfirm
           C:/msys64/usr/bin/pacman -S --noconfirm `
-            mingw-w64-ucrt-x86_64-extra-cmake-modules `
+            mingw-w64-clang-x86_64-extra-cmake-modules `
             cmake `
             fmt `
             gcc `
@@ -40,7 +40,7 @@ jobs:
         run: |
           C:/msys64/usr/bin/pacman -Syu --noconfirm
           C:/msys64/usr/bin/pacman -S --noconfirm `
-            mingw-w64-ucrt-x86_64-extra-cmake-modules `
+            mingw-w64-clang-x86_64-extra-cmake-modules `
             mingw-w64-clang-x86_64-clang `
             mingw-w64-clang-x86_64-cmake `
             mingw-w64-clang-x86_64-fmt `
@@ -54,10 +54,13 @@ jobs:
           git apply --directory=fcitx5 patches/fcitx5.patch
 
       - name: Build
+        env:
+          DESTDIR: dist
         run: |
           cmake -B build -G Ninja `
             -DCMAKE_BUILD_TYPE=Release
           cmake --build build
+          cmake --install build
 
       - name: Setup tmate session
         if: ${{ failure() }}

.gitignore

@@ -1,2 +1,3 @@
 build
+dist
 .cache

CMakeLists.txt

@@ -6,6 +6,8 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 set(CMAKE_CXX_STANDARD 17)
 
+set(CMAKE_INSTALL_PREFIX C:)
+
 option(ENABLE_TESTING_ADDONS "" OFF)
 option(ENABLE_TEST "" OFF)
 option(ENABLE_COVERAGE "" OFF)
@@ -23,10 +25,10 @@ option(ENABLE_LIBUUID "" OFF)
 option(BUILD_SPELL_DICT "" ${CYGWIN})
 
 if (CYGWIN)
-    set(ECM_DIR /ucrt64/share/ECM/cmake)
+    set(ECM_DIR /clang64/share/ECM/cmake)
     add_compile_definitions(-D_GNU_SOURCE)
 else()
-    set(ECM_DIR C:/msys64/ucrt64/share/ECM/cmake)
+    set(ECM_DIR C:/msys64/clang64/share/ECM/cmake)
     set(GETTEXT_MSGMERGE_EXECUTABLE C:/msys64/usr/bin/msgmerge.exe)
     set(GETTEXT_MSGFMT_EXECUTABLE C:/msys64/usr/bin/msgfmt.exe)
 endif()

patches/fcitx5.patch

@@ -1,21 +1,8 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d3ab20d4..4b63da23 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -116,7 +116,7 @@ endif()
- if(${CMAKE_SYSTEM_NAME} MATCHES "BSD|DragonFly")
-     find_package(LibKVM REQUIRED)
- endif()
--find_package(DL REQUIRED)
-+# find_package(DL REQUIRED)
-
- if (NOT TARGET LibIntl::LibIntl)
-     find_package(LibIntl REQUIRED)
 diff --git a/src/lib/fcitx-utils/CMakeLists.txt b/src/lib/fcitx-utils/CMakeLists.txt
-index 9eb64046..a6122746 100644
+index 9eb64046..5050e5d5 100644
 --- a/src/lib/fcitx-utils/CMakeLists.txt
 +++ b/src/lib/fcitx-utils/CMakeLists.txt
-@@ -38,13 +38,13 @@ endif()
+@@ -38,7 +38,7 @@ endif()
 
  list(APPEND FCITX_UTILS_SOURCES
      stringutils.cpp
@@ -24,22 +11,6 @@ index 9eb64046..a6122746 100644
      key.cpp
      cutf8.cpp
      color.cpp
-     i18nstring.cpp
-     eventdispatcher.cpp
--    library.cpp
-+    # library.cpp
-     fs.cpp
-     standardpath.cpp
-     unixfd.cpp
-@@ -129,7 +129,7 @@ target_include_directories(Fcitx5Utils PUBLIC
-     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
-     $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/..>
-     $<INSTALL_INTERFACE:${CMAKE_INSTALL_FULL_INCLUDEDIR}/Fcitx5/Utils>)
--target_link_libraries(Fcitx5Utils PRIVATE DL::DL LibIntl::LibIntl Pthread::Pthread ${FMT_TARGET})
-+target_link_libraries(Fcitx5Utils PRIVATE LibIntl::LibIntl Pthread::Pthread ${FMT_TARGET})
- if(LIBKVM_FOUND)
-     target_link_libraries(Fcitx5Utils PRIVATE LibKVM::LibKVM)
- endif()
 diff --git a/src/lib/fcitx-utils/endian_p.h b/src/lib/fcitx-utils/endian_p.h
 index 332043b8..15b349f3 100644
 --- a/src/lib/fcitx-utils/endian_p.h
@@ -189,6 +160,56 @@ index da9dfdd6..3d78a18b 100644
  namespace fcitx {
  const std::string &I18NString::match(const std::string &locale_) const {
      std::string locale = locale_;
+diff --git a/src/lib/fcitx-utils/library.cpp b/src/lib/fcitx-utils/library.cpp
+index 4dbe80c3..4474436f 100644
+--- a/src/lib/fcitx-utils/library.cpp
++++ b/src/lib/fcitx-utils/library.cpp
+@@ -8,7 +8,9 @@
+ #include "library.h"
+ #include <dlfcn.h>
+ #include <fcntl.h>
++#ifndef _WIN32
+ #include <sys/mman.h>
++#endif
+ #include <sys/stat.h>
+ #include <unistd.h>
+ #include <cerrno>
+@@ -62,9 +64,11 @@ bool Library::load(Flags<fcitx::LibraryLoadHint> hint) {
+         flag |= RTLD_LAZY;
+     }
+
++#ifndef _WIN32
+     if (hint & LibraryLoadHint::PreventUnloadHint) {
+         flag |= RTLD_NODELETE;
+     }
++#endif
+
+     if (hint & LibraryLoadHint::ExportExternalSymbolsHint) {
+         flag |= RTLD_GLOBAL;
+@@ -143,7 +147,11 @@ bool Library::findData(const char *slug, const char *magic, size_t lenOfMagic,
+         }
+         void *needunmap = nullptr;
+         void *data = needunmap =
++#ifdef _WIN32
++            nullptr;
++#else
+             mmap(nullptr, statbuf.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
++#endif
+         if (!data) {
+             data = malloc(statbuf.st_size);
+             needfree.reset(data);
+@@ -163,9 +171,11 @@ bool Library::findData(const char *slug, const char *magic, size_t lenOfMagic,
+             parser(pos);
+         }
+         result = true;
++#ifndef _WIN32
+         if (needunmap) {
+             munmap(needunmap, statbuf.st_size);
+         }
++#endif
+     } while (false);
+
+     close(fd);
 diff --git a/src/lib/fcitx-utils/misc.cpp b/src/lib/fcitx-utils/misc.cpp
 index ef5eb415..b356550d 100644
 --- a/src/lib/fcitx-utils/misc.cpp
@@ -352,39 +373,6 @@ index 927d1676..6ce9b0f4 100644
      inputmethodengine.cpp
      )
 
-diff --git a/src/lib/fcitx/addonloader.cpp b/src/lib/fcitx/addonloader.cpp
-index a069b6a1..2991a4bf 100644
---- a/src/lib/fcitx/addonloader.cpp
-+++ b/src/lib/fcitx/addonloader.cpp
-@@ -24,6 +24,7 @@ namespace fcitx {
-
- AddonLoader::~AddonLoader() {}
-
-+/*
- SharedLibraryLoader::~SharedLibraryLoader() {}
-
- AddonInstance *SharedLibraryLoader::load(const AddonInfo &info,
-@@ -99,6 +100,7 @@ AddonInstance *SharedLibraryLoader::load(const AddonInfo &info,
-     }
-     return nullptr;
- }
-+*/
-
- StaticLibraryLoader::StaticLibraryLoader(StaticAddonRegistry *registry_)
-     : registry(registry_) {}
-diff --git a/src/lib/fcitx/addonmanager.cpp b/src/lib/fcitx/addonmanager.cpp
-index 55269f33..6e6e1b88 100644
---- a/src/lib/fcitx/addonmanager.cpp
-+++ b/src/lib/fcitx/addonmanager.cpp
-@@ -250,7 +250,7 @@ void AddonManager::unregisterLoader(const std::string &name) {
- }
-
- void AddonManager::registerDefaultLoader(StaticAddonRegistry *registry) {
--    registerLoader(std::make_unique<SharedLibraryLoader>());
-+    // registerLoader(std::make_unique<SharedLibraryLoader>());
-     if (registry) {
-         registerLoader(std::make_unique<StaticLibraryLoader>(registry));
-     }
 diff --git a/src/lib/fcitx/instance.cpp b/src/lib/fcitx/instance.cpp
 index de27cd9b..d3e9c3f9 100644
 --- a/src/lib/fcitx/instance.cpp

src/CMakeLists.txt

@@ -1,2 +1,4 @@
 add_executable(Fcitx5 main.cpp)
 target_link_libraries(Fcitx5 Fcitx5::Core)
+
+install(TARGETS Fcitx5 DESTINATION "${FCITX_INSTALL_BINDIR}")