diff options
| author | Tim Biermann <tbier@posteo.de> | 2021-01-15 10:09:35 +0000 |
|---|---|---|
| committer | Tim Biermann <tbier@posteo.de> | 2021-01-15 10:09:35 +0000 |
| commit | 7fb2b7f7c8f84f2ff40c5a425a477948a32eb400 (patch) | |
| tree | 7b7ab50f8a4ec4311dfceb459d3991f0e2a5bb80 /keepassxc | |
| parent | c52f8689d6d04a138eca88f73d633d776aa33d05 (diff) | |
| download | contrib-7fb2b7f7c8f84f2ff40c5a425a477948a32eb400.tar.gz contrib-7fb2b7f7c8f84f2ff40c5a425a477948a32eb400.tar.xz | |
keepassxc: 2.6.2 -> 2.6.3
Diffstat (limited to 'keepassxc')
| -rw-r--r-- | keepassxc/.signature | 7 | ||||
| -rw-r--r-- | keepassxc/Pkgfile | 8 | ||||
| -rw-r--r-- | keepassxc/keepassxc-quazip1.patch | 19 |
3 files changed, 29 insertions, 5 deletions
diff --git a/keepassxc/.signature b/keepassxc/.signature index 867425c7c..15309ba6e 100644 --- a/keepassxc/.signature +++ b/keepassxc/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF34J/qab0mv+IBcgibdpKuh5TbxLy6MX5DrXeXLkPUSLW/0U+Jx+fWoo6+pctTCuRi3tEqhHd2w2OUb4bMT+yGAk= -SHA256 (Pkgfile) = 8bf875fbb155241118dc16db0a304b6e66d2f82acbe67467775c220445d5c44b +RWSagIOpLGJF30Eo0vj9ydQEks1ExnSINw+j9DVqsaUQjikhLA99vZlK8KMSErvDugyynKMTlvSgGQD75x4bbPBfnEo7CStSSgQ= +SHA256 (Pkgfile) = 8b3f89015c0f73fc80e11a99f603844747fed371b7e182b75b74fc99dd0ec3bf SHA256 (.footprint) = 3518370ae52ecb1b0452d1aaa3b291be9b017eb1a4c8ac77c322ac88aa7fbdf1 -SHA256 (keepassxc-2.6.2-src.tar.xz) = 101bfade0a760d6ec6b8c4f3556e7f1201f1edd29ceabc73ad5846f9a57d7e38 +SHA256 (keepassxc-2.6.3-src.tar.xz) = e7e0b6ed8f3881c5b9579074bc3cde3991b28c1a3d1c852c46f2b7930a10f7d1 +SHA256 (keepassxc-quazip1.patch) = 8744b0ba137d644d855ac095b928bc4bdb5674b431a1f24fee7212036097ceaf diff --git a/keepassxc/Pkgfile b/keepassxc/Pkgfile index e0f7f5698..58d003974 100644 --- a/keepassxc/Pkgfile +++ b/keepassxc/Pkgfile @@ -5,13 +5,17 @@ # Optional: quazip5 name=keepassxc -version=2.6.2 +version=2.6.3 release=1 -source=(https://github.com/keepassxreboot/keepassxc/releases/download/$version/$name-$version-src.tar.xz) +source=(https://github.com/keepassxreboot/keepassxc/releases/download/$version/$name-$version-src.tar.xz + keepassxc-quazip1.patch) build() { [[ -e /usr/lib/ccache ]] && PATH="$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')" [[ -e /usr/lib/ccache ]] && PKGMK_KEEPASSXC+=' -D WITH_CCACHE=ON' + + patch -Np1 -d $name-$version -i $SRC/keepassxc-quazip1.patch + cmake -S $name-$version -B build -G Ninja $PKGMK_KEEPASSXC \ -D CMAKE_INSTALL_PREFIX=/usr \ -D CMAKE_INSTALL_LIBDIR=lib \ diff --git a/keepassxc/keepassxc-quazip1.patch b/keepassxc/keepassxc-quazip1.patch new file mode 100644 index 000000000..95514ab14 --- /dev/null +++ b/keepassxc/keepassxc-quazip1.patch @@ -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 QuaZip-Qt5-1.1/quazip + ) + find_path(QUAZIP_ZLIB_INCLUDE_DIR zlib.h PATHS /usr/include /usr/local/include) + endif() |