<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/7f9e0f2eb226a68ba1f88999f5d11450060f419d">https://github.com/macports/macports-ports/commit/7f9e0f2eb226a68ba1f88999f5d11450060f419d</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 7f9e0f2eb22 KeePassXC: fix compilation on older systems & update patches
</span>7f9e0f2eb22 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7f9e0f2eb226a68ba1f88999f5d11450060f419d
</span>Author: tenzap <fabstz-it@yahoo.fr>
AuthorDate: Sat Nov 13 09:37:26 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> KeePassXC: fix compilation on older systems & update patches
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * refresh patch-no-deployqt.diff
</span><span style='display:block; white-space:pre;color:#404040;'> * fix compilation on macOS 10.12 (may also fix <= 10.9)
</span><span style='display:block; white-space:pre;color:#404040;'> * Add patch patch-no-findpackage-path.diff
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/61740
</span>---
security/KeePassXC/Portfile | 3 +-
security/KeePassXC/files/patch-no-deployqt.diff | 16 ++---
.../KeePassXC/files/patch-no-findpackage-path.diff | 13 +++++
security/KeePassXC/files/patch-old-mac.diff | 68 +++++++++++++---------
4 files changed, 62 insertions(+), 38 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 d0c862a2d2f..f3cb17b0ac7 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 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> github.tarball_from releases
distname keepassxc-${version}-src
use_xz yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,6 +70,7 @@ depends_lib-append port:argon2 \
</span> compiler.cxx_standard 2011
patchfiles patch-no-deployqt.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-no-findpackage-path.diff \
</span> patch-old-mac.diff
# KeePassXC uses -fstack-protector-strong on Clang [1]. That flag is not
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC/files/patch-no-deployqt.diff b/security/KeePassXC/files/patch-no-deployqt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index a7e7dfec365..3dab9d91d3b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/KeePassXC/files/patch-no-deployqt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/KeePassXC/files/patch-no-deployqt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt 2020-04-23 12:59:39.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2020-04-23 13:06:45.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -397,12 +397,6 @@
</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;'>+@@ -423,12 +423,6 @@
</span>
if(APPLE)
set(CMAKE_MACOSX_RPATH TRUE)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,9 +13,9 @@
</span> elseif(MINGW)
find_program(WINDEPLOYQT_EXE windeployqt HINTS ${Qt5_PREFIX}/bin ENV PATH)
if(NOT WINDEPLOYQT_EXE)
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/CMakeLists.txt 2020-04-09 18:24:20.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/CMakeLists.txt 2020-04-23 13:07:45.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -380,11 +380,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -408,11 +408,6 @@
</span> set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSXC_VERSION}")
include(CPack)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,8 +27,8 @@
</span> endif()
install(TARGETS ${PROGNAME}
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/autotype/mac/CMakeLists.txt 2020-04-09 18:24:20.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/autotype/mac/CMakeLists.txt 2020-04-23 13:09:07.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/autotype/mac/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/autotype/mac/CMakeLists.txt
</span> @@ -7,8 +7,8 @@
if(WITH_APP_BUNDLE)
add_custom_command(TARGET keepassx-autotype-cocoa
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC/files/patch-no-findpackage-path.diff b/security/KeePassXC/files/patch-no-findpackage-path.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..5f7d7358889
</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/patch-no-findpackage-path.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</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;'>+@@ -402,8 +402,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(UNIX AND NOT APPLE)
</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 /usr/local/opt/qt/lib/cmake /usr/local/Cellar/qt/*/lib/cmake ENV PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_package(Qt5 COMPONENTS MacExtras HINTS /usr/local/opt/qt/lib/cmake /usr/local/Cellar/qt/*/lib/cmake 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><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 201566f64f5..5e4d6c0b8c4 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,14 +1,30 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gui/osutils/macutils/AppKitImpl.mm 2020-04-09 18:24:20.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gui/osutils/macutils/AppKitImpl.mm.new 2020-04-23 13:24:04.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -134,6 +134,7 @@
</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;'>+@@ -139,6 +139,7 @@ - (bool) isDarkMode
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - (bool) isStatusBarDark
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __clang_major__ >= 9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (@available(macOS 10.17, *)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // This is an ugly hack, but I couldn't find a way to access QTrayIcon's NSStatusItem.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSStatusItem* dummy = [[NSStatusBar systemStatusBar] statusItemWithLength:0];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -146,6 +147,7 @@ - (bool) isStatusBarDark
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [[NSStatusBar systemStatusBar] removeStatusItem:dummy];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [appearance containsString:@"dark"];
</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;'>+ return [self isDarkMode];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -176,6 +178,7 @@ - (bool) enableAccessibility
</span> //
- (bool) enableScreenRecording
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef MAC_OS_X_VERSION_10_15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __clang_major__ >= 9
</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:#ffe0e0;'>-@@ -151,6 +152,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -193,6 +196,7 @@ - (bool) enableScreenRecording
</span> return NO;
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,13 +32,25 @@
</span> return YES;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gui/styles/base/BaseStyle.orig.cpp 2021-11-10 11:10:45.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gui/styles/base/BaseStyle.cpp 2021-11-10 11:07:30.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -292,16 +292,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/gui/styles/base/BaseStyle.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/gui/styles/base/BaseStyle.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -53,8 +53,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <qdrawutil.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef Q_OS_MACOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QOperatingSystemVersion>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</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;'>+ #include <cmath>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -279,16 +281,22 @@ namespace Phantom
</span> #ifdef Q_OS_MACOS
QColor tabBarBase(const QPalette& pal)
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 10) && QT_VERSION < QT_VERSION_CHECK(5, 13, 0) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ || QT_VERSION >= QT_VERSION_CHECK(5, 15, 1)
</span> if (QOperatingSystemVersion::current() >= QOperatingSystemVersion::MacOSBigSur) {
return hack_isLightPalette(pal) ? QRgb(0xD4D4D4) : QRgb(0x2A2A2A);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +59,8 @@
</span> }
QColor tabBarBaseInactive(const QPalette& pal)
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 10) && QT_VERSION < QT_VERSION_CHECK(5, 13, 0) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ || QT_VERSION >= QT_VERSION_CHECK(5, 15, 1)
</span> if (QOperatingSystemVersion::current() >= QOperatingSystemVersion::MacOSBigSur) {
return hack_isLightPalette(pal) ? QRgb(0xF5F5F5) : QRgb(0x2D2D2D);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,22 +68,3 @@
</span> return hack_isLightPalette(pal) ? QRgb(0xF4F4F4) : QRgb(0x282828);
}
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gui/osutils/macutils/AppKitImpl.orig.mm 2021-11-10 11:29:13.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gui/osutils/macutils/AppKitImpl.mm 2021-11-10 11:28:28.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -139,6 +139,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (bool) isStatusBarDark
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if __clang_major__ >= 9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (@available(macOS 10.17, *)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // This is an ugly hack, but I couldn't find a way to access QTrayIcon's NSStatusItem.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSStatusItem* dummy = [[NSStatusBar systemStatusBar] statusItemWithLength:0];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -146,7 +147,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [[NSStatusBar systemStatusBar] removeStatusItem:dummy];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return [appearance containsString:@"dark"];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return [self isDarkMode];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>