diff options
Diffstat (limited to 'security/keepassxc/files')
| -rw-r--r-- | security/keepassxc/files/patch-CMakeLists.txt | 12 | ||||
| -rw-r--r-- | security/keepassxc/files/patch-src_thirdparty_ykcore_CMakeLists.txt | 8 |
2 files changed, 9 insertions, 11 deletions
diff --git a/security/keepassxc/files/patch-CMakeLists.txt b/security/keepassxc/files/patch-CMakeLists.txt index 38c92ebea387..2b8b5fb5c912 100644 --- a/security/keepassxc/files/patch-CMakeLists.txt +++ b/security/keepassxc/files/patch-CMakeLists.txt @@ -1,13 +1,11 @@ ---- CMakeLists.txt.orig 2024-06-19 14:32:55.000000000 -0700 -+++ CMakeLists.txt 2024-06-20 07:26:46.907481000 -0700 -@@ -575,8 +575,8 @@ +--- CMakeLists.txt.orig 2025-07-25 11:50:52 UTC ++++ CMakeLists.txt +@@ -575,7 +575,7 @@ if(WITH_XC_YUBIKEY) include_directories(SYSTEM ${PCSC_INCLUDE_DIRS}) if(UNIX AND NOT APPLE) - find_library(LIBUSB_LIBRARIES NAMES usb-1.0 REQUIRED) -- find_path(LIBUSB_INCLUDE_DIR NAMES libusb.h PATH_SUFFIXES "libusb-1.0" "libusb" REQUIRED) -+ find_library(LIBUSB_LIBRARIES NAMES usb REQUIRED) -+ find_path(LIBUSB_INCLUDE_DIR NAMES libusb.h PATH_SUFFIXES "libusb" "libusb" REQUIRED) ++ find_library(LIBUSB_LIBRARIES NAMES usb-1.0 usb REQUIRED) + find_path(LIBUSB_INCLUDE_DIR NAMES libusb.h PATH_SUFFIXES "libusb-1.0" "libusb" REQUIRED) include_directories(SYSTEM ${LIBUSB_INCLUDE_DIR}) endif() - endif() diff --git a/security/keepassxc/files/patch-src_thirdparty_ykcore_CMakeLists.txt b/security/keepassxc/files/patch-src_thirdparty_ykcore_CMakeLists.txt index af4cb68d5d09..28106f838730 100644 --- a/security/keepassxc/files/patch-src_thirdparty_ykcore_CMakeLists.txt +++ b/security/keepassxc/files/patch-src_thirdparty_ykcore_CMakeLists.txt @@ -1,8 +1,8 @@ ---- src/thirdparty/ykcore/CMakeLists.txt.orig 2022-03-21 22:47:20 UTC +--- src/thirdparty/ykcore/CMakeLists.txt.orig 2025-03-02 22:31:21 UTC +++ src/thirdparty/ykcore/CMakeLists.txt -@@ -27,7 +27,7 @@ elseif(UNIX AND NOT APPLE)
- elseif(UNIX AND NOT APPLE)
- target_sources(ykcore PRIVATE ykcore_libusb-1.0.c)
+@@ -29,7 +29,7 @@ elseif(UNIX AND NOT APPLE)
+
+ find_package(Threads REQUIRED)
- find_library(LIBUSB_LIBRARY NAMES usb-1.0)
+ find_library(LIBUSB_LIBRARY NAMES usb-1.0 usb)
|