diff options
| -rw-r--r-- | PKGBUILD | 35 | ||||
| -rw-r--r-- | keepassxc-quazip1.patch | 19 |
2 files changed, 41 insertions, 13 deletions
@@ -5,32 +5,41 @@ # # I maintain this because: # Arch version uses yubikey libs # Arch version enables networking support +# Arch version does not use ~/.config # Arch version lacks additional optimization and hardening flags _NETBUILD=OFF pkgname=keepassxc -pkgver=2.6.0 +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 hicolor-icon-theme libgcrypt libsodium libxtst qrencode - qt5-svg qt5-x11extras + qt5-svg qt5-x11extras quazip ) makedepends=(asciidoctor cmake qt5-tools) -optdepends=('xclip: keepassxc-cli clipboard support') +optdepends=('xclip: keepassxc-cli clipboard support under X server' + 'wl-clipboard: keepassxc-cli clipboard support under Wayland') source=("$pkgname-$pkgver.tar.xz::https://github.com/keepassxreboot/keepassxc/releases/download/$pkgver/$pkgname-$pkgver-src.tar.xz" - "$pkgname-$pkgver.tar.xz.sig::https://github.com/keepassxreboot/keepassxc/releases/download/$pkgver/$pkgname-$pkgver-src.tar.xz.sig") -b2sums=('9872b9fa5f809e2d2e6ed4a233ca248d19ada1c495f4c8febdfa765565963a01a5ede97d1f3830a39a6dc1063f88cb77b9b216776767111686288284aae63399' - 'SKIP') + "$pkgname-$pkgver.tar.xz.sig::https://github.com/keepassxreboot/keepassxc/releases/download/$pkgver/$pkgname-$pkgver-src.tar.xz.sig" + keepassxc-quazip1.patch) +b2sums=('ca02e59c7355f7f7e14bb4fa318fab66d354e84d1025847b413b7e838dc5a42024b963dea1e3ba2060c51da7daed2ee5b220e5dab72b5813d39c04b49c6ba9ba' + 'SKIP' + 'ab5e4bd02df5bc3a9a2016ab9042a1611aedbeef9ab1c0787e0079a88fc19c1939acb20f11edec894362737c27a9cfd4339a783a2416dd586c83595e22ff4a89') # 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 + sed 's|Exec=keepassxc %f|Exec=keepassxc --localconfig ~/.config/keepassxc/keepassxclocal.ini %f|' $srcdir/$pkgname-$pkgver/share/linux/org.keepassxc.KeePassXC.desktop +} + build() { # lto breaks compiling @@ -39,24 +48,24 @@ build() { export CXXFLAGS="$CXXFLAGS -O3 -fstack-protector-all" cmake -S $pkgname-$pkgver -B build \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ -DWITH_XC_AUTOTYPE=ON \ -DWITH_XC_NETWORKING=OFF \ -DWITH_XC_BROWSER=${_NETBUILD} \ -DWITH_XC_YUBIKEY=OFF \ -DWITH_XC_SSHAGENT=OFF \ -DWITH_XC_KEESHARE=OFF \ - -DWITH_XC_UPDATECHECK=OFF \ - -DWITH_XC_FDOSECRETS=OFF + -DWITH_XC_FDOSECRETS=OFF \ + -DWITH_XC_UPDATECHECK=OFF cmake --build build } check() { - cmake --build build --target test + cmake --build build --target test } package() { - cmake --build build --target install -- DESTDIR="$pkgdir" + cmake --build build --target install -- DESTDIR="$pkgdir" } diff --git a/keepassxc-quazip1.patch b/keepassxc-quazip1.patch new file mode 100644 index 0000000..95514ab --- /dev/null +++ b/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() |