<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/802a1ba2268ceefefb6c8115d9cd9ea106b2aca8">https://github.com/macports/macports-ports/commit/802a1ba2268ceefefb6c8115d9cd9ea106b2aca8</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 802a1ba2268 KeePassXC: Add libomp dependency; minor fixes
</span>802a1ba2268 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 802a1ba2268ceefefb6c8115d9cd9ea106b2aca8
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Wed Apr 10 04:30:25 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> KeePassXC: Add libomp dependency; minor fixes
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Use subport directive in the normal way.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Increase minimum Qt version to 5.8.0 based on evidence.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add libomp dependency and revbump.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Use configure.args instead of configure.pre_args.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Only use -DWITH_XC_BROWSER_PASSKEYS=ON with a sufficient Qt version.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/69580
</span>---
security/KeePassXC/Portfile | 35 +++++++++++++++++++++++------------
1 file changed, 23 insertions(+), 12 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 df086472a93..f9a796b938d 100644
</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;'>@@ -17,7 +17,6 @@ PortGroup compiler_blacklist_versions 1.0
</span> PortGroup gpg_verify 1.0
name KeePassXC
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport KeePassXC-devel {}
</span> categories security aqua
maintainers nomaintainer
description KeePassXC is a cross-platform community-driven port \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,7 +31,7 @@ license_noconflict openssl openssl10 openssl11 openssl3
</span> if {${subport} eq ${name}} {
# stable
github.setup keepassxreboot keepassxc 2.7.7
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span> github.tarball_from releases
distname keepassxc-${version}-src
use_xz yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,13 +52,13 @@ if {${subport} eq ${name}} {
</span>
gpg_verify.use_gpg_verification \
yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # devel subport
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${name}-devel {
</span> github.setup keepassxreboot keepassxc 37dabd2561c33d7c0e66bba6ab0883bb55e90cf1
set githash [string range ${github.version} 0 6]
version 20230514.git${githash}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span>
conflicts KeePassXC
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,7 +68,6 @@ if {${subport} eq ${name}} {
</span>
gpg_verify.use_gpg_verification \
no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> }
if {[option gpg_verify.use_gpg_verification]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,7 +84,12 @@ if {[option gpg_verify.use_gpg_verification]} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-qt5.min_version 5.5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# CMakeLists.txt only checks for Qt 5.2.0 and later but, per the developers,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# "That version check is only for Linux OS. Every other platform we assume
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# latest available Qt." Empirically, KeePassXC builds with Qt 5.8 and later
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# but not with 5.7 and earlier.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/keepassxreboot/keepassxc/issues/6352
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+qt5.min_version 5.8.0
</span> qt5.depends_component qtmacextras qtsvg
qt5.depends_build_component \
qttools
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,6 +97,7 @@ qt5.depends_build_component \
</span> depends_lib-append port:argon2 \
port:botan \
port:libgcrypt \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libomp \
</span> port:libsodium \
port:minizip \
port:readline \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -111,13 +115,12 @@ compiler.blacklist-append {clang < 1200}
</span>
compiler.cxx_standard 2017
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.pre_args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span> -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 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DWITH_XC_BROWSER_PASSKEYS=ON \
</span> -DWITH_XC_KEESHARE=ON \
-DWITH_XC_NETWORKING=ON \
-DWITH_XC_SSHAGENT=ON \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -126,9 +129,17 @@ configure.pre_args-append \
</span> -DWITH_XC_DOCS=OFF
# QTest::addRow was introduced in Qt 5.9
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Don't build tests in that case
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp ${qt5.version} 5.9] < 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.pre_args-append -DWITH_TESTS=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp ${qt5.version} < 5.9]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DWITH_TESTS=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DWITH_TESTS=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Qt version 5.12.0 or higher is required for Passkeys support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp ${qt5.version} < 5.12]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DWITH_XC_BROWSER_PASSKEYS=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DWITH_XC_BROWSER_PASSKEYS=ON
</span> }
post-destroot {
</pre><pre style='margin:0'>
</pre>