From 098e7b4195fdea4413922c3acda4f0ebf0b89575 Mon Sep 17 00:00:00 2001 From: Giuseppe Fierro Date: Sun, 7 Apr 2019 12:21:32 +0200 Subject: [PATCH] keepassxc: update to 2.4.0. --- srcpkgs/keepassxc/patches/001-musl.patch | 25 --------------- srcpkgs/keepassxc/template | 39 ++++++------------------ 2 files changed, 9 insertions(+), 55 deletions(-) delete mode 100644 srcpkgs/keepassxc/patches/001-musl.patch diff --git a/srcpkgs/keepassxc/patches/001-musl.patch b/srcpkgs/keepassxc/patches/001-musl.patch deleted file mode 100644 index 907869b2f8..0000000000 --- a/srcpkgs/keepassxc/patches/001-musl.patch +++ /dev/null @@ -1,25 +0,0 @@ -# include prototypes for musl -# should not be neccesary for keepassxc 2.3.2 -# see: https://github.com/keepassxreboot/keepassxc/pull/1726 - ---- src/sshagent/blf.h -+++ src/sshagent/blf.h -@@ -30,6 +30,8 @@ - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -+#define _GNU_SOURCE -+#include - - #ifndef _BLF_H_ - #define _BLF_H_ ---- src/sshagent/blowfish.c -+++ src/sshagent/blowfish.c -@@ -49,7 +49,6 @@ - #include - #endif - --#include - #ifdef HAVE_BLF_H - #include "blf.h" - #endif diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template index cd3a0ed15d..f369d4312b 100644 --- a/srcpkgs/keepassxc/template +++ b/srcpkgs/keepassxc/template @@ -1,45 +1,24 @@ # Template file for 'keepassxc' pkgname=keepassxc -version=2.3.4 +version=2.4.0 revision=1 build_style=cmake -configure_args="-DWITH_TESTS=OFF - -DWITH_XC_AUTOTYPE=$(vopt_if autotype ON OFF) - -DWITH_XC_NETWORKING=$(vopt_if network ON OFF) - -DWITH_XC_YUBIKEY=$(vopt_if yubikey ON OFF) - -DWITH_XC_BROWSER=$(vopt_if browser ON OFF) - -DWITH_XC_SSHAGENT=$(vopt_if sshagent ON OFF)" -makedepends="qt5-tools-devel libgcrypt-devel libargon2-devel - $(vopt_if autotype 'qt5-x11extras-devel libXtst-devel libXi-devel') - $(vopt_if browser libsodium-devel) - $(vopt_if network libcurl-devel) - $(vopt_if yubikey 'libykpers-devel libyubikey-devel')" +configure_args="-DWITH_TESTS=OFF -DWITH_XC_ALL=ON" +makedepends="qt5-tools-devel qt5-svg-devel libgcrypt-devel libargon2-devel qrencode-devel + qt5-x11extras-devel libXtst-devel libykpers-devel libyubikey-devel libsodium-devel" short_desc="KeePassXC is a cross-platform port of “Keepass Password Safe”" maintainer="ibrokemypie " -license="GPL-3.0-only" +license="GPL-3.0-or-later, BSD-3-Clause, CC0-1.0, LGPL-2.0-only, LGPL-2.1-only, + LGPL-3.0-or-later, Nokia-Qt-exception-1.1, MIT BSL-1.0" homepage="https://keepassxc.org/" distfiles="https://github.com/keepassxreboot/keepassxc/releases/download/${version}/keepassxc-${version}-src.tar.xz" -checksum=0c24a78895185b9b6b098f08a15b332c600f80aa570d608940fcc2a38e02780a +checksum=081ff1a34da8e0e8db951b5d70824d7a2b3d299ed4ae54e6ddc1e3ac176b95a8 if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools" + hostmakedepends+=" qt5-qmake qt5-host-tools" fi -build_options="autotype browser network sshagent yubikey" -desc_option_autotype="Enable auto-type" -desc_option_browser="Enable browser integration with keepassxc-browser" -desc_option_network="Enable networking support (favicon download)" -desc_option_sshagent="Enable SSH agent support" -desc_option_yubikey="Enable YubiKey HMAC-SHA1 authentication support" -build_options_default="autotype browser sshagent yubikey network" - post_install() { - vlicense COPYING - vlicense LICENSE.BOOST-1.0 vlicense LICENSE.BSD - vlicense LICENSE.CC0 - vlicense LICENSE.NOKIA-LGPL-EXCEPTION - vlicense LICENSE.LGPL-3 - vlicense LICENSE.LGPL-2.1 - vlicense LICENSE.GPL-2 + vlicense LICENSE.MIT }