[arch-commits] Commit in qtkeychain/repos/extra-x86_64 (PKGBUILD PKGBUILD)

[Antonio Rojas]

    Date: Saturday, October 16, 2021 @ 22:51:52
  Author: arojas
Revision: 426093

archrelease: copy trunk to extra-x86_64

Added:
  qtkeychain/repos/extra-x86_64/PKGBUILD
    (from rev 426092, qtkeychain/trunk/PKGBUILD)
Deleted:
  qtkeychain/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |  100 ++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 53 insertions(+), 47 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-10-16 22:51:42 UTC (rev 426092)
+++ PKGBUILD	2021-10-16 22:51:52 UTC (rev 426093)
@@ -1,47 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Kuba Serafinowski <zizzfizzix(at)gmail(dot)com>
-# Contributor: Teo Mrnjavac <teo at kde.org>
-
-pkgbase=qtkeychain
-pkgname=(qtkeychain-qt5 qtkeychain-qt6)
-pkgver=0.12.0
-pkgrel=1
-pkgdesc='Provides support for secure credentials storage'
-arch=(x86_64)
-url='https://github.com/frankosterfeld/qtkeychain'
-license=(BSD)
-depends=(libsecret)
-makedepends=(cmake qt5-tools qt6-tools)
-source=("$pkgname-$pkgver.tar.gz::https://github.com/frankosterfeld/qtkeychain/archive/v$pkgver.tar.gz")
-sha256sums=('cc547d58c1402f6724d3ff89e4ca83389d9e2bdcfd9ae3d695fcdffa50a625a8')
-
-build() {
-  cmake -B build-qt5 -S $pkgbase-$pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib
-  cmake --build build-qt5
-
-  cmake -B build-qt6 -S $pkgbase-$pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib \
-    -DBUILD_WITH_QT6=ON
-  cmake --build build-qt6
-}
-
-package_qtkeychain-qt5() {
-  depends+=(qt5-base)
-  optdepends=('kwallet: kwallet backend')
-  conflicts=(qtkeychain)
-  provides=(qtkeychain)
-  replaces=(qtkeychain)
-
-  DESTDIR="$pkgdir" cmake --install build-qt5
-  install -Dm644 $pkgbase-$pkgver/COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
-
-package_qtkeychain-qt6() {
-  depends+=(qt6-base)
-
-  DESTDIR="$pkgdir" cmake --install build-qt6
-  install -Dm644 $pkgbase-$pkgver/COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}

Copied: qtkeychain/repos/extra-x86_64/PKGBUILD (from rev 426092, qtkeychain/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-10-16 22:51:52 UTC (rev 426093)
@@ -0,0 +1,53 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Kuba Serafinowski <zizzfizzix(at)gmail(dot)com>
+# Contributor: Teo Mrnjavac <teo at kde.org>
+
+pkgbase=qtkeychain
+pkgname=(qtkeychain-qt5 qtkeychain-qt6)
+pkgver=0.12.0
+pkgrel=2
+pkgdesc='Provides support for secure credentials storage'
+arch=(x86_64)
+url='https://github.com/frankosterfeld/qtkeychain'
+license=(BSD)
+depends=(libsecret)
+makedepends=(cmake qt5-tools qt6-tools)
+source=(https://github.com/frankosterfeld/qtkeychain/archive/v$pkgver/$pkgname-$pkgver.tar.gz
+        https://github.com/frankosterfeld/qtkeychain/commit/ae1f9a47.patch)
+sha256sums=('cc547d58c1402f6724d3ff89e4ca83389d9e2bdcfd9ae3d695fcdffa50a625a8'
+            '7a0d29a04a8950ab5e674fc5738373acded775c496050e06a59897773f859150')
+
+prepare() {
+  patch -d $pkgbase-$pkgver -p1 < ae1f9a47.patch # Fix Qt dependency in cmake config
+}
+
+build() {
+  cmake -B build-qt5 -S $pkgbase-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib
+  cmake --build build-qt5
+
+  cmake -B build-qt6 -S $pkgbase-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DBUILD_WITH_QT6=ON
+  cmake --build build-qt6
+}
+
+package_qtkeychain-qt5() {
+  depends+=(qt5-base)
+  optdepends=('kwallet: kwallet backend')
+  conflicts=(qtkeychain)
+  provides=(qtkeychain)
+  replaces=(qtkeychain)
+
+  DESTDIR="$pkgdir" cmake --install build-qt5
+  install -Dm644 $pkgbase-$pkgver/COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
+
+package_qtkeychain-qt6() {
+  depends+=(qt6-base)
+
+  DESTDIR="$pkgdir" cmake --install build-qt6
+  install -Dm644 $pkgbase-$pkgver/COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}