[arch-commits] Commit in deepin-session-shell/trunk (PKGBUILD)

[Felix Yan]

    Date: Sunday, April 25, 2021 @ 11:09:09
  Author: felixonmars
Revision: 924135

upgpkg: deepin-session-shell 5.4.9-1

Modified:
  deepin-session-shell/trunk/PKGBUILD

----------+
 PKGBUILD |   17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-25 11:06:24 UTC (rev 924134)
+++ PKGBUILD	2021-04-25 11:09:09 UTC (rev 924135)
@@ -3,7 +3,7 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=deepin-session-shell
-pkgver=5.3.0.45
+pkgver=5.4.9
 pkgrel=1
 pkgdesc='Deepin desktop-environment - session-shell module'
 arch=('x86_64')
@@ -12,23 +12,20 @@
 # qt5-tools: for qdbus executable
 depends=('deepin-daemon' 'deepin-qt5integration' 'deepin-wallpapers' 'gsettings-qt' 'liblightdm-qt5'
          'qt5-tools' 'startdde')
-makedepends=('cmake' 'ninja')
+makedepends=('cmake' 'gmock' 'gtest' 'ninja')
 conflicts=('deepin-session-ui<5')
 provides=('lightdm-deepin-greeter')
 groups=('deepin')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-session-shell/archive/$pkgver.tar.gz"
-        $pkgname-wrapper-execution.patch::https://github.com/linuxdeepin/dde-session-shell/commit/5b5aa3aeb9ac8fc378083eeb327eac8f784cba66.patch
-        $pkgname-wrapper-typo.patch::https://github.com/linuxdeepin/dde-session-shell/commit/fe0f13fca67c955a0a5c7f0b17178c22bc9a7b51.patch)
-sha512sums=('64714269a1322dca5863df0cb6ca22bd81c50a69bad37cd04ad0cf0d5b3ef8d5ed81770ac55025f4933008dc34001670084542f6f9b15bf8050d0c7461ef50a3'
-            '78180766be987b9619161571bbea3e598b3f47433a892af2d5a2387ea8321160feef38f0b9450d8bc8c18c0cae515b00e1a07e21f57538f39009abd0d75411b3'
-            '482707b46af2165ce44730b394f2d29e7abcb011fff5793cda204e7e7feaaf0c94ec94ceaebed934a206815dea0757520821b60df9b8f2c12dea93b1d047109c')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-session-shell/archive/$pkgver.tar.gz")
+sha512sums=('ba06ad832ce79f6a6e55d0911aa18cd14fd0a88f82cf8153bca08b8af16fafc1cf21d5ce5d181fcf205ce237007ad0db883c485a7d6e3f19fcc75bca7ee1429d')
 
 prepare() {
   cd dde-session-shell-$pkgver
-  patch -p1 -i ../$pkgname-wrapper-execution.patch
-  patch -p1 -i ../$pkgname-wrapper-typo.patch
   # We don't have common-auth on Arch
   sed -i 's/common-auth/system-login/' src/libdde-auth/authagent.cpp
+
+  # Weird upstream depends on dtkwidget 5.5 and 5.4 at the same time, while they don't really need 5.5
+  sed -i 's|5\.5||' CMakeLists.txt tests/dde-lock/CMakeLists.txt tests/lightdm-deepin-greeter/CMakeLists.txt
 }
 
 build() {