KeePassXC, -devel: update to 2.7.10, 20250909.git9a40182

contextnerror · contextnerror · commit d19564f3168c · 2025-09-19T21:31:16.000-07:00
* patch value of MAC_OS_VERSION_12_3 to fix build on older systems * add ScreenCaptureKit to existing patches * create separate old_macos patch for devel version * make devel builds not marked as Release build type 2.7.10 adds restrictions on short custom word lists, this is not a bug. Behavior is changed in devel version. Closes: https://trac.macports.org/ticket/72178
diff --git a/security/KeePassXC/Portfile b/security/KeePassXC/Portfile
@@ -27,13 +27,9 @@ long_description        KeePassXC is a community fork of KeePassX with the \
 license                 {GPL-2 GPL-3}
 license_noconflict      openssl openssl10 openssl11 openssl3
 
-if { ${os.platform} eq "darwin" && ${os.major} >= 24 } {
-    macosx_deployment_target 14.0
-}
-
 if {${subport} eq ${name}} {
     # stable
-    github.setup        keepassxreboot keepassxc 2.7.9
+    github.setup        keepassxreboot keepassxc 2.7.10
     revision            0
     github.tarball_from releases
     distname            keepassxc-${version}-src
@@ -45,34 +41,39 @@ if {${subport} eq ${name}} {
 
     # See keepassxc-${version}-src.tar.xz.DIGEST on upstream GitHub releases page for SHA256 sums
     checksums           ${distname}${extract.suffix} \
-                        rmd160  0ac59defa184907036007f57d55e97ab8b422ce6 \
-                        sha256  3c44e45f22c00ddac63d8bc11054b4b0ada0222ffac08d3ed70f196cb9ed46fd \
-                        size    9789312 \
+                        rmd160  98dd8094eedd8029a4d7e5cc4dbb53d23299fb98 \
+                        sha256  5ce76d6440986c24842585f019d5f3cadc166fa71fc911a4fe97b8bbc4819dfa \
+                        size    9787952 \
                         ${distname}${extract.suffix}.sig \
-                        rmd160  1ca16506c6bd2abbf3e30e3cb91b5d9a06139ec0 \
-                        sha256  f3a51f4cbb7f4b3574cf3201d84427ebec59461eb5db516065bf282ba9b16a8b \
+                        rmd160  66bf14a194f8dbc459f7fd0abee18c7ee5e1c54e \
+                        sha256  315a1e19af294feec6eb7ffaa3f6621318d339e169636ad66dd188522ffd1374 \
                         size    488
 
     gpg_verify.use_gpg_verification \
                         yes
+
+    patchfiles-append   add_support_for_old_macos.diff
+
+    configure.args-append -DKEEPASSXC_BUILD_TYPE=Release \
 }
 
 subport ${name}-devel {
-    github.setup        keepassxreboot keepassxc 37dabd2561c33d7c0e66bba6ab0883bb55e90cf1
-    # Change github.tarball_from to 'releases' or 'archive' next update
-    github.tarball_from tarball
+    github.setup        keepassxreboot keepassxc 9a40182a62543858537e279b2c9be9e2a9f92639
+    github.tarball_from archive
     set githash         [string range ${github.version} 0 6]
-    version             20230514.git${githash}
-    revision            2
+    version             20250909.git${githash}
+    revision            0
 
     conflicts           KeePassXC
 
-    checksums           rmd160  16d79aa775a0dc6d8cf32015a3dc7131a2e13163 \
-                        sha256  05fb0c84e426f33bacd41f6809d52c5bc758dace52b41c58001385a26bed89c3 \
-                        size    10967053
+    checksums           rmd160  bb3804d67e76adba06ecee9df6159c31a9b1802c \
+                        sha256  7a2a62c1c28612dadc180e90c07a5c482f98ef2af328dd6fb7979efe19bcf0ba \
+                        size    12712636
 
     gpg_verify.use_gpg_verification \
                         no
+
+    patchfiles-append   add_support_for_old_macos_devel.diff
 }
 
 if {[option gpg_verify.use_gpg_verification]} {
@@ -112,7 +113,6 @@ depends_lib-append      port:argon2 \
 
 patchfiles-append       patch-no-deployqt.diff \
                         patch-no-findpackage-path.diff \
-                        add_support_for_old_macos.diff \
                         add_support_for_old_macos-2.diff
 
 # error: no matching constructor for initialization of 'std::shared_ptr<unsigned char []>'
@@ -124,7 +124,6 @@ configure.args-append \
     -DCMAKE_INSTALL_PREFIX=${applications_dir} \
     -DCMAKE_INSTALL_MANDIR=${prefix}/share/man \
     -DCMAKE_PREFIX_PATH=${qt_cmake_module_dir} \
-    -DKEEPASSXC_BUILD_TYPE=Release \
     -DWITH_XC_BROWSER=ON \
     -DWITH_XC_KEESHARE=ON \
     -DWITH_XC_NETWORKING=ON \
diff --git a/security/KeePassXC/files/add_support_for_old_macos-2.diff b/security/KeePassXC/files/add_support_for_old_macos-2.diff
@@ -1,6 +1,15 @@
---- src/gui/osutils/macutils/AppKitImpl.mm
-+++ src/gui/osutils/macutils/AppKitImpl.mm
-@@ -66,7 +66,7 @@
+--- src/gui/osutils/macutils/AppKitImpl.mm.orig	2025-05-27 17:48:31.000000000 -0700
++++ src/gui/osutils/macutils/AppKitImpl.mm	2025-05-27 19:14:00.000000000 -0700
+@@ -19,7 +19,7 @@
+ #import "AppKitImpl.h"
+ #import <QWindow>
+ #import <Cocoa/Cocoa.h>
+-#if __clang_major__ >= 13 && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_VERSION_12_3
++#if __clang_major__ >= 13 && MAC_OS_X_VERSION_MIN_REQUIRED >= 120300
+ #import <ScreenCaptureKit/ScreenCaptureKit.h>
+ #endif
+ 
+@@ -61,7 +61,7 @@
  
  - (void) observeValueForKeyPath:(NSString *)keyPath
                        ofObject:(id)object
@@ -9,7 +18,7 @@
                         context:(void *)context
  {
      Q_UNUSED(object)
-@@ -80,8 +80,10 @@
+@@ -75,8 +75,10 @@
              };
  
              if(@available(macOS 11.0, *)) {
@@ -20,7 +29,7 @@
              }
              else {
                  emitBlock();
-@@ -139,7 +141,11 @@
+@@ -134,7 +136,11 @@
  //
  - (bool) isDarkMode
  {
@@ -32,3 +41,12 @@
  }
  
  
+@@ -186,7 +192,7 @@
+ //
+ - (bool) enableScreenRecording 
+ {
+-#if __clang_major__ >= 13 && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_VERSION_12_3
++#if __clang_major__ >= 13 && MAC_OS_X_VERSION_MIN_REQUIRED >= 120300
+     if (@available(macOS 12.3, *)) {
+         __block BOOL hasPermission = NO;
+         dispatch_semaphore_t sema = dispatch_semaphore_create(0);
diff --git a/security/KeePassXC/files/add_support_for_old_macos.diff b/security/KeePassXC/files/add_support_for_old_macos.diff
@@ -11,9 +11,9 @@ Upstream doesn't want to merge patches to build on versions prior to macos
 10.13, so this patch is not forwarded upstream.
 See: https://github.com/keepassxreboot/keepassxc/pull/8650#issuecomment-1291750066
 
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -81,6 +81,42 @@ if(APPLE)
+--- CMakeLists.txt.orig	2025-09-17 16:07:50.000000000 -0700
++++ CMakeLists.txt	2025-09-17 16:14:00.000000000 -0700
+@@ -82,6 +82,46 @@
         ${CMAKE_CURRENT_BINARY_DIR}/tiometry_test/
         ${CMAKE_CURRENT_SOURCE_DIR}/cmake/compiler-checks/macos/control_watch_support.mm)
      message(STATUS "Apple watch compiler support: ${XC_APPLE_COMPILER_SUPPORT_WATCH}")
@@ -53,6 +53,10 @@ See: https://github.com/keepassxreboot/keepassxc/pull/8650#issuecomment-12917500
 +       ${CMAKE_CURRENT_SOURCE_DIR}/cmake/compiler-checks/macos/control_SecAccessControlRef_support.mm)
 +    message(STATUS "SecAccessControlRef compiler support: ${XC_APPLE_COMPILER_SUPPORT_SecAccessControlRef}")
 +
++    try_compile(XC_APPLE_COMPILER_SUPPORT_ScreenCaptureKit
++       ${CMAKE_CURRENT_BINARY_DIR}/ScreenCaptureKit_test/
++       ${CMAKE_CURRENT_SOURCE_DIR}/cmake/compiler-checks/macos/control_ScreenCaptureKit_support.mm)
++    message(STATUS "ScreenCaptureKit compiler support: ${XC_APPLE_COMPILER_SUPPORT_ScreenCaptureKit}")
  endif()
  
  if(WITH_CCACHE)
@@ -115,9 +119,14 @@ See: https://github.com/keepassxreboot/keepassxc/pull/8650#issuecomment-12917500
 +   kSecUseOperationPrompt;
 +   return 0;
 +}
---- src/config-keepassx.h.cmake
-+++ src/config-keepassx.h.cmake
-@@ -41,10 +41,24 @@
+--- /dev/null
++++ cmake/compiler-checks/macos/control_ScreenCaptureKit_support.mm
+@@ -0,0 +1,2 @@
++#include <ScreenCaptureKit/ScreenCaptureKit.h>
++int main() { return 0; }
+--- src/config-keepassx.h.cmake.orig	2025-09-17 16:23:31.000000000 -0700
++++ src/config-keepassx.h.cmake	2025-09-17 16:26:08.000000000 -0700
+@@ -43,10 +43,26 @@
  #cmakedefine01 XC_APPLE_COMPILER_SUPPORT_BIOMETRY()
  #cmakedefine01 XC_APPLE_COMPILER_SUPPORT_TOUCH_ID()
  #cmakedefine01 XC_APPLE_COMPILER_SUPPORT_WATCH()
@@ -128,6 +137,7 @@ See: https://github.com/keepassxreboot/keepassxc/pull/8650#issuecomment-12917500
 +#cmakedefine01 XC_APPLE_COMPILER_SUPPORT_kSecAttrAccessControl()
 +#cmakedefine01 XC_APPLE_COMPILER_SUPPORT_kSecUseOperationPrompt()
 +#cmakedefine01 XC_APPLE_COMPILER_SUPPORT_SecAccessControlRef()
++#cmakedefine01 XC_APPLE_COMPILER_SUPPORT_ScreenCaptureKit()
  
  #define XC_COMPILER_SUPPORT(X) XC_COMPILER_SUPPORT_PRIVATE_DEFINITION_##X()
  #define XC_COMPILER_SUPPORT_PRIVATE_DEFINITION_APPLE_BIOMETRY() XC_APPLE_COMPILER_SUPPORT_BIOMETRY()
@@ -140,6 +150,7 @@ See: https://github.com/keepassxreboot/keepassxc/pull/8650#issuecomment-12917500
 +#define XC_COMPILER_SUPPORT_PRIVATE_DEFINITION_kSecAttrAccessControl() XC_APPLE_COMPILER_SUPPORT_kSecAttrAccessControl()
 +#define XC_COMPILER_SUPPORT_PRIVATE_DEFINITION_kSecUseOperationPrompt() XC_APPLE_COMPILER_SUPPORT_kSecUseOperationPrompt()
 +#define XC_COMPILER_SUPPORT_PRIVATE_DEFINITION_SecAccessControlRef() XC_APPLE_COMPILER_SUPPORT_SecAccessControlRef()
++#define XC_COMPILER_SUPPORT_PRIVATE_DEFINITION_ScreenCaptureKit() XC_APPLE_COMPILER_SUPPORT_ScreenCaptureKit()
  
  #endif // KEEPASSX_CONFIG_KEEPASSX_H
 --- src/touchid/TouchID.mm
@@ -229,17 +240,34 @@ See: https://github.com/keepassxreboot/keepassxc/pull/8650#issuecomment-12917500
          LogStatusError("TouchID::getKey - key query error", status);
          return false;
      }
---- src/CMakeLists.txt
-+++ src/CMakeLists.txt
-@@ -354,7 +354,10 @@ if(WITH_XC_KEESHARE)
+--- src/CMakeLists.txt.orig	2025-09-17 17:04:25.000000000 -0700
++++ src/CMakeLists.txt	2025-09-17 17:06:55.000000000 -0700
+@@ -372,7 +372,13 @@
  endif()
  
  if(APPLE)
--    target_link_libraries(keepassx_core "-framework Foundation -framework AppKit -framework Carbon -framework Security -framework LocalAuthentication")
+-    target_link_libraries(keepassx_core "-framework Foundation -framework AppKit -framework Carbon -framework Security -framework LocalAuthentication -framework ScreenCaptureKit")
 +    target_link_libraries(keepassx_core "-framework Foundation -framework AppKit -framework Carbon -framework Security")
 +    if(XC_APPLE_COMPILER_SUPPORT_LocalAuthentication)
 +        target_link_libraries(keepassx_core "-framework LocalAuthentication")
++    endif()
++    if(XC_APPLE_COMPILER_SUPPORT_ScreenCaptureKit)
++        target_link_libraries(keepassx_core "-framework ScreenCaptureKit")
 +    endif()
      if(Qt5MacExtras_FOUND)
          target_link_libraries(keepassx_core Qt5::MacExtras)
      endif()
+--- src/autotype/mac/CMakeLists.txt.orig	2025-09-17 18:29:38.000000000 -0700
++++ src/autotype/mac/CMakeLists.txt	2025-09-17 18:40:25.000000000 -0700
+@@ -1,7 +1,10 @@
+ set(autotype_mac_SOURCES AutoTypeMac.cpp)
+ 
+ add_library(keepassxc-autotype-cocoa MODULE ${autotype_mac_SOURCES})
+-set_target_properties(keepassxc-autotype-cocoa PROPERTIES LINK_FLAGS "-framework Foundation -framework AppKit -framework Carbon -framework ScreenCaptureKit")
++set_target_properties(keepassxc-autotype-cocoa PROPERTIES LINK_FLAGS "-framework Foundation -framework AppKit -framework Carbon")
++    if(XC_APPLE_COMPILER_SUPPORT_ScreenCaptureKit)
++        set_target_properties(keepassxc-autotype-cocoa PROPERTIES LINK_FLAGS "-framework ScreenCaptureKit")
++    endif()
+ target_link_libraries(keepassxc-autotype-cocoa ${PROGNAME} Qt5::Core Qt5::Widgets)
+ 
+ install(TARGETS keepassxc-autotype-cocoa
diff --git a/security/KeePassXC/files/add_support_for_old_macos_devel.diff b/security/KeePassXC/files/add_support_for_old_macos_devel.diff
