[arch-commits] Commit in keepassxc/trunk (PKGBUILD keepassxc-quazip1.patch)

[Antonio Rojas]

    Date: Monday, October 5, 2020 @ 19:05:24
  Author: arojas
Revision: 718926

quazip 1.0 rebuild

Added:
  keepassxc/trunk/keepassxc-quazip1.patch
Modified:
  keepassxc/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |   12 +++++++++---
 keepassxc-quazip1.patch |   19 +++++++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-10-05 19:04:30 UTC (rev 718925)
+++ PKGBUILD	2020-10-05 19:05:24 UTC (rev 718926)
@@ -3,7 +3,7 @@
 
 pkgname=keepassxc
 pkgver=2.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Cross-platform community-driven port of Keepass password manager"
 arch=(x86_64)
 url="https://keepassxc.org/"
@@ -14,9 +14,11 @@
 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})
+source=(https://github.com/keepassxreboot/keepassxc/releases/download/$pkgver/keepassxc-$pkgver-src.tar.xz{,.sig}
+        keepassxc-quazip1.patch)
 sha256sums=('b466759947fcd71a59b8d498a1f154cb7b85b4f2a0a417c92a75845d8bac8cc8'
-            'SKIP')
+            'SKIP'
+            '800a309f02a483eebcb06ca312800f03f9fea2ce9ecfd5fde2dae9e34c88ea88')
 # List of signing keys can be found at https://keepassxc.org/verifying-signatures/
 validpgpkeys=(BF5A669F2272CF4324C1FDA8CFB4C2166397D0D2
               71D4673D73C7F83C17DAE6A2D8538E98A26FD9C4
@@ -23,6 +25,10 @@
               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 \

Added: keepassxc-quazip1.patch
===================================================================
--- keepassxc-quazip1.patch	                        (rev 0)
+++ keepassxc-quazip1.patch	2020-10-05 19:05:24 UTC (rev 718926)
@@ -0,0 +1,19 @@
+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
+     )
+     find_path(QUAZIP_ZLIB_INCLUDE_DIR zlib.h PATHS /usr/include /usr/local/include)
+ endif()