<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/d1aaf0cbc77912f8eff8d9e5cc9e24f181dfeb16">https://github.com/macports/macports-ports/commit/d1aaf0cbc77912f8eff8d9e5cc9e24f181dfeb16</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 d1aaf0cbc77 qt55-qtbase-docs: needs patch-xcrun.diff
</span>d1aaf0cbc77 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d1aaf0cbc77912f8eff8d9e5cc9e24f181dfeb16
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Sun Jul 24 12:39:17 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> qt55-qtbase-docs: needs patch-xcrun.diff
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Not known if also needed for qt53-qtbase-docs,
</span><span style='display:block; white-space:pre;color:#404040;'> but apply anyway for consistency
</span><span style='display:block; white-space:pre;color:#404040;'> Put URL to ticket in comments
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/52200
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> [skip ci]
</span>---
aqua/qt53/Portfile | 9 +++++++--
aqua/qt55/Portfile | 8 ++++++--
2 files changed, 13 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt53/Portfile b/aqua/qt53/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fca32758c63..21827d66e48 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt53/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt53/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -692,7 +692,7 @@ foreach {module module_info} [array get modules] {
</span> # this qt55 patch does not apply on qt53 and does not appear to be needed
# patchfiles-append patch-machtest.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # see #52200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/52200
</span> # see https://codereview.qt-project.org/#/c/164673/
patchfiles-append patch-xcrun.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1446,6 +1446,11 @@ foreach {module module_info} [array get modules] {
</span> qt5.debug_variant no
# special cases
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${module} eq "qtbase" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/52200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://codereview.qt-project.org/#/c/164673/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-xcrun.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> if { ${module} eq "qttools" || ${module} eq "qtbase" } {
post-extract {
# generated makefiles assume full Qt was built locally
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1562,7 +1567,7 @@ foreach {sql_names sql_info} [array get sql_plugins] {
</span> # see https://trac.macports.org/ticket/53248
qt5.top_level ${worksrcpath}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # see #52200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/52200
</span> # see https://codereview.qt-project.org/#/c/164673/
patchfiles-append patch-xcrun.diff
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt55/Portfile b/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f87c9dff76d..640ea60a19a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -742,7 +742,7 @@ foreach {module module_info} [array get modules] {
</span> # When testing, ensure that a universal object file is not inadvertently created.
patchfiles-append patch-machtest.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # see #52200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/52200
</span> # see https://codereview.qt-project.org/#/c/164673/
patchfiles-append patch-xcrun.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1506,6 +1506,10 @@ foreach {module module_info} [array get modules] {
</span> xinstall -d -m 0755 ${worksrcpath}/Source/WebCore/generated
touch ${worksrcpath}/Source/WebCore/generated/InspectorBackendCommands.qrc
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif { ${module} eq "qtbase" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/52200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://codereview.qt-project.org/#/c/164673/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-xcrun.diff
</span> }
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1592,7 +1596,7 @@ foreach {sql_names sql_info} [array get sql_plugins] {
</span> # see https://trac.macports.org/ticket/53248
qt5.top_level ${worksrcpath}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # see #52200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/52200
</span> # see https://codereview.qt-project.org/#/c/164673/
patchfiles-append patch-xcrun.diff
}
</pre><pre style='margin:0'>
</pre>