primrose/.files
1
0
Fork 0
mirror of https://codeberg.org/leana8959/.files.git synced 2025-12-06 14:49:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

vanadium: fix build

Browse source 
packages/ruler: update

vanadium/overlays/fcitx5: fix patch

vanadium/overlays/fcitx5-chinese-addons: fix patch

treewide: system -> stdenv.hostPlatform.system

vanadium: fix warnings
This commit is contained in:
Primrose 2025-11-26 08:52:29 +08:00
parent 8f0bc83348
commit bc4490acff
Signed by: primrose
GPG key ID: 4E887A4CA9714ADA
22 changed files with 78 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

17
nix/configurations/vanadium/patches/fcitx5/disable-clipboard.patch
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)

5
nix/configurations/vanadium/patches/fcitx5/disable-quickphrase.patch
View file

@ -25,10 +25,10 @@ index b5bc37ac..04f4da59 100644
+# FILES_MATCHING PATTERN "*.mb")
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 97eed1f3..53e09977 100644
index 643d96f4..0916c732 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -147,10 +147,10 @@ if (ENABLE_KEYBOARD)
@@ -162,10 +162,10 @@ if (ENABLE_KEYBOARD)
add_test(NAME testspell COMMAND testspell)
endif()
@ -43,4 +43,3 @@ index 97eed1f3..53e09977 100644
if (ENABLE_X11)
add_executable(testxim testxim.cpp)

10
nix/configurations/vanadium/patches/fcitx5/disable-unicode.patch
View file

@ -1,13 +1,13 @@
diff --git a/src/modules/unicode/CMakeLists.txt b/src/modules/unicode/CMakeLists.txt
index 73f7e064..afddabee 100644
index 11512ecf..9efde8ac 100644
--- a/src/modules/unicode/CMakeLists.txt
+++ b/src/modules/unicode/CMakeLists.txt
@@ -1,11 +1,11 @@
-add_fcitx5_addon(unicode unicode.cpp charselectdata.cpp)
-target_link_libraries(unicode Fcitx5::Core Fcitx5::Module::Clipboard ${FMT_TARGET})
-target_link_libraries(unicode Fcitx5::Core Fcitx5::Module::Clipboard)
-install(TARGETS unicode DESTINATION "${FCITX_INSTALL_ADDONDIR}")
+# add_fcitx5_addon(unicode unicode.cpp charselectdata.cpp)
+# target_link_libraries(unicode Fcitx5::Core Fcitx5::Module::Clipboard ${FMT_TARGET})
+# target_link_libraries(unicode Fcitx5::Core Fcitx5::Module::Clipboard)
+# install(TARGETS unicode DESTINATION "${FCITX_INSTALL_ADDONDIR}")
configure_file(unicode.conf.in.in unicode.conf.in @ONLY)
fcitx5_translate_desktop_file(${CMAKE_CURRENT_BINARY_DIR}/unicode.conf.in unicode.conf)
@ -21,10 +21,10 @@ index 73f7e064..afddabee 100644
+# install(FILES charselectdata DESTINATION "${FCITX_INSTALL_PKGDATADIR}/unicode" COMPONENT config)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 97eed1f3..ff902c88 100644
index 643d96f4..d008183a 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -134,10 +134,10 @@ add_dependencies(testemoji emoji emoji.conf.in-fmt)
@@ -149,10 +149,10 @@ add_dependencies(testemoji emoji emoji.conf.in-fmt)
add_test(NAME testemoji COMMAND testemoji)
endif()