<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/2306ea5a3a82485d7914a530f83a78c3a9d415e2">https://github.com/macports/macports-ports/commit/2306ea5a3a82485d7914a530f83a78c3a9d415e2</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 2306ea5a3a8 KeePassXC: Fix compilation on osx 10.7, 10.8 & 10.9
</span>2306ea5a3a8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2306ea5a3a82485d7914a530f83a78c3a9d415e2
</span>Author: tenzap <fabstz-it@yahoo.fr>
AuthorDate: Sun Nov 14 09:53:50 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> KeePassXC: Fix compilation on osx 10.7, 10.8 & 10.9
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> set minimal Qt version to 5.5 (as stated by upstream since 2.5.0)
</span><span style='display:block; white-space:pre;color:#404040;'> As a consequence, KeePassXC can't be built on Snow Leopard (which
</span><span style='display:block; white-space:pre;color:#404040;'> uses Qt 5.3)
</span>---
security/KeePassXC/Portfile | 3 +-
security/KeePassXC/files/patch-old-mac.diff | 119 +++++++++++++++++++++++++++-
2 files changed, 119 insertions(+), 3 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 f3cb17b0ac7..d031c92b2c3 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;'>@@ -21,7 +21,7 @@ license GPL-2+
</span> license_noconflict openssl
github.setup keepassxreboot keepassxc 2.6.6
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> github.tarball_from releases
distname keepassxc-${version}-src
use_xz yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,6 +54,7 @@ if {[option gpg_verify.use_gpg_verification]} {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+qt5.min_version 5.5.0
</span> qt5.depends_component qtmacextras qtsvg
qt5.depends_build_component \
qttools
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC/files/patch-old-mac.diff b/security/KeePassXC/files/patch-old-mac.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 5e4d6c0b8c4..7321039acda 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/KeePassXC/files/patch-old-mac.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/KeePassXC/files/patch-old-mac.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,44 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Fix compilation when osx <= 10.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+* AppKitImpl.mm: Syntax is not understood by 10.7, update it to be understandable by <= 10.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: expected method to read dictionary element not found on object of type 'NSDictionary *'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSRunningApplication* app = userInfo[NSWorkspaceApplicationKey];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ^
</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;'>+@@ -60,7 +60,7 @@ - (id) initWithObject:(AppKit*)appkit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - (void) didDeactivateApplicationObserver:(NSNotification*) notification
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSDictionary* userInfo = notification.userInfo;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NSRunningApplication* app = userInfo[NSWorkspaceApplicationKey];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NSRunningApplication* app = [userInfo objectForKey:NSWorkspaceApplicationKey];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (app.processIdentifier != [self ownProcessId]) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.lastActiveApplication = app;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Fix compilation when osx <= 10.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+* AppKitImpl.mm: The code uses @available syntax which is new in clang 9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This prevents compilation on older version of macOS that don't
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use this version. For example on El Capitan.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+* AppKitImpl.mm: button property is new in 10.10. It is used for a feature of KeePassXC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ that is only available from 10.17 onwards. So we don't need it when compiling on <= 10.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: property 'button' not found on object of type 'NSStatusItem *'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSString* appearance = [dummy.button.effectiveAppearance.name lowercaseString];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ^
</span> --- src/gui/osutils/macutils/AppKitImpl.mm
+++ src/gui/osutils/macutils/AppKitImpl.mm
@@ -139,6 +139,7 @@ - (bool) isDarkMode
//
- (bool) isStatusBarDark
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if __clang_major__ >= 9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __clang_major__ >= 9 && defined MAC_OS_X_VERSION_10_10
</span> if (@available(macOS 10.17, *)) {
// This is an ugly hack, but I couldn't find a way to access QTrayIcon's NSStatusItem.
NSStatusItem* dummy = [[NSStatusBar systemStatusBar] statusItemWithLength:0];
<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> @@ -146,6 +147,7 @@ - (bool) isStatusBarDark
[[NSStatusBar systemStatusBar] removeStatusItem:dummy];
return [appearance containsString:@"dark"];
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,11 +47,51 @@
</span>
return [self isDarkMode];
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Fix compilation when osx <= 10.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+* AppKitImpl.mm: AXIsProcessTrustedWithOptions exists from 10.9 onwards
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: use of undeclared identifier 'kAXTrustedCheckOptionPrompt'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: use of undeclared identifier 'AXIsProcessTrustedWithOptions'
</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;'>+@@ -168,9 +168,15 @@ - (void) userSwitchHandler:(NSNotification*) notification
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - (bool) enableAccessibility
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // Request accessibility permissions for Auto-Type type on behalf of the user
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NSDictionary* opts = @{static_cast<id>(kAXTrustedCheckOptionPrompt): @YES};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return AXIsProcessTrustedWithOptions(static_cast<CFDictionaryRef>(opts));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __clang_major__ >= 9 && defined MAC_OS_X_VERSION_10_9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (@available(macOS 10.15, *)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Request accessibility permissions for Auto-Type type on behalf of the user
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NSDictionary* opts = @{static_cast<id>(kAXTrustedCheckOptionPrompt): @YES};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return AXIsProcessTrustedWithOptions(static_cast<CFDictionaryRef>(opts));
</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;'>++ return YES;
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Fix compilation when osx <= 10.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+* AppKitImpl.mm: The code uses @available syntax which is new in clang 9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This prevents compilation on older version of macOS that don't
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use this version. For example on El Capitan.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+* AppKitImpl.mm: CGDisplayStreamRef exists from 10.8 onwards only. It is used for a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ feature of KeePassXC that is only available from 10.15 onwards. So we don't need it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ when compiling on <= 10.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: unknown type name 'CGDisplayStreamRef'
</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> @@ -176,6 +178,7 @@ - (bool) enableAccessibility
//
- (bool) enableScreenRecording
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if __clang_major__ >= 9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __clang_major__ >= 9 && defined MAC_OS_X_VERSION_10_8
</span> if (@available(macOS 10.15, *)) {
// Request screen recording permission on macOS 10.15+
// This is necessary to get the current window title
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,6 +103,19 @@
</span> return YES;
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] fix compilation on Qt not having QOperatingSystemVersion::MacOSBigSur
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The code uses 'QOperatingSystemVersion::MacOSBigSur' which doesn't exist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+in all Qt versions (it has been backported to Qt 5.12.10+ & 5.15.1+ only).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+On older macos systems like El Capitan the last supported
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version of Qt is 5.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This will fix compilation issue on such older systems and on systems
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+running with Qt not supporting QOperatingSystemVersion::MacOSBigSur
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Compilation error was:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: no member named 'MacOSBigSur' in 'QOperatingSystemVersion'
</span> --- src/gui/styles/base/BaseStyle.cpp
+++ src/gui/styles/base/BaseStyle.cpp
@@ -53,8 +53,10 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,3 +152,34 @@
</span> return hack_isLightPalette(pal) ? QRgb(0xF4F4F4) : QRgb(0x282828);
}
#endif
<span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Fix compilation when osx <= 10.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+* MacUtils.cpp: CoreGraphics exists from 10.8 onwards only, capslock detection feature
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ would have to be implemented on OSX < 10.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/gui/osutils/macutils/MacUtils.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/gui/osutils/macutils/MacUtils.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,8 +24,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QStandardPaths>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QTimer>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined MAC_OS_X_VERSION_10_8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <CoreGraphics/CGEventSource.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</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;'>+ QPointer<MacUtils> MacUtils::m_instance = nullptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -136,7 +137,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool MacUtils::isCapslockEnabled()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined MAC_OS_X_VERSION_10_8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (CGEventSourceFlagsState(kCGEventSourceStateHIDSystemState) & kCGEventFlagMaskAlphaShift) != 0;
</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>