Date: Thursday, March 23, 2023 @ 23:54:52
Author: felixonmars
Revision: 1427445
archrelease: copy trunk to community-x86_64
Added:
deepin-session-shell/repos/community-x86_64/PKGBUILD
(from rev 1427443, deepin-session-shell/trunk/PKGBUILD)
deepin-session-shell/repos/community-x86_64/fix-dtk-linking.patch
(from rev 1427443, deepin-session-shell/trunk/fix-dtk-linking.patch)
Deleted:
deepin-session-shell/repos/community-x86_64/PKGBUILD
-----------------------+
PKGBUILD | 81 ++++++++++++++++++++++++------------------------
fix-dtk-linking.patch | 19 +++++++++++
2 files changed, 61 insertions(+), 39 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-03-23 23:54:47 UTC (rev 1427444)
+++ PKGBUILD 2023-03-23 23:54:52 UTC (rev 1427445)
@@ -1,39 +0,0 @@
-# Maintainer: Felix Yan <[email protected]>
-# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
-# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
-
-pkgname=deepin-session-shell
-pkgver=5.5.83
-pkgrel=1
-pkgdesc='Deepin desktop-environment - session-shell module'
-arch=('x86_64')
-url="https://github.com/linuxdeepin/dde-session-shell";
-license=('GPL3')
-# qt5-tools: for qdbus executable
-depends=('deepin-daemon' 'deepin-network-core' 'deepin-qt5integration'
'deepin-wallpapers'
- 'gsettings-qt' 'liblightdm-qt5' 'lightdm' 'qt5-tools' 'startdde')
-makedepends=('cmake' 'gmock' 'gtest' 'ninja')
-conflicts=('deepin-session-ui<5')
-provides=('lightdm-deepin-greeter')
-groups=('deepin')
-source=("https://github.com/linuxdeepin/dde-session-shell/archive/$pkgver/$pkgname-$pkgver.tar.gz";)
-sha512sums=('13f742005f59d3eed281e075d42df0da01d7373db368a49137a3343d3564de3e3af102131a5c5a9c9a09ef23d7b48e59b1393f83d50704413bd5b77c4eda1c7d')
-
-prepare() {
- cd dde-session-shell-$pkgver
- # We don't have common-auth on Arch
- sed -i 's/common-auth/system-login/' src/libdde-auth/deepinauthframework.cpp
-}
-
-build() {
- cd dde-session-shell-$pkgver
- cmake . -GNinja -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc
- ninja
-}
-
-package() {
- cd dde-session-shell-$pkgver
- DESTDIR="$pkgdir" ninja install
-
- chmod +x "$pkgdir"/usr/bin/deepin-greeter
-}
Copied: deepin-session-shell/repos/community-x86_64/PKGBUILD (from rev 1427443,
deepin-session-shell/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-03-23 23:54:52 UTC (rev 1427445)
@@ -0,0 +1,42 @@
+# Maintainer: Felix Yan <[email protected]>
+# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
+# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
+
+pkgname=deepin-session-shell
+pkgver=5.5.84
+pkgrel=1
+pkgdesc='Deepin desktop-environment - session-shell module'
+arch=('x86_64')
+url="https://github.com/linuxdeepin/dde-session-shell";
+license=('GPL3')
+# qt5-tools: for qdbus executable
+depends=('deepin-daemon' 'deepin-network-core' 'deepin-qt5integration'
'deepin-wallpapers'
+ 'gsettings-qt' 'liblightdm-qt5' 'lightdm' 'qt5-tools' 'startdde'
'kwayland')
+makedepends=('cmake' 'gmock' 'gtest' 'ninja')
+conflicts=('deepin-session-ui<5')
+provides=('lightdm-deepin-greeter')
+groups=('deepin')
+source=("https://github.com/linuxdeepin/dde-session-shell/archive/$pkgver/$pkgname-$pkgver.tar.gz";
+ fix-dtk-linking.patch)
+sha512sums=('3292f6e6ba05615bf2c40dbd418ad0f0228307df1f00651d5df21b8130c9fb5fbca5e9c84a9f6370430dc2dbd6b1760c99802eef0f961f0bc2b4c797da8f879d'
+
'77265da51f5c8eb55589d0ba11fa4e216404b821bd95126669b0bc4ad7c47e06711e1ad4637a0ed58f45553a837e2d582341c66fb17ba026ef0bd1d6af09b765')
+
+prepare() {
+ cd dde-session-shell-$pkgver
+ patch -p1 -i ../fix-dtk-linking.patch
+ # We don't have common-auth on Arch
+ sed -i 's/common-auth/system-login/' src/libdde-auth/deepinauthframework.cpp
+}
+
+build() {
+ cd dde-session-shell-$pkgver
+ cmake . -GNinja -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc
+ ninja
+}
+
+package() {
+ cd dde-session-shell-$pkgver
+ DESTDIR="$pkgdir" ninja install
+
+ chmod +x "$pkgdir"/usr/bin/deepin-greeter
+}
Copied: deepin-session-shell/repos/community-x86_64/fix-dtk-linking.patch (from
rev 1427443, deepin-session-shell/trunk/fix-dtk-linking.patch)
===================================================================
--- fix-dtk-linking.patch (rev 0)
+++ fix-dtk-linking.patch 2023-03-23 23:54:52 UTC (rev 1427445)
@@ -0,0 +1,19 @@
+diff --git a/plugins/one-key-login/CMakeLists.txt
b/plugins/one-key-login/CMakeLists.txt
+index 2c532f76..47ee48da 100644
+--- a/plugins/one-key-login/CMakeLists.txt
++++ b/plugins/one-key-login/CMakeLists.txt
+@@ -1,9 +1,14 @@
++
+ find_package(QT NAMES Qt5 COMPONENTS Widgets REQUIRED)
+ find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets REQUIRED)
++find_package(DtkCore REQUIRED)
++find_package(DtkWidget REQUIRED)
+
+ link_libraries(
+ ${Qt_LIBS}
+ Qt${QT_VERSION_MAJOR}::Widgets
++ ${DtkCore_LIBRARIES}
++ ${DtkWidget_LIBRARIES}
+ )
+
+ set(LIB_NAME one-key-login)
