git » kirigami-addons.git » commit df30a4f

upgpkg: 0.11.0-4: Build for Qt6

author Antonio Rojas
2023-10-13 22:50:53 UTC
committer Antonio Rojas
2023-10-13 22:50:53 UTC
parent fdd5323d89f1eafa58701d7be2171eabd3d22c3d

upgpkg: 0.11.0-4: Build for Qt6

.SRCINFO +21 -11
PKGBUILD +37 -17

diff --git a/.SRCINFO b/.SRCINFO
index 259028e..47e5ee7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,37 @@
 pkgbase = kirigami-addons
 	pkgdesc = Add-ons for the Kirigami framework
 	pkgver = 0.11.0
-	pkgrel = 3
+	pkgrel = 4
 	url = https://invent.kde.org/libraries/kirigami-addons
 	arch = x86_64
 	license = GPL
 	license = LGPL
 	makedepends = extra-cmake-modules
+	makedepends = ki18n
 	makedepends = ki18n5
+	makedepends = kirigami
+	makedepends = kirigami2
+	makedepends = ksvg
+	makedepends = git
 	depends = gcc-libs
 	depends = glibc
-	depends = kirigami2
-	depends = qt5-base
-	depends = qt5-declarative
-	depends = qt5-quickcontrols2
-	source = https://download.kde.org/stable/kirigami-addons5/kirigami-addons-0.11.0.tar.xz
-	source = https://download.kde.org/stable/kirigami-addons5/kirigami-addons-0.11.0.tar.xz.sig
+	source = git+https://invent.kde.org/libraries/kirigami-addons#commit=a0375f95c5d1ce8c7f5ce7f1d95c6a02fc838a34
 	validpgpkeys = 0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D
 	validpgpkeys = 39FFA93CAE9C6AFC212AD00202325448204E452A
-	sha256sums = 05296c5afbe6804308bf9c0d2751f3b748b40d00fa784946d1dcdf3af4bffbad
 	sha256sums = SKIP
 
+pkgname = kirigami-addons
+	depends = gcc-libs
+	depends = glibc
+	depends = kirigami
+	depends = ksvg
+	depends = qt6-base
+	depends = qt6-declarative
+
 pkgname = kirigami-addons5
-	provides = kirigami-addons
-	conflicts = kirigami-addons
-	replaces = kirigami-addons
+	depends = gcc-libs
+	depends = glibc
+	depends = kirigami2
+	depends = qt5-base
+	depends = qt5-declarative
+	depends = qt5-quickcontrols2
diff --git a/PKGBUILD b/PKGBUILD
index 72f2d7f..7a3c152 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,58 @@
 # Maintainer: Antonio Rojas <arojas@archlinux.org>
 
 pkgbase=kirigami-addons
-pkgname=(kirigami-addons5)
+pkgname=(kirigami-addons kirigami-addons5)
 pkgver=0.11.0
-pkgrel=3
+pkgrel=4
 pkgdesc='Add-ons for the Kirigami framework'
 url='https://invent.kde.org/libraries/kirigami-addons'
 arch=(x86_64)
 license=(GPL LGPL)
 depends=(gcc-libs
-         glibc
-         kirigami2
-         qt5-base
-         qt5-declarative
-         qt5-quickcontrols2)
+         glibc)
 makedepends=(extra-cmake-modules
-             ki18n5)
-source=(https://download.kde.org/stable/$pkgname/$pkgbase-$pkgver.tar.xz{,.sig})
-sha256sums=('05296c5afbe6804308bf9c0d2751f3b748b40d00fa784946d1dcdf3af4bffbad'
-            'SKIP')
+             ki18n
+             ki18n5
+             kirigami
+             kirigami2
+             ksvg)
+#source=(https://download.kde.org/stable/$pkgname/$pkgbase-$pkgver.tar.xz{,.sig})
+makedepends+=(git)
+_commit=a0375f95c5d1ce8c7f5ce7f1d95c6a02fc838a34
+source=(git+https://invent.kde.org/libraries/$pkgbase#commit=$_commit)
+sha256sums=('SKIP')
 validpgpkeys=(0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D  # Bhushan Shah (mykolab address) <bshah@mykolab.com>
               39FFA93CAE9C6AFC212AD00202325448204E452A) # Carl Schwan <carl@carlschwan.eu>
 
 build() {
-  cmake -B build -S $pkgbase-$pkgver \
+  cmake -B build -S $pkgbase \
     -DBUILD_TESTING=OFF \
-    -DBUILD_QCH=ON
+    -DBUILD_QCH=ON \
+    -DQT_MAJOR_VERSION=6
   cmake --build build
+
+  cmake -B build5 -S $pkgbase \
+    -DBUILD_TESTING=OFF \
+    -DBUILD_QCH=ON \
+    -DQT_MAJOR_VERSION=5
+  cmake --build build5
 }
 
-package_kirigami-addons5() {
-  conflicts=(kirigami-addons)
-  provides=(kirigami-addons)
-  replaces=(kirigami-addons)
+package_kirigami-addons() {
+  depends+=(kirigami
+            ksvg
+            qt6-base
+            qt6-declarative)
 
   DESTDIR="$pkgdir" cmake --install build
+  rm -r "$pkgdir"/usr/share/locale
+}
+
+package_kirigami-addons5() {
+  depends+=(kirigami2
+            qt5-base
+            qt5-declarative
+            qt5-quickcontrols2)
+
+  DESTDIR="$pkgdir" cmake --install build5
 }