From b395987d755382c8da62cd1aef064c06b1d35e82 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Wed, 30 Jun 2021 20:08:22 -0700 Subject: Updated to 2.6.6 --- PKGBUILD | 13 +++++-------- keepassxc-quazip1.patch | 19 ------------------- 2 files changed, 5 insertions(+), 27 deletions(-) delete mode 100644 keepassxc-quazip1.patch diff --git a/PKGBUILD b/PKGBUILD index 6bba3ca..518454c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -11,8 +11,8 @@ _NETBUILD=OFF pkgname=keepassxc -pkgver=2.6.4 -pkgrel=1.2 +pkgver=2.6.6 +pkgrel=1 pkgdesc="Cross-platform community-driven port of Keepass password manager" arch=(x86_64) url="https://keepassxc.org/" @@ -24,11 +24,9 @@ makedepends=(asciidoctor cmake qt5-tools) 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" - keepassxc-quazip1.patch) -b2sums=('ca02e59c7355f7f7e14bb4fa318fab66d354e84d1025847b413b7e838dc5a42024b963dea1e3ba2060c51da7daed2ee5b220e5dab72b5813d39c04b49c6ba9ba' - 'SKIP' - 'ab5e4bd02df5bc3a9a2016ab9042a1611aedbeef9ab1c0787e0079a88fc19c1939acb20f11edec894362737c27a9cfd4339a783a2416dd586c83595e22ff4a89') + "$pkgname-$pkgver.tar.xz.sig::https://github.com/keepassxreboot/keepassxc/releases/download/$pkgver/$pkgname-$pkgver-src.tar.xz.sig") +b2sums=('ed55dfe992c02e78354d7aeb9f63853380dbcdec0e834232997cb6f5ecc303ff18ed50dcc48f54497031d6fc8b741c620202e78c3eacbe50d4dcfa7e4d59a92c' + 'SKIP') # List of signing keys can be found at https://keepassxc.org/verifying-signatures/ validpgpkeys=(BF5A669F2272CF4324C1FDA8CFB4C2166397D0D2 71D4673D73C7F83C17DAE6A2D8538E98A26FD9C4 @@ -36,7 +34,6 @@ validpgpkeys=(BF5A669F2272CF4324C1FDA8CFB4C2166397D0D2 C1E4CBA3AD78D3AFD894F9E0B7A66F03B59076A8) prepare() { - patch -d $pkgname-$pkgver -p1 -i ../keepassxc-quazip1.patch # Fix build with quazip 1 sed -i 's|Exec=keepassxc %f|Exec=keepassxc --localconfig ~/.config/keepassxc/keepassxc.ini %f|' $srcdir/$pkgname-$pkgver/share/linux/org.keepassxc.KeePassXC.desktop } diff --git a/keepassxc-quazip1.patch b/keepassxc-quazip1.patch deleted file mode 100644 index 95514ab..0000000 --- a/keepassxc-quazip1.patch +++ /dev/null @@ -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() -- cgit v1.2.1