[arch-commits] Commit in keepassxc/repos/community-x86_64 (3 files)

[Antonio Rojas]

    Date: Saturday, June 26, 2021 @ 10:21:45
  Author: arojas
Revision: 967531

archrelease: copy trunk to community-x86_64

Added:
  keepassxc/repos/community-x86_64/PKGBUILD
    (from rev 967530, keepassxc/trunk/PKGBUILD)
Deleted:
  keepassxc/repos/community-x86_64/PKGBUILD
  keepassxc/repos/community-x86_64/keepassxc-quazip1.patch

-------------------------+
 PKGBUILD                |   90 +++++++++++++++++++++-------------------------
 keepassxc-quazip1.patch |   19 ---------
 2 files changed, 42 insertions(+), 67 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-26 10:21:35 UTC (rev 967530)
+++ PKGBUILD	2021-06-26 10:21:45 UTC (rev 967531)
@@ -1,48 +0,0 @@
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Maintainer: Bruno Pagani <archange at archlinux.org>
-
-pkgname=keepassxc
-pkgver=2.6.4
-pkgrel=1
-pkgdesc="Cross-platform community-driven port of Keepass password manager"
-arch=(x86_64)
-url="https://keepassxc.org/"
-license=(GPL)
-depends=(argon2 curl hicolor-icon-theme libgcrypt libsodium libxtst qrencode
-         qt5-svg qt5-x11extras quazip yubikey-personalization)
-makedepends=(asciidoctor cmake qt5-tools)
-optdepends=('xclip: keepassxc-cli clipboard support under X server'
-            'wl-clipboard: keepassxc-cli clipboard support under Wayland')
-provides=(org.freedesktop.secrets)
-source=(https://github.com/keepassxreboot/keepassxc/releases/download/$pkgver/keepassxc-$pkgver-src.tar.xz{,.sig}
-        keepassxc-quazip1.patch)
-sha256sums=('e536e2a71c90fcf264eb831fb1a8b518ee1b03829828f862eeea748d3310f82b'
-            'SKIP'
-            '8744b0ba137d644d855ac095b928bc4bdb5674b431a1f24fee7212036097ceaf')
-# List of signing keys can be found at https://keepassxc.org/verifying-signatures/
-validpgpkeys=(BF5A669F2272CF4324C1FDA8CFB4C2166397D0D2
-              71D4673D73C7F83C17DAE6A2D8538E98A26FD9C4
-              AF0AEA44ABAC8F1047733EA7AFF235EEFB5A2517
-              C1E4CBA3AD78D3AFD894F9E0B7A66F03B59076A8)
-
-prepare() {
-  patch -d $pkgname-$pkgver -p1 -i ../keepassxc-quazip1.patch # Fix build with quazip 1
-}
-
-build() {
-    cmake -S keepassxc-$pkgver -B build \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_INSTALL_LIBDIR=lib \
-        -DWITH_XC_ALL=ON \
-        -DWITH_XC_UPDATECHECK=OFF
-    cmake --build build
-}
-
-check() {
-    cmake --build build --target test
-}
-
-package() {
-    cmake --build build --target install -- DESTDIR="$pkgdir"
-}

Copied: keepassxc/repos/community-x86_64/PKGBUILD (from rev 967530, keepassxc/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-06-26 10:21:45 UTC (rev 967531)
@@ -0,0 +1,42 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Maintainer: Bruno Pagani <archange at archlinux.org>
+
+pkgname=keepassxc
+pkgver=2.6.6
+pkgrel=1
+pkgdesc="Cross-platform community-driven port of Keepass password manager"
+arch=(x86_64)
+url="https://keepassxc.org/"
+license=(GPL)
+depends=(argon2 curl hicolor-icon-theme libgcrypt libsodium libxtst qrencode
+         qt5-svg qt5-x11extras quazip yubikey-personalization)
+makedepends=(asciidoctor cmake qt5-tools)
+optdepends=('xclip: keepassxc-cli clipboard support under X server'
+            'wl-clipboard: keepassxc-cli clipboard support under Wayland')
+provides=(org.freedesktop.secrets)
+source=(https://github.com/keepassxreboot/keepassxc/releases/download/$pkgver/keepassxc-$pkgver-src.tar.xz{,.sig})
+sha256sums=('3603b11ac39b289c47fac77fa150e05fd64b393d8cfdf5732dc3ef106650a4e2'
+            'SKIP')
+# List of signing keys can be found at https://keepassxc.org/verifying-signatures/
+validpgpkeys=(BF5A669F2272CF4324C1FDA8CFB4C2166397D0D2
+              71D4673D73C7F83C17DAE6A2D8538E98A26FD9C4
+              AF0AEA44ABAC8F1047733EA7AFF235EEFB5A2517
+              C1E4CBA3AD78D3AFD894F9E0B7A66F03B59076A8)
+
+build() {
+    cmake -S keepassxc-$pkgver -B build \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_INSTALL_LIBDIR=lib \
+        -DWITH_XC_ALL=ON \
+        -DWITH_XC_UPDATECHECK=OFF
+    cmake --build build
+}
+
+check() {
+    cmake --build build --target test
+}
+
+package() {
+    cmake --build build --target install -- DESTDIR="$pkgdir"
+}

Deleted: keepassxc-quazip1.patch
===================================================================
--- keepassxc-quazip1.patch	2021-06-26 10:21:35 UTC (rev 967530)
+++ keepassxc-quazip1.patch	2021-06-26 10:21:45 UTC (rev 967531)
@@ -1,19 +0,0 @@
-diff --git a/cmake/FindQuaZip.cmake b/cmake/FindQuaZip.cmake
-index a387e2f8..9fab3e57 100644
---- a/cmake/FindQuaZip.cmake
-+++ b/cmake/FindQuaZip.cmake
-@@ -10,12 +10,12 @@ if(MINGW)
-     find_path(QUAZIP_ZLIB_INCLUDE_DIR zlib.h)
- else()
-     find_library(QUAZIP_LIBRARIES
--        NAMES quazip5 quazip
-+        NAMES quazip5 quazip quazip1-qt5
- 	PATHS /usr/lib /usr/lib64 /usr/local/lib
-     )
-     find_path(QUAZIP_INCLUDE_DIR quazip.h
- 	PATHS /usr/include /usr/local/include
--        PATH_SUFFIXES quazip5 quazip
-+        PATH_SUFFIXES quazip5 quazip QuaZip-Qt5-1.0/quazip QuaZip-Qt5-1.1/quazip
-     )
-     find_path(QUAZIP_ZLIB_INCLUDE_DIR zlib.h PATHS /usr/include /usr/local/include)
- endif()