diff --git a/0001-Revert-fix.patch b/0001-Revert-fix.patch new file mode 100644 index 0000000000000000000000000000000000000000..7c5cce3e811ce999f9c858015be1da2e3671ee2f --- /dev/null +++ b/0001-Revert-fix.patch @@ -0,0 +1,37 @@ +From 9c4267f33adec589b2c72a87656c96f03046cbe1 Mon Sep 17 00:00:00 2001 +From: Super User +Date: Sun, 28 Apr 2024 16:02:16 +0800 +Subject: [PATCH 1/1] =?UTF-8?q?Revert=20"fix:=20=E4=BF=AE=E5=A4=8D?= + =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=A0=8F=E7=94=B5=E6=BA=90=E6=8F=92=E4=BB=B6?= + =?UTF-8?q?=E5=8F=B3=E9=94=AE=E9=94=81=E5=AE=9A=E6=8F=90=E7=A4=BA=E9=94=81?= + =?UTF-8?q?=E5=B1=8F=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98"?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This reverts commit 277cb0def0242e7e6099c5b24d032fec3ccba69a. +--- + plugins/shutdown/shutdownplugin.cpp | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/plugins/shutdown/shutdownplugin.cpp b/plugins/shutdown/shutdownplugin.cpp +index ef15f4ce..e5cdcf31 100644 +--- a/plugins/shutdown/shutdownplugin.cpp ++++ b/plugins/shutdown/shutdownplugin.cpp +@@ -304,7 +304,12 @@ void ShutdownPlugin::invokedMenuItem(const QString &itemKey, const QString &menu + #endif + + } else { +- QProcess::execute("bash -c \"originmap=$(setxkbmap -query | grep option | awk -F ' ' '{print $2}');/usr/bin/setxkbmap -option grab:break_actions&&/usr/bin/xdotool key XF86Ungrab&&dbus-send --print-reply --dest=com.deepin.dde.lockFront /com/deepin/dde/lockFront com.deepin.dde.lockFront.Show&&setxkbmap -option $originmap\""); ++ DDBusSender() ++ .service("com.deepin.dde.lockFront") ++ .interface("com.deepin.dde.lockFront") ++ .path("/com/deepin/dde/lockFront") ++ .method(QString("Show")) ++ .call(); + } + } else + DDBusSender() +-- +2.43.0 + diff --git a/dde-dock.spec b/dde-dock.spec index 065d6634986a62bf622209877cf334c067942c3a..ac60ae1583d83f0547a83a9d5d889b407e6a8e11 100644 --- a/dde-dock.spec +++ b/dde-dock.spec @@ -3,7 +3,7 @@ Name: dde-dock Version: 5.6.22 -Release: 1%{?dist}.02 +Release: 5 Summary: Deepin desktop-environment - Dock module License: GPLv3 URL: https://github.com/linuxdeepin/dde-dock/ @@ -13,12 +13,13 @@ Patch2: 0001-Hidden-state.patch Patch3: 0001-hide-status-box.patch Patch4: 0001-fix-build-error.patch Patch5: 0001-fix-dde-trash-error.patch +Patch6: 0001-Revert-fix.patch BuildRequires: cmake BuildRequires: libarchive BuildRequires: gcc-c++ BuildRequires: pkgconfig(dbusmenu-qt5) -#####BuildRequires: dde-network-core-devel +BuildRequires: dde-network-core-devel BuildRequires: dtkcommon-devel BuildRequires: dtkwidget-devel >= 5.4.19 BuildRequires: dtkcore-devel >= 5.4.14 @@ -50,13 +51,13 @@ BuildRequires: dde-control-center-devel >= 5.5.77 BuildRequires: dde-control-center >= 5.5.77 Requires: dbusmenu-qt5 -######Requires: dde-network-core +Requires: dde-network-core Requires: dde-qt-dbus-factory Requires: xcb-util-wm Requires: xcb-util-image Requires: libxcb Requires: deepin-desktop-schemas -#######Requires: dde-daemon +Requires: dde-daemon Requires: startdde Requires: libqtxdg-devel Requires: onboard @@ -81,12 +82,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} deepin desktop-environment - dock plugin. %prep -%setup -q -n %{name}-%{version} -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 +%autosetup -n %{name}-%{version} -p1 find plugins/ -mindepth 2 -maxdepth 2 -type f -name CMakeLists.txt | grep -vE 'dcc-dock-plugin/CMakeLists.txt' | xargs -I '{file_name}' sed -i '/TARGETS/s|lib|%{_lib}|' '{file_name}' @@ -144,6 +140,18 @@ chmod +x %{buildroot}/%{_bindir}/%{name}-wrapper %changelog +* Mon Apr 29 2024 liweigang - 5.6.22-5 +- fix plugin shutdown lock fail + +* Wed Apr 17 2024 liuzhilin - 5.6.22-4 +- backport buildrequires + +* Tue Apr 16 2024 liuzhilin - 5.6.22-3 +- fix build dde-session-ui error + +* Fri Apr 12 2024 liuzhilin - 5.6.22-2 +- backport buildrequires + * Thu Dec 28 2023 liuzhilin - 5.6.22-1.02 - fix: fix-dde-trash-error