<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/cebf40aa9323d588a3dbb03a792209b7f09924ea">https://github.com/macports/macports-ports/commit/cebf40aa9323d588a3dbb03a792209b7f09924ea</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 cebf40aa932 KeePassXC-devel: update to 20230416.git28e2806
</span>cebf40aa932 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit cebf40aa9323d588a3dbb03a792209b7f09924ea
</span>Author: tenzap <fabstz-it@yahoo.fr>
AuthorDate: Tue Apr 18 12:35:30 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> KeePassXC-devel: update to 20230416.git28e2806
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> KeePassXC-devel:
</span><span style='display:block; white-space:pre;color:#404040;'> - update to 20230416.git28e2806 (latest commit of upstream's
</span><span style='display:block; white-space:pre;color:#404040;'> release/2.7.x branch)
</span><span style='display:block; white-space:pre;color:#404040;'> - add patch to build on older macos
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> KeePassXC:
</span><span style='display:block; white-space:pre;color:#404040;'> - fix build with MacPorts 2.8.1 (set worksrcdir)
</span><span style='display:block; white-space:pre;color:#404040;'> - no need to increment revision
</span>---
security/KeePassXC/Portfile | 18 +++++++-----
.../files/devel/add_support_for_old_macos-2.diff | 34 ++++++++++++++++++++++
2 files changed, 45 insertions(+), 7 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 fb6356cf751..0844e5dd98d 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;'>@@ -38,6 +38,7 @@ if {${subport} eq ${name}} {
</span> distname keepassxc-${version}-src
use_xz yes
distfiles-append ${distname}${extract.suffix}.sig
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ worksrcdir keepassxc-${version}
</span>
conflicts KeePassXC-devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,22 +55,26 @@ if {${subport} eq ${name}} {
</span> gpg_verify.use_gpg_verification \
yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append add_support_for_qt5.6.diff
</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 12be175d583fbfac5a7b6b250a3bb5f792925285
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup keepassxreboot keepassxc 28e2806e077a2871dbb4f7e960febfc3653b6719
</span> set githash [string range ${github.version} 0 6]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20221120.git${githash}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20230416.git${githash}
</span> revision 0
conflicts KeePassXC
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 031fee017468df9410f58cdca2841d0c7d01cfbe \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9e81c92baefe7adafbd3f1caee927ef9a55c02b2d7f8f4efb70b6f1390ad963a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 11245059
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 f7368e399fd091a089878257c7bdc875115fd33e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 04b44a3bf60e57b50577d755a470524ca45b919fa48082a1a23db0ec38813ed1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 10718196
</span>
gpg_verify.use_gpg_verification \
no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append devel/add_support_for_old_macos-2.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
if {[option gpg_verify.use_gpg_verification]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -103,8 +108,7 @@ depends_lib-append port:argon2 \
</span>
patchfiles-append patch-no-deployqt.diff \
patch-no-findpackage-path.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- add_support_for_old_macos.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_support_for_qt5.6.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_support_for_old_macos.diff
</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;color:#808080;'>diff --git a/security/KeePassXC/files/devel/add_support_for_old_macos-2.diff b/security/KeePassXC/files/devel/add_support_for_old_macos-2.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..53d027a80ed
</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/add_support_for_old_macos-2.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/gui/osutils/macutils/AppKitImpl.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/gui/osutils/macutils/AppKitImpl.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -66,7 +66,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - (void) observeValueForKeyPath:(NSString *)keyPath
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ofObject:(id)object
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- change:(NSDictionary<NSKeyValueChangeKey,id> *)change
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ change:(NSDictionary *)change
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ context:(void *)context
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Q_UNUSED(object)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -80,8 +80,10 @@
</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;'>+ if(@available(macOS 11.0, *)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __clang_major__ >= 9 && MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Not sure why exactly this call is needed, but Apple sample code uses it so it's best to use it here too
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [NSApp.effectiveAppearance performAsCurrentDrawingAppearance:emitBlock];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ emitBlock();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -139,7 +141,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - (bool) isDarkMode
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __clang_major__ >= 9 && MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [NSApp.effectiveAppearance.name isEqualToString:NSAppearanceNameDarkAqua];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</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;'>+
</span></pre><pre style='margin:0'>
</pre>