fix(*):Fix some bugs with patch
- 同步修复的补丁
This commit is contained in:
meizhigang
parent
795492129b
commit
7eacc95f90
@ -0,0 +1,32 @@
|
||||
From 082be19f9d8b365d2c0b168011f07da5a0f26e40 Mon Sep 17 00:00:00 2001
|
||||
From: meizhigang <meizhigang@kylinsec.com.cn>
|
||||
Date: Thu, 7 Mar 2024 12:06:47 +0800
|
||||
Subject: [PATCH 1/4] fix(appearance):Change the light theme name to
|
||||
Kiran-white
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
- 将浅色主题名修改为Kiran-white
|
||||
|
||||
Related #24747
|
||||
---
|
||||
include/appearance-i.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/appearance-i.h b/include/appearance-i.h
|
||||
index 7076367..dda6e7e 100644
|
||||
--- a/include/appearance-i.h
|
||||
+++ b/include/appearance-i.h
|
||||
@@ -24,7 +24,7 @@ extern "C"
|
||||
#define APPEARANCE_DBUS_INTERFACE_NAME "com.kylinsec.Kiran.SessionDaemon.Appearance"
|
||||
|
||||
// 默认浅色主题
|
||||
-#define APPEARANCE_DEFAULT_LIGHT_GTK_THEME "Kiran"
|
||||
+#define APPEARANCE_DEFAULT_LIGHT_GTK_THEME "Kiran-white"
|
||||
// 默认深色主题
|
||||
#define APPEARANCE_DEFAULT_DARK_GTK_THEME "Kiran-dark"
|
||||
|
||||
--
|
||||
2.27.0
|
||||
|
||||
31
0009-fix-power-Fix-coredump-while-log-print-in-power.patch
Normal file
31
0009-fix-power-Fix-coredump-while-log-print-in-power.patch
Normal file
@ -0,0 +1,31 @@
|
||||
From b66f73004a1803e8de197a036d8a1cd8fd0621e0 Mon Sep 17 00:00:00 2001
|
||||
From: meizhigang <meizhigang@kylinsec.com.cn>
|
||||
Date: Thu, 21 Mar 2024 20:48:12 +0800
|
||||
Subject: [PATCH 2/4] fix(power):Fix coredump while log print in power
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
- 修复日志输出导致的崩溃
|
||||
|
||||
Related #31141
|
||||
---
|
||||
plugins/power/event/power-event-button.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/plugins/power/event/power-event-button.cpp b/plugins/power/event/power-event-button.cpp
|
||||
index 6feef81..8a17c5f 100644
|
||||
--- a/plugins/power/event/power-event-button.cpp
|
||||
+++ b/plugins/power/event/power-event-button.cpp
|
||||
@@ -111,7 +111,7 @@ void PowerEventButton::emit_button_signal(PowerEvent type)
|
||||
unsigned long elapsed_msec;
|
||||
if (this->button_signal_timer_.elapsed(elapsed_msec) < POWER_BUTTON_DUPLICATE_TIMEOUT)
|
||||
{
|
||||
- KLOG_DEBUG_POWER("Ignoring duplicate button %s", type);
|
||||
+ KLOG_DEBUG_POWER("Ignoring duplicate button %d", type);
|
||||
return;
|
||||
}
|
||||
|
||||
--
|
||||
2.27.0
|
||||
|
||||
39
0010-feature-CI-ref-new-CI-entry-point.patch
Normal file
39
0010-feature-CI-ref-new-CI-entry-point.patch
Normal file
@ -0,0 +1,39 @@
|
||||
From d46319a3567927abb0f9861a95fe83d6da855464 Mon Sep 17 00:00:00 2001
|
||||
From: meizhigang <meizhigang@kylinsec.com.cn>
|
||||
Date: Mon, 25 Mar 2024 15:18:51 +0800
|
||||
Subject: [PATCH 3/4] feature(CI): ref new CI entry point
|
||||
|
||||
---
|
||||
.gitlab-ci.yml | 4 ++--
|
||||
plugins/power/tray/power-tray.cpp | 1 -
|
||||
2 files changed, 2 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
|
||||
index a52f8cc..0b8aa2b 100644
|
||||
--- a/.gitlab-ci.yml
|
||||
+++ b/.gitlab-ci.yml
|
||||
@@ -2,7 +2,7 @@ variables:
|
||||
RPM_BUILD_REQUIRES: 'cmake make systemd-devel libselinux-devel gettext gcc-c++ intltool libX11-devel xerces-c-devel xsd fontconfig-devel jsoncpp-devel cairomm-devel kiran-log-gtk3-devel fmt-devel python3-jinja2 gdbus-codegen-glibmm gtest-devel libnotify-devel pulseaudio-libs-devel libxml++-devel gtkmm30-devel libgtop2-devel libgudev-devel cryptopp-devel libwnck3-devel'
|
||||
|
||||
include:
|
||||
- - project: 'os/gitlab-ci'
|
||||
+ - project: 'os/ks-devops'
|
||||
ref: main
|
||||
- file: '/cmake/cxx.gitlab-ci.yml'
|
||||
+ file: '/entrypoint/develop/cmake.yml'
|
||||
|
||||
diff --git a/plugins/power/tray/power-tray.cpp b/plugins/power/tray/power-tray.cpp
|
||||
index 6c96069..8f76bcb 100644
|
||||
--- a/plugins/power/tray/power-tray.cpp
|
||||
+++ b/plugins/power/tray/power-tray.cpp
|
||||
@@ -172,7 +172,6 @@ Glib::RefPtr<Gdk::Pixbuf> PowerTray::get_pixbuf_by_icon_name(const std::string&
|
||||
Gdk::RGBA success_color;
|
||||
Gdk::RGBA warning_color;
|
||||
Gdk::RGBA error_color;
|
||||
-
|
||||
|
||||
if (theme_name.empty())
|
||||
{
|
||||
--
|
||||
2.27.0
|
||||
|
||||
@ -0,0 +1,42 @@
|
||||
From 16f0c4876beb217bdf904386e766f904ce10f8b2 Mon Sep 17 00:00:00 2001
|
||||
From: meizhigang <meizhigang@kylinsec.com.cn>
|
||||
Date: Fri, 29 Mar 2024 10:36:15 +0800
|
||||
Subject: [PATCH 4/4] fix(audio):Fix audio stream volume retain while set mute
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
- 音频流设置静音保留音量大小
|
||||
|
||||
Related #33694
|
||||
---
|
||||
plugins/audio/audio-stream.cpp | 13 -------------
|
||||
1 file changed, 13 deletions(-)
|
||||
|
||||
diff --git a/plugins/audio/audio-stream.cpp b/plugins/audio/audio-stream.cpp
|
||||
index 263f2cc..2616a42 100644
|
||||
--- a/plugins/audio/audio-stream.cpp
|
||||
+++ b/plugins/audio/audio-stream.cpp
|
||||
@@ -72,19 +72,6 @@ void AudioStream::SetMute(bool mute, MethodInvocation &invocation)
|
||||
DBUS_ERROR_REPLY_AND_RET(CCErrorCode::ERROR_AUDIO_STREAM_SET_MUTE_FAILED);
|
||||
}
|
||||
|
||||
- // 如果设置了静音，则将音量也设置为0
|
||||
- if (mute)
|
||||
- {
|
||||
- auto volume_absolute = AudioUtils::volume_range2absolute(0,
|
||||
- this->stream_->get_min_volume(),
|
||||
- this->stream_->get_max_volume());
|
||||
-
|
||||
- if (!this->stream_->set_volume(volume_absolute))
|
||||
- {
|
||||
- DBUS_ERROR_REPLY_AND_RET(CCErrorCode::ERROR_AUDIO_STREAM_SET_VOLUME_FAILED);
|
||||
- }
|
||||
- }
|
||||
-
|
||||
invocation.ret();
|
||||
}
|
||||
|
||||
--
|
||||
2.27.0
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
Name: kiran-cc-daemon
|
||||
Version: 2.6.1
|
||||
Release: 9%{?dist}
|
||||
Release: 10%{?dist}
|
||||
Summary: DBus daemon for Kiran Desktop
|
||||
|
||||
License: MulanPSL-2.0
|
||||
@ -16,6 +16,10 @@ Patch0004: 0004-fix-keybinding-Fix-shortcut-grab-in-system-and-conf-.patch
|
||||
Patch0005: 0005-fix-power-Fix-dpms-force-level-effective-while-state.patch
|
||||
Patch0006: 0006-feature-appearance-Add-support-reset-default-font.patch
|
||||
Patch0007: 0007-fix-keybidning-avoid-shift-to-participate-in-transla.patch
|
||||
Patch0008: 0008-fix-appearance-Change-the-light-theme-name-to-Kiran-.patch
|
||||
Patch0009: 0009-fix-power-Fix-coredump-while-log-print-in-power.patch
|
||||
Patch0010: 0010-feature-CI-ref-new-CI-entry-point.patch
|
||||
Patch0011: 0011-fix-audio-Fix-audio-stream-volume-retain-while-set-m.patch
|
||||
|
||||
BuildRequires: cmake >= 3.2
|
||||
BuildRequires: pkgconfig(glibmm-2.4)
|
||||
@ -202,6 +206,12 @@ glib-compile-schemas /usr/share/glib-2.0/schemas &> /dev/nulls || :
|
||||
%{_libdir}/pkgconfig/kiran-cc-daemon.pc
|
||||
|
||||
%changelog
|
||||
* Mon Apr 01 2024 meizhigang <meizhigang@kylinsec.com.cn> - 2.6.1-10
|
||||
- KYOS-B: Change the light theme name to Kiran-white (#24747)
|
||||
- KYOS-B: Fix coredump while log print in power (#31141)
|
||||
- KYOS-B: ref new CI entry point
|
||||
- KYOS-B: Fix audio stream volume retain while set mute (#33694)
|
||||
|
||||
* Wed Mar 20 2024 yinhongchang <yinhongchang@kylinsec.com.cn> - 2.6.1-9
|
||||
- KYOS-B: openeuler and kylinsec replaced with macro definitions %{_vendor}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user