<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/f509018fe5ffe19fca5346d3f0b201c832292687">https://github.com/macports/macports-ports/commit/f509018fe5ffe19fca5346d3f0b201c832292687</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 f509018fe5f qt6: Add macdeployqt patch
</span>f509018fe5f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f509018fe5ffe19fca5346d3f0b201c832292687
</span>Author: Jonas Kvinge <jonas@jkvinge.net>
AuthorDate: Wed Sep 27 22:14:05 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> qt6: Add macdeployqt patch
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes deploying application libraries with .so extension such as glib
</span><span style='display:block; white-space:pre;color:#404040;'> gio modules, this also applies to gstreamer since macports currently
</span><span style='display:block; white-space:pre;color:#404040;'> uses an older version of gstreamer which uses .so extensions for
</span><span style='display:block; white-space:pre;color:#404040;'> plugins.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See https://codereview.qt-project.org/c/qt/qtbase/+/507393
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Co-Authored-By: Christopher Chavez <chrischavez@gmx.us>
</span>---
aqua/qt6/Portfile | 9 +++++++-
aqua/qt6/files/patch-qtbase-macdeployqt.diff | 33 ++++++++++++++++++++++++++++
2 files changed, 41 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt6/Portfile b/aqua/qt6/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1f087af0026..04308266643 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -106,7 +106,7 @@ array set modules {
</span> "Qt OpenGL" "Qt Platform Headers" "Qt Print Support" "Qt XML"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 3"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 4"
</span> "License: "
}
qtsvg {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1030,6 +1030,13 @@ if { ${subport} eq "${name}-qtbase" || ${subport} eq "${name}-qtbase-docs" } {
</span> # see https://trac.macports.org/ticket/67980
patchfiles-append patch-qtbase-memory_resource.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Fixes deploying application libraries with .so extension.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # glib gio modules, this also applies to gstreamer since macports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # currently uses an older version of gstreamer which uses .so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # extensions for plugins.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://codereview.qt-project.org/c/qt/qtbase/+/507393
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtbase-macdeployqt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.pre_args-replace --prefix=${prefix} \
"-prefix ${qt6.dir}"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt6/files/patch-qtbase-macdeployqt.diff b/aqua/qt6/files/patch-qtbase-macdeployqt.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..82080215941
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt6/files/patch-qtbase-macdeployqt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,33 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From c66dab56b20a47062c74fa6ecf8ea438bdc07b24 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Jonas Kvinge <jonas@jkvinge.net>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 26 Sep 2023 19:02:47 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] macdeployqt: Also look for app libraries with .so extension
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+MIME-Version: 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Content-Type: text/plain; charset=utf8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Content-Transfer-Encoding: 8bit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fixes deploying glib-networking gio modules which uses .so file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+extension.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Change-Id: I6b4c4e9c3bb5745ffa33d7e83c5853a9372f1ca6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/tools/macdeployqt/shared/shared.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/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0671ebf2f32f..413f8413f69f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/tools/macdeployqt/shared/shared.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/tools/macdeployqt/shared/shared.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -435,7 +435,7 @@ QStringList findAppLibraries(const QString &appBundlePath)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QStringList result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // dylibs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QDirIterator iter(appBundlePath, QStringList() << QString::fromLatin1("*.dylib"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QDirIterator iter(appBundlePath, QStringList() << QString::fromLatin1("*.dylib") << QString::fromLatin1("*.so"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QDir::Files | QDir::NoSymLinks, QDirIterator::Subdirectories);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while (iter.hasNext()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ iter.next();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.16.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>