diff --git a/0001-fix-compile-error-for-openeuler.patch b/0001-fix-compile-error-for-openeuler.patch deleted file mode 100644 index 0583c40368df88a478a79ebea49e65ff2faaba39..0000000000000000000000000000000000000000 --- a/0001-fix-compile-error-for-openeuler.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 2fd2c44240f32423c040f909de2a323d72d4fe82 Mon Sep 17 00:00:00 2001 -From: panchenbo -Date: Wed, 9 Sep 2020 19:48:57 +0800 -Subject: [PATCH] fix compile error - ---- - CMakeLists.txt | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a50f11e..0f47e79 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -147,14 +147,14 @@ set(WIDGETS_SRCS - ./src/widgets/fullscreenbackground.h - ./src/widgets/userbutton.h - ./src/widgets/controlwidget.h -- ./src/widgets/errortooltip.h -+ #./src/widgets/errortooltip.h - ./src/widgets/shutdownwidget.h - ./src/widgets/dbreathinglabel.h - ./src/widgets/rounditembutton.h - ./src/widgets/kblayoutwidget.h - ./src/widgets/mediawidget.h - ./src/widgets/propertygroup.h -- ./src/widgets/darrowrectangle.h -+ #./src/widgets/darrowrectangle.h - ./src/widgets/userbreathinglabel.h - ./src/widgets/virtualkbinstance.h - ./src/widgets/logowidget.h -@@ -164,8 +164,8 @@ set(WIDGETS_SRCS - ./src/widgets/fullscreenbackground.cpp - ./src/widgets/loginbutton.cpp - ./src/widgets/dbreathinglabel.cpp -- ./src/widgets/errortooltip.cpp -- ./src/widgets/darrowrectangle.cpp -+ #./src/widgets/errortooltip.cpp -+ #./src/widgets/darrowrectangle.cpp - ./src/widgets/mediawidget.cpp - ./src/widgets/controlwidget.cpp - ./src/widgets/virtualkbinstance.cpp --- -2.20.1 - diff --git a/dde-session-shell-5.4.20.24.orig.tar.xz b/dde-session-shell-5.4.20.24.orig.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..a227ce3856a59ad712f39df15d138891452d4600 Binary files /dev/null and b/dde-session-shell-5.4.20.24.orig.tar.xz differ diff --git a/dde-session-shell.spec b/dde-session-shell.spec index 7c43fc94561e7dbb940cbe29574312fdce1d4898..bd3ee9b865bbeb17d556b1dd9ea2929334264578 100644 --- a/dde-session-shell.spec +++ b/dde-session-shell.spec @@ -1,18 +1,16 @@ Name: dde-session-shell -Version: 5.3.0.40.2 +Version: 5.4.20.24 Release: 1 Summary: deepin-session-shell - Deepin desktop-environment - session-shell module License: GPLv3+ URL: http://shuttle.corp.deepin.com/cache/repos/eagle/release-candidate/RERFNS4wLjAuNzYxMA/pool/main/d/dde-session-shell/ -Source0: %{name}_%{version}.orig.tar.xz +Source0: %{name}-%{version}.orig.tar.xz BuildRequires: cmake -BuildRequires: dde-daemon -BuildRequires: dtkcore-devel +BuildRequires: dtkcore dtkcore-devel BuildRequires: gsettings-qt -BuildRequires: startdde BuildRequires: qt5-linguist -BuildRequires: dtkwidget-devel >= 5.1 +BuildRequires: dtkwidget-devel dtkwidget dtkgui dtkgui-devel BuildRequires: qt5-qtx11extras-devel BuildRequires: qt5-qtmultimedia-devel BuildRequires: qt5-qtsvg-devel @@ -25,6 +23,7 @@ BuildRequires: dde-qt-dbus-factory-devel BuildRequires: gsettings-qt-devel BuildRequires: lightdm-qt5-devel BuildRequires: pam-devel +BuildRequires: gtest-devel Requires: lightdm Requires(post): sed Provides: lightdm-deepin-greeter = %{version}-%{release} @@ -48,18 +47,23 @@ sed -i "s|VERSION 3.13.4|VERSION $cmake_version|g" CMakeLists.txt %files %{_bindir}/dde-lock -%{_bindir}/dde-shutdown %{_bindir}/lightdm-deepin-greeter %attr(755,root,root) %{_bindir}/deepin-greeter %{_sysconfdir}/deepin/greeters.d/00-xrandr %{_sysconfdir}/deepin/greeters.d/lightdm-deepin-greeter %{_datadir}/dde-session-shell/ +%{_sysconfdir}/deepin/greeters.d/10-cursor-theme %{_datadir}/xgreeters/lightdm-deepin-greeter.desktop %{_datadir}/dbus-1/services/com.deepin.dde.lockFront.service %{_datadir}/dbus-1/services/com.deepin.dde.shutdownFront.service +%{_datadir}/applications/dde-lock.desktop +%{_datadir}/glib-2.0/schemas/com.deepin.dde.session-shell.gschema.xml %changelog +* Thu Jun 11 2020 uoser - 5.4.20.24-1 +- Update to 5.4.20.24 + * Thu Jul 08 2021 weidong - 5.3.0.40.2-1 - Update 5.3.0.40.2 diff --git a/dde-session-shell_5.3.0.40.2.orig.tar.xz b/dde-session-shell_5.3.0.40.2.orig.tar.xz deleted file mode 100644 index 31d9367c8dc6ae99a27f5bc5d883d64064b0471e..0000000000000000000000000000000000000000 Binary files a/dde-session-shell_5.3.0.40.2.orig.tar.xz and /dev/null differ