<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bd5ab9b5aad989e525c3e1611d64e14ec1a729d9">https://github.com/macports/macports-ports/commit/bd5ab9b5aad989e525c3e1611d64e14ec1a729d9</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 bd5ab9b5aad qt5-qtwebkit: allow build with conflicting ports active
</span>bd5ab9b5aad is described below
<span style='display:block; white-space:pre;color:#808000;'>commit bd5ab9b5aad989e525c3e1611d64e14ec1a729d9
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Mon Dec 26 14:12:28 2022 -0800
<span style='display:block; white-space:pre;color:#404040;'> qt5-qtwebkit: allow build with conflicting ports active
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> rather than force the deactivation of certain ports to build this,
</span><span style='display:block; white-space:pre;color:#404040;'> instead force the needed headers to the front of the queue.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This can work because qt5-qtwebkit does not use either libarchive
</span><span style='display:block; white-space:pre;color:#404040;'> nor libevent during the build.
</span>---
aqua/qt5/Portfile | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/Portfile b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d341b917875..b4ddd8b184c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1609,11 +1609,18 @@ foreach {module module_info} [array get modules] {
</span>
# special case
if { ${module} eq "qtwebkit" } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup conflicts_build 1.0
</span>
# Compile fails on case insensitve filesystems due to similar header files from other
# macports headers found on the include search path. In particular event.h and archive.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts_build-append libevent libarchive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt5 Portfile: Forcing qtwebkit's Archive.h and Event.h to the front of the header search path."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file mkdir "${worksrcpath}/preferredheaders"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${worksrcpath}/Source/WebCore/loader/archive/Archive.h ${worksrcpath}/preferredheaders/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${worksrcpath}/Source/WebCore/dom/Event.h ${worksrcpath}/preferredheaders/
</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;'>+ configure.cppflags-prepend -I${worksrcpath}/preferredheaders
</span>
# use MacPorts icu
#
</pre><pre style='margin:0'>
</pre>