<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e40ed89b12050e0f0f0d940a424da20cbe89c5a1">https://github.com/macports/macports-ports/commit/e40ed89b12050e0f0f0d940a424da20cbe89c5a1</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 e40ed89b120 KeePassXC: & -devel: enable sized-deallocation, update to latest
</span>e40ed89b120 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e40ed89b12050e0f0f0d940a424da20cbe89c5a1
</span>Author: tenzap <fabstz-it@yahoo.fr>
AuthorDate: Thu Nov 25 07:44:36 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> KeePassXC: & -devel: enable sized-deallocation, update to latest
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> KeePassXC & KeePassXC-devel
</span><span style='display:block; white-space:pre;color:#404040;'> - enable sized-deallocation on macOS < 10.12
</span><span style='display:block; white-space:pre;color:#404040;'> - remove patch: patch-sized_deallocation.diff
</span><span style='display:block; white-space:pre;color:#404040;'> - use legacysupport PG & macports-libcxx
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/64055
</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 latest
</span><span style='display:block; white-space:pre;color:#404040;'> - upgrade to c++ 2017
</span><span style='display:block; white-space:pre;color:#404040;'> - remove merged patches
</span>---
security/KeePassXC/Portfile | 35 +-
.../KeePassXC/files/devel/patch-old-mac-other.diff | 32 --
security/KeePassXC/files/devel/patch-old-mac.diff | 355 ---------------------
.../KeePassXC/files/patch-sized_deallocation.diff | 47 ---
4 files changed, 21 insertions(+), 448 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC/Portfile b/security/KeePassXC/Portfile
</span>old mode 100644
new mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index 48bcac4034b..0f7e0900aac
</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;'>@@ -1,6 +1,15 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup legacysupport 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Enable use of 'macports-libcxx' for macOS 10.11 and earlier, as port uses
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# libcxx features normally only available on 10.12 and later.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See: https://trac.macports.org/ticket/64055
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+legacysupport.newest_darwin_requires_legacy 15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+legacysupport.use_mp_libcxx yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> PortGroup qt5 1.0
PortGroup github 1.0
PortGroup cmake 1.1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,7 +33,7 @@ license_noconflict openssl
</span> if {${subport} eq ${name}} {
# stable
github.setup keepassxreboot keepassxc 2.6.6
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 6
</span> github.tarball_from releases
distname keepassxc-${version}-src
use_xz yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,23 +54,24 @@ if {${subport} eq ${name}} {
</span> gpg_verify.use_gpg_verification \
yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> patchfiles patch-no-deployqt.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-sized_deallocation.diff \
</span> patch-no-findpackage-path.diff \
patch-quazip.diff \
patch-old-mac.diff
} else {
# devel subport
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup keepassxreboot keepassxc d3b28f86515df73194d1102253b739b51b1909f5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup keepassxreboot keepassxc a0a063b57f6f577bed505ccd652763eeadd1b876
</span> set githash [string range ${github.version} 0 6]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20211123+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 20211208+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 1d5efc1ed802520465de17a18a5f893c59c8e31a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c9f486bfc844731f0c1932488d8309bee61459597c7760c0fe2c6500c4e1891a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 10072963
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 18aa88707b3886cf85eb55c886db2f952f46d791 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 78ee1c2cbfd3560d576d343c6ad931f225e2e7a95af8b7009d86eae720013692 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 10076145
</span>
gpg_verify.use_gpg_verification \
no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,11 +79,10 @@ if {${subport} eq ${name}} {
</span> depends_lib-append port:botan
patchfiles devel/patch-no-deployqt.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-sized_deallocation.diff \
</span> devel/patch-no-findpackage-path.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- devel/patch-old-mac-other.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- devel/patch-quazip.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- devel/patch-old-mac.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ devel/patch-quazip.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.cxx_standard 2017
</span>
post-destroot {
ln -s ${applications_dir}/KeePassXC.app/Contents/MacOS/keepassxc-proxy \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -109,8 +118,6 @@ depends_lib-append port:argon2 \
</span> port:ykpers \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # KeePassXC uses -fstack-protector-strong on Clang [1]. That flag is not
# available until clang 602 [2] or upstream clang 3.5 [3]
# [1] https://github.com/keepassxreboot/keepassxc/blob/develop/CMakeLists.txt
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC/files/devel/patch-old-mac-other.diff b/security/KeePassXC/files/devel/patch-old-mac-other.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 64e90e23005..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/KeePassXC/files/devel/patch-old-mac-other.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,32 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/core/CustomData.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/core/CustomData.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -27,7 +27,7 @@ const QString CustomData::BrowserLegacyKeyPrefix = QStringLiteral("Public Key: "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const QString CustomData::ExcludeFromReportsLegacy = QStringLiteral("KnownBad");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Fallback item for return by reference
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static const CustomData::CustomDataItem NULL_ITEM;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static const CustomData::CustomDataItem NULL_ITEM {}; // Fix compilation on osx 10.11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CustomData::CustomData(QObject* parent)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- : ModifiableObject(parent)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/core/Metadata.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/core/Metadata.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -29,7 +29,7 @@ const int Metadata::DefaultHistoryMaxItems = 10;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const int Metadata::DefaultHistoryMaxSize = 6 * 1024 * 1024;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Fallback icon for return by reference
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static const Metadata::CustomIconData NULL_ICON;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static const Metadata::CustomIconData NULL_ICON {}; // Fix compilation on osx 10.10 - 10.11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Metadata::Metadata(QObject* parent)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- : ModifiableObject(parent)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tests/TestTools.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tests/TestTools.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,6 +20,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "core/Clock.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QTest>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <QUuid>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QTEST_GUILESS_MAIN(TestTools)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC/files/devel/patch-old-mac.diff b/security/KeePassXC/files/devel/patch-old-mac.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7c07f0cb6bf..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/KeePassXC/files/devel/patch-old-mac.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,355 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 0bc9890ba149037cd8385619ba121939edb63f9b Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: tenzap <fabstz-it@yahoo.fr>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Thu, 11 Nov 2021 08:50:21 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1/6] fix compilation on macOS with clang < 9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The code uses @available syntax which is new in clang 9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This prevents compilation on older version of macOS that don't
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use this version. For example on El Capitan.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This fix will allow to compile on such older systems.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/gui/osutils/macutils/AppKitImpl.mm | 4 ++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 4 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/gui/osutils/macutils/AppKitImpl.mm b/src/gui/osutils/macutils/AppKitImpl.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 76fe7fe06d..ddbe2ad5b9 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gui/osutils/macutils/AppKitImpl.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gui/osutils/macutils/AppKitImpl.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -139,6 +139,7 @@ - (bool) isDarkMode
</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,6 +147,7 @@ - (bool) isStatusBarDark
</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;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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;'>-@@ -176,6 +178,7 @@ - (bool) enableAccessibility
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (bool) enableScreenRecording
</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.15, *)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Request screen recording permission on macOS 10.15+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // This is necessary to get the current window title
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -193,6 +196,7 @@ - (bool) enableScreenRecording
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NO;
</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 YES;
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 202b05d81076e34a0d1938851e6187555f59cb96 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: tenzap <fabstz-it@yahoo.fr>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Thu, 11 Nov 2021 08:58:49 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 2/6] fix compilation on Qt not having
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QOperatingSystemVersion::MacOSBigSur
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The code uses 'QOperatingSystemVersion::MacOSBigSur' which doesn't exist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-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:#ffe0e0;'>-On older macos systems like El Capitan the last supported
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version of Qt is 5.11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This will fix compilation issue on such older systems and on systems
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-running with Qt not supporting QOperatingSystemVersion::MacOSBigSur
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Compilation error was:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-error: no member named 'MacOSBigSur' in 'QOperatingSystemVersion'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/gui/styles/base/BaseStyle.cpp | 8 ++++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 8 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/gui/styles/base/BaseStyle.cpp b/src/gui/styles/base/BaseStyle.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0068943b43..ec3fd9b8ac 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gui/styles/base/BaseStyle.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gui/styles/base/BaseStyle.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -41,8 +41,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef Q_OS_MACOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QMainWindow>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QOperatingSystemVersion>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "gui/Icons.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -279,16 +281,22 @@ namespace Phantom
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef Q_OS_MACOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QColor tabBarBase(const QPalette& pal)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#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:#ffe0e0;'>-+ || QT_VERSION >= QT_VERSION_CHECK(5, 15, 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (QOperatingSystemVersion::current() >= QOperatingSystemVersion::MacOSBigSur) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return hack_isLightPalette(pal) ? QRgb(0xD4D4D4) : QRgb(0x2A2A2A);
</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 hack_isLightPalette(pal) ? QRgb(0xDD1D1D1) : QRgb(0x252525);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QColor tabBarBaseInactive(const QPalette& pal)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#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:#ffe0e0;'>-+ || QT_VERSION >= QT_VERSION_CHECK(5, 15, 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (QOperatingSystemVersion::current() >= QOperatingSystemVersion::MacOSBigSur) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return hack_isLightPalette(pal) ? QRgb(0xF5F5F5) : QRgb(0x2D2D2D);
</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 hack_isLightPalette(pal) ? QRgb(0xF4F4F4) : QRgb(0x282828);
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 15bd8e3b22be3040b5f44d83dfeb553c7640b8c4 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: tenzap <fabstz-it@yahoo.fr>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sun, 14 Nov 2021 10:13:39 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 3/6] Fix compilation when osx <= 10.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* 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:#ffe0e0;'>- 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:#ffe0e0;'>-error: property 'button' not found on object of type 'NSStatusItem *'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSString* appearance = [dummy.button.effectiveAppearance.name lowercaseString];
</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;'>- src/gui/osutils/macutils/AppKitImpl.mm | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/gui/osutils/macutils/AppKitImpl.mm b/src/gui/osutils/macutils/AppKitImpl.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index ddbe2ad5b9..52d328e241 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gui/osutils/macutils/AppKitImpl.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gui/osutils/macutils/AppKitImpl.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -139,7 +139,7 @@ - (bool) isDarkMode
</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 __clang_major__ >= 9 && MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 8b0027dd1ed1243754ea77f3e6b0b2c3b65a0db1 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: tenzap <fabstz-it@yahoo.fr>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sun, 14 Nov 2021 14:47:50 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 4/6] Fix compilation when osx <= 10.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* AppKitImpl.mm: AXIsProcessTrustedWithOptions exists from 10.9 onwards
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-error: use of undeclared identifier 'kAXTrustedCheckOptionPrompt'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-error: use of undeclared identifier 'AXIsProcessTrustedWithOptions'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/gui/osutils/macutils/AppKitImpl.mm | 12 +++++++++---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 9 insertions(+), 3 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/gui/osutils/macutils/AppKitImpl.mm b/src/gui/osutils/macutils/AppKitImpl.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 52d328e241..77450b1636 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gui/osutils/macutils/AppKitImpl.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gui/osutils/macutils/AppKitImpl.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -168,9 +168,15 @@ - (void) userSwitchHandler:(NSNotification*) notification
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (bool) enableAccessibility
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- // Request accessibility permissions for Auto-Type type on behalf of the user
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NSDictionary* opts = @{static_cast<id>(kAXTrustedCheckOptionPrompt): @YES};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return AXIsProcessTrustedWithOptions(static_cast<CFDictionaryRef>(opts));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if __clang_major__ >= 9 && MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (@available(macOS 10.9, *)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Request accessibility permissions for Auto-Type type on behalf of the user
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSDictionary* opts = @{static_cast<id>(kAXTrustedCheckOptionPrompt): @YES};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return AXIsProcessTrustedWithOptions(static_cast<CFDictionaryRef>(opts));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return YES;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</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;'>- //
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 57dfd7e603a693603dd1439afcd0308187f2aaf2 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: tenzap <fabstz-it@yahoo.fr>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sun, 14 Nov 2021 15:40:41 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 5/6] Fix compilation when osx <= 10.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* MacUtils.cpp: CoreGraphics exists from 10.8 onwards only, capslock detection feature
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- would have to be implemented on OSX <= 10.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* AppKitImpl.mm: CGDisplayStreamRef exists from 10.8 onwards only. It is used for a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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:#ffe0e0;'>- when compiling on <= 10.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-error: unknown type name 'CGDisplayStreamRef'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* 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:#ffe0e0;'>-error: expected method to read dictionary element not found on object of type 'NSDictionary *'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSRunningApplication* app = userInfo[NSWorkspaceApplicationKey];
</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;'>- src/gui/osutils/macutils/AppKitImpl.mm | 4 ++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/gui/osutils/macutils/MacUtils.cpp | 7 +++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2 files changed, 9 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/gui/osutils/macutils/AppKitImpl.mm b/src/gui/osutils/macutils/AppKitImpl.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 77450b1636..b3ee9fc5d9 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gui/osutils/macutils/AppKitImpl.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gui/osutils/macutils/AppKitImpl.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -60,7 +60,7 @@ - (id) initWithObject:(AppKit*)appkit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (void) didDeactivateApplicationObserver:(NSNotification*) notification
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSDictionary* userInfo = notification.userInfo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NSRunningApplication* app = userInfo[NSWorkspaceApplicationKey];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSRunningApplication* app = [userInfo objectForKey:NSWorkspaceApplicationKey];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (app.processIdentifier != [self ownProcessId]) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self.lastActiveApplication = app;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -184,7 +184,7 @@ - (bool) enableAccessibility
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (bool) enableScreenRecording
</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 __clang_major__ >= 9 && MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (@available(macOS 10.15, *)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Request screen recording permission on macOS 10.15+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // This is necessary to get the current window title
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/gui/osutils/macutils/MacUtils.cpp b/src/gui/osutils/macutils/MacUtils.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 6e4b478bfc..5b47516034 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gui/osutils/macutils/MacUtils.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gui/osutils/macutils/MacUtils.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26,7 +26,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QWindow>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <ApplicationServices/ApplicationServices.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <CoreGraphics/CGEventSource.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define INVALID_KEYCODE 0xFFFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -138,7 +141,11 @@ void MacUtils::setLaunchAtStartup(bool enable)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool MacUtils::isCapslockEnabled()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return (CGEventSourceFlagsState(kCGEventSourceStateHIDSystemState) & kCGEventFlagMaskAlphaShift) != 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</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;'>- /**
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 6b51d7296a75e67865e726d1b29eb1b97ef4df53 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: tenzap <fabstz-it@yahoo.fr>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 15 Nov 2021 01:00:31 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 6/6] Fix compilation error on OS X 10.11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-src/core/Alloc.cpp:44:10: error: no type named 'free' in namespace 'std'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::free(ptr);
</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;'>-This is a regression, since it was fixed in [1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Per [2], std::free() needs #include <cstdlib>. That file is included
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-indirectly on newer systems.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-[1] https://github.com/keepassxreboot/keepassxc/commit/7c6c027d33b06eb706f93e3d178a2305d7bcfd56
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-[2] https://en.cppreference.com/w/cpp/memory/c/free
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/core/Alloc.cpp | 1 +
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 insertion(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/core/Alloc.cpp b/src/core/Alloc.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 266f2a3861..b9ae09221a 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/core/Alloc.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/core/Alloc.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -16,6 +16,7 @@
</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;'>- #include <botan/mem_ops.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <cstdlib>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(Q_OS_MACOS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <malloc/malloc.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(Q_OS_FREEBSD)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From f024f18c71dd6f285d5106ded3dbeca7b648d133 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: tenzap <fabstz-it@yahoo.fr>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 22 Nov 2021 09:25:12 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] fix compilation on older macs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-These methods are only available from macOS 10.15
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - kSecAccessControlWatch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - LAPolicy.deviceOwnerAuthenticationWithBiometricsOrWatch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/touchid/TouchID.mm | 18 ++++++++++++++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 18 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/touchid/TouchID.mm b/src/touchid/TouchID.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index a2cefecf..283c33ed 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/touchid/TouchID.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/touchid/TouchID.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -95,18 +95,24 @@ bool TouchID::storeKey(const QString& databasePath, const QByteArray& passwordKe
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // prepare adding secure entry to the macOS KeyChain
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFErrorRef error = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SecAccessControlRef sacObject;
</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.15, *)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 101500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // kSecAccessControlWatch is only available for macOS 10.15 and later
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sacObject = SecAccessControlCreateWithFlags(kCFAllocatorDefault,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- kSecAttrAccessibleWhenUnlockedThisDeviceOnly,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- kSecAccessControlOr | kSecAccessControlBiometryCurrentSet | kSecAccessControlWatch,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- &error);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sacObject = SecAccessControlCreateWithFlags(kCFAllocatorDefault,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- kSecAttrAccessibleWhenUnlockedThisDeviceOnly,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- kSecAccessControlTouchIDCurrentSet, // depr: kSecAccessControlBiometryCurrentSet,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- &error);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if __clang_major__ >= 9
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (sacObject == NULL || error != NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -234,11 +240,17 @@ bool TouchID::isAvailable()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LAContext* context = [[LAContext alloc] init];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LAPolicy policyCode;
</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.15, *)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 101500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- policyCode = LAPolicyDeviceOwnerAuthenticationWithBiometricsOrWatch;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- policyCode = LAPolicyDeviceOwnerAuthenticationWithBiometrics;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if __clang_major__ >= 9
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool canAuthenticate = [context canEvaluatePolicy:policyCode error:nil];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [context release];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -274,11 +286,17 @@ bool TouchID::authenticate(const QString& message) const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSString* authMessage = msg.toNSString(); // autoreleased
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LAPolicy policyCode;
</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.15, *)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 101500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- policyCode = LAPolicyDeviceOwnerAuthenticationWithBiometricsOrWatch;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- policyCode = LAPolicyDeviceOwnerAuthenticationWithBiometrics;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if __clang_major__ >= 9
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [context evaluatePolicy:policyCode
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- localizedReason:authMessage reply:^(BOOL success, NSError* error) {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC/files/patch-sized_deallocation.diff b/security/KeePassXC/files/patch-sized_deallocation.diff
</span>deleted file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index 39edbb8eb9e..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/KeePassXC/files/patch-sized_deallocation.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,47 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From fef0356d0d2b1be8ba9f6d7429314478934a6d13 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: tenzap <fabstz-it@yahoo.fr>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 24 Nov 2021 19:01:00 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Enable "-fsized-deallocation" iif deallocation functions are
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- present
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-On some systems, although "-fsized-deallocation" compiler flag is there,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compilation will fail because some deallocation functions are missing.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Typically 'operator delete ( void* ptr, std::size_t sz )' is missing on some
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-macOS systems.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This will check their presence.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-On macOS we can have this case when using a compiler that supports the flag,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-while the OS doesn't have all the deallocation functions. Typically,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-::operator delete(ptr, size) appeared in macOS 10.12
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reported error was:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-error: call to unavailable function 'operator delete': introduced in macOS 10.12
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CMakeLists.txt | 13 ++++++++++++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 12 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/CMakeLists.txt b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d8d0393f0..5452dc3c5 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -314,7 +314,18 @@ endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_gcc_compiler_cflags("-std=c99")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_gcc_compiler_cxxflags("-std=c++11")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--check_add_gcc_compiler_flag("-fsized-deallocation" CXX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+check_cxx_compiler_flag("-fsized-deallocation" CXX_HAS_fsized_deallocation)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(CXX_HAS_fsized_deallocation)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # Do additional check: the deallocation functions must be there too.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(CMAKE_REQUIRED_FLAGS "-fsized-deallocation")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ check_cxx_source_compiles("#include <new>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int main() { void * ptr = nullptr; std::size_t size = 1; ::operator delete(ptr, size); }"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ HAVE_DEALLOCATION_FUNCTIONS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(HAVE_DEALLOCATION_FUNCTIONS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ check_add_gcc_compiler_flag("-fsized-deallocation" CXX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ unset(CMAKE_REQUIRED_FLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(APPLE AND CMAKE_COMPILER_IS_CLANGXX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_gcc_compiler_cxxflags("-stdlib=libc++")
</span></pre><pre style='margin:0'>
</pre>