Upgrade to 25.11 (#25)

Reviewed-on: https://codeberg.org/leana8959/.files/pulls/25
Co-authored-by: Léana 江 <leana.jiang+git@icloud.com>
Co-committed-by: Léana 江 <leana.jiang+git@icloud.com>
This commit is contained in:
Primrose 2025-11-28 04:30:58 +01:00 committed by Léana
parent b7b2083c74
commit b50954a4ef
27 changed files with 141 additions and 100 deletions

View file

@ -1,8 +1,8 @@
diff --git a/src/modules/clipboard/CMakeLists.txt b/src/modules/clipboard/CMakeLists.txt
index 997c4e3e..4163cada 100644
index afeaa6d3..ad4e77e0 100644
--- a/src/modules/clipboard/CMakeLists.txt
+++ b/src/modules/clipboard/CMakeLists.txt
@@ -1,21 +1,21 @@
@@ -1,25 +1,25 @@
-add_fcitx5_addon(clipboard)
-
-target_sources(clipboard PRIVATE clipboard.cpp)
@ -15,7 +15,11 @@ index 997c4e3e..4163cada 100644
-
-if (WAYLAND_FOUND)
- target_sources(clipboard PRIVATE waylandclipboard.cpp)
- target_link_libraries(clipboard Fcitx5::Module::Wayland Fcitx5::Wayland::WLRDataControl Pthread::Pthread)
- target_link_libraries(clipboard
- Fcitx5::Module::Wayland
- Fcitx5::Wayland::WLRDataControl
- Fcitx5::Wayland::ExtDataControl
- Pthread::Pthread)
-endif()
-
-install(TARGETS clipboard DESTINATION "${FCITX_INSTALL_ADDONDIR}")
@ -33,7 +37,11 @@ index 997c4e3e..4163cada 100644
+#
+# if (WAYLAND_FOUND)
+# target_sources(clipboard PRIVATE waylandclipboard.cpp)
+# target_link_libraries(clipboard Fcitx5::Module::Wayland Fcitx5::Wayland::WLRDataControl Pthread::Pthread)
+# target_link_libraries(clipboard
+# Fcitx5::Module::Wayland
+# Fcitx5::Wayland::WLRDataControl
+# Fcitx5::Wayland::ExtDataControl
+# Pthread::Pthread)
+# endif()
+#
+# install(TARGETS clipboard DESTINATION "${FCITX_INSTALL_ADDONDIR}")
@ -42,4 +50,3 @@ index 997c4e3e..4163cada 100644
configure_file(clipboard.conf.in.in clipboard.conf.in @ONLY)
fcitx5_translate_desktop_file(${CMAKE_CURRENT_BINARY_DIR}/clipboard.conf.in clipboard.conf)
fcitx5_export_module(Clipboard TARGET clipboard BUILD_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}" HEADERS clipboard_public.h INSTALL)