<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/c3c0b5e73af2a851c3ae6ffd27aa9adc48f9ad31">https://github.com/macports/macports-ports/commit/c3c0b5e73af2a851c3ae6ffd27aa9adc48f9ad31</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 c3c0b5e73af KeepassXC-devel: fix build on macos 10.7-10.9
</span>c3c0b5e73af is described below

<span style='display:block; white-space:pre;color:#808000;'>commit c3c0b5e73af2a851c3ae6ffd27aa9adc48f9ad31
</span>Author: tenzap <fabstz-it@yahoo.fr>
AuthorDate: Tue May 2 10:29:00 2023 +0200

<span style='display:block; white-space:pre;color:#404040;'>    KeepassXC-devel: fix build on macos 10.7-10.9
</span>---
 security/KeePassXC/Portfile                        |  6 +-
 ...owFlags-instead-of-setWindowFlag-on-Qt-5..patch | 69 ++++++++++++++++++++++
 .../devel/0002-Fix-build-failure-with-Qt5.6.patch  | 38 ++++++++++++
 3 files changed, 111 insertions(+), 2 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 0844e5dd98d..e6633683138 100755
</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;'>@@ -62,7 +62,7 @@ if {${subport} eq ${name}} {
</span>     github.setup        keepassxreboot keepassxc 28e2806e077a2871dbb4f7e960febfc3653b6719
     set githash         [string range ${github.version} 0 6]
     version             20230416.git${githash}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    revision            0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    revision            1
</span> 
     conflicts           KeePassXC
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,7 +73,9 @@ if {${subport} eq ${name}} {
</span>     gpg_verify.use_gpg_verification \
                         no
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    patchfiles-append   devel/add_support_for_old_macos-2.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append   devel/add_support_for_old_macos-2.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        devel/0001-use-setWindowFlags-instead-of-setWindowFlag-on-Qt-5..patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        devel/0002-Fix-build-failure-with-Qt5.6.patch
</span> 
 }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC/files/devel/0001-use-setWindowFlags-instead-of-setWindowFlag-on-Qt-5..patch b/security/KeePassXC/files/devel/0001-use-setWindowFlags-instead-of-setWindowFlag-on-Qt-5..patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..271eb7c7bb2
</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/0001-use-setWindowFlags-instead-of-setWindowFlag-on-Qt-5..patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,69 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 1160c25898b84f5c8477c3ab08c78a24c3b48b2e Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: tenzap <fabstz-it@yahoo.fr>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 2 May 2023 10:04:37 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1/2] use setWindowFlags() instead of setWindowFlag on Qt<5.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fixes:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+src/gui/CloneDialog.cpp:32:5: error: use of undeclared identifier 'setWindowFlag'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    setWindowFlag(Qt::WindowContextHelpButtonHint, false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    ^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+void QWidget::setWindowFlag(Qt::WindowType flag, bool on = true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--> This function was introduced in Qt 5.9.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/gui/CloneDialog.cpp        | 4 ++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/gui/DatabaseOpenDialog.cpp | 4 ++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/gui/TotpSetupDialog.cpp    | 4 ++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3 files changed, 12 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/gui/CloneDialog.cpp b/src/gui/CloneDialog.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4ba5856b..72199ae5 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/gui/CloneDialog.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/gui/CloneDialog.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,7 +29,11 @@ CloneDialog::CloneDialog(DatabaseWidget* parent, Database* db, Entry* entry)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     m_ui->setupUi(this);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     window()->layout()->setSizeConstraint(QLayout::SetFixedSize);
</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;'>+     setWindowFlag(Qt::WindowContextHelpButtonHint, false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     setAttribute(Qt::WA_DeleteOnClose);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     connect(m_ui->buttonBox, SIGNAL(rejected()), SLOT(close()));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/gui/DatabaseOpenDialog.cpp b/src/gui/DatabaseOpenDialog.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index acf90504..366f7a9c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/gui/DatabaseOpenDialog.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/gui/DatabaseOpenDialog.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,7 +36,11 @@ DatabaseOpenDialog::DatabaseOpenDialog(QWidget* parent)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     setWindowTitle(tr("Unlock Database - KeePassXC"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     setWindowFlags(Qt::Dialog);
</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;'>+     setWindowFlag(Qt::WindowContextHelpButtonHint, false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef Q_OS_LINUX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     // Linux requires this to overcome some Desktop Environments (also no Quick Unlock)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/gui/TotpSetupDialog.cpp b/src/gui/TotpSetupDialog.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 875dfcfd..d33d9ce3 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/gui/TotpSetupDialog.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/gui/TotpSetupDialog.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,7 +29,11 @@ TotpSetupDialog::TotpSetupDialog(QWidget* parent, Entry* entry)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     m_ui->setupUi(this);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     setAttribute(Qt::WA_DeleteOnClose);
</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;'>+     setWindowFlag(Qt::WindowContextHelpButtonHint, false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     setFixedSize(sizeHint());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     connect(m_ui->buttonBox, SIGNAL(rejected()), SLOT(close()));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-- 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.30.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC/files/devel/0002-Fix-build-failure-with-Qt5.6.patch b/security/KeePassXC/files/devel/0002-Fix-build-failure-with-Qt5.6.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..7cda5517ce9
</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/0002-Fix-build-failure-with-Qt5.6.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,38 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 8c8a155f50a4804c658b6976082fc0aac1dd5a09 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: tenzap <fabstz-it@yahoo.fr>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 2 May 2023 10:07:43 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 2/2] Fix build failure with Qt5.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+With Qt 5.6, build fails with error below.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This is because in Qt 5.6, the 3rd argument is not optional. Starting from Qt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+5.7 the default value for the 3rd argument is nullptr, so setting it to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+nullptr.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://doc.qt.io/archives/qt-5.6/qaction.html#QAction-2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://doc.qt.io/archives/qt-5.7/qaction.html#QAction-2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Error:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+src/autotype/AutoTypeSelectDialog.cpp:330:34: error: no matching constructor for initialization of 'QAction'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    auto typeVirtualAction = new QAction(icons()->icon("auto-type"), tr("Use Virtual Keyboard"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                 ^       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/autotype/AutoTypeSelectDialog.cpp | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/autotype/AutoTypeSelectDialog.cpp b/src/autotype/AutoTypeSelectDialog.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 71542438..1e767d79 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/autotype/AutoTypeSelectDialog.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/autotype/AutoTypeSelectDialog.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -327,7 +327,7 @@ void AutoTypeSelectDialog::buildActionMenu()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     });
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(Q_OS_WIN) || defined(Q_OS_MAC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    auto typeVirtualAction = new QAction(icons()->icon("auto-type"), tr("Use Virtual Keyboard"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    auto typeVirtualAction = new QAction(icons()->icon("auto-type"), tr("Use Virtual Keyboard"), nullptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     m_actionMenu->insertAction(copyUsernameAction, typeVirtualAction);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     typeVirtualAction->setShortcut(Qt::CTRL + Qt::Key_4);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     connect(typeVirtualAction, &QAction::triggered, this, [&] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-- 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.30.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>

</pre>