<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9860cf90590700b610d6355e1651bea75c4b59d4">https://github.com/macports/macports-ports/commit/9860cf90590700b610d6355e1651bea75c4b59d4</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new 9860cf90590 KeePassXC-devel: upgrade to latest commit of 2.7.x branch
</span>9860cf90590 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 9860cf90590700b610d6355e1651bea75c4b59d4
</span>Author: tenzap <fabstz-it@yahoo.fr>
AuthorDate: Tue Oct 18 22:03:17 2022 +0200

<span style='display:block; white-space:pre;color:#404040;'>    KeePassXC-devel: upgrade to latest commit of 2.7.x branch
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    on KeePassXC-devel:
</span><span style='display:block; white-space:pre;color:#404040;'>     - patch-touch-id.diff is not needed anymore
</span><span style='display:block; white-space:pre;color:#404040;'>     - -DWITH_XC_TOUCHID=OFF is not needed anymore
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    BTW: remove + character from version string (see https://trac.macports.org/ticket/65073)
</span>---
 security/KeePassXC/Portfile                        | 32 ++++++++++++----------
 .../files/devel/patch-no-findpackage-path.diff     | 21 ++++++++++++++
 2 files changed, 38 insertions(+), 15 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC/Portfile b/security/KeePassXC/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 258a4e5e5ec..65987b98f8f 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/KeePassXC/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/KeePassXC/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,22 +54,31 @@ if {${subport} eq ${name}} {
</span>     gpg_verify.use_gpg_verification \
                         yes
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append   patch-no-findpackage-path.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        patch-touch-id.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # In the future the Touch ID feature may require Darwin 17 (10.13)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # https://github.com/keepassxreboot/keepassxc/issues/2484
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {${os.major} < 16} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.pre_args-append   -DWITH_XC_TOUCHID=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span> } else {
     # devel subport
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    github.setup        keepassxreboot keepassxc 5916a8f8dd93eb6a5de544caedd7a9d8e9a3b1ee
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    github.setup        keepassxreboot keepassxc edae652d6f25e5170cdfc5424e59e847983b9a25
</span>     set githash         [string range ${github.version} 0 6]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    version             20220406+git${githash}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    revision            1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    version             20221018.git${githash}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    revision            0
</span> 
     conflicts           KeePassXC
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    checksums           rmd160  a2c24f7f12b19baaf47a4f25399f33bee6cefe13 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        sha256  5193db2c656bdbb29605df573057e23316e4572327d616b6ac052e857cf4af73 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        size    11171009
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    checksums           rmd160  661e9aa854515d5f6e0bed3bb5b54e5db1973364 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        sha256  8d0daa4e99119916f080fb4945499ee2c588a5637df581f91645ceb462cf77b5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        size    11236977
</span> 
     gpg_verify.use_gpg_verification \
                         no
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append    devel/patch-no-findpackage-path.diff
</span> }
 
 if {[option gpg_verify.use_gpg_verification]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -101,9 +110,8 @@ depends_lib-append      port:argon2 \
</span>                         port:ykpers \
                         port:zlib
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles              patch-no-deployqt.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        patch-no-findpackage-path.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        patch-touch-id.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append       patch-no-deployqt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> 
 # KeePassXC uses -fstack-protector-strong on Clang [1]. That flag is not
 # available until clang 602 [2] or upstream clang 3.5 [3]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -129,12 +137,6 @@ configure.pre_args-append \
</span>     -DWITH_XC_UPDATECHECK=OFF \
     -DWITH_XC_DOCS=OFF
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# In the future the Touch ID feature may require Darwin 17 (10.13)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/keepassxreboot/keepassxc/issues/2484
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.major} < 16} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.pre_args-append   -DWITH_XC_TOUCHID=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # QTest::addRow was introduced in Qt 5.9
 # Don't build tests in that case
 if {[vercmp ${qt5.version} 5.9] < 0} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC/files/devel/patch-no-findpackage-path.diff b/security/KeePassXC/files/devel/patch-no-findpackage-path.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c25ce7462c1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/KeePassXC/files/devel/patch-no-findpackage-path.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -478,16 +478,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     find_package(Qt5 COMPONENTS ${QT_COMPONENTS} DBus REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elseif(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    find_package(Qt5 COMPONENTS ${QT_COMPONENTS} REQUIRED HINTS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            /usr/local/opt/qt@5/lib/cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            /usr/local/Cellar/qt@5/*/lib/cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            /opt/homebrew/opt/qt@5/lib/cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            ENV PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    find_package(Qt5 COMPONENTS MacExtras HINTS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            /usr/local/opt/qt@5/lib/cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            /usr/local/Cellar/qt@5/*/lib/cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            /opt/homebrew/opt/qt@5/lib/cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            ENV PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++     find_package(Qt5 COMPONENTS ${QT_COMPONENTS} REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++     find_package(Qt5 COMPONENTS MacExtras)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     find_package(Qt5 COMPONENTS ${QT_COMPONENTS} REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span></pre><pre style='margin:0'>

</pre>