git » plasma-integration.git » commit 5414310

upgpkg: 5.91.0-2: Fix lock screen breakage

author Antonio Rojas
2023-12-23 10:51:31 UTC
committer Antonio Rojas
2023-12-23 10:51:31 UTC
parent b9222ee767d7b2bd89d556503b49449b2ce12e2e

upgpkg: 5.91.0-2: Fix lock screen breakage

.SRCINFO +101 -10
PKGBUILD +100 -10

diff --git a/.SRCINFO b/.SRCINFO
index c7e2c41..61b4d8e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,118 @@
 pkgbase = plasma-integration
 	pkgdesc = Qt Platform Theme integration plugins for the Plasma workspaces
-	pkgver = 5.27.10
-	pkgrel = 1
+	pkgver = 5.91.0
+	pkgrel = 2
 	url = https://kde.org/plasma-desktop/
 	arch = x86_64
 	groups = plasma
 	license = LGPL
 	makedepends = extra-cmake-modules
-	makedepends = breeze
 	makedepends = plasma-wayland-protocols
+	makedepends = kconfig5
+	makedepends = ki18n5
+	makedepends = kiconthemes5
+	makedepends = kio5
+	makedepends = knotifications5
+	makedepends = kwayland5
+	makedepends = kwindowsystem5
+	makedepends = kxmlgui5
+	makedepends = qt5-base
+	makedepends = qt5-declarative
+	makedepends = qt5-quickcontrols2
+	makedepends = qt5-wayland
+	makedepends = qt5-x11extras
+	depends = gcc-libs
+	depends = glibc
+	depends = kcolorscheme
+	depends = kcompletion
+	depends = kconfig
+	depends = kcoreaddons
+	depends = kguiaddons
+	depends = kiconthemes
+	depends = ki18n
+	depends = kio
+	depends = kjobwidgets
+	depends = kservice
+	depends = kstatusnotifieritem
+	depends = kwidgetsaddons
+	depends = kwindowsystem
+	depends = kxmlgui
+	depends = libxcb
 	depends = libxcursor
-	depends = noto-fonts
-	depends = ttf-hack
-	depends = qqc2-desktop-style5
-	depends = kio5
 	depends = perl
-	source = https://download.kde.org/stable/plasma/5.27.10/plasma-integration-5.27.10.tar.xz
-	source = https://download.kde.org/stable/plasma/5.27.10/plasma-integration-5.27.10.tar.xz.sig
+	depends = qqc2-desktop-style
+	depends = qt6-base
+	depends = qt6-declarative
+	depends = qt6-wayland
+	depends = wayland
+	source = https://download.kde.org/unstable/plasma/5.91.0/plasma-integration-5.91.0.tar.xz
+	source = https://download.kde.org/unstable/plasma/5.91.0/plasma-integration-5.91.0.tar.xz.sig
+	source = https://invent.kde.org/plasma/plasma-integration/-/commit/14f80450.patch
+	source = qt-6.7.patch
 	validpgpkeys = E0A3EB202F8E57528E13E72FD7574483BB57B18D
 	validpgpkeys = 0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D
 	validpgpkeys = D07BD8662C56CB291B316EB2F5675605C74E02CF
 	validpgpkeys = 1FA881591C26B276D7A5518EEAAF29B42A678C20
-	sha256sums = 35f2c81e8586051acd4bbccd9c44bab7dc86a1b3f5f0988589f43777032affbb
+	sha256sums = 4aeba5b0eb693d5e406469e31774194792d64473886471b6d662b5f0e197e2f5
 	sha256sums = SKIP
+	sha256sums = f0a6e3dd5ea82a46c4cd0b763a0159f30eba3c56733a60b483302769fbe41dd3
+	sha256sums = 167ee4a1789d106f6ebbad4a5004aed28fb8ba75a5351073356134aca6e1ffda
 
 pkgname = plasma-integration
+	depends = gcc-libs
+	depends = glibc
+	depends = kcolorscheme
+	depends = kcompletion
+	depends = kconfig
+	depends = kcoreaddons
+	depends = kguiaddons
+	depends = kiconthemes
+	depends = ki18n
+	depends = kio
+	depends = kjobwidgets
+	depends = kservice
+	depends = kstatusnotifieritem
+	depends = kwidgetsaddons
+	depends = kwindowsystem
+	depends = kxmlgui
+	depends = libxcb
+	depends = libxcursor
+	depends = perl
+	depends = qqc2-desktop-style
+	depends = qt6-base
+	depends = qt6-declarative
+	depends = qt6-wayland
+	depends = wayland
+	depends = noto-fonts
+	depends = ttf-hack
+	depends = xdg-desktop-portal-kde
+
+pkgname = plasma5-integration
+	pkgdesc = Qt5 Platform Theme integration plugins for the Plasma workspaces
+	groups = 
+	depends = gcc-libs
+	depends = glibc
+	depends = kcompletion5
+	depends = kconfig5
+	depends = kconfigwidgets5
+	depends = kcoreaddons5
+	depends = ki18n5
+	depends = kiconthemes5
+	depends = kio5
+	depends = kjobwidgets5
+	depends = knotifications5
+	depends = kservice5
+	depends = kwayland5
+	depends = kwidgetsaddons5
+	depends = kwindowsystem5
+	depends = kxmlgui5
+	depends = libxcb
+	depends = libxcursor
+	depends = qt5-base
+	depends = qt5-declarative
+	depends = qt5-quickcontrols2
+	depends = qt5-wayland
+	depends = qt5-x11extras
+	depends = wayland
+	conflicts = plasma-integration<5.27.80
+	replaces = plasma-integration<5.27.80
diff --git a/PKGBUILD b/PKGBUILD
index bf5a356..759e1cd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,121 @@
 # Maintainer: Antonio Rojas <arojas@archlinux.org>
 # Maintainer: Felix Yan <felixonmars@archlinux.org>
 
-pkgname=plasma-integration
-pkgver=5.27.10
+pkgbase=plasma-integration
+pkgname=(plasma-integration
+         plasma5-integration)
+pkgver=5.91.0
 _dirver=$(echo $pkgver | cut -d. -f1-3)
-pkgrel=1
+pkgrel=2
 pkgdesc='Qt Platform Theme integration plugins for the Plasma workspaces'
 arch=(x86_64)
 url='https://kde.org/plasma-desktop/'
 license=(LGPL)
-depends=(libxcursor noto-fonts ttf-hack qqc2-desktop-style5 kio5 perl)
-makedepends=(extra-cmake-modules breeze plasma-wayland-protocols)
+depends=(gcc-libs
+         glibc
+         kcolorscheme
+         kcompletion
+         kconfig
+         kcoreaddons
+         kguiaddons
+         kiconthemes
+         ki18n
+         kio
+         kjobwidgets
+         kservice
+         kstatusnotifieritem
+         kwidgetsaddons
+         kwindowsystem
+         kxmlgui
+         libxcb
+         libxcursor
+         perl
+         qqc2-desktop-style
+         qt6-base
+         qt6-declarative
+         qt6-wayland
+         wayland)
+makedepends=(extra-cmake-modules
+             plasma-wayland-protocols
+             kconfig5
+             ki18n5
+             kiconthemes5
+             kio5
+             knotifications5
+             kwayland5
+             kwindowsystem5
+             kxmlgui5
+             qt5-base
+             qt5-declarative
+             qt5-quickcontrols2
+             qt5-wayland
+             qt5-x11extras)
 groups=(plasma)
-source=(https://download.kde.org/stable/plasma/$_dirver/$pkgname-$pkgver.tar.xz{,.sig})
-sha256sums=('35f2c81e8586051acd4bbccd9c44bab7dc86a1b3f5f0988589f43777032affbb'
-            'SKIP')
+source=(https://download.kde.org/unstable/plasma/$_dirver/$pkgname-$pkgver.tar.xz{,.sig}
+        https://invent.kde.org/plasma/plasma-integration/-/commit/14f80450.patch
+        qt-6.7.patch)
+sha256sums=('4aeba5b0eb693d5e406469e31774194792d64473886471b6d662b5f0e197e2f5'
+            'SKIP'
+            'f0a6e3dd5ea82a46c4cd0b763a0159f30eba3c56733a60b483302769fbe41dd3'
+            '167ee4a1789d106f6ebbad4a5004aed28fb8ba75a5351073356134aca6e1ffda')
 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 < qt-6.7.patch # Fix build with Qt 6.7
+  patch -d $pkgname-$pkgver -p1 < 14f80450.patch # Fix breakage if breeze QML theme is not installed
+}
+
 build() {
   cmake -B build -S $pkgname-$pkgver \
-    -DBUILD_TESTING=OFF
+    -DBUILD_TESTING=OFF \
+    -DBUILD_QT5=OFF
   cmake --build build
+
+  cmake -B build5 -S $pkgname-$pkgver \
+    -DBUILD_TESTING=OFF \
+    -DBUILD_QT6=OFF
+  cmake --build build5
 }
 
-package() {
+package_plasma-integration() {
+  depends+=(noto-fonts
+            ttf-hack
+            xdg-desktop-portal-kde)
   DESTDIR="$pkgdir" cmake --install build
 }
+
+package_plasma5-integration() {
+  pkgdesc='Qt5 Platform Theme integration plugins for the Plasma workspaces'
+  depends=(gcc-libs
+           glibc
+           kcompletion5
+           kconfig5
+           kconfigwidgets5
+           kcoreaddons5
+           ki18n5
+           kiconthemes5
+           kio5
+           kjobwidgets5
+           knotifications5
+           kservice5
+           kwayland5
+           kwidgetsaddons5
+           kwindowsystem5
+           kxmlgui5
+           libxcb
+           libxcursor
+           qt5-base
+           qt5-declarative
+           qt5-quickcontrols2
+           qt5-wayland
+           qt5-x11extras
+           wayland)
+  conflicts=('plasma-integration<5.27.80')
+  replaces=('plasma-integration<5.27.80')
+  groups=()
+
+  DESTDIR="$pkgdir" cmake --install build5
+}