git » plasma-integration.git » commit 904ae5e

diff --git a/.SRCINFO b/.SRCINFO
index a701ab7..dbfead5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = plasma-integration
 	pkgdesc = Qt Platform Theme integration plugins for the Plasma workspaces
 	pkgver = 6.0.1
-	pkgrel = 2
+	pkgrel = 3
 	url = https://kde.org/plasma-desktop/
 	arch = x86_64
 	groups = plasma
@@ -31,20 +31,23 @@ pkgbase = plasma-integration
 	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 = qqc2-breeze-style
 	depends = qqc2-desktop-style
 	depends = qt6-base
 	depends = qt6-declarative
 	depends = qt6-wayland
+	depends = ttf-hack
 	depends = wayland
+	depends = xdg-desktop-portal-kde
+	conflicts = plasma5-integration
+	replaces = plasma5-integration
 	source = https://download.kde.org/stable/plasma/6.0.1/plasma-integration-6.0.1.tar.xz
 	source = https://download.kde.org/stable/plasma/6.0.1/plasma-integration-6.0.1.tar.xz.sig
 	validpgpkeys = E0A3EB202F8E57528E13E72FD7574483BB57B18D
@@ -55,59 +58,3 @@ pkgbase = plasma-integration
 	sha256sums = SKIP
 
 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 = qqc2-breeze-style
-	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
diff --git a/PKGBUILD b/PKGBUILD
index 48c88d7..1399224 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,10 @@
 # Maintainer: Antonio Rojas <arojas@archlinux.org>
 # Maintainer: Felix Yan <felixonmars@archlinux.org>
 
-pkgbase=plasma-integration
-pkgname=(plasma-integration
-         plasma5-integration)
+pkgname=plasma-integration
 pkgver=6.0.1
 _dirver=$(echo $pkgver | cut -d. -f1-3)
-pkgrel=2
+pkgrel=3
 pkgdesc='Qt Platform Theme integration plugins for the Plasma workspaces'
 arch=(x86_64)
 url='https://kde.org/plasma-desktop/'
@@ -21,20 +19,21 @@ depends=(gcc-libs
          kiconthemes
          ki18n
          kio
-         kjobwidgets
-         kservice
          kstatusnotifieritem
          kwidgetsaddons
          kwindowsystem
          kxmlgui
          libxcb
          libxcursor
+         noto-fonts
          qqc2-breeze-style
          qqc2-desktop-style
          qt6-base
          qt6-declarative
          qt6-wayland
-         wayland)
+         ttf-hack
+         wayland
+         xdg-desktop-portal-kde)
 makedepends=(extra-cmake-modules
              plasma-wayland-protocols
              kconfig5
@@ -50,6 +49,8 @@ makedepends=(extra-cmake-modules
              qt5-quickcontrols2
              qt5-wayland
              qt5-x11extras)
+conflicts=(plasma5-integration)
+replaces=(plasma5-integration)
 groups=(plasma)
 source=(https://download.kde.org/stable/plasma/$_dirver/$pkgname-$pkgver.tar.xz{,.sig})
 sha256sums=('16d123dc3f59c492251b8e2fba949c75d3bf0f67f3cecf96c51be48dc414429f'
@@ -61,51 +62,10 @@ validpgpkeys=('E0A3EB202F8E57528E13E72FD7574483BB57B18D'  # Jonathan Esk-Riddell
 
 build() {
   cmake -B build -S $pkgname-$pkgver \
-    -DBUILD_TESTING=OFF \
-    -DBUILD_QT5=OFF
+    -DBUILD_TESTING=OFF
   cmake --build build
-
-  cmake -B build5 -S $pkgname-$pkgver \
-    -DBUILD_TESTING=OFF \
-    -DBUILD_QT6=OFF
-  cmake --build build5
 }
 
-package_plasma-integration() {
-  depends+=(noto-fonts
-            ttf-hack
-            xdg-desktop-portal-kde)
+package() {
   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')
-  groups=()
-
-  DESTDIR="$pkgdir" cmake --install build5
-}