From 05e6da3a86767ade8e99c47034edd00a0f13c645 Mon Sep 17 00:00:00 2001 From: Piraty Date: Mon, 24 Oct 2022 00:49:01 +0200 Subject: [PATCH] keepassxc: update to 2.7.3. --- ...001-Link-ykcore-against-pthread-7807.patch | 33 ------------------- srcpkgs/keepassxc/template | 4 +-- 2 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 srcpkgs/keepassxc/patches/0001-Link-ykcore-against-pthread-7807.patch diff --git a/srcpkgs/keepassxc/patches/0001-Link-ykcore-against-pthread-7807.patch b/srcpkgs/keepassxc/patches/0001-Link-ykcore-against-pthread-7807.patch deleted file mode 100644 index cad44dae05d..00000000000 --- a/srcpkgs/keepassxc/patches/0001-Link-ykcore-against-pthread-7807.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 7edeceec0376513002813efb7bf723fbcbe6752d Mon Sep 17 00:00:00 2001 -From: Piraty -Date: Fri, 15 Apr 2022 08:27:04 +0000 -Subject: [PATCH] Link ykcore against pthread (#7807) - ---- - src/thirdparty/ykcore/CMakeLists.txt | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/thirdparty/ykcore/CMakeLists.txt b/src/thirdparty/ykcore/CMakeLists.txt -index 47191ea7..103349f2 100644 ---- a/src/thirdparty/ykcore/CMakeLists.txt -+++ b/src/thirdparty/ykcore/CMakeLists.txt -@@ -27,13 +27,15 @@ if(WIN32) - elseif(UNIX AND NOT APPLE) - target_sources(ykcore PRIVATE ykcore_libusb-1.0.c) - -+ find_package(Threads REQUIRED) -+ - find_library(LIBUSB_LIBRARY NAMES usb-1.0) - find_path(LIBUSB_INCLUDE_DIR NAMES libusb.h PATH_SUFFIXES "libusb-1.0" "libusb") - if(NOT LIBUSB_LIBRARY OR NOT LIBUSB_INCLUDE_DIR) - message(FATAL_ERROR "libusb-1.0 dev package required, but not found") - endif() - -- target_link_libraries(ykcore PRIVATE ${LIBUSB_LIBRARY}) -+ target_link_libraries(ykcore PRIVATE Threads::Threads ${LIBUSB_LIBRARY}) - target_include_directories(ykcore PRIVATE ${LIBUSB_INCLUDE_DIR}) - target_compile_definitions(ykcore PRIVATE _GNU_SOURCE) - elseif(APPLE) --- -2.35.1 - diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template index a4839235260..8c897db884c 100644 --- a/srcpkgs/keepassxc/template +++ b/srcpkgs/keepassxc/template @@ -1,6 +1,6 @@ # Template file for 'keepassxc' pkgname=keepassxc -version=2.7.1 +version=2.7.3 revision=1 build_style=cmake configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_DOCS=ON @@ -26,7 +26,7 @@ license="GPL-3.0-or-later, BSD-3-Clause, CC0-1.0, LGPL-2.0-only, LGPL-2.1-only, homepage="https://keepassxc.org/" changelog="https://raw.githubusercontent.com/keepassxreboot/keepassxc/${version}/CHANGELOG.md" distfiles="https://github.com/keepassxreboot/keepassxc/releases/download/${version}/keepassxc-${version}-src.tar.xz" -checksum=6001ba626c35c316dbda6de35736f012a2264f95139fcb4a094b8eb49b15d3e7 +checksum=3d5dd662ae1b9c48f4a796606088fb68a4f0e6f147458d477ee6fb0f4cb2a7de build_options="autotype browser fdosecrets keeshare network sshagent yubikey" desc_option_autotype="Include auto-type"