<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/eefba82bd65d4b1a38a1be8fccebc8772dc3279b">https://github.com/macports/macports-ports/commit/eefba82bd65d4b1a38a1be8fccebc8772dc3279b</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 eefba82 qt5-qtwebkit: fix build with latest Qt version
</span>eefba82 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit eefba82bd65d4b1a38a1be8fccebc8772dc3279b
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Mar 21 10:09:59 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5-qtwebkit: fix build with latest Qt version
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> No revbump since port builds correctly or not at all.
</span>---
aqua/qt5/Portfile | 3 +++
aqua/qt5/files/patch-qtwebkit_fix_mirclient_test.diff | 15 +++++++++++++++
2 files changed, 18 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 328882d..1d1967f 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;'>@@ -1452,6 +1452,9 @@ foreach {module module_info} [array get modules] {
</span> # see https://bugs.webkit.org/show_bug.cgi?id=171612
patchfiles-append patch-qtwebkit_fix_icu.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # avoid: Project ERROR: Could not find feature mirclient.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtwebkit_fix_mirclient_test.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # qtwebkit uses
# glx
# libXcomposite
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtwebkit_fix_mirclient_test.diff b/aqua/qt5/files/patch-qtwebkit_fix_mirclient_test.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..fe12a39
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-qtwebkit_fix_mirclient_test.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Tools/qmake/mkspecs/features/configure.prf.orig 2017-06-16 05:46:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Tools/qmake/mkspecs/features/configure.prf 2020-03-21 10:06:53.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -130,9 +130,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ addReasonForSkippingBuild("Build not supported on Android.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QT_FOR_CONFIG += gui-private
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- production_build:qtConfig(mirclient) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- addReasonForSkippingBuild("Build not supported on Ubuntu Touch.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #production_build:qtConfig(mirclient) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # addReasonForSkippingBuild("Build not supported on Ubuntu Touch.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !gnu_thin_archives:!win32-msvc2013:!mingw:qtConfig(static) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ addReasonForSkippingBuild("QtWebKit cannot be built as a static library on this platform. Check your configuration in qtbase/config.summary.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span></pre><pre style='margin:0'>
</pre>