git » kuserfeedback.git » commit ca7c18f

Revert "upgpkg: 1.2.0.20231012-1"

author Antonio Rojas
2023-10-12 19:09:36 UTC
committer Antonio Rojas
2023-10-12 19:09:36 UTC
parent 2c674f52214817d90a259f7a4897b17b6fbe166c

Revert "upgpkg: 1.2.0.20231012-1"

This reverts commit 73ca8516c0e046a2a55c8cf96fea3bb8fb37e6db.

.SRCINFO +0 -42
PKGBUILD +13 -52

diff --git a/.SRCINFO b/.SRCINFO
deleted file mode 100644
index 3bee5de..0000000
--- a/.SRCINFO
+++ /dev/null
@@ -1,42 +0,0 @@
-pkgbase = kuserfeedback
-	pkgdesc = Framework for collecting user feedback for applications via telemetry and surveys
-	pkgver = 1.2.0.20231012
-	pkgrel = 1
-	url = https://kde.org/products/frameworks/
-	arch = x86_64
-	license = GPL
-	makedepends = clang
-	makedepends = extra-cmake-modules
-	makedepends = qt5-base
-	makedepends = qt5-charts
-	makedepends = qt5-declarative
-	makedepends = qt5-svg
-	makedepends = qt5-tools
-	makedepends = qt6-base
-	makedepends = qt6-charts
-	makedepends = qt6-declarative
-	makedepends = qt6-svg
-	makedepends = qt6-tools
-	makedepends = git
-	depends = gcc-libs
-	depends = glibc
-	source = git+https://invent.kde.org/libraries/kuserfeedback#commit=47526c23b2b7aa7d2b10f88eabe459f35dcd7cff
-	validpgpkeys = E0A3EB202F8E57528E13E72FD7574483BB57B18D
-	sha256sums = SKIP
-
-pkgname = kuserfeedback5
-	depends = gcc-libs
-	depends = glibc
-	depends = qt5-base
-	optdepends = qt5-charts: User Feedback console
-	optdepends = qt5-declarative: QML bindings
-	optdepends = qt5-svg: User Feedback console
-	provides = kuserfeedback
-	conflicts = kuserfeedback
-	replaces = kuserfeedback
-
-pkgname = kuserfeedback6
-	depends = gcc-libs
-	depends = glibc
-	depends = qt6-base
-	optdepends = qt6-declarative: QML bindings
diff --git a/PKGBUILD b/PKGBUILD
index 6200ccd..38f45b2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,65 +1,26 @@
 # Maintainer: Antonio Rojas <arojas@archlinux.org>
 
-pkgbase=kuserfeedback
-pkgname=(kuserfeedback5 kuserfeedback6)
-pkgver=1.2.0.20231012
+pkgname=kuserfeedback
+pkgver=1.2.0
 pkgrel=1
 pkgdesc='Framework for collecting user feedback for applications via telemetry and surveys'
 arch=(x86_64)
 url='https://kde.org/products/frameworks/'
 license=(GPL)
-depends=(gcc-libs
-         glibc)
-makedepends=(clang
-             extra-cmake-modules
-             qt5-base
-             qt5-charts
-             qt5-declarative
-             qt5-svg
-             qt5-tools
-             qt6-base
-             qt6-charts
-             qt6-declarative
-             qt6-svg
-             qt6-tools)
-#source=(https://download.kde.org/stable/$pkgbase/$pkgbase-$pkgver.tar.xz{,.sig})
-_commit=47526c23b2b7aa7d2b10f88eabe459f35dcd7cff
-makedepends+=(git)
-source=(git+https://invent.kde.org/libraries/$pkgbase#commit=$_commit)
-sha256sums=('SKIP')
+depends=(qt5-base)
+makedepends=(extra-cmake-modules qt5-tools clang qt5-charts qt5-svg qt5-declarative)
+optdepends=('qt5-declarative: QML bindings' 'qt5-charts: User Feedback console' 'qt5-svg: User Feedback console')
+source=(https://download.kde.org/stable/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
+sha256sums=('76aac922b153249b274680a6f4c72c238ef14e3df04bad00cb64158b1063f264'
+            'SKIP')
 validpgpkeys=(E0A3EB202F8E57528E13E72FD7574483BB57B18D) # Jonathan Esk-Riddell <jr@jriddell.org>
 
 build() {
-  cmake -B build5 -S $pkgbase \
-    -DBUILD_TESTING=OFF \
-    -DQT_MAJOR_VERSION=5
-  cmake --build build5
-
-  cmake -B build6 -S $pkgbase \
-    -DBUILD_TESTING=OFF \
-    -DQT_MAJOR_VERSION=6 \
-    -DENABLE_CONSOLE=OFF \
-    -DENABLE_CLI=OFF \
-    -DENABLE_DOCS=OFF
-  cmake --build build6
+  cmake -B build -S $pkgname-$pkgver \
+    -DBUILD_TESTING=OFF
+  cmake --build build
 }
 
-package_kuserfeedback5() {
-  depends+=(qt5-base)
-  optdepends=('qt5-charts: User Feedback console'
-              'qt5-declarative: QML bindings'
-              'qt5-svg: User Feedback console')
-  conflicts=(kuserfeedback)
-  provides=(kuserfeedback)
-  replaces=(kuserfeedback)
-
-  DESTDIR="$pkgdir" cmake --install build5
-}
-
-package_kuserfeedback6() {
-  depends+=(qt6-base)
-  optdepends=('qt6-declarative: QML bindings')
-
-  DESTDIR="$pkgdir" cmake --install build6
-  rm -r "$pkgdir"/usr/share/locale
+package() {
+  DESTDIR="$pkgdir" cmake --install build
 }