From fb389ae80ab3b971da76fc23732c667833bafc44 Mon Sep 17 00:00:00 2001 From: meizhigang Date: Wed, 23 Aug 2023 09:50:36 +0800 Subject: [PATCH] fix(power):Fix related project build with power event param MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 适配关联项目使用电源参数编译 Related #11422 --- ...lated-project-build-with-power-event.patch | 31 +++++++++++++++++++ kiran-cc-daemon.spec | 6 +++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 0001-fix-power-Fix-related-project-build-with-power-event.patch diff --git a/0001-fix-power-Fix-related-project-build-with-power-event.patch b/0001-fix-power-Fix-related-project-build-with-power-event.patch new file mode 100644 index 0000000..838cdad --- /dev/null +++ b/0001-fix-power-Fix-related-project-build-with-power-event.patch @@ -0,0 +1,31 @@ +From 3cc2fdcd60239c91bf974238d3e7f9afd1388e82 Mon Sep 17 00:00:00 2001 +From: meizhigang +Date: Wed, 23 Aug 2023 09:35:51 +0800 +Subject: [PATCH] fix(power):Fix related project build with power event param +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + + - 适配关联项目使用电源参数编译 + + Related #11422 +--- + include/power-i.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/include/power-i.h b/include/power-i.h +index ace2ec6..52194d0 100644 +--- a/include/power-i.h ++++ b/include/power-i.h +@@ -67,6 +67,8 @@ extern "C" + + enum PowerEvent + { ++ // 按下关机键 该参数将在后续的版本中废弃 ++ POWER_EVENT_PRESSED_POWEROFF = 0, + // 释放关机键 + POWER_EVENT_RELEASE_POWEROFF = 0, + // 按下睡眠键 +-- +2.27.0 + diff --git a/kiran-cc-daemon.spec b/kiran-cc-daemon.spec index d5e4ddd..2b9b7a9 100644 --- a/kiran-cc-daemon.spec +++ b/kiran-cc-daemon.spec @@ -1,6 +1,6 @@ Name: kiran-cc-daemon Version: 2.5.1 -Release: 22 +Release: 23 Summary: DBus daemon for Kiran Desktop License: MulanPSL-2.0 @@ -26,6 +26,7 @@ Patch0017: 0001-fix-accounts-Fix-user-icon-file-display-while-change.patch Patch0018: 0001-fix-keybindings-Remove-power-and-logout-invalid-key-.patch Patch0019: 0001-fix-power-Change-poweroff-action-from-key-press-to-r.patch Patch0020: 0001-feature-font-Change-the-default-GTK-application-font.patch +Patch0021: 0001-fix-power-Fix-related-project-build-with-power-event.patch BuildRequires: cmake >= 3.2 BuildRequires: pkgconfig(glibmm-2.4) @@ -195,6 +196,9 @@ glib-compile-schemas /usr/share/glib-2.0/schemas &> /dev/nulls || : %{_libdir}/pkgconfig/kiran-cc-daemon.pc %changelog +* Wed Aug 23 2023 meizhigang - 2.5.1-23 +- KYOS-B: Fix related project build with power event param (#11422) + * Tue Aug 22 2023 luoqing - 2.5.1-22 - KYOS-B: Change the default GTK application font size from 10 to 9 (#13006) -- Gitee