diff --git a/0001-to-fix-a-potential-crash-issue-in-the-control-center.patch b/0001-to-fix-a-potential-crash-issue-in-the-control-center.patch new file mode 100644 index 0000000000000000000000000000000000000000..2dc048d6437d34453a8bcd4bef74cd7706b043a3 --- /dev/null +++ b/0001-to-fix-a-potential-crash-issue-in-the-control-center.patch @@ -0,0 +1,26 @@ +From 95f9ca4ca8ac63a51a15742044a538a2e0418b12 Mon Sep 17 00:00:00 2001 +From: root +Date: Mon, 18 Dec 2023 17:33:22 +0800 +Subject: [PATCH] test + +--- + keybinding/shortcuts/shortcut_manager.go | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/keybinding/shortcuts/shortcut_manager.go b/keybinding/shortcuts/shortcut_manager.go +index 84e3c05..7c8a2be 100644 +--- a/keybinding/shortcuts/shortcut_manager.go ++++ b/keybinding/shortcuts/shortcut_manager.go +@@ -938,6 +938,9 @@ func (sm *ShortcutManager) AddKWin(wmObj wm.Wm) { + logger.Debugf("release type is server filter '%s'", accel.Id) + continue + } ++ if accel.Id == "preview-workspace" || accel.Id == "color-picker" { ++ continue ++ } + name := idNameMap[accel.Id] + if name == "" { + name = accel.Id +-- +2.27.0 + diff --git a/dde-daemon.spec b/dde-daemon.spec index 018c2953fb5f36f383873fce0f1e8cc272a73ff9..63269a2047a815e6d67490d160813543a666310d 100644 --- a/dde-daemon.spec +++ b/dde-daemon.spec @@ -7,12 +7,14 @@ Name: dde-daemon Version: 5.13.85.8 -Release: 2 +Release: 3 Summary: Daemon handling the DDE session settings License: GPLv3 URL: http://shuttle.corp.deepin.com/cache/tasks/18802/unstable-amd64/ Source0: %{name}-%{version}.tar.gz +Patch0001: 0001-to-fix-a-potential-crash-issue-in-the-control-center.patch + BuildRequires: python3 BuildRequires: gocode @@ -205,6 +207,9 @@ fi %{_var}/lib/polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Grub2.pkla %changelog +* Mon Dec 18 2023 liuzhilin - 5.13.85.8-3 +- fix-a-potential-crash-issue-in-the-control-center + * Tue Nov 28 2023 hanshuang - 5.13.85.8-2 - modify spec remove openeuler info