<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/0d43191a007bf4439d0e56ac98bc47da7e764a1c">https://github.com/macports/macports-ports/commit/0d43191a007bf4439d0e56ac98bc47da7e764a1c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0d43191a007bf4439d0e56ac98bc47da7e764a1c
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Mon Feb 11 09:43:42 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5: update version 5.12.0->5.12.1
</span>---
aqua/qt5/Portfile | 316 +++++++++++----------
aqua/qt5/files/patch-find_rez.diff | 2 +-
aqua/qt5/files/patch-pc_files.diff | 2 +-
aqua/qt5/files/patch-qtwebengine_tests.diff | 16 +-
aqua/qt5/files/patch-qtwebkit_opengl_location.diff | 15 +
5 files changed, 189 insertions(+), 162 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 85cf065..41e3f27 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;'>@@ -13,7 +13,7 @@ license {LGPL-3 GPL-3 OpenSSLException}
</span>
homepage https://www.qt.io
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 5.12.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 5.12.1
</span> set middle_name everywhere
if { ${subport} eq "${name}-qtwebkit" ||
${subport} eq "${name}-qtwebkit-examples" ||
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -131,9 +131,9 @@ foreach {qt_test_name qt_test_info} [array get available_qt_versions] {
</span> array set modules {
qt3d {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0069c65bdd3b55ce4a3f44be0ce94cea8cd80da3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a12adc9c14ffa18ff5c4951efb41914d4840a0c2a88486eb8d39a4833e4631da
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 84949704
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1cced46e7d22ba60bf036c85a5a96f42c3d85751
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ce51ed3fe403672db2c874cbaa60f3a139ec817abd1270dc5e4255d35fd64bf1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 84953112
</span> }
""
"port:assimp"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -141,14 +141,14 @@ array set modules {
</span> {"Qt 3D"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtbase {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 83fbdcf4cfa783c7e1be09fee1a439c26d006a70
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5e03221d780e121aabd734896aab8f331e5d8c9d9b54f1eb04907d0818eaeecb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 48288896
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a67136b24d1cb2c8e1b44279bd6209b46d5cddd6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 533078ce02678988576e224cb3844979907950cf83e0fda3364bc1d5701c9049
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 48239912
</span> }
""
"port:zlib port:libpng port:jpeg port:freetype path:bin/dbus-daemon:dbus port:tiff port:libmng path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre2 port:harfbuzz"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -156,14 +156,14 @@ array set modules {
</span> {"Qt Core" "Qt GUI" "Qt Network" "Qt SQL" "Qt Test" "Qt Widgets" "Qt Concurrent" "Qt D-Bus" "Qt OpenGL" "Qt Platform Headers" "Qt Print Support" "Qt XML"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtcanvas3d {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8c1414770b3479c2463840505a8bcfc54c852cc2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- b21b9f01c498d0e51e3db4c54344147fb901c0f40ec8b3135609905b55f9c128
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 10914876
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2ecd222a7405477c038a8486141d86b4ffd57565
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c7c940a06062b1e5078fd697e1da0cdaeaa315b6fcea81de15308a9d3f8ac254
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10915000
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -171,14 +171,14 @@ array set modules {
</span> {"Qt Canvas 3D"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtcharts {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- f2ab6d30427152f8e9e630b8de52494b757e7a67
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 9cd71c4a4c10611083ce8f16992c59666d51b5275cc1a79f324ee18579ced450
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4242288
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f26d4e5dbe89626786fa3df47e7f7db638eaf81f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 142eb2b87a0bc2220a9f12e56bf390b846968c201d135b1a2a2338545692fdc0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4242664
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -186,14 +186,14 @@ array set modules {
</span> {"Qt Charts"}
"GPLv3 license only"
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: {GPL-3 OpenSSLException}"
}
qtconnectivity {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 246d95a80f5d1b9fcb076ceaa63c2c9ed8449e4c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8ebca1ba859ebb5b0e8e6fffff1f8131dd84f9e44448df6ac58c8be32b5122a4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2740124
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 97d89fd02fa5e0c38e063c986aa0bd54997629ce
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0edd0bd784a71809540dc23d24a842bd88dee2cdb5394b69c9e704f7e1ac8d6c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2748888
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -201,14 +201,14 @@ array set modules {
</span> {"Qt Bluetooth" "Qt NFC"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtdatavis3d {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 19c06fa3dce52d179f68fefcd498a798b7d1d946
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4eda7e352b5d7d58a19611f76a906e952f6a86451740a80a3759b8871090f433
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5201308
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2e4884973e5ee54cca353d1ece91f4c261409668
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8ebb94459e5eb5b978dcdac1d2d6503a7763d790ce74b03f78388beb480436a0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5199768
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -216,14 +216,14 @@ array set modules {
</span> {"Qt Data Visualization"}
"GPLv3 license only"
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: {GPL-3 OpenSSLException}"
}
qtdeclarative {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 9cb53067daaa9d02e482b62abb6b3a7fbfacc184
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4ffd58102b5714ae058f91cc31511f1c928978f77f01652beb9ce2352a4c227b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 20436712
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8cc1c262de95f256e14eb076a81b4a74884b968c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a384a734d94f28a98aa74e076d50fa6b9724af83526feb6c371945545d8cb409
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 20486428
</span> }
"port:python27"
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -231,14 +231,14 @@ array set modules {
</span> {"Qt QML" "Qt Quick" "Qt Quick Layouts" "Qt Quick Widgets"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtdoc {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 844a2f27c363fbdb6e5f247da7d4b8cdebe55916
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 306576d717ffd37eafe10914dfa5a51301f3d5c701ef2416cc36b16a83520ccd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5588676
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d8f24906634a4b6bd88e0b6aa89510badce4003d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7d4204e6ef5d9307975337cd18ffdc0b04e2d851c368eb36a48b9331377deadd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5588248
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -246,14 +246,14 @@ array set modules {
</span> {"Qt Reference Documentation"}
"requires all documentation"
"variant overrides: ~examples ~tests ~debug noarch ~docs"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtgamepad {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ff97dfccae48b620824668501af9a91629c034ba
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4c1900b9917dc18584b2287cd7382f0668d71237ef8e71e3feb4d457c2b56091
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 385484
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 81a6b27628922ccb44d98540afcaa1fe6fd7d1c4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 717c11f8fba4e23c0096fcf3161d43223956038e866fcd7a18d2255755415d62
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 385492
</span> }
""
"port:libsdl2"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -261,14 +261,14 @@ array set modules {
</span> {"Qt Gamepad"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtgraphicaleffects {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- aa6e1c8b9059f9edee311d617aadf187e5b9105e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 81058fb12d4dd019bed6bb196a13ea5d308a390d72a1468da11171f8c3003455
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 14270812
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8ec322c3d213197c069ef003e56ac3c4835211f4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2e63abf6b02b86461b73b317eba00b6721601a9469c22da28e3f4ea1d5df68d7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 14270888
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -276,14 +276,14 @@ array set modules {
</span> {"Qt Graphical Effects"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtimageformats {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- c5552608b6f482f9b8e2ced76e3d3cf58f82bacb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5f907de96d3db6276816f321b7e11cba7beb1fcc81bcb3f1729cde3b7599732e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1774820
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cdee8cf1677615a28810404b5acc55ec187fd28a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0425f35dbcc83cd5840e2d3a73ed4c57c426af9d6ac7b9fe3a40d23560653421
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1782660
</span> }
""
"port:jasper port:libmng port:tiff port:webp"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -291,14 +291,14 @@ array set modules {
</span> {"Qt Image Formats"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtlocation {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ec71fed7b1e254906503e2986256382c1547d576
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- b0a3134df3a00f6045405d3c12e0ea3ae7e640feaf38e238873df85424674449
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5898856
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ efa25d82e1abd7fbdefdd4dd97ba0eaa125f44c8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8b922373e6eefd1b0e2a993dbf3d0b3f3df777bc720d40cad3ccb46e1936bc50
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5902336
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -306,14 +306,14 @@ array set modules {
</span> {"Qt Location" "Qt Positioning"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtmacextras {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 75efbe705582ba2926197f1c49eb11a93452b37e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d90a7ba25543503ed40f6c248780b6859254536735d8f87fe5598f688c9cb003
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 68592
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ de62f56492cc4131fa443b9d6ff32d8154008d70
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ af6449c052aea19d100deb2b7f558835b8b88862d6bfdae3c510b60c80bc64c3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 68680
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -321,14 +321,14 @@ array set modules {
</span> {"Qt Mac Extras"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtmultimedia {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- e56e7d38cb9ca5f3b429ff9451162b00b1b7027c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5c4b0cb9c08c57ce1aad3aee267c6f6270d254addfb2a6dd363a272e98e926a9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3716764
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5575863b5e3d4306b1d40e16cc0631ad7212f158
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9c5ba11225f57d3a8124f109514443e290a9eb94e063a5b1f78e63edfb5f0b18
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3740192
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -336,14 +336,14 @@ array set modules {
</span> {"Qt Multimedia" "Qt Multimedia Widgets"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtnetworkauth {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 87f8de8c34beaa08303f6dbb7812976e33c231ed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 41111946f40ee110b789f365a398c3f27bc4fd6c0f9a8b1a72b79c81543e0775
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 139012
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f35ab0fd1221c46e411e0a558f984ca97a2a3a65
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 090fbb6be35b2f2edf7cc4cb32f0f9c27a9a66defa06f6d23e1397836e31d44c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 139024
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -351,14 +351,14 @@ array set modules {
</span> {"Qt Network Authorization"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtpurchasing {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 4615c4941c32602a707f2fec8e576493421dca58
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d90bed1ec3e937255246873831f035684723f54fe91124ed7239ec43c46d60da
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 207680
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1b569e12584f6e0b35837cb733f83fec6a72a93f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 80485095ab64f48951b27795c72e7ed7c13e1ab3db2670c061548834584b1d19
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 207812
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -366,14 +366,14 @@ array set modules {
</span> {"Qt Purchasing"}
"in-app purchases is of limited value on desktop"
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: {GPL-3 OpenSSLException}"
}
qtquickcontrols {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- b95370caa1f46b337b994ce03158e5e31045835f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2bfb63240beed6926be429310e91b33df836fe38bcaf9de6883d5e781511cd73
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 6054956
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7c3398a7d71f104124c85ac4af0fb4c8c0e8b505
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 15164b00921352b5145a4fc3be0015b8521138a0cb1ecfb9811f39fd35ecd62c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6055248
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -381,14 +381,14 @@ array set modules {
</span> {"Qt Quick Controls" "Qt Quick Dialogs" "Qt Quick Extras"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtquickcontrols2 {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 5e20609dc4220eb59ce139899fe6ec1825ab1892
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 89777e2ee89a08d203e0e394be0c47dc52008ea58506f4b3bdf1a696c5907dc6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 9279804
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 232ac2b6d0ad77550e4741038b921aed70a5d9fd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ caa47b6d771b11c65d595fdd0f0942c3d78cda2884d318e3b1da8ec67155a8e7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9289452
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -396,14 +396,14 @@ array set modules {
</span> {"Qt Quick Controls 2"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtremoteobjects {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 1962e22d8cb2ed851780e04b92d1aa497b70d4ca
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0940d0a4a961b64f38c52a2e5638c2b3341fe46bd6bd88d1c638707f42159d5f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 335472
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2b4b25af3b7499992529faa3ae7711af26a3c7f5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f18cfde8d060d76f5f56ffb701a27f6e0c39b5abdae3dbac933dbb41d191f740
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 335956
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -411,14 +411,14 @@ array set modules {
</span> {"Qt Remote Objects"}
"technology preview module"
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtscript {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- a22f566b64a81a03ef898a4a49fa095837af82d5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 97fe1a22e5d0e89d3850546c0771fe41707d4c40062dc16fae8e21bf6f8cffa8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2674336
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ff9c3d7523d39f0fb224997eafa0bd46dc0f3061
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e5c158fb85799404d20d1ec5dd33a25d5f5736807e1008ce626f666a52c80624
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2674208
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -426,14 +426,14 @@ array set modules {
</span> {"Qt Script" "Qt Script Tools"}
"deprecated in favor QJS* in Qt QML"
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtscxml {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 1046d997677970c74498e8d6de126d2da0796831
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dc6ece52669976836844b0d9bcf4910bca7b5d2c446c6755d7b9f79bfa1add6b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 433896
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5a186ea9f32c3819aa1b19d5f076b0168c66a20a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 59a2aa1000fe03b0a3eff6fddd21f782e305408fcdd7af1f564a382331cb20b7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 434112
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -441,14 +441,14 @@ array set modules {
</span> {"Qt SCXML"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtsensors {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- a21cb60c341403c548eebcdd3d804c23a26d367c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- c53132847a1f70d5a4c5fe689a9943d8afae3f3648bf5b0d824015093addc5a6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2031092
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2d999de6317630a01bbee2cc925a8c55829e7860
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ebc8b4bcfacf10c3bea3f400da7bf3fc7f44f90fa9eb0320c3b87f17307a63e4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2036116
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -456,14 +456,14 @@ array set modules {
</span> {"Qt Sensors"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtserialbus {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 41ca8c4e617ff6f0254696480cc8532c01b9d038
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 6b9286c9762341a48c636da62fecb7b76168a4634e44508b42c19eb0058a359a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 324680
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b1f1d968fd8d1768faeba5d2d49c58050ccdfd57
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 97f0c690c77b0e19a8c90e376ecc94d59b21adb20a90179700d1c514a4c50d74
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 328608
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -471,14 +471,14 @@ array set modules {
</span> {"Qt Serial Bus"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtserialport {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ffbc581bb9ff99f3b576b4c10ae8010659c30e8d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 59d4005695089c6b50fc5123094125d9224c1715655128640158a2404075a9bb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 298892
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ af209e1e2d559a48648accb314c9b6b72faab015
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 243b2502283c45f5163d68c3f23c787d46eb0e3ba58f3d9a0560dc7968a6ce19
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 302656
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -486,14 +486,14 @@ array set modules {
</span> {"Qt Serial Port"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtspeech {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- e5d5104b239e7faf47b25205fd1ed1d98f857139
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1939a2ece528b115e4682dba7fa7138c132c62bb88db7d1f3552c543a1e2a4fb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 99696
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2ff8978e12c60842596e38bf40f00feffb5dd189
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 147524ba6f97c76784beb315ee939614b7a3b4eb1a6417cc0beea662cf0d9121
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 99716
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -501,14 +501,14 @@ array set modules {
</span> {"Qt Speech"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtsvg {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- f1bd9553d623cdc9e5996c6904491d439a24ac1a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ebe68d8ad73b6b8d8eabac81edcbf395838caf4d498d6b047c74b57341c3fbce
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1845656
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6b329ce254fac1c670013d7aeb882bc52e3697e7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5bc1f744d32c06f5aa4eff33759568106a995ce21fa1326a247dfa5f783f63c8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1859248
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -516,14 +516,14 @@ array set modules {
</span> {"Qt SVG"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qttools {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 3b2f2f598d1b5af1e4ecb8a0fed1ec59e1f25274
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 574ce34b6e5bcd5dce4020a3947730f3c2223eee65d0396a311099223364dac3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 9775520
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5312790ba03218c0369477d5d0a20b15a6678523
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ab1da4fbd84a9d3873e4ed212a0ae614c6059b8e7dca2f0a599a6f7e61f6cbf3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9818060
</span> }
""
"port:clang-7.0"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -531,14 +531,14 @@ array set modules {
</span> {"Qt Designer" "Qt Help" "Qt UI Tools"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qttranslations {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- d6cba02e157d58e7ab5312ac03b6246b828abba6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5b4f186e0b96703041319b5b131393b6aa829ea74e067697ede548d936327508
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1424236
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4c2ce877e0ab5653ff08a7fdc3f0bdf35219d452
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7443d70d8572321e810c52fbdd096666e61510e07e17437f1910f0b800cca6a7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1372812
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -546,14 +546,14 @@ array set modules {
</span> {"translation files"}
""
"variant overrides: ~examples ~tests ~debug noarch ~docs"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtvirtualkeyboard {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 1777a7030f346a18e0cdda2439f7d8a5011f3e4b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- db93b89ba13ec1a688850f456be9f10037033cebf7b4deb151ed9f5322d0d6da
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 10913328
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8b58d9d6b79b6ac09de14e00ddfaf30686f0b368
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a9e3ed4786d603314144c7ad29a9fdeb6e5c3f2ea5a27f6545cc9777244cd683
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10917704
</span> }
""
"port:hunspell"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -561,14 +561,14 @@ array set modules {
</span> {"Qt Virtual Keyboard"}
"GPLv3 license only"
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: {GPL-3 OpenSSLException}"
}
qtwebchannel {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 3540a2a9ce6c6637623c834b2e74b2cd3c0cf1d9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 851af30ab951c7543c82640f46686227b244331ebf9235f963edcb7e5a184bf0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 177328
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c781e6ebe47958140ab1e7bbdf12ba42ff47e4c6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 40c3e74347c67a9864d0d54f14120555860e4ce529746407325b3cd6e9aeb5bf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 182060
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -576,14 +576,14 @@ array set modules {
</span> {"Qt WebChannel"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtwebengine {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- e168bc2432543be171b8b78d3bf9ef708d2d479d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bd581e390a30e0f74d41b0e3334b3cf612dd4af23de36a3bf5931d5b4453687c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 252044400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c7eac331aab9c668b70c6ad112ca8fcea4d79f64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 43e91e06bc4a60ef0f91d15ae06425cf9c6b4f7dafe960259a5b013c687c3bd0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 249191844
</span> }
"port:python27 port:py27-ply port:ninja port:gperf port:bison port:flex"
"port:fontconfig port:dbus port:harfbuzz path:lib/pkgconfig/glib-2.0.pc:glib2 port:zlib port:minizip port:libevent port:libxml2 port:jsoncpp port:protobuf3-cpp port:poppler port:pulseaudio port:icu path:lib/libavcodec.dylib:ffmpeg port:libopus port:webp port:libpng port:lcms2 port:freetype port:re2 port:snappy"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -591,14 +591,14 @@ array set modules {
</span> {"Qt WebEngine"}
"very large and relatively new"
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtwebglplugin {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ffbb4987aa10a938c1dd5438b6cd87424a8f3ba7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 65223ad13a46e38343a621459a60ea25bc9e74d6549bf62a2d54d839c66b652e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 73260
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3bb2b878d3b50c2e1c56a2c483b15caa047fd24d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7ca4f9b6fb8f893fff50b586a4dfb9d6519c33dfaaab6747b462c143ed32a0de
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 73304
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -606,7 +606,7 @@ array set modules {
</span> {"QPA plugin for running an application via a browser using streamed WebGL commands"}
"technology preview module; GPLv3 license only"
"variant overrides: ~docs ~examples"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: {GPL-3 OpenSSLException}"
}
qtwebkit {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -641,9 +641,9 @@ array set modules {
</span> }
qtwebsockets {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- a23233f837eabb4710c2827b204c8e587f1b0fe3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 444da1c1d32910738a01b8251c1ccc3ffe4df148f125bb4af532b247ad74fc3f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 230980
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f4417e33765868cfc5a65743e138899166c517e4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2fd0627916d817599c5f855a97156113ed3625b90b350603be6f668762abfc79
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 235360
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -651,14 +651,14 @@ array set modules {
</span> {"Qt WebSockets"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtwebview {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ef9a5ac5956ae4ff04405869ad7688668a881295
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- b7a82cc4edf9361d64155f0ec7848b37c947e0cfe9a9f03efe8af515c6326185
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 130676
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 31520ddbf5cf505f89eafe2fc368ff6ebc00aff5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 092624ba45913f6c90f7311c96bb5c3e97f2c2b427d834d3669434f97234bc97
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 130712
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -666,14 +666,14 @@ array set modules {
</span> {"Qt WebView"}
"new in 5.6.0; requires qtwebengine"
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtxmlpatterns {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 9b29676bec7f53cf3146b098967e89eff8eeb666
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f36279bcafb8052a0b60edd473e1d341b4733a43eb26239848b4382303679375
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1389248
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f472f3ea7f6c5cf7e4911adde956bd889e201fa5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 76988ca9a7a184b9013b8a5864dad150e4603890c7eb7aecad4baad071802ecb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1389136
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -681,7 +681,7 @@ array set modules {
</span> {"Qt XML Patterns"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -699,7 +699,7 @@ array set modules {
</span> #
###############################################################################
array set sql_plugins {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- {sqlite SQLite "revision 1"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {sqlite SQLite "revision 0"} {
</span> {
"sqlite3"
"port:sqlite3"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -709,7 +709,7 @@ array set sql_plugins {
</span> ""
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- {psql PostgreSQL "revision 1"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {psql PostgreSQL "revision 0"} {
</span> {
"postgresql96"
"port:postgresql96"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -743,7 +743,7 @@ array set sql_plugins {
</span> ""
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- {mysql MySQL "revision 1"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {mysql MySQL "revision 0"} {
</span> {
"mariadb55"
"port:mariadb"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1017,6 +1017,22 @@ foreach {module module_info} [array get modules] {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://bugreports.qt.io/browse/QTBUG-72903
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach del {QMAKE_LIBS_OPENGL QMAKE_INCDIR_OPENGL} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "/${del}\ =/d" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/src/gui/qtgui-config.pri
</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;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach del {QMAKE_LIBS_OPENGL QMAKE_INCDIR_OPENGL} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "/${del}\ =/d" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${qt_mkspecs_dir}/modules/qt_lib_gui_private.pri
</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;'>+
</span> # return modified spec files to the default values
post-build {
foreach conf {clang.conf macx.conf clang-mac.conf gcc-base.conf} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1027,13 +1043,6 @@ foreach {module module_info} [array get modules] {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # qcollectiongenerator was removed in http://code.qt.io/cgit/qt/qttools.git/commit/?h=5.12&id=30a75f7f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # however, some ports still depend on it (e.g. octave)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://trac.macports.org/ticket/57781
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s qhelpgenerator ${destroot}${qt_bins_dir}/qcollectiongenerator
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # --prefix is not recognized.
configure.pre_args-delete --prefix=${prefix}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1375,6 +1384,9 @@ foreach {module module_info} [array get modules] {
</span> # "may change from version to version"
patchfiles-append patch-qtwebkit_internal_api.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # find OpenGL headers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtwebkit_opengl_location.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # qtwebkit uses
# glx
# libXcomposite
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1678,7 +1690,7 @@ foreach {sql_names sql_info} [array get sql_plugins] {
</span>
configure.args-append \
[subst QMAKE_INCDIR_${use_name}+=\"[lindex ${variant_info} 2]\"] \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- [subst QMAKE_LIBDIR_${use_name}+=\"[lindex ${variant_info} 3]\"] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [subst QMAKE_LIBDIR+=\"[lindex ${variant_info} 3]\"] \
</span> [subst QMAKE_LIBS_${use_name}+=\"[lindex ${variant_info} 4]\"]
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-find_rez.diff b/aqua/qt5/files/patch-find_rez.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c0b7e14..0ddbe03 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-find_rez.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-find_rez.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,8 +7,8 @@
</span> -QMAKE_RESOURCE = /Developer/Tools/Rez
+QMAKE_RESOURCE = __MACPORTS_Rez__
QMAKE_EXTENSION_SHLIB = dylib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_EXTENSIONS_AUX_SHLIB = tbd
</span> QMAKE_LIBDIR =
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> --- mkspecs/features/mac/rez.prf.orig 2015-10-12 21:35:32.000000000 -0700
+++ mkspecs/features/mac/rez.prf 2017-11-04 22:44:49.000000000 -0700
@@ -1,7 +1,7 @@
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-pc_files.diff b/aqua/qt5/files/patch-pc_files.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 94caf13..3eb2786 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-pc_files.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-pc_files.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- qmake/generators/makefile.cpp.orig 2018-12-03 04:15:26.000000000 -0700
+++ qmake/generators/makefile.cpp 2018-12-22 06:02:13.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3368,7 +3368,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3406,7 +3406,7 @@
</span> t << "-I${includedir}";
if (target_mode == TARG_MAC_MODE && project->isActiveConfig("lib_bundle")
&& libDir != QLatin1String("/Library/Frameworks")) {
<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 f503b97..a940b2d 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;'>-@@ -334,87 +334,87 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -338,87 +338,87 @@
</span> "features": {
"webengine-system-fontconfig": {
"label": "fontconfig",
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -112,7 +112,7 @@
</span> "output": [ "privateFeature" ]
},
"webengine-python2": {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -458,7 +458,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -462,7 +462,7 @@
</span> },
"webengine-alsa": {
"label": "Use ALSA",
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -121,7 +121,7 @@
</span> "output": [ "privateFeature" ]
},
"webengine-v8-snapshot": {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -474,17 +474,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -478,17 +478,17 @@
</span> },
"webengine-system-khr" : {
"label": "khr",
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -142,7 +142,7 @@
</span> "output": [ "privateFeature" ]
},
"webengine-winversion" : {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -494,13 +494,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -498,13 +498,13 @@
</span> },
"webengine-geolocation": {
"label": "Geolocation",
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -158,7 +158,7 @@
</span> "output": [ "privateFeature" ]
},
"webengine-pepper-plugins": {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -577,31 +577,31 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -581,31 +581,31 @@
</span> "webengine-system-libwebp": {
"label": "libwebp, libwebpmux and libwebpdemux",
"autoDetect": "config.unix",
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -195,7 +195,7 @@
</span> "output": [ "privateFeature" ]
},
"webengine-system-ninja": {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -617,12 +617,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -621,12 +621,12 @@
</span> },
"webengine-system-glibc": {
"label": "glibc",
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -210,7 +210,7 @@
</span> && libs.webengine-libxml2
&& tests.webengine-libxml2-compatible",
"output": [ "privateFeature" ]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -630,17 +630,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -634,17 +634,17 @@
</span> "webengine-system-lcms2" : {
"label": "lcms2",
"autoDetect": "features.webengine-printing-and-pdf",
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -231,7 +231,7 @@
</span> "output": [ "privateFeature" ]
},
"webengine-sanitizer" : {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -652,7 +652,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -656,7 +656,7 @@
</span> "webengine-poppler-cpp": {
"label": "poppler-cpp",
"autoDetect": "config.unix",
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtwebkit_opengl_location.diff b/aqua/qt5/files/patch-qtwebkit_opengl_location.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..19ebf81
</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_opengl_location.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;'>+--- Source/WebCore/platform/graphics/surfaces/mac/GraphicsSurfaceMac.cpp.orig 2017-06-16 05:46:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WebCore/platform/graphics/surfaces/mac/GraphicsSurfaceMac.cpp 2019-02-09 19:09:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,9 +23,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if USE(GRAPHICS_SURFACE) && OS(DARWIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "TextureMapperGL.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <CoreFoundation/CFNumber.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <CGLContext.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <CGLCurrent.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <CGLIOSurface.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <OpenGL/CGLContext.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <OpenGL/CGLCurrent.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <OpenGL/CGLIOSurface.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <IOSurface/IOSurface.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <OpenGL/OpenGL.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <OpenGL/gl.h>
</span></pre><pre style='margin:0'>
</pre>