Date: Thursday, October 22, 2020 @ 19:16:26 Author: archange Revision: 729418
archrelease: copy trunk to community-x86_64 Added: keepassxc/repos/community-x86_64/PKGBUILD (from rev 729416, keepassxc/trunk/PKGBUILD) keepassxc/repos/community-x86_64/keepassxc-quazip1.patch (from rev 729416, keepassxc/trunk/keepassxc-quazip1.patch) Deleted: keepassxc/repos/community-x86_64/PKGBUILD keepassxc/repos/community-x86_64/keepassxc-quazip1.patch -------------------------+ PKGBUILD | 96 +++++++++++++++++++++++----------------------- keepassxc-quazip1.patch | 38 +++++++++--------- 2 files changed, 67 insertions(+), 67 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-10-22 19:16:24 UTC (rev 729417) +++ PKGBUILD 2020-10-22 19:16:26 UTC (rev 729418) @@ -1,48 +0,0 @@ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> -# Maintainer: Bruno Pagani <archa...@archlinux.org> - -pkgname=keepassxc -pkgver=2.6.1 -pkgrel=2 -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=('b466759947fcd71a59b8d498a1f154cb7b85b4f2a0a417c92a75845d8bac8cc8' - 'SKIP' - '800a309f02a483eebcb06ca312800f03f9fea2ce9ecfd5fde2dae9e34c88ea88') -# 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 729416, keepassxc/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-10-22 19:16:26 UTC (rev 729418) @@ -0,0 +1,48 @@ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> +# Maintainer: Bruno Pagani <archa...@archlinux.org> + +pkgname=keepassxc +pkgver=2.6.2 +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=('101bfade0a760d6ec6b8c4f3556e7f1201f1edd29ceabc73ad5846f9a57d7e38' + '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" +} Deleted: keepassxc-quazip1.patch =================================================================== --- keepassxc-quazip1.patch 2020-10-22 19:16:24 UTC (rev 729417) +++ keepassxc-quazip1.patch 2020-10-22 19:16:26 UTC (rev 729418) @@ -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 - ) - find_path(QUAZIP_ZLIB_INCLUDE_DIR zlib.h PATHS /usr/include /usr/local/include) - endif() Copied: keepassxc/repos/community-x86_64/keepassxc-quazip1.patch (from rev 729416, keepassxc/trunk/keepassxc-quazip1.patch) =================================================================== --- keepassxc-quazip1.patch (rev 0) +++ keepassxc-quazip1.patch 2020-10-22 19:16:26 UTC (rev 729418) @@ -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()