<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/84a901b22d8946f3a1080dbf4b7220e84e8b8272">https://github.com/macports/macports-ports/commit/84a901b22d8946f3a1080dbf4b7220e84e8b8272</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 84a901b22d8 KeePassXC-devel: fix compilation on older systems (update 1)
</span>84a901b22d8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 84a901b22d8946f3a1080dbf4b7220e84e8b8272
</span>Author: tenzap <fabstz-it@yahoo.fr>
AuthorDate: Tue Nov 23 07:58:08 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> KeePassXC-devel: fix compilation on older systems (update 1)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * remove patch that was merged upstream + update to latest devel commit
</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 | 13 ++++---
.../KeePassXC/files/devel/patch-FindOpenMP.diff | 15 --------
.../KeePassXC/files/devel/patch-old-mac-other.diff | 42 +++++++++++-----------
3 files changed, 27 insertions(+), 43 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 3828d4bb718..335de16c776 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;'>@@ -50,16 +50,16 @@ if {${subport} eq ${name}} {
</span> patch-old-mac.diff
} else {
# devel subport
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup keepassxreboot keepassxc a3dc977e58470644f2acca77905285d44b22f2b8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup keepassxreboot keepassxc d3b28f86515df73194d1102253b739b51b1909f5
</span> set githash [string range ${github.version} 0 6]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20211122+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 20211123+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 fe1f549411cebe5f2a1366eb92d9b56c107d1e17 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e48208f3aab88b7a0a366c97f7b049bca6fce9f5f0664d636652347dbdcaf519 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 10072744
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 1d5efc1ed802520465de17a18a5f893c59c8e31a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c9f486bfc844731f0c1932488d8309bee61459597c7760c0fe2c6500c4e1891a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 10072963
</span>
gpg_verify.use_gpg_verification \
no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,7 +68,6 @@ 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:#ffe0e0;'>- devel/patch-FindOpenMP.diff \
</span> devel/patch-old-mac-other.diff \
devel/patch-old-mac.diff
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 761ca414a6f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/KeePassXC/files/devel/patch-FindOpenMP.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</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;'>-@@ -253,7 +253,11 @@ if(WITH_APP_BUNDLE)
</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;'>- add_gcc_compiler_flags("-fno-common")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--check_add_gcc_compiler_flag("-fopenmp")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+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:#ffe0e0;'>-+if(OpenMP_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ add_gcc_compiler_cflags(${OpenMP_C_FLAGS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ add_gcc_compiler_cxxflags(${OpenMP_CXX_FLAGS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_gcc_compiler_flags("-Wall -Wextra -Wundef -Wpointer-arith -Wno-long-long")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_gcc_compiler_flags("-Wformat=2 -Wmissing-format-attribute")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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><span style='display:block; white-space:pre;color:#808080;'>index 8a191c4bbad..64e90e23005 100644
</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;'>+++ b/security/KeePassXC/files/devel/patch-old-mac-other.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,31 +2,31 @@
</span> +++ src/core/CustomData.cpp
@@ -27,7 +27,7 @@ const QString CustomData::BrowserLegacyKeyPrefix = QStringLiteral("Public Key: "
const QString CustomData::ExcludeFromReportsLegacy = QStringLiteral("KnownBad");
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> // Fallback item for return by reference
-static const CustomData::CustomDataItem NULL_ITEM;
+static const CustomData::CustomDataItem NULL_ITEM {}; // Fix compilation on osx 10.11
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> CustomData::CustomData(QObject* parent)
: ModifiableObject(parent)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/tests/TestTools.cpp b/tests/TestTools.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index edfeb503..74f06667 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/core/Metadata.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/core/Metadata.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,7 +29,7 @@ const int Metadata::DefaultHistoryMaxItems = 10;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const int Metadata::DefaultHistoryMaxSize = 6 * 1024 * 1024;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Fallback icon for return by reference
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static const Metadata::CustomIconData NULL_ICON;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static const Metadata::CustomIconData NULL_ICON {}; // Fix compilation on osx 10.10 - 10.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Metadata::Metadata(QObject* parent)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ : ModifiableObject(parent)
</span> --- tests/TestTools.cpp
+++ tests/TestTools.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -93,12 +93,14 @@ void TestTools::testEnvSubstitute()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void TestTools::testValidUuid()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- auto validUuid = Tools::uuidToHex(QUuid::createUuid());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ static const QUuid q1 = QUuid::createUuid(); // Fix for osx 10.7-10.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ auto validUuid = Tools::uuidToHex(q1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- auto nonRfc4122Uuid = "1234567890abcdef1234567890abcdef";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- auto emptyUuid = QString();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- auto shortUuid = validUuid.left(10);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- auto longUuid = validUuid + "baddata";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- auto nonHexUuid = Tools::uuidToHex(QUuid::createUuid()).replace(0, 1, 'p');
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ static const QUuid q2 = QUuid::createUuid(); // Fix for osx 10.7-10.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ auto nonHexUuid = Tools::uuidToHex(q2).replace(0, 1, 'p');
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QVERIFY(Tools::isValidUuid(validUuid));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Before https://github.com/keepassxreboot/keepassxc/pull/1770/, entry
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,6 +20,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "core/Clock.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QTest>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QUuid>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QTEST_GUILESS_MAIN(TestTools)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>