<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/77b30cd4dce0a8ab240e2c59af77e5fd5ae8ebce">https://github.com/macports/macports-ports/commit/77b30cd4dce0a8ab240e2c59af77e5fd5ae8ebce</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 77b30cd4dce KeePassXC-devel: fix compilation on older systems
</span>77b30cd4dce is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 77b30cd4dce0a8ab240e2c59af77e5fd5ae8ebce
</span>Author: tenzap <fabstz-it@yahoo.fr>
AuthorDate: Mon Nov 22 22:43:20 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> KeePassXC-devel: fix compilation on older systems
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Try to fix compilation issues on osx 10.7-10.11
</span>---
security/KeePassXC/Portfile | 3 ++
.../KeePassXC/files/devel/patch-FindOpenMP.diff | 15 ++++++++++
.../KeePassXC/files/devel/patch-old-mac-other.diff | 32 ++++++++++++++++++++++
3 files changed, 50 insertions(+)
<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 380be0a87ed..3828d4bb718 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;'>@@ -53,6 +53,7 @@ if {${subport} eq ${name}} {
</span> github.setup keepassxreboot keepassxc a3dc977e58470644f2acca77905285d44b22f2b8
set githash [string range ${github.version} 0 6]
version 20211122+git${githash}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span>
conflicts KeePassXC
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,6 +68,8 @@ if {${subport} eq ${name}} {
</span>
patchfiles devel/patch-no-deployqt.diff \
devel/patch-no-findpackage-path.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ devel/patch-FindOpenMP.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ devel/patch-old-mac-other.diff \
</span> devel/patch-old-mac.diff
post-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC/files/devel/patch-FindOpenMP.diff b/security/KeePassXC/files/devel/patch-FindOpenMP.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..761ca414a6f
</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/patch-FindOpenMP.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</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;'>+@@ -253,7 +253,11 @@ if(WITH_APP_BUNDLE)
</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;'>+ add_gcc_compiler_flags("-fno-common")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-check_add_gcc_compiler_flag("-fopenmp")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++find_package(OpenMP) # Add OpenMP compiler flags (trial to fix compilation on osx 10.10 with appleClang 7.0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(OpenMP_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add_gcc_compiler_cflags(${OpenMP_C_FLAGS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add_gcc_compiler_cxxflags(${OpenMP_CXX_FLAGS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_gcc_compiler_flags("-Wall -Wextra -Wundef -Wpointer-arith -Wno-long-long")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_gcc_compiler_flags("-Wformat=2 -Wmissing-format-attribute")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_gcc_compiler_flags("-fvisibility=hidden")
</span><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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8a191c4bbad
</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/patch-old-mac-other.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,32 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/core/CustomData.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/core/CustomData.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,7 +27,7 @@ const QString CustomData::BrowserLegacyKeyPrefix = QStringLiteral("Public Key: "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const QString CustomData::ExcludeFromReportsLegacy = QStringLiteral("KnownBad");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Fallback item for return by reference
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static const CustomData::CustomDataItem NULL_ITEM;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static const CustomData::CustomDataItem NULL_ITEM {}; // Fix compilation on osx 10.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CustomData::CustomData(QObject* parent)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ : ModifiableObject(parent)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/tests/TestTools.cpp b/tests/TestTools.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index edfeb503..74f06667 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tests/TestTools.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tests/TestTools.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -93,12 +93,14 @@ void TestTools::testEnvSubstitute()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void TestTools::testValidUuid()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- auto validUuid = Tools::uuidToHex(QUuid::createUuid());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static const QUuid q1 = QUuid::createUuid(); // Fix for osx 10.7-10.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ auto validUuid = Tools::uuidToHex(q1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ auto nonRfc4122Uuid = "1234567890abcdef1234567890abcdef";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ auto emptyUuid = QString();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ auto shortUuid = validUuid.left(10);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ auto longUuid = validUuid + "baddata";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- auto nonHexUuid = Tools::uuidToHex(QUuid::createUuid()).replace(0, 1, 'p');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static const QUuid q2 = QUuid::createUuid(); // Fix for osx 10.7-10.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ auto nonHexUuid = Tools::uuidToHex(q2).replace(0, 1, 'p');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QVERIFY(Tools::isValidUuid(validUuid));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Before https://github.com/keepassxreboot/keepassxc/pull/1770/, entry
</span></pre><pre style='margin:0'>
</pre>