From b56667ddc9e7bc72813f3e655a76f07f2bacf839 Mon Sep 17 00:00:00 2001 From: gaoboqwq Date: Thu, 27 Nov 2025 18:08:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9C=AC=E5=9C=B0=E5=8C=96?= =?UTF-8?q?=E7=BF=BB=E8=AF=91=E3=80=81=E4=BF=AE=E6=94=B9cmake=20minimum=20?= =?UTF-8?q?version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 0035-change-cmake-minimun-version.patch | 374 ++++++++++++++++++++++++ kiran-cc-daemon.spec | 36 ++- 2 files changed, 404 insertions(+), 6 deletions(-) create mode 100644 0035-change-cmake-minimun-version.patch diff --git a/0035-change-cmake-minimun-version.patch b/0035-change-cmake-minimun-version.patch new file mode 100644 index 0000000..c8e8885 --- /dev/null +++ b/0035-change-cmake-minimun-version.patch @@ -0,0 +1,374 @@ +From c93b662ddb6f000d86e5f2341be20ec49d2772d1 Mon Sep 17 00:00:00 2001 +From: gaoboqwq +Date: Thu, 27 Nov 2025 16:54:25 +0800 +Subject: [PATCH] change cmake minimun version + +--- + CMakeLists.txt | 2 +- + data/CMakeLists.txt | 2 -- + lib/CMakeLists.txt | 2 -- + lib/base/CMakeLists.txt | 2 -- + lib/dbus/CMakeLists.txt | 2 -- + lib/display/CMakeLists.txt | 2 -- + lib/iso/CMakeLists.txt | 2 -- + lib/osdwindow/CMakeLists.txt | 2 -- + plugins/CMakeLists.txt | 2 -- + plugins/accounts/CMakeLists.txt | 2 -- + plugins/appearance/CMakeLists.txt | 2 -- + plugins/audio/CMakeLists.txt | 2 -- + plugins/bluetooth/CMakeLists.txt | 2 -- + plugins/clipboard/CMakeLists.txt | 2 -- + plugins/display/CMakeLists.txt | 2 -- + plugins/greeter/CMakeLists.txt | 2 -- + plugins/inputdevices/common/CMakeLists.txt | 2 -- + plugins/inputdevices/keyboard/CMakeLists.txt | 2 -- + plugins/inputdevices/mouse/CMakeLists.txt | 2 -- + plugins/inputdevices/touchpad/CMakeLists.txt | 2 -- + plugins/keybinding/CMakeLists.txt | 2 -- + plugins/network/CMakeLists.txt | 2 -- + plugins/power/CMakeLists.txt | 2 -- + plugins/power/tools/CMakeLists.txt | 2 -- + plugins/power/tray/CMakeLists.txt | 2 -- + plugins/power/tray/po/CMakeLists.txt | 2 -- + plugins/systeminfo/CMakeLists.txt | 2 -- + plugins/timedate/CMakeLists.txt | 2 -- + plugins/timedate/po-timezones/CMakeLists.txt | 2 -- + plugins/xsettings/CMakeLists.txt | 2 -- + po/CMakeLists.txt | 2 -- + src/CMakeLists.txt | 2 -- + test/CMakeLists.txt | 2 -- + 33 files changed, 1 insertion(+), 65 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 77ad186..b92f1b4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.2) ++cmake_minimum_required(VERSION 3.2...${CMAKE_VERSION}) + + project(kiran-cc-daemon VERSION 2.3) + +diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt +index f0b232b..57b87d6 100644 +--- a/data/CMakeLists.txt ++++ b/data/CMakeLists.txt +@@ -1,5 +1,3 @@ +-cmake_minimum_required(VERSION 3.0) +- + find_program(INTLTOOL-MERGE NAMES "intltool-merge" REQUIRED) + + # system-daemon +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index eb0ff65..073e156 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -1,5 +1,3 @@ +-cmake_minimum_required(VERSION 3.0) +- + add_subdirectory(base) + add_subdirectory(dbus) + add_subdirectory(iso) +diff --git a/lib/base/CMakeLists.txt b/lib/base/CMakeLists.txt +index 8f79b7d..ec68f5b 100644 +--- a/lib/base/CMakeLists.txt ++++ b/lib/base/CMakeLists.txt +@@ -1,5 +1,3 @@ +-cmake_minimum_required(VERSION 3.0) +- + set(TARGET_NAME lib-base) + + file(GLOB_RECURSE BASE_H_FILES ./*.h) +diff --git a/lib/dbus/CMakeLists.txt b/lib/dbus/CMakeLists.txt +index e599ad9..94cfd36 100644 +--- a/lib/dbus/CMakeLists.txt ++++ b/lib/dbus/CMakeLists.txt +@@ -1,5 +1,3 @@ +-cmake_minimum_required(VERSION 3.0) +- + set(TARGET_NAME lib-dbus) + + file(GLOB_RECURSE DBUS_H_FILES ./*.h) +diff --git a/lib/display/CMakeLists.txt b/lib/display/CMakeLists.txt +index 48ae03e..6a682a6 100644 +--- a/lib/display/CMakeLists.txt ++++ b/lib/display/CMakeLists.txt +@@ -1,5 +1,3 @@ +-cmake_minimum_required(VERSION 3.2) +- + set(TARGET_NAME lib-display) + + file(GLOB_RECURSE DISPLAY_H_FILES ./*.h) +diff --git a/lib/iso/CMakeLists.txt b/lib/iso/CMakeLists.txt +index 5a5ae16..b984d18 100644 +--- a/lib/iso/CMakeLists.txt ++++ b/lib/iso/CMakeLists.txt +@@ -1,5 +1,3 @@ +-cmake_minimum_required(VERSION 3.0) +- + set(TARGET_NAME lib-iso) + + file(GLOB_RECURSE ISO_H_FILES ./*.h) +diff --git a/lib/osdwindow/CMakeLists.txt b/lib/osdwindow/CMakeLists.txt +index 63207f0..281a159 100644 +--- a/lib/osdwindow/CMakeLists.txt ++++ b/lib/osdwindow/CMakeLists.txt +@@ -1,5 +1,3 @@ +-cmake_minimum_required(VERSION 3.2) +- + set(TARGET_NAME lib-osdwindow) + + file(GLOB_RECURSE OSD_H_FILES ./*.h) +diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt +index 2a413ca..66ee5bd 100644 +--- a/plugins/CMakeLists.txt ++++ b/plugins/CMakeLists.txt +@@ -1,5 +1,3 @@ +-cmake_minimum_required(VERSION 3.2) +- + if(build-system-daemon) + add_subdirectory(accounts) + add_subdirectory(timedate) +diff --git a/plugins/accounts/CMakeLists.txt b/plugins/accounts/CMakeLists.txt +index 8d0e9c4..a4e163e 100644 +--- a/plugins/accounts/CMakeLists.txt ++++ b/plugins/accounts/CMakeLists.txt +@@ -1,5 +1,3 @@ +-cmake_minimum_required(VERSION 3.2) +- + set(TARGET_NAME accounts) + + file(GLOB_RECURSE CORE_H_FILES ./*.h) +diff --git a/plugins/appearance/CMakeLists.txt b/plugins/appearance/CMakeLists.txt +index 941444f..00b9a4e 100644 +--- a/plugins/appearance/CMakeLists.txt ++++ b/plugins/appearance/CMakeLists.txt +@@ -1,5 +1,3 @@ +-cmake_minimum_required(VERSION 3.2) +- + set(TARGET_NAME appearance) + + file(GLOB_RECURSE APPEARANCE_H_FILES ./*.h) +diff --git a/plugins/audio/CMakeLists.txt b/plugins/audio/CMakeLists.txt +index fcec5f2..40134be 100644 +--- a/plugins/audio/CMakeLists.txt ++++ b/plugins/audio/CMakeLists.txt +@@ -1,5 +1,3 @@ +-cmake_minimum_required(VERSION 3.2) +- + set(TARGET_NAME audio) + + file(GLOB_RECURSE AUDIO_H_FILES ./*.h) +diff --git a/plugins/bluetooth/CMakeLists.txt b/plugins/bluetooth/CMakeLists.txt +index e5f6210..e761515 100644 +--- a/plugins/bluetooth/CMakeLists.txt ++++ b/plugins/bluetooth/CMakeLists.txt +@@ -1,5 +1,3 @@ +-cmake_minimum_required(VERSION 3.2) +- + set(TARGET_NAME bluetooth) + + file(GLOB_RECURSE BLUETOOTH_H_FILES ./*.h) +diff --git a/plugins/clipboard/CMakeLists.txt b/plugins/clipboard/CMakeLists.txt +index 9e6c0cf..be3da40 100644 +--- a/plugins/clipboard/CMakeLists.txt ++++ b/plugins/clipboard/CMakeLists.txt +@@ -1,5 +1,3 @@ +-cmake_minimum_required(VERSION 3.2) +- + set(TARGET_NAME clipboard) + + file(GLOB_RECURSE CLIPBOARD_H_FILES ./*.h) +diff --git a/plugins/display/CMakeLists.txt b/plugins/display/CMakeLists.txt +index c14237e..afe817e 100644 +--- a/plugins/display/CMakeLists.txt ++++ b/plugins/display/CMakeLists.txt +@@ -1,5 +1,3 @@ +-cmake_minimum_required(VERSION 3.2) +- + set(TARGET_NAME display) + + file(GLOB_RECURSE DISPLAY_H_FILES ./*.h) +diff --git a/plugins/greeter/CMakeLists.txt b/plugins/greeter/CMakeLists.txt +index 0b360a0..bf89187 100644 +--- a/plugins/greeter/CMakeLists.txt ++++ b/plugins/greeter/CMakeLists.txt +@@ -1,5 +1,3 @@ +-cmake_minimum_required(VERSION 3.2) +- + set(TARGET_NAME greeter) + + file(GLOB_RECURSE GREETER_H_FILES ./*.h) +diff --git a/plugins/inputdevices/common/CMakeLists.txt b/plugins/inputdevices/common/CMakeLists.txt +index 2b49a82..6d10b9a 100644 +--- a/plugins/inputdevices/common/CMakeLists.txt ++++ b/plugins/inputdevices/common/CMakeLists.txt +@@ -1,5 +1,3 @@ +-cmake_minimum_required(VERSION 3.0) +- + set(TARGET_NAME inputdevices-common) + + file(GLOB_RECURSE COMMON_H_FILES ./*.h) +diff --git a/plugins/inputdevices/keyboard/CMakeLists.txt b/plugins/inputdevices/keyboard/CMakeLists.txt +index 015284e..eef7296 100644 +--- a/plugins/inputdevices/keyboard/CMakeLists.txt ++++ b/plugins/inputdevices/keyboard/CMakeLists.txt +@@ -1,5 +1,3 @@ +-cmake_minimum_required(VERSION 3.0) +- + set(TARGET_NAME keyboard) + + file(GLOB_RECURSE KEYBOARD_H_FILES ./*.h) +diff --git a/plugins/inputdevices/mouse/CMakeLists.txt b/plugins/inputdevices/mouse/CMakeLists.txt +index 3a15cfc..345fed3 100644 +--- a/plugins/inputdevices/mouse/CMakeLists.txt ++++ b/plugins/inputdevices/mouse/CMakeLists.txt +@@ -1,5 +1,3 @@ +-cmake_minimum_required(VERSION 3.0) +- + set(TARGET_NAME mouse) + + file(GLOB_RECURSE MOUSE_H_FILES ./*.h) +diff --git a/plugins/inputdevices/touchpad/CMakeLists.txt b/plugins/inputdevices/touchpad/CMakeLists.txt +index 5f1babf..7611b76 100644 +--- a/plugins/inputdevices/touchpad/CMakeLists.txt ++++ b/plugins/inputdevices/touchpad/CMakeLists.txt +@@ -1,5 +1,3 @@ +-cmake_minimum_required(VERSION 3.0) +- + set(TARGET_NAME touchpad) + + file(GLOB_RECURSE TOUCHPAD_H_FILES ./*.h) +diff --git a/plugins/keybinding/CMakeLists.txt b/plugins/keybinding/CMakeLists.txt +index 1cc744f..b4e2e05 100644 +--- a/plugins/keybinding/CMakeLists.txt ++++ b/plugins/keybinding/CMakeLists.txt +@@ -1,5 +1,3 @@ +-cmake_minimum_required(VERSION 3.2) +- + set(TARGET_NAME keybinding) + + file(GLOB_RECURSE KEYBINDING_H_FILES ./*.h) +diff --git a/plugins/network/CMakeLists.txt b/plugins/network/CMakeLists.txt +index a406c2f..cec5365 100644 +--- a/plugins/network/CMakeLists.txt ++++ b/plugins/network/CMakeLists.txt +@@ -1,5 +1,3 @@ +-cmake_minimum_required(VERSION 3.2) +- + set(TARGET_NAME network) + + file(GLOB_RECURSE NETWORK_H_FILES ./*.h) +diff --git a/plugins/power/CMakeLists.txt b/plugins/power/CMakeLists.txt +index 67db9e0..baa5202 100644 +--- a/plugins/power/CMakeLists.txt ++++ b/plugins/power/CMakeLists.txt +@@ -1,5 +1,3 @@ +-cmake_minimum_required(VERSION 3.2) +- + set(TARGET_NAME power) + + file(GLOB_RECURSE POWER_H_FILES ./*.h) +diff --git a/plugins/power/tools/CMakeLists.txt b/plugins/power/tools/CMakeLists.txt +index d6dd7cf..1775d1d 100644 +--- a/plugins/power/tools/CMakeLists.txt ++++ b/plugins/power/tools/CMakeLists.txt +@@ -1,5 +1,3 @@ +-cmake_minimum_required(VERSION 3.2) +- + set(TARGET_NAME kiran-power-backlight-helper) + + file(GLOB_RECURSE POWER_BACKLIGHT_HELPER_H_FILES ./*.h) +diff --git a/plugins/power/tray/CMakeLists.txt b/plugins/power/tray/CMakeLists.txt +index 5366d66..6545e93 100644 +--- a/plugins/power/tray/CMakeLists.txt ++++ b/plugins/power/tray/CMakeLists.txt +@@ -1,5 +1,3 @@ +-cmake_minimum_required(VERSION 3.2) +- + set(TARGET_NAME kiran-power-status-icon) + + file(GLOB_RECURSE POWER_TRAY_H_FILES ./*.h) +diff --git a/plugins/power/tray/po/CMakeLists.txt b/plugins/power/tray/po/CMakeLists.txt +index 3a5e160..dc04776 100644 +--- a/plugins/power/tray/po/CMakeLists.txt ++++ b/plugins/power/tray/po/CMakeLists.txt +@@ -1,5 +1,3 @@ +-cmake_minimum_required(VERSION 3.0) +- + find_program(MSGFMT NAMES "msgfmt" REQUIRED) + find_program(INTLTOOL-UPDATE NAMES "intltool-update" REQUIRED) + +diff --git a/plugins/systeminfo/CMakeLists.txt b/plugins/systeminfo/CMakeLists.txt +index 2937068..e4ac0b7 100644 +--- a/plugins/systeminfo/CMakeLists.txt ++++ b/plugins/systeminfo/CMakeLists.txt +@@ -1,5 +1,3 @@ +-cmake_minimum_required(VERSION 3.2) +- + set(TARGET_NAME systeminfo) + + file(GLOB_RECURSE SYSTEMINFO_H_FILES ./*.h) +diff --git a/plugins/timedate/CMakeLists.txt b/plugins/timedate/CMakeLists.txt +index d496676..da838a1 100644 +--- a/plugins/timedate/CMakeLists.txt ++++ b/plugins/timedate/CMakeLists.txt +@@ -1,5 +1,3 @@ +-cmake_minimum_required(VERSION 3.2) +- + set(TARGET_NAME timedate) + + file(GLOB_RECURSE TIMEDATE_H_FILES ./*.h) +diff --git a/plugins/timedate/po-timezones/CMakeLists.txt b/plugins/timedate/po-timezones/CMakeLists.txt +index 7f05d76..c9d0a96 100644 +--- a/plugins/timedate/po-timezones/CMakeLists.txt ++++ b/plugins/timedate/po-timezones/CMakeLists.txt +@@ -1,5 +1,3 @@ +-cmake_minimum_required(VERSION 3.0) +- + find_program(MSGFMT NAMES "msgfmt" REQUIRED) + + file(GLOB TS_FILES *.po) +diff --git a/plugins/xsettings/CMakeLists.txt b/plugins/xsettings/CMakeLists.txt +index e71c3ea..937b3e0 100644 +--- a/plugins/xsettings/CMakeLists.txt ++++ b/plugins/xsettings/CMakeLists.txt +@@ -1,5 +1,3 @@ +-cmake_minimum_required(VERSION 3.2) +- + set(TARGET_NAME xsettings) + + file(GLOB_RECURSE XSETTINGS_H_FILES ./*.h) +diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt +index 460b881..9dc85cc 100644 +--- a/po/CMakeLists.txt ++++ b/po/CMakeLists.txt +@@ -1,5 +1,3 @@ +-cmake_minimum_required(VERSION 3.0) +- + find_program(MSGFMT NAMES "msgfmt" REQUIRED) + find_program(INTLTOOL-UPDATE NAMES "intltool-update" REQUIRED) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index e0b3821..1b5f60e 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -1,5 +1,3 @@ +-cmake_minimum_required(VERSION 3.0) +- + set_common_exe_linker_flags() + + file(GLOB_RECURSE CORE_H_FILES ./*.h) +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index 9642993..18d0142 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -1,5 +1,3 @@ +-cmake_minimum_required(VERSION 3.2) +- + enable_testing() + + set(TARGET_NAME kiran-cc-test) +-- +2.33.0 + diff --git a/kiran-cc-daemon.spec b/kiran-cc-daemon.spec index 4bb9e30..42194fa 100644 --- a/kiran-cc-daemon.spec +++ b/kiran-cc-daemon.spec @@ -9,8 +9,9 @@ Name: kiran-cc-daemon Version: 2.6.1 -Release: 25%{?dist} -Summary: DBus daemon for Kiran Desktop +Release: 26%{?dist} +Summary: DBus daemon for Kiran Desktop +Summary(zh_CN): Kiran桌面的 D-Bus 守护进程 License: MulanPSL-2.0 Source0: %{name}-%{version}.tar.gz @@ -52,6 +53,7 @@ Patch0031: 0031-fix-audio-Fix-the-audio-device-properties-not-initia.patch Patch0032: 0032-fix-accounts-fix-the-passwd-command-compatible-probl.patch Patch0033: 0033-feature-appearance-Add-icon-and-cursor-theme-changin.patch Patch0034: 0034-feature-theme-Modify-gtk-and-icon-theme-to-light-the.patch +Patch0035: 0035-change-cmake-minimun-version.patch BuildRequires: cmake >= 3.2 BuildRequires: pkgconfig(glibmm-2.4) @@ -93,9 +95,12 @@ BuildRequires: libwnck3-devel %description DBus daemon for Kiran Desktop +%description -l zh_CN +Kiran桌面的 D-Bus 守护进程 %package -n kiran-system-daemon -Summary: System DBus daemon for Kiran Desktop +Summary: System DBus daemon for Kiran Desktop +Summary(zh_CN): Kiran桌面的系统级 D-Bus 守护进程 Requires: systemd %if 0%{?rhel} > 7 || 0%{?openEuler} @@ -124,8 +129,12 @@ Requires: %{_vendor}-lsb %description -n kiran-system-daemon System DBus daemon for Kiran Desktop +%description -l zh_CN +Kiran桌面的系统级 D-Bus 守护进程 + %package -n kiran-session-daemon -Summary: Session DBus daemon for Kiran Desktop +Summary: Session DBus daemon for Kiran Desktop +Summary(zh_CN): Kiran桌面的会话级 D-Bus 守护进程 %if 0%{?rhel} > 7 || 0%{?openEuler} Requires: dbus-daemon @@ -143,18 +152,29 @@ Requires: libwnck3 %description -n kiran-session-daemon Session DBus daemon for Kiran Desktop +%description -n kiran-session-daemon -l zh_CN +Kiran桌面的会话级 D-Bus 守护进程 + %package common -Summary: Common files for kiran-session-daemon and kiran-system-daemon +Summary: Common files for kiran-session-daemon and kiran-system-daemon +Summary(zh_CN): kiran-session-daemon 和 kiran-system-daemon 的通用文件 %description common Common files for kiran-session-daemon and kiran-system-daemon +%description common -l zh_CN +kiran-session-daemon 和 kiran-system-daemon 的通用文件 + %package devel -Summary: Development files for communicating with control center daemon +Summary: Development files for communicating with control center daemon +Summary(zh_CN): 用于与控制中心守护进程通信的开发文件 %description devel Development files for communicating with control center daemon +%description devel -l zh_CN +用于与控制中心守护进程通信的开发文件 + %prep %autosetup -p1 @@ -237,6 +257,10 @@ glib-compile-schemas /usr/share/glib-2.0/schemas &> /dev/nulls || : %{_libdir}/pkgconfig/kiran-cc-daemon.pc %changelog +* Thu Nov 27 2025 gaobo - 2.6.1-26 +- add location translations +- change cmake minimun version + * Mon Mar 24 2025 liuxinhao - 2.6.1-25 - KYOS-B: fix the passwd command compatible problem for KY3.3-9-Server(#46550) - KYOS-F: Add icon and cursor theme changing when enable auto switch theme.(#73665) -- Gitee