<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/5bd98e8a7177bc87100acc80dbf424bd44d04776">https://github.com/macports/macports-ports/commit/5bd98e8a7177bc87100acc80dbf424bd44d04776</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 5bd98e8a7177bc87100acc80dbf424bd44d04776
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Fri Oct 25 04:46:48 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5-qtwebengine: ensure patch applies cleanly
</span>---
aqua/qt5/files/patch-qtwebengine_tests.diff | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtwebengine_tests.diff b/aqua/qt5/files/patch-qtwebengine_tests.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index bbe0605..9f3d3cf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-qtwebengine_tests.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-qtwebengine_tests.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@
</span> CONFIG -= qt
--- src/core/configure.json.orig 2018-11-26 21:10:38.000000000 -0700
+++ src/core/configure.json 2018-12-09 10:07:41.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -338,82 +338,82 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -339,82 +339,82 @@
</span> "features": {
"webengine-system-fontconfig": {
"label": "fontconfig",
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -106,7 +106,7 @@
</span> "output": [ "privateFeature" ]
},
"webengine-python2": {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -457,7 +457,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -458,7 +458,7 @@
</span> },
"webengine-alsa": {
"label": "Use ALSA",
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -115,7 +115,7 @@
</span> "output": [ "privateFeature" ]
},
"webengine-v8-snapshot": {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -473,17 +473,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -474,17 +474,17 @@
</span> },
"webengine-system-khr" : {
"label": "khr",
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -136,7 +136,7 @@
</span> "output": [ "privateFeature" ]
},
"webengine-winversion" : {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -493,13 +493,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -494,13 +494,13 @@
</span> },
"webengine-geolocation": {
"label": "Geolocation",
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -152,7 +152,7 @@
</span> "output": [ "privateFeature" ]
},
"webengine-pepper-plugins": {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -576,31 +576,31 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -577,31 +577,31 @@
</span> "webengine-system-libwebp": {
"label": "libwebp, libwebpmux and libwebpdemux",
"autoDetect": "config.unix",
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -189,7 +189,7 @@
</span> "output": [ "privateFeature" ]
},
"webengine-system-ninja": {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -616,12 +616,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -617,12 +617,12 @@
</span> },
"webengine-system-glibc": {
"label": "glibc",
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -204,7 +204,7 @@
</span> && libs.webengine-libxml2
&& tests.webengine-libxml2-compatible",
"output": [ "privateFeature" ]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -629,17 +629,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -630,17 +630,17 @@
</span> "webengine-system-lcms2" : {
"label": "lcms2",
"autoDetect": "features.webengine-printing-and-pdf",
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -224,8 +224,8 @@
</span> + "condition": "!config.macos && config.unix && libs.webengine-x11",
"output": [ "privateFeature" ]
},
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "webengine-sanitizer" : {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -651,7 +651,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "webengine-ozone-x11" : {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -663,7 +663,7 @@
</span> "webengine-poppler-cpp": {
"label": "poppler-cpp",
"autoDetect": "config.unix",
</pre><pre style='margin:0'>
</pre>