<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/8b528349a8adb591352e8a81ec884764c7bb8e65">https://github.com/macports/macports-ports/commit/8b528349a8adb591352e8a81ec884764c7bb8e65</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 8b528349a8a qt5-qtwebkit: Fix build for Big Sur, Monterey, and Ventura with header conflicts
</span>8b528349a8a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8b528349a8adb591352e8a81ec884764c7bb8e65
</span>Author: John Hoyt <john.hoyt@gmail.com>
AuthorDate: Sun Dec 4 16:59:42 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> qt5-qtwebkit: Fix build for Big Sur, Monterey, and Ventura with header conflicts
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> On case insensitive file systems, the include search path picks up header files from
</span><span style='display:block; white-space:pre;color:#404040;'> macports before the local header files causing an error while compiling. This
</span><span style='display:block; white-space:pre;color:#404040;'> modification places flags the known conflicting ports with conflicts_build.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/63877
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/62027
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/66177
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/63566
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> [skip ci]
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> fun
</span>---
aqua/qt5/Portfile | 12 ++++++++++++
1 file changed, 12 insertions(+)
<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 2de358071ee..7a39adfb030 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,7 +1609,19 @@ foreach {module module_info} [array get modules] {
</span>
# special case
if { ${module} eq "qtwebkit" } {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup conflicts_build 1.0
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Compile fails on case insensitve filesystems due to similar header files from other
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # macports headers found on the include search path. In particular event.h and archive.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${prefix}/include/event.h]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts_build-append libevent
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Ruby 30/31 also adds an event.h header
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts_build-append ruby30
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts_build-append ruby31
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${prefix}/include/archive.h]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts_build-append libarchive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> # use MacPorts icu
#
# qmake uses pkgconfig to look for icu
</pre><pre style='margin:0'>
</pre>