git » plasma-workspace.git » commit 4206ada

upgpkg: 6.0.5.1-2: Fix session restore on X

author Antonio Rojas
2024-06-08 07:24:32 UTC
committer Antonio Rojas
2024-06-08 07:24:32 UTC
parent 939e30e7b64e881f8c0b4905623f0182cd9a4c17

upgpkg: 6.0.5.1-2: Fix session restore on X

.SRCINFO +3 -1
PKGBUILD +9 -3

diff --git a/.SRCINFO b/.SRCINFO
index 3f8dece..c5196a8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = plasma-workspace
 	pkgdesc = KDE Plasma Workspace
 	pkgver = 6.0.5.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://kde.org/plasma-desktop/
 	arch = x86_64
 	groups = plasma
@@ -126,11 +126,13 @@ pkgbase = plasma-workspace
 	replaces = plasma-wayland-session
 	source = https://download.kde.org/stable/plasma/6.0.5/plasma-workspace-6.0.5.1.tar.xz
 	source = https://download.kde.org/stable/plasma/6.0.5/plasma-workspace-6.0.5.1.tar.xz.sig
+	source = https://invent.kde.org/plasma/plasma-workspace/-/commit/0857d18d.patch
 	validpgpkeys = E0A3EB202F8E57528E13E72FD7574483BB57B18D
 	validpgpkeys = 0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D
 	validpgpkeys = D07BD8662C56CB291B316EB2F5675605C74E02CF
 	validpgpkeys = 1FA881591C26B276D7A5518EEAAF29B42A678C20
 	sha256sums = 8907f9fded5fc6e5d95355f8346328de18d7c8850dabd9109d75458d5aeed813
 	sha256sums = SKIP
+	sha256sums = ae4406bbb6c3068f499f521fb1a4df15362d08ccefc92c5519ba5c5735407ad2
 
 pkgname = plasma-workspace
diff --git a/PKGBUILD b/PKGBUILD
index b12b7c6..53334b4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=plasma-workspace
 pkgver=6.0.5.1
 _dirver=$(echo $pkgver | cut -d. -f1-3)
-pkgrel=1
+pkgrel=2
 pkgdesc='KDE Plasma Workspace'
 arch=(x86_64)
 url='https://kde.org/plasma-desktop/'
@@ -130,14 +130,20 @@ optdepends=('appmenu-gtk-module: global menu support for GTK2 and some GTK3 appl
 conflicts=(plasma-wayland-session)
 replaces=(plasma-wayland-session)
 groups=(plasma)
-source=(https://download.kde.org/stable/plasma/$_dirver/$pkgname-$pkgver.tar.xz{,.sig})
+source=(https://download.kde.org/stable/plasma/$_dirver/$pkgname-$pkgver.tar.xz{,.sig}
+        https://invent.kde.org/plasma/plasma-workspace/-/commit/0857d18d.patch)
 sha256sums=('8907f9fded5fc6e5d95355f8346328de18d7c8850dabd9109d75458d5aeed813'
-            'SKIP')
+            'SKIP'
+            'ae4406bbb6c3068f499f521fb1a4df15362d08ccefc92c5519ba5c5735407ad2')
 validpgpkeys=('E0A3EB202F8E57528E13E72FD7574483BB57B18D'  # Jonathan Esk-Riddell <jr@jriddell.org>
               '0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D'  # Bhushan Shah <bshah@kde.org>
               'D07BD8662C56CB291B316EB2F5675605C74E02CF'  # David Edmundson <davidedmundson@kde.org>
               '1FA881591C26B276D7A5518EEAAF29B42A678C20') # Marco Martin <notmart@gmail.com>
 
+prepare() {
+  patch -d $pkgname-$pkgver -p1 < 0857d18d.patch # Fix session restore on X
+}
+
 build() {
   cmake -B build -S $pkgname-$pkgver \
     -DCMAKE_INSTALL_LIBEXECDIR=lib \