Compare commits

...

12 Commits

Author SHA1 Message Date
openeuler-ci-bot
c2f33a5e52
!23 modify version info
From: @hanshuang123456 
Reviewed-by: @ut-layne-yang 
Signed-off-by: @ut-layne-yang
2023-11-17 10:04:09 +00:00
hanshuang
07ee04c9f2 modify version info 2023-11-17 15:26:09 +08:00
openeuler-ci-bot
022d3f0cfa
!22 update package
From: @hanshuang123456 
Reviewed-by: @HelloWorld_lvcongqing 
Signed-off-by: @HelloWorld_lvcongqing
2023-10-25 06:59:57 +00:00
hanshuang
e983d61c64 update dde-session-shell package 2023-10-20 18:30:10 +08:00
openeuler-ci-bot
db9eec19b9 !6 fix compile error
Merge pull request !6 from panchenbo/master
2020-09-09 22:04:06 +08:00
panchenbo
88852a3a41 fix compile error for openeuler 2020-09-09 19:59:40 +08:00
panchenbo
51af99632c fix compile error for openeuler 2020-09-09 19:55:33 +08:00
openeuler-ci-bot
8065df23ef !5 fix source url in spec
Merge pull request !5 from weidongkl/master
2020-09-04 14:09:25 +08:00
weidong
70337b38ae fix conflict 2020-09-04 13:42:57 +08:00
weidong
c1e1224e1b fix conflict 2020-09-04 13:37:04 +08:00
openeuler-ci-bot
e47f04b373 !4 fix compile error
Merge pull request !4 from panchenbo/master
2020-09-04 11:52:36 +08:00
panchenbo
ffaace8079 fix compile error 2020-09-04 11:19:28 +08:00
4 changed files with 83 additions and 20 deletions

View File

@ -0,0 +1,44 @@
From 2fd2c44240f32423c040f909de2a323d72d4fe82 Mon Sep 17 00:00:00 2001
From: panchenbo <panchenbo@uniontech.com>
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

Binary file not shown.

View File

@ -1,22 +1,25 @@
%if 0%{?with_debug}
%global debug_package %{nil}
%endif
%global debug_package %{nil}
%debug_package %{nil}
Name: dde-session-shell
Version: 5.0.0.8
Release: 2
Version: 5.4.92
Release: 2
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: http://shuttle.corp.deepin.com/cache/repos/eagle/release-candidate/RERFNS4wLjAuNzYxMA/pool/main/d/%{name}/%{name}_%{version}.orig.tar.xz
Source0: %{name}-%{version}.orig.tar.xz
BuildRequires: cmake
BuildRequires: dde-daemon
BuildRequires: dtkcore >= 5.1
BuildRequires: glib2-devel
BuildRequires: libarchive
BuildRequires: dtkcore-devel >= 5.5
BuildRequires: dtkcommon-devel
BuildRequires: gsettings-qt
BuildRequires: startdde
BuildRequires: qt5-qttools-devel
BuildRequires: qt5-qtdeclarative-devel
BuildRequires: qt5-linguist
BuildRequires: dtkwidget-devel >= 5.1
BuildRequires: dtkwidget-devel >= 5.5
BuildRequires: qt5-qtx11extras-devel
BuildRequires: qt5-qtmultimedia-devel
BuildRequires: qt5-qtsvg-devel
@ -24,10 +27,25 @@ BuildRequires: libXcursor-devel
BuildRequires: libXrandr-devel
BuildRequires: libXtst-devel
BuildRequires: libXi-devel
BuildRequires: deepin-gettext-tools
BuildRequires: xcb-util-wm xcb-util-wm-devel
BuildRequires: dde-qt-dbus-factory-devel
BuildRequires: gsettings-qt-devel
BuildRequires: lightdm-qt5-devel lightdm-gtk-greeter
BuildRequires: lightdm-qt5-devel
BuildRequires: pam-devel
BuildRequires: openssl-devel
BuildRequires: gtest-devel
BuildRequires: dtkgui-devel
Requires: lightdm
Requires: google-noto-cjk-fonts
Requires: libqtxdg-devel
Requires: deepin-desktop-schemas
Requires: dde-daemon
Requires: startdde
Requires(post): sed
Provides: lightdm-deepin-greeter = %{version}-%{release}
Provides: lightdm-greeter = 1.2
%description
deepin-session-shell - Deepin desktop-environment - session-shell module.
@ -35,34 +53,35 @@ deepin-session-shell - Deepin desktop-environment - session-shell module.
%prep
%setup -q -n %{name}-%{version}
%build
export PATH=$PATH:%{_qt5_bindir}
cmake_version=$(cmake --version | head -1 | awk '{print $3}')
sed -i "s|VERSION 3.13.4|VERSION $cmake_version|g" CMakeLists.txt
%{__cmake} .
make
%cmake
%make_build
%install
%make_install
%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
%{_datadir}/deepin-authentication/privileges/lightdm-deepin-greeter.conf
%changelog
* Thu Sep 3 2020 weidong <weidong@uniontech.com> - 5.0.0.8-2
- fix source url in spec
* Fri Nov 17 2023 hanshuang <hanshuang@uniontech.com> - 5.4.92-2
- modify version info
* Thu Jul 30 2020 openEuler Buildteam <buildteam@openeuler.org> - 5.0.0.8-1
- Package init
* Fri Jun 10 2022 uoser <uoser@uniontech.com> - 5.4.92-1.01
- package init