git » breeze.git » commit f918bc9

upgpkg: 6.0.1-4: Merge breeze5

author Antonio Rojas
2024-03-09 15:26:35 UTC
committer Antonio Rojas
2024-03-09 15:26:35 UTC
parent 6329328412cfd464919efba984d9c771e4196b6b

upgpkg: 6.0.1-4: Merge breeze5

.SRCINFO +3 -20
PKGBUILD +7 -36

diff --git a/.SRCINFO b/.SRCINFO
index f05af9d..a384843 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = breeze
 	pkgdesc = Artwork, styles and assets for the Breeze visual style for the Plasma Desktop
 	pkgver = 6.0.1
-	pkgrel = 3
+	pkgrel = 4
 	url = https://kde.org/plasma-desktop/
 	arch = x86_64
 	groups = plasma
@@ -30,7 +30,8 @@ pkgbase = breeze
 	depends = qt6-base
 	depends = qt6-declarative
 	optdepends = breeze-gtk: Breeze widget style for GTK applications
-	optdepends = breeze5: Breeze widget style for Qt5 applications
+	conflicts = breeze5
+	replaces = breeze5
 	source = https://download.kde.org/stable/plasma/6.0.1/breeze-6.0.1.tar.xz
 	source = https://download.kde.org/stable/plasma/6.0.1/breeze-6.0.1.tar.xz.sig
 	validpgpkeys = E0A3EB202F8E57528E13E72FD7574483BB57B18D
@@ -41,21 +42,3 @@ pkgbase = breeze
 	sha256sums = SKIP
 
 pkgname = breeze
-
-pkgname = breeze5
-	pkgdesc = Qt5 Breeze style
-	groups = 
-	depends = breeze
-	depends = breeze-icons
-	depends = gcc-libs
-	depends = glibc
-	depends = frameworkintegration5
-	depends = kconfig5
-	depends = kconfigwidgets5
-	depends = kguiaddons5
-	depends = kiconthemes5
-	depends = kirigami2
-	depends = kwindowsystem5
-	depends = qt5-base
-	depends = qt5-declarative
-	optdepends = 
diff --git a/PKGBUILD b/PKGBUILD
index 4c147f5..ff4c101 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,12 +2,10 @@
 # Maintainer: Antonio Rojas <arojas@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
-pkgbase=breeze
-pkgname=(breeze
-         breeze5)
+pkgname=breeze
 pkgver=6.0.1
 _dirver=$(echo $pkgver | cut -d. -f1-3)
-pkgrel=3
+pkgrel=4
 arch=(x86_64)
 pkgdesc='Artwork, styles and assets for the Breeze visual style for the Plasma Desktop'
 url='https://kde.org/plasma-desktop/'
@@ -35,8 +33,9 @@ makedepends=(extra-cmake-modules
              kiconthemes5
              kirigami2
              kwindowsystem5)
-optdepends=('breeze-gtk: Breeze widget style for GTK applications'
-            'breeze5: Breeze widget style for Qt5 applications')
+optdepends=('breeze-gtk: Breeze widget style for GTK applications')
+conflicts=(breeze5)
+replaces=(breeze5)
 groups=(plasma)
 source=(https://download.kde.org/stable/plasma/$_dirver/$pkgname-$pkgver.tar.xz{,.sig})
 sha256sums=('200482cefd066e0d48e16aa7380a9cb00e634b2ba34834cdc7354f363b60544d'
@@ -48,38 +47,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_breeze() {
+package() {
   DESTDIR="$pkgdir" cmake --install build
 }
-
-package_breeze5() {
-  pkgdesc='Qt5 Breeze style'
-  depends=(breeze
-           breeze-icons
-           gcc-libs
-           glibc
-           frameworkintegration5
-           kconfig5
-           kconfigwidgets5
-           kguiaddons5
-           kiconthemes5
-           kirigami2
-           kwindowsystem5
-           qt5-base
-           qt5-declarative)
-  optdepends=()
-  groups=()
-
-  DESTDIR="$pkgdir" cmake --install build5
-  rm -r "$pkgdir"/usr/share
-}