<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/94477f08935455160e4a16dd35491ca8f1bc4cec">https://github.com/macports/macports-ports/commit/94477f08935455160e4a16dd35491ca8f1bc4cec</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 94477f0 qt5: downgrade Qt 5.14.0->5.13.2 on macOS 10.12
</span>94477f0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 94477f08935455160e4a16dd35491ca8f1bc4cec
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Feb 9 06:47:51 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5: downgrade Qt 5.14.0->5.13.2 on macOS 10.12
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * create new Qt port qt513
</span><span style='display:block; white-space:pre;color:#404040;'> * make qt513 the default Qt on macOS 10.12
</span><span style='display:block; white-space:pre;color:#404040;'> * replace qt5 with qt513 on macOS 10.12
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/60045
</span>---
_resources/port1.0/group/qt5-1.0.tcl | 5 +-
aqua/qt5/Portfile | 17 +-
aqua/{qt5 => qt513}/Portfile | 363 +++++++--------------
aqua/qt513/files/patch-find_rez.diff | 22 ++
aqua/qt513/files/patch-icu.diff | 38 +++
aqua/qt513/files/patch-mkspecs.diff | 66 ++++
aqua/qt513/files/patch-no_qtwebkit.diff | 20 ++
aqua/qt513/files/patch-pc_files.diff | 11 +
aqua/qt513/files/patch-qmake_flags.diff | 13 +
.../patch-qtmultimedia_no_macports_openal.diff | 11 +
aqua/qt513/files/patch-qtscript_ceil.diff | 11 +
.../qt513/files/patch-qtvirtualkeyboard_noxcb.diff | 17 +
.../patch-qtwebengine_forward_declarations.diff | 22 ++
aqua/qt513/files/patch-qtwebengine_tests.diff | 236 ++++++++++++++
.../patch-qtwebkit-examples_header_location.diff | 55 ++++
aqua/qt513/files/patch-qtwebkit_fix_icu.diff | 57 ++++
aqua/qt513/files/patch-qtwebkit_internal_api.diff | 18 +
.../files/patch-qtwebkit_opengl_location.diff | 15 +
aqua/qt513/files/patch-shared.diff | 11 +
aqua/qt513/files/patch-sql_plugins.diff | 18 +
aqua/qt513/files/patch-tst_qpluginloader.diff | 20 ++
21 files changed, 804 insertions(+), 242 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/qt5-1.0.tcl b/_resources/port1.0/group/qt5-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index e5a0239..c93dfe2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/qt5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/qt5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,6 +8,7 @@
</span> global available_qt_versions
array set available_qt_versions {
qt5 {qt5-qtbase 5.14}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt513 {qt513-qtbase 5.13}
</span> qt511 {qt511-qtbase 5.11}
qt59 {qt59-qtbase 5.9}
qt58 {qt58-qtbase 5.8}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -120,7 +121,7 @@ proc qt5.get_default_name {} {
</span> #
# macOS Sierra (10.12)
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Qt 5.14: Not Supported but seems to work
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Qt 5.14: Not Supported
</span> # Qt 5.13: Supported
# Qt 5.12: Supported
# Qt 5.11: Supported
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -129,7 +130,7 @@ proc qt5.get_default_name {} {
</span> # Qt 5.8: Supported
# Qt 5.7: Not Supported but seems to work
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return qt513
</span> #
} elseif { ${os.major} == 17 } {
#
<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 b6bcce3..1fa65f1 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;'>@@ -1963,8 +1963,9 @@ foreach {component component_info} [array get qt5pg::qt5_component_lib] {
</span> # Qt 5.9 will not work on OS X 10.9
# Qt 5.10 will not work on OS X 10.10
# Qt 5.12 will not work on OS X 10.11
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# replace qt5-XYZ port with qt5{6,7,8,9,11}-XYZ port
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} < 16} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Qt 5.14 will not work on OS X 10.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# replace qt5-XYZ port with qt5{6,7,8,9,11,13}-XYZ port
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.major} < 17} {
</span>
if { ${os.major} < 12 } {
set qt_replace_version 5.6
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1974,8 +1975,10 @@ if { ${os.major} < 16} {
</span> set qt_replace_version 5.8
} elseif { ${os.major} < 15 } {
set qt_replace_version 5.9
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif { ${os.major} < 16 } {
</span> set qt_replace_version 5.11
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set qt_replace_version 5.13
</span> }
set qt_replace_name qt[join [split ${qt_replace_version} .] ""]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1999,6 +2002,14 @@ if { ${os.major} < 16} {
</span> if { [vercmp ${qt_version_introduced} ${qt_replace_version}] <= 0 && [vercmp ${qt_version_removed} ${qt_replace_version}] > 0 } {
replaced_by ${qt_replace_port}
conflicts-delete ${qt_replace_port}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[vercmp ${qt_version_introduced} ${qt_replace_version}] > 0 && ![catch {set installed [lindex [registry_active ${subport}] 0]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # this should not really be possible
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Qt 5.14.0 built on macOS Sierra, but Qt 5.14.1 did not
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # so the upgrade path could be qt5 (5.14.0) --> qt513 (5.13.2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # this is a problem for qtquick3d and qtquicktimeline because they were introduced in 5.14.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/60045
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replaced_by ${qt_replace_name}-qtbase
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts-delete ${qt_replace_name}-qtbase
</span> }
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/Portfile b/aqua/qt513/Portfile
</span>old mode 100644
new mode 100755
similarity index 86%
copy from aqua/qt5/Portfile
copy to aqua/qt513/Portfile
<span style='display:block; white-space:pre;color:#808080;'>index b6bcce3..4f5399a
</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/qt513/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@
</span>
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name qt513
</span>
categories aqua
platforms macosx
<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.14.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 5.13.2
</span> set middle_name everywhere
if { ${subport} eq "${name}-qtwebkit" ||
${subport} eq "${name}-qtwebkit-examples" ||
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,6 +36,9 @@ compiler.cxx_standard 2011
</span> master_sites \
https://download.qt.io/official_releases/qt/${branch}/${version}/submodules
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://trac.macports.org/ticket/53952
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+dist_subdir qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # file sizes are significantly smaller using xz
if { ${subport} ne ${name} && ${subport} ne "${name}-docs" } {
use_xz yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,6 +52,11 @@ foreach {qt_test_name qt_test_info} [array get available_qt_versions] {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# qt513-qtbase replaces qt5-qtbase, so can not conflict
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.major} == 16 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts-delete qt5-qtbase
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> ############################################################################### Modules Not Considered
#
# No qtactiveqt (Windows Only)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,7 +85,7 @@ foreach {qt_test_name qt_test_info} [array get available_qt_versions] {
</span> # port provides `find ./ -name \*.dylib -exec otool -L {} \; | grep /opt/local/libexec/qt5 | cut -d ' ' -f1` | cut -d : -f2 | sort -u
# port provides `find ./ -name \*.dylib -exec otool -L {} \; | grep /opt/local/lib/ | cut -d ' ' -f1` | cut -d : -f2 | sort -u
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://code.qt.io/cgit/qt/qt5.git/tree/.gitmodules?h=5.14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://code.qt.io/cgit/qt/qt5.git/tree/.gitmodules?h=5.13
</span> #
###############################################################################
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -125,15 +133,15 @@ foreach {qt_test_name qt_test_info} [array get available_qt_versions] {
</span> # license replacement
# }
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# module info found at https://doc.qt.io/qt-5.14/qtmodules.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# module info found at https://doc.qt.io/qt-5.13/qtmodules.html
</span> #
###############################################################################
array set modules {
qt3d {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 121f7c3cf9aca4a0d5b78cc64a7a710eb6dda116
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 86f425e8bdf55b7b3f6a8384c2b9cffee30407fcf87ece0db060fdfb797a0774
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 81561704
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 44ace68d9969a6aa2f7996383fc6950f56fe462d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d1b9fc0be82264b5f76c3a5330901dff95c1f2bcb67916c3fac6bad4ff69adc9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 81537856
</span> }
""
"port:assimp"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -146,12 +154,12 @@ array set modules {
</span> }
qtbase {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 042845e1ea20879a26d59b2be2e46bebb3a62c44
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d9d423a6e7bcf1055c0372fc029f14a6fe67dd62c67b83095cde68b60b762cf7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 49828188
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 94749bf68e78cf3e3fa84a8df73910b501869293
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 26b6b686d66a7ad28eaca349e55e2894e5a735f3831e45f2049e93b1daa92121
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 48735704
</span> }
""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "port:zlib port:libpng port:jpeg port:freetype path:bin/dbus-daemon:dbus path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre2 port:harfbuzz port:double-conversion port:zstd"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "port:zlib port:libpng port:jpeg port:freetype path:bin/dbus-daemon:dbus path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre2 port:harfbuzz port:double-conversion"
</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"}
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -161,9 +169,9 @@ array set modules {
</span> }
qtcharts {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 87a6247e15f0e80c68f87fee3b0b441e4586ab03
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3dd7466c06130ec3a7842189a203a72576e7ed5424950903410fa1a4f70d9c2b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4250588
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 37bc5548361ff55cefcc472e9eddd25826119992
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3bad81c3cfb32cf72fb0ce2ac2794d031cf78a3902b4715f89c09b2d0e041e87
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4244092
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -176,9 +184,9 @@ array set modules {
</span> }
qtconnectivity {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 3de0c35010c7201ee6ab28a8545e63f84f2948a5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ef0cb1883c0e765cacf6c8b9422997b93fd861cf2289e56791615401eefa2d72
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2803040
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5001272b8ba4bf8ca0699a71a160bf99808dcc51
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 644e234eb64f602ef5cdeb8802ef9b58e75478f1124f001937275d62ed692e17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2777504
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -191,9 +199,9 @@ array set modules {
</span> }
qtdatavis3d {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- c31a923c918ea82d50380df22ed8e579afb9c23f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cfb94803a88c7405abf78ac445c4603b614889504fbf5279c9c192451a378f96
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5190456
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f9b6d842aed45aa64a51edd39721e7a76332f52c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ecf934c3eb07173505781734f95cfc2cf9d89e6b1b98516ac98a137797f4ef28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5182216
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -206,9 +214,9 @@ array set modules {
</span> }
qtdeclarative {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- af1093f266bca1e92a12dd58fbbd521516e67d5c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 762fe495d2f97fd70f06dc7d3929506ea3b5e3151ad813e0629209b7bc504c8a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 21299728
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0ffe0f6c54cfb6ae8d05b9d1023a2b29bcf62c25
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d9a524f45fe9e136cda2252f9d7013ec17046d907e3f39606db920987c22d1fd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 20940748
</span> }
"port:python27"
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -221,9 +229,9 @@ array set modules {
</span> }
qtdoc {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 36f835da48b853e02829544194031e212d4b6704
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 17c66b4c0bbee3d7d7ed8e93453d2b994b2a16921b0789dc198fdb8085988c4b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5735776
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c15972fa405ae8f8cd2dfb77b442168a863de15a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ be09543143d5dca984d2c2d9085751317e7a95b78fdbe9b6a30f2faa03543e46
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5747084
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -236,9 +244,9 @@ array set modules {
</span> }
qtgamepad {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- b24941a47bc2d3807202b2ac8e29e6a180d4e829
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 13277d7362ebe912b55e233674bc862e4b5342705c9207bd16c83f107d0e3499
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 386892
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7323d110e3090bc189c0b5a05d5737514dc2f4c2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 75164885433e36a90b557aa7f319ff3d6278c3616469f67b42dda6eb8b92e76e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 386668
</span> }
""
"port:libsdl2"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -251,9 +259,9 @@ array set modules {
</span> }
qtgraphicaleffects {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 9b45ea128c81c470a710956a3ae96128d2274124
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- aabb87d9f982a8cb213de06b954cef29551f2d9ce10afa0ff9e5571203b56138
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 14040704
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5740edaf153498882157449602c74171937a58ab
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 297a89bb6c771f849c4ce866e5c98dadf665163b3dab03bc48a58f51424e7e66
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 14845928
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -266,9 +274,9 @@ array set modules {
</span> }
qtimageformats {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- bd3a7e65af9ff808b38c25d1fa8b0f6f9eafaee7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- b8b177ea68df3a99f45740cb3193e3b38738c5e2b272028445bd31a4305c8e5e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1810072
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b9118a89a786418f8227981674a3d1ce80b62713
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6968649fdccc7d633cf9ada25f1bdaf0a2fb45a214d58c2c47896166d4553ac0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1803796
</span> }
""
"port:jasper port:libmng port:tiff port:webp"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -281,9 +289,9 @@ array set modules {
</span> }
qtlocation {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 2570ed0b534fb73e6a63aafad685c97e8e525f73
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a0dd1712a5b7a0425b57d17318294b6f7e968c4b81d52048696d029b04d2f12f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 6119236
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 69484f3b23039dfc94a52ef9adac79ade1e1afbb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5fe4b824d3dc6c800682ff986333ec09edb9c27582066e928b1862b4d58212e3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6050044
</span> }
""
"port:icu port:zlib"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -296,9 +304,9 @@ array set modules {
</span> }
qtlottie {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 282d7b18256d7facc235e6c63a1445b821251d7e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 098fbb8d8ce1288f940a3203f1353b4da522623d59fe5bed61abd3df41e5b2aa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 82616
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ be5e31c30b35d25841c8da4ac3f69884d7779ec5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ af9a10aaa110767ffd88e02cb8ad0a3930ccfeb61f0c125afbf3791136d36253
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 82052
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -311,9 +319,9 @@ array set modules {
</span> }
qtmacextras {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 2a070f3cfb35751d9bf3f06d1150c0e5f6847ea4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8c263fdba519d7e04bc64767883283eedede0752aa47cc440670129725696e29
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 69340
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b816c248bca3a3576dde2a79f1f124e9e9059694
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 545ede0783ebc2405c6efa6ed0b2b7147a1d7e60eb7fcb853abfca0a9cb65ed5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 69164
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -326,9 +334,9 @@ array set modules {
</span> }
qtmultimedia {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 804ff3fd59d3302c8ddd17fb5770a597119da917
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- c458121c8db7ff77eefe643a7c9847ff324647f2603bb5664bcafa6435edeae7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3795732
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6b6f99e01c307b260bb1c8d906a27e67e1c81e7b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5f885459d46ea2f2bb24597678befd4913d8f88029730d01984f51f9c367b9f4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3820660
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -341,9 +349,9 @@ array set modules {
</span> }
qtnetworkauth {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 27b900f48dc55763a5e29f6264f5cdf620e4b59d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- e7f9705d014056a0d8a9751e7ad4b472f1184b8ef822124f0363753730536ae0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 141432
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 95b35ac7e7d619c71056e5961bbb71de414026c7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6326943e5c1a3e6eac8dcc44d088f1a3d1c45d14100ff1e95f833b0463243af3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 141172
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -356,9 +364,9 @@ array set modules {
</span> }
qtpurchasing {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- b7c5f526ad0444b0ce9c54d55122fe06ffbbb195
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bcb0a7f62be4a116feee4af759b89a55084c0364327a83ab0b73acdc60eab8a9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 208688
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e4fcdeecfaa2ea185557dd76cd83b7329c74dadc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e9ef800b7d79f660c72f7024f82a2915b1111b47417f93c3dc2354b9bf307ff4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 208096
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -369,26 +377,11 @@ array set modules {
</span> "revision 0"
"License: {GPL-3 OpenSSLException}"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- qtquick3d {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 237a2679d58d0d39fe018971705ee1a8d2a242af
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 073a88e440c355c408500306c3a6aa166be60c67e5ce26a9cb6ff7aac0bd43dc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 61584836
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "port:assimp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "qtbase qtdeclarative"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"Provides a high-level API for creating 3D content or UIs based on Qt Quick."}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "technology preview module; GPLv3 license only"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "variant overrides: "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 0"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "License: {GPL-3 OpenSSLException}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> qtquickcontrols {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 504c4ed3648c1039f22bcfe3aab8df83ee9a2f7f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 54519e7c6748bb9af46435a7ba2ce1c53e4ad164a70e88915fe0e61277540a1a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5982788
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5c4fa9e83cede4e873c23172502a36d22936062e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d6e64d8db13ada55fcb0d5e8ca26097085680087d931435c6c6db859d87493ea
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5955448
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -401,9 +394,9 @@ array set modules {
</span> }
qtquickcontrols2 {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- b596c3bd1e95894d5715094dafc866f7949e8460
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 52d652c48933cc8416a91138eb6fb4c31625734265671f286b6c0d3e27d120ae
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8151808
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 75863e6ec38e4e5319efc3a8c4fccfcceeabddf6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 90ee8be7b66cc65f3f22e71a0b35adab5c169ac4f8ebc6f9e7685228bf8a7d70
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9252912
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -414,26 +407,11 @@ array set modules {
</span> "revision 0"
"License: "
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- qtquicktimeline {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 537824fe58470c397b5aa2e7695f6522a7301824
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2b2e0e74aaf277a585ea40bcbc3e530090420d71e420f6d1e9c6a134cd0836c8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 102624
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "qtbase qtdeclarative"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"A platform target to compile Qt applications for the web browsers using WebAssembly."}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "technology preview module; GPLv3 license only"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "variant overrides: "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 0"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "License: {GPL-3 OpenSSLException}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> qtremoteobjects {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 2e7ba83deea644ca798e5cb685f4a98f00e9d12b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 189c8bddaebde0420742af0d85b7e7bf00c558f030bc0a7b704ce86072706e75
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 376104
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 20097626c8ea2d6cf8de9b318e45bd716f597869
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bd24db9d2bb08ae7955291af52ee7510aa193d0f72ed0e3ff74f7cf7e81f4d65
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 367032
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -446,9 +424,9 @@ array set modules {
</span> }
qtscript {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 97b5694c546872852f2eb6cefd9a9f802a900635
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d8071e665935f7f6733f5ef700054a0cbbf8b569e7900439b89d3301f70adadd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2654744
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 71e26d3b2ce11bfa51d0748ff2e73983e33c26f3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3d92691c25577fbf7511d40253de0cd9d31444ea5a0aa860f65efb9fa0f3ce70
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2696452
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -461,9 +439,9 @@ array set modules {
</span> }
qtscxml {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- c263a11636a9c89e6a44cb9e31b478342e536d5d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 6dbcf012cc11931050c8d9422cbf478ee173dfb0c5b8aebf0f829b6f74d741aa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 433256
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a77625982d484e0ca8a43f986522788f769318f0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e489dff21e18c1e7f72ffd31af82404f845bd90824c6b978140591366398a9d9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 435428
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -476,9 +454,9 @@ array set modules {
</span> }
qtsensors {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- b532c19704a944e30f900ab41fc40140cdcbe7a4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- eda3862cf079ac2357553be4faaae0136aa017e954506ca0c4239995b5be214c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2050076
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8e722c909dfdf14df32fbe93e4ec8d227cf13297
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 46f73bbfddfd78a419c6424d6839318774b84c955a7f7a96c12c590f6d8fb177
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2046708
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -491,13 +469,13 @@ array set modules {
</span> }
qtserialbus {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 14cc2a999326545e3c33525bc0e8333f7eb3b2d8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a49f72ef59e2ad82155269bd54322bf2638d2793b5adc0cd44ae99bab88f1045
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 349772
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2ff0ed6d010569251cfa0937c74bf7bbf28c1bc4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 48159393b1368976b5324eac48424e2a6e5d63c783194d0576a978151f882da3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 338428
</span> }
""
""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "qtbase qtserialport"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "qtserialport"
</span> {"Qt Serial Bus"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -506,9 +484,9 @@ array set modules {
</span> }
qtserialport {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 608b4c156fedf2b603de4fe1d8b35b2a8302488f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac7e51e99294998fae8bb3e2feebbd1820ecd774eb9ad8e7ea507f5bd06dcd6f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 316528
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7238c5988a02b6ea2c9d2e01e37614fe362c7e38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7677ffc1dce3b75c0a98d07d215588a8dccb5c276c55b4ecd60c35ed1c89cb34
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 310736
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -521,9 +499,9 @@ array set modules {
</span> }
qtspeech {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7c5c792d891f3d787288df43904f95a926d49716
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- abd9a1863a64de0a148ae37e5fdecde7fd486348f7b26c054008f8506223e425
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 101072
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8f41ce8fec774203e5bbf9ef59748d3ae3d42239
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a0aca08feeac6925ead7f841319bdcfd60bfc126de07807edaf267c2ca8d13d5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 100312
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -536,9 +514,9 @@ array set modules {
</span> }
qtsvg {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- e958c687b4a9ce1f8a8893a09d58dec79e54e813
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8540a57312f815f81a45b891b49959d776727fde17579bb6bf1a537996bc9359
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1879708
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8bc01bd283fe156a09e594ee432c30ee74ce8ab6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 849e2e357e1333b64ecb728352f652cd8d916f029ed848f775b15d0b500cb7d7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1890380
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -551,9 +529,9 @@ array set modules {
</span> }
qttools {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 67a8cf8a41dfd17b50c72517778c15dfdebd29f5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7f5e6370cf4ed59f2bdd6517870cdcb1df9a055bbd885d056d90938ab302c70c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8810972
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a5b422b534c00437a9adb1cfe4ccb7afd2e8854a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 919a2713b6d2d7873a09ad85bd93cf4282606e5bf84d5884250f665a253ec06e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9110256
</span> }
""
"port:clang-9.0"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -566,9 +544,9 @@ array set modules {
</span> }
qttranslations {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- d7c97eaaabc25926c6fbcdb2e4008822a252e8c8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a7598068802f4ddda99865ea9c3503015d02ed1e1ff5875e936b42ab8eb2de46
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1348664
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4bd7a4da9034603ec6de5f72aca2e3188720f876
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 25755941a2525de2d7ae48e0011d04db7cc09e4e73fe83293206ceafa0aa82d9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1365880
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -581,9 +559,9 @@ array set modules {
</span> }
qtvirtualkeyboard {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8c387022c00e7a43896df055def0da5841915c88
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 277baaf6043328d06585c7a9046461308aa7602b21f531bcda12e6df5bce5295
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 10950684
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ abd0f990c262ac13e7f0e0ad9cc372f9878437d8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8e368dde237d21666f6cc8512a060e205388e519a4d7559c0505cc75224ed62b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10923292
</span> }
""
"port:hunspell"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -596,9 +574,9 @@ array set modules {
</span> }
qtwebchannel {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- c4bc5c330eaa90d8ded7af01b1c0593222f36484
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3af5262fde14c7dfe7bcc12d5796a482837bd09f0878851fd8de5db0b1985e6a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 202524
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 624790b4ce487ff62e5ca4db2bdf94aa4f7638bc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f452d419d8b19b566835f316bbf282dabc8b1c2a74c9c98c1aec4184465e9c13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 192652
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -611,9 +589,9 @@ array set modules {
</span> }
qtwebengine {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0fbb132a115d96d329f8e3fc0222bc80050f058b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4ec77040a876a83aa2a833ebfe7b3e88dcc167ceb317095eb226a0b8d455e887
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 242438244
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ db36dd8fade1ea196e273304855292df46e3f24e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ adcf56b5de6f34744bba2307b696fc75611884f4270e87dfa760d6e99dd711bb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 255593964
</span> }
"port:python27 port:py27-ply path:bin/ninja: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;'>@@ -626,9 +604,9 @@ array set modules {
</span> }
qtwebglplugin {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 1e8319461e6e9edede34ded5fbb911dac1ae1654
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- de7768ab6a8de06e09467b6dc8714fa71ed5781e2654aa3498a7105328f565a6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 74120
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 95daeefa4fe3b98994dcc0218efb6180e472e7ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ae369929d5a3356391bccd25cac22846dc44cbb726ce7b60924f53944addabb7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 73608
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -651,7 +629,7 @@ array set modules {
</span> {"Qt WebKit" "Qt WebKit Widgets"}
"community support only (use Qt WebEngine)"
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 4"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtwebkit-examples {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -666,14 +644,14 @@ array set modules {
</span> {"examples for Qt WebKit"}
"community support only (use Qt WebEngine)"
"variant overrides: ++examples ~docs "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 3"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtwebsockets {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0840e8758e74faac28f1f0bc31975cef3123af11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 742fb3d39043728ca4fc1533e9a1e3b701bc5bf4e27cba316077e9f0df0b3fef
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 252616
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 985bd55daed9c4f99af165986379a40532e477fc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fc11236c8bf69b27a4e237a27b9ea27fc90d8c25d81d1d451ce3a0b63cbc02d3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 244668
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -686,9 +664,9 @@ array set modules {
</span> }
qtwebview {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0834bf0a22c79c6f9f5f1dd15669893402dd48b1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8c18e7686d1480eb255b68e57a196f3ebc37cc4e2fbcd698ec3bed903517adff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 132824
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 44df0e0dc744c1018529a5c9b4ac88689e81949c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 394cc7a9cb29b7883816ff3137b022f30568151aada0739fc99a23789c21c015
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 131168
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -701,9 +679,9 @@ array set modules {
</span> }
qtxmlpatterns {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- e6250bdabc6acacb37eab8cfb8833117179ba0ce
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fb993a112e591c84ea159a752a4026031a212a7af6f31a1b288552c924c18224
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1403600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d0be90cf4c12d789731b5a1cbdb86992c0b811ad
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1e87d8c004ec0beea3b29d13f0964c563aa9fae51c392c998750ca4e386374e2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1392192
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1143,6 +1121,7 @@ foreach {module module_info} [array get modules] {
</span> -no-openssl \
-no-libproxy \
-system-pcre \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-xcb \
</span> -glib \
-no-gtk
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1180,6 +1159,7 @@ foreach {module module_info} [array get modules] {
</span> -no-directfb \
-no-linuxfb \
-no-kms \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -no-mirclient \
</span> -no-libinput \
-no-system-proxies
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1402,13 +1382,6 @@ foreach {module module_info} [array get modules] {
</span> }
# special case
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${module} eq "qtquick3d" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see config_help.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.post_args-append -- \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -system-assimp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # special case
</span> if { ${module} eq "qtwebkit" } {
# use MacPorts icu
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1479,7 +1452,6 @@ foreach {module module_info} [array get modules] {
</span> set qt_list [lreplace ${qt_list} 0 0]
set framework_list [lreplace ${framework_list} 0 0]
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> set libreplace [string repeat ../ [llength ${qt_list}]][join ${framework_list} /]
if { ${libreplace} ne "lib" } {
patchfiles-append patch-shared.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1516,24 +1488,21 @@ foreach {module module_info} [array get modules] {
</span> # Undefined symbols for architecture x86_64
conflicts_build-append ${subport}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # either have VNRequest forward declarations or include correct header file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtwebengine_forward_declarations.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # do not opportunistically find MacPorts libraries (e.g. X11 libraries)
patchfiles-append patch-qtwebengine_tests.diff
# see https://trac.macports.org/ticket/59294
use_xcode yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # see config_help.txt
</span> configure.post_args-append \
-- \
-webengine-native-spellchecker \
-webengine-kerberos \
-system-webengine-icu \
-system-webengine-ffmpeg
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # missing file spell_check_host_chrome_impl_mac.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # TODO: investigate further
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.post_args-delete \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -webengine-native-spellchecker
</span> }
# special case
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1936,83 +1905,3 @@ if {${subport} eq ${name}} {
</span> } else {
livecheck.type none
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach {component component_info} [array get qt5pg::qt5_component_lib] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set suffix [lindex ${component_info} 3]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set qt_version ${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set qt_version_introduced [lindex ${component_info} 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set qt_version_removed [lindex ${component_info} 1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [vercmp ${qt_version_removed} ${qt_version}] <= 0 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- subport ${name}-${component}${suffix} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup obsolete 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${component} ne "qtquick1" && ${component} ne "qtwebkit-examples" && ${component} ne "qtdoc" && ${suffix} ne "-plugin" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- subport ${name}-${component}${suffix}-docs {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup obsolete 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Qt 5.7 will not work on Mac OS X 10.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Qt 5.8 will not work on OS X 10.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Qt 5.9 will not work on OS X 10.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Qt 5.10 will not work on OS X 10.10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Qt 5.12 will not work on OS X 10.11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# replace qt5-XYZ port with qt5{6,7,8,9,11}-XYZ port
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} < 16} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} < 12 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set qt_replace_version 5.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif { ${os.major} < 13 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set qt_replace_version 5.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif { ${os.major} < 14 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set qt_replace_version 5.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif { ${os.major} < 15 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set qt_replace_version 5.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set qt_replace_version 5.11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set qt_replace_name qt[join [split ${qt_replace_version} .] ""]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set qt_replace_port ${qt_replace_name}[string range ${subport} 3 end]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set suffix [string range ${subport} [string last - ${subport}] end]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${suffix} eq "-docs" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set component [string range ${subport} 4 end-5]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set component [string range ${subport} 4 end]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${component} eq "" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- replaced_by ${qt_replace_port}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts-delete ${qt_replace_port}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set component_info $qt5pg::qt5_component_lib(${component})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set qt_version_introduced [lindex ${component_info} 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set qt_version_removed [lindex ${component_info} 1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [vercmp ${qt_version_introduced} ${qt_replace_version}] <= 0 && [vercmp ${qt_version_removed} ${qt_replace_version}] > 0 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- replaced_by ${qt_replace_port}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts-delete ${qt_replace_port}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://trac.macports.org/ticket/53789
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://trac.macports.org/wiki/PortfileRecipes#deactivatehack
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# special case
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${subport} eq "qt5-qtdeclarative" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-activate {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![catch {set installed [lindex [registry_active qt5-qtquickcontrols] 0]}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set _version [lindex $installed 1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp $_version 5.7] < 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- registry_deactivate_composite qt5-qtquickcontrols "" [list ports_nodepcheck 1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt513/files/patch-find_rez.diff b/aqua/qt513/files/patch-find_rez.diff
</span>new file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..0ddbe03
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt513/files/patch-find_rez.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/common/mac.conf.orig 2015-10-12 21:35:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/common/mac.conf 2017-11-04 22:43:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12,7 +12,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(unix.conf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_RESOURCE = /Developer/Tools/Rez
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_RESOURCE = __MACPORTS_Rez__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_EXTENSION_SHLIB = dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_EXTENSIONS_AUX_SHLIB = tbd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_LIBDIR =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/features/mac/rez.prf.orig 2015-10-12 21:35:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/features/mac/rez.prf 2017-11-04 22:44:49.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #global defaults
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ isEmpty(QMAKE_REZ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QMAKE_REZ = /Developer/Tools/Rez
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QMAKE_REZ = __MACPORTS_Rez__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ isEmpty(REZ_DIR):REZ_DIR = .
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ isEmpty(QMAKE_EXT_REZ):QMAKE_EXT_REZ = .rsrc
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt513/files/patch-icu.diff b/aqua/qt513/files/patch-icu.diff
</span>new file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..5aeb3ab
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt513/files/patch-icu.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,38 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Tools/qmake/config.tests/icu/icu.pro.orig 2015-07-16 11:45:20.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Tools/qmake/config.tests/icu/icu.pro 2015-07-16 11:46:05.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14,6 +14,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS += -licuin -licuuc -licudt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else:qtConfig(pkg-config):packagesExist("icu-i18n") {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONFIG += link_pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKGCONFIG += icu-i18n
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS += -licui18n -licuuc -licudata
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WTF/WTF.pri.orig 2015-10-12 21:37:08.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WTF/WTF.pri 2016-05-04 04:22:48.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9,10 +9,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INCLUDEPATH += $$PWD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mac {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Mac OS does ship libicu but not the associated header files.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Therefore WebKit provides adequate header files.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- INCLUDEPATH = $${ROOT_WEBKIT_DIR}/Source/WTF/icu $$INCLUDEPATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIBS += -licucore
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONFIG += link_pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PKGCONFIG *= icu-i18n
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else:!use?(wchar_unicode): {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ win32 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONFIG(static, static|shared) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WebCore/Target.pri.orig 2015-10-12 21:37:22.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WebCore/Target.pri 2016-05-04 09:47:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2986,9 +2986,7 @@
</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;'>+ mac {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # For Mac we use the same SmartReplace implementation as the Apple port.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SOURCES += editing/SmartReplaceCF.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- INCLUDEPATH += $$PWD/icu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SOURCES += editing/SmartReplaceICU.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SOURCES += editing/SmartReplaceICU.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt513/files/patch-mkspecs.diff b/aqua/qt513/files/patch-mkspecs.diff
</span>new file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..7d55398
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt513/files/patch-mkspecs.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,66 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/common/clang.conf.orig 2017-06-28 02:54:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/common/clang.conf 2017-08-27 07:20:26.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4,8 +4,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_COMPILER = gcc clang llvm # clang pretends to be gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_CC = $${CROSS_COMPILE}clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_CXX = $${CROSS_COMPILE}clang++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_CC = __MACPORTS_CC__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_CXX = __MACPORTS_CXX__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_LINK_C = $$QMAKE_CC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_LINK_C_SHLIB = $$QMAKE_CC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/common/macx.conf.orig 2017-06-28 02:54:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/common/macx.conf 2017-08-27 07:11:49.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,10 +3,10 @@
</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;'>+ QMAKE_PLATFORM += macos osx macx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_MAC_SDK = macosx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_MAC_SDK = __MACPORTS_MAC_SDK__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_APPLE_DEVICE_ARCHS = x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_APPLE_DEVICE_ARCHS = __MACPORTS_DEVICE_ARCHS__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QT_MAC_SDK_VERSION_MIN = 10.13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QT_MAC_SDK_VERSION_MAX = 10.15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/macx-clang/qmake.conf.orig 2017-06-28 02:54:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/macx-clang/qmake.conf 2017-08-27 07:13:38.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,8 +21,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # and X11, OpenGL is currently not supported.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_LIBS_X11 = -lX11 -lXext -lm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_LIBDIR_X11 = /opt/X11/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_INCDIR_X11 = /opt/X11/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_LIBDIR_X11 = __MACPORTS_PREFIX__/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_INCDIR_X11 = __MACPORTS_PREFIX__/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(../common/macx.conf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(../common/gcc-base-mac.conf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/common/clang-mac.conf.orig 2017-06-28 02:54:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/common/clang-mac.conf 2017-08-27 07:17:44.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6,8 +6,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_XCODE_GCC_VERSION = com.apple.compilers.llvm.clang.1_0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_CXXFLAGS += -stdlib=libc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_LFLAGS += -stdlib=libc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_CXXFLAGS += -stdlib=__MACPORTS_CXX_STDLIB__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_LFLAGS += -stdlib=__MACPORTS_CXX_STDLIB__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_AR_LTCG = libtool -static -o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_CFLAGS_APPLICATION_EXTENSION = -fapplication-extension
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/common/gcc-base.conf.orig 2017-06-28 02:54:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/common/gcc-base.conf 2017-10-12 09:42:06.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,7 +34,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_CFLAGS_OPTIMIZE = -O2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_CFLAGS_OPTIMIZE_SIZE = __MACPORTS_OPTFLAGS__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !equals(QMAKE_HOST.os, Windows): QMAKE_CFLAGS += -pipe
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_CFLAGS_DEPS += -M
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt513/files/patch-no_qtwebkit.diff b/aqua/qt513/files/patch-no_qtwebkit.diff
</span>new file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..5efb06d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt513/files/patch-no_qtwebkit.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/assistant/assistant/assistant.pro.orig 2016-02-26 03:07:22.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/assistant/assistant/assistant.pro 2016-05-04 16:32:44.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,8 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BROWSER = qtwebkit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BROWSER = qtextbrowser
</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;'>+ QT += widgets network help sql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtHaveModule(printsupport): QT += printsupport
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/designer/src/plugins/plugins.pro.orig 2016-02-26 03:07:22.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/designer/src/plugins/plugins.pro 2016-05-04 16:32:21.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,6 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TEMPLATE = subdirs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # qtHaveModule(opengl): SUBDIRS += tools/view3d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-qtHaveModule(webkitwidgets): SUBDIRS += qwebview
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ win32: qtHaveModule(axcontainer): SUBDIRS += activeqt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtHaveModule(quickwidgets): SUBDIRS += qquickwidget
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt513/files/patch-pc_files.diff b/aqua/qt513/files/patch-pc_files.diff
</span>new file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..37a3564
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt513/files/patch-pc_files.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- qmake/generators/makefile.cpp.orig 2018-12-03 04:15:26.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ qmake/generators/makefile.cpp 2018-12-22 06:02:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3426,7 +3426,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ t << "-I${includedir}";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (target_mode == TARG_MAC_MODE && project->isActiveConfig("lib_bundle")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && libDir != QLatin1String("/Library/Frameworks")) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- t << " -F${libdir}";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ t << " -F${libdir} -I${prefix}/include";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ t << endl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt513/files/patch-qmake_flags.diff b/aqua/qt513/files/patch-qmake_flags.diff
</span>new file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..2731739
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt513/files/patch-qmake_flags.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- qmake/Makefile.unix.macos.orig 2017-06-28 02:54:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ qmake/Makefile.unix.macos 2017-08-27 13:44:44.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2,8 +2,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CARBON_LFLAGS = -framework ApplicationServices
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CARBON_CFLAGS = -fconstant-cfstrings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-EXTRA_CXXFLAGS = $(CARBON_CFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-EXTRA_LFLAGS = $(COCOA_LFLAGS) $(CARBON_LFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++EXTRA_CXXFLAGS = __MACPORTS_CXX_ARCH_FLAGS__ $(CARBON_CFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++EXTRA_LFLAGS = __MACPORTS_LD_ARCH_FLAGS__ $(COCOA_LFLAGS) $(CARBON_LFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QTOBJS2 = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qsettings_mac.o \
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt513/files/patch-qtmultimedia_no_macports_openal.diff b/aqua/qt513/files/patch-qtmultimedia_no_macports_openal.diff
</span>new file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..e336d52
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt513/files/patch-qtmultimedia_no_macports_openal.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/multimedia/configure.json.orig 2017-06-22 23:32:22.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/multimedia/configure.json 2017-08-28 05:37:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -125,7 +125,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "label": "OpenAL",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "test": "openal",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "sources": [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { "type": "pkgConfig", "args": "openal" },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { "type": "pkgConfig", "args": "openal", "condition": "!config.darwin" },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { "libs": "-lOpenAL32", "condition": "config.win32" },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { "libs": "-framework OpenAL", "condition": "config.darwin" },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { "libs": "-lopenal", "condition": "config.unix && !config.darwin" }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt513/files/patch-qtscript_ceil.diff b/aqua/qt513/files/patch-qtscript_ceil.diff
</span>new file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..0d2dbbd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt513/files/patch-qtscript_ceil.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h.orig 2017-06-08 07:29:22.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h 2017-09-30 13:12:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -73,7 +73,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Work around a bug in the Mac OS X libc where ceil(-0.1) return +0.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inline double wtf_ceil(double x) { return copysign(ceil(x), x); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define ceil(x) wtf_ceil(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++//#define ceil(x) wtf_ceil(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt513/files/patch-qtvirtualkeyboard_noxcb.diff b/aqua/qt513/files/patch-qtvirtualkeyboard_noxcb.diff
</span>new file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..437654a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt513/files/patch-qtvirtualkeyboard_noxcb.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/virtualkeyboard/virtualkeyboard.pro.orig 2016-11-28 02:45:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/virtualkeyboard/virtualkeyboard.pro 2017-06-20 07:13:44.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -405,10 +405,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SOURCES += desktopinputpanel.cpp inputview.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HEADERS += desktopinputpanel_p.h inputview_p.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEFINES += QT_VIRTUALKEYBOARD_DESKTOP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- !no-pkg-config:packagesExist(xcb) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PKGCONFIG += xcb xcb-xfixes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DEFINES += QT_VIRTUALKEYBOARD_HAVE_XCB
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #!no-pkg-config:packagesExist(xcb) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # PKGCONFIG += xcb xcb-xfixes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # DEFINES += QT_VIRTUALKEYBOARD_HAVE_XCB
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ record-trace-input {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt513/files/patch-qtwebengine_forward_declarations.diff b/aqua/qt513/files/patch-qtwebengine_forward_declarations.diff
</span>new file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..7c99c71
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt513/files/patch-qtwebengine_forward_declarations.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/chromium/base/mac/sdk_forward_declarations.h.orig 2018-11-13 11:25:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/chromium/base/mac/sdk_forward_declarations.h 2018-12-09 08:42:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -262,8 +262,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Once Chrome no longer supports OSX 10.12, everything within this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // preprocessor block can be removed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !defined(MAC_OS_X_VERSION_10_13) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++//#if !defined(MAC_OS_X_VERSION_10_13) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // VNRequest forward declarations.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @class VNRequest;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -343,7 +343,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @property(readonly, nonatomic, copy) NSString* payloadStringValue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif // MAC_OS_X_VERSION_10_13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++//#endif // MAC_OS_X_VERSION_10_13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Once Chrome no longer supports macOS 10.13, everything within this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // preprocessor block can be removed.
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt513/files/patch-qtwebengine_tests.diff b/aqua/qt513/files/patch-qtwebengine_tests.diff
</span>new file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..85f8827
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt513/files/patch-qtwebengine_tests.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,236 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config.tests/snappy/snappy.pro.orig 2018-11-26 21:10:38.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config.tests/snappy/snappy.pro 2018-12-08 12:40:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,3 +1,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-linux:SOURCES += snappy.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SOURCES += snappy.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS += -lsnappy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONFIG -= qt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/core/configure.json.orig 2018-11-26 21:10:38.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/core/configure.json 2018-12-09 10:07:41.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -344,82 +344,82 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "features": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "webengine-system-fontconfig": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "label": "fontconfig",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "condition": "libs.webengine-fontconfig",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "condition": "config.macos && libs.webengine-fontconfig",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "webengine-system-dbus": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "label": "dbus",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "condition": "libs.webengine-dbus",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "condition": "config.macos && libs.webengine-dbus",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "webengine-system-libdrm": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "label": "libdrm",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "condition": "libs.webengine-libdrm",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "condition": "!config.macos && libs.webengine-libdrm",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "webengine-system-xcomposite": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "label": "xcomposite",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "condition": "libs.webengine-xcomposite",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "condition": "!config.macos && libs.webengine-xcomposite",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "webengine-system-xcursor": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "label": "xcursor",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "condition": "libs.webengine-xcursor",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "condition": "!config.macos && libs.webengine-xcursor",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "webengine-system-xi": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "label": "xi",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "condition": "libs.webengine-xi",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "condition": "!config.macos && libs.webengine-xi",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "webengine-system-xtst": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "label": "xtst",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "condition": "libs.webengine-xtst",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "condition": "!config.macos && libs.webengine-xtst",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "webengine-system-harfbuzz": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "label": "harfbuzz",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "condition": "config.unix && features.system-harfbuzz && libs.webengine-harfbuzz",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "condition": "config.macos && config.unix && features.system-harfbuzz && libs.webengine-harfbuzz",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "webengine-system-glib" : {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "label": "glib",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "condition": "config.unix && libs.webengine-glib",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "condition": "config.macos && config.unix && libs.webengine-glib",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "webengine-system-minizip" : {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "label": "minizip",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "condition": "config.unix && libs.webengine-minizip",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "condition": "config.macos && config.unix && libs.webengine-minizip",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "webengine-system-zlib" : {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "label": "zlib",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "condition": "config.unix && features.system-zlib && libs.webengine-zlib",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "condition": "config.macos && config.unix && features.system-zlib && libs.webengine-zlib",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "webengine-system-libevent" : {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "label": "libevent",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "condition": "config.unix && libs.webengine-libevent",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "condition": "config.macos && config.unix && libs.webengine-libevent",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "webengine-system-jsoncpp" : {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "label": "jsoncpp",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "condition": "config.unix && libs.webengine-jsoncpp",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "condition": "config.macos && config.unix && libs.webengine-jsoncpp",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "webengine-system-protobuf" : {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "label": "protobuf",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "condition": "config.unix && libs.webengine-protobuf && tests.webengine-protoc",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "condition": "config.macos && config.unix && libs.webengine-protobuf && tests.webengine-protoc",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "webengine-system-png" : {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "label": "png",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "condition": "config.unix && features.system-png && libs.webengine-png",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "condition": "config.macos && config.unix && features.system-png && libs.webengine-png",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "webengine-system-jpeg" : {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "label": "JPEG",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "condition": "config.unix && features.system-jpeg && libs.webengine-jpeglib",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "condition": "config.macos && config.unix && features.system-jpeg && libs.webengine-jpeglib",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "webengine-python2": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -463,7 +463,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "webengine-alsa": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "label": "Use ALSA",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "condition": "config.unix && tests.webengine-alsa",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "condition": "!config.macos && config.unix && tests.webengine-alsa",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "webengine-v8-snapshot": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -479,17 +479,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "webengine-system-khr" : {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "label": "khr",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "condition": "config.unix && tests.webengine-khr",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "condition": "!config.macos && config.unix && tests.webengine-khr",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "webengine-system-libvpx" : {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "label": "libvpx",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "condition": "config.unix && tests.webengine-libvpx",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "condition": "!config.macos && config.unix && tests.webengine-libvpx",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "webengine-system-snappy" : {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "label": "snappy",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "condition": "config.unix && tests.webengine-snappy",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "condition": "config.macos && config.unix && tests.webengine-snappy",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "webengine-winversion" : {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -499,13 +499,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "webengine-geolocation": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "label": "Geolocation",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "condition": "module.positioning",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "condition": "config.macos && module.positioning",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "output": [ "publicFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "webengine-pulseaudio": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "label": "Use PulseAudio",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "autoDetect": "config.unix",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "condition": "libs.pulseaudio",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "condition": "config.macos && libs.pulseaudio",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "webengine-pepper-plugins": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -581,31 +581,31 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "webengine-system-libwebp": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "label": "libwebp, libwebpmux and libwebpdemux",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "autoDetect": "config.unix",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "condition": "libs.webengine-webp",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "condition": "config.macos && libs.webengine-webp",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "webengine-system-opus": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "label": "opus",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "autoDetect": "config.unix",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "condition": "libs.webengine-opus",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "condition": "config.macos && libs.webengine-opus",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "webengine-system-ffmpeg": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "label": "ffmpeg",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "autoDetect": false,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "condition": "libs.webengine-ffmpeg && features.webengine-system-opus && features.webengine-system-libwebp",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "condition": "config.macos && libs.webengine-ffmpeg && features.webengine-system-opus && features.webengine-system-libwebp",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "webengine-system-icu": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "label": "icu",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "autoDetect": false,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "condition": "libs.webengine-icu",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "condition": "config.macos && libs.webengine-icu",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "webengine-system-re2": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "label": "re2",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "autoDetect": "config.unix",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "condition": "tests.webengine-re2",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "condition": "config.macos && tests.webengine-re2",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "webengine-system-ninja": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -621,12 +621,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "webengine-system-glibc": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "label": "glibc",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "condition": "config.linux && tests.webengine-glibc",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "condition": "config.macos && config.linux && tests.webengine-glibc",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "webengine-system-libxml2": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "label": "libxml2 and libxslt",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "condition": "config.unix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "condition": "config.macos && config.unix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && libs.webengine-libxml2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && tests.webengine-libxml2-compatible",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -634,17 +634,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "webengine-system-lcms2" : {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "label": "lcms2",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "autoDetect": "features.webengine-printing-and-pdf",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "condition": "config.unix && libs.webengine-lcms2",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "condition": "config.macos && config.unix && libs.webengine-lcms2",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "webengine-system-freetype" : {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "label": "freetype",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "condition": "config.unix && features.system-freetype && libs.webengine-freetype",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "condition": "config.macos && config.unix && features.system-freetype && libs.webengine-freetype",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "webengine-system-x11" : {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "label": "x11",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "condition": "config.unix && libs.webengine-x11",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "condition": "!config.macos && config.unix && libs.webengine-x11",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "webengine-ozone-x11" : {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -667,7 +667,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "webengine-poppler-cpp": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "label": "poppler-cpp",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "autoDetect": "config.unix",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "condition": "libs.webengine-poppler-cpp",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "condition": "config.macos && libs.webengine-poppler-cpp",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "webengine-win-compiler64": {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt513/files/patch-qtwebkit-examples_header_location.diff b/aqua/qt513/files/patch-qtwebkit-examples_header_location.diff
</span>new file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..1fa96bf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt513/files/patch-qtwebkit-examples_header_location.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,55 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- examples/webkitwidgets/domtraversal/window.ui.orig 2017-05-10 10:07:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ examples/webkitwidgets/domtraversal/window.ui 2018-12-14 16:26:12.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -81,7 +81,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <customwidget>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <class>QWebView</class>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <extends>QWidget</extends>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <header>QtWebKitWidgets/QWebView</header>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <header>QWebView</header>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </customwidget>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </customwidgets>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <resources/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- examples/webkitwidgets/simpleselector/window.ui.orig 2017-05-10 10:07:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ examples/webkitwidgets/simpleselector/window.ui 2018-12-14 16:26:43.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -64,7 +64,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <customwidget>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <class>QWebView</class>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <extends>QWidget</extends>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <header>QtWebKit/QWebView</header>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <header>QWebView</header>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </customwidget>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </customwidgets>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <resources/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- examples/webkitwidgets/previewer/previewer.ui.orig 2017-05-10 10:07:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ examples/webkitwidgets/previewer/previewer.ui 2018-12-14 16:27:18.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -74,7 +74,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <customwidget>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <class>QWebView</class>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <extends>QWidget</extends>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <header>QtWebKit/QWebView</header>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <header>QWebView</header>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </customwidget>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </customwidgets>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <resources/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui.orig 2017-05-10 10:07:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui 2018-12-14 16:28:01.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -188,7 +188,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <customwidget>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <class>QWebView</class>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <extends>QWidget</extends>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <header>QtWebKit/QWebView</header>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <header>QWebView</header>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </customwidget>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </customwidgets>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <resources/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- examples/webkitwidgets/formextractor/formextractor.ui.orig 2017-05-10 10:07:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ examples/webkitwidgets/formextractor/formextractor.ui 2018-12-14 16:28:40.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -151,7 +151,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <customwidget>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <class>QWebView</class>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <extends>QWidget</extends>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <header>QtWebKit/QWebView</header>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <header>QWebView</header>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </customwidget>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </customwidgets>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <resources/>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt513/files/patch-qtwebkit_fix_icu.diff b/aqua/qt513/files/patch-qtwebkit_fix_icu.diff
</span>new file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..9d3bb20
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt513/files/patch-qtwebkit_fix_icu.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,57 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/JavaScriptCore/runtime/DatePrototype.cpp.orig 2017-06-16 05:46:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/JavaScriptCore/runtime/DatePrototype.cpp 2019-10-07 15:34:27.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -167,7 +167,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFRelease(locale);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (useCustomFormat) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFStringRef customFormatCFString = CFStringCreateWithCharacters(0, customFormatString.characters(), customFormatString.length());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CFStringRef customFormatCFString = CFStringCreateWithCharacters(0, reinterpret_cast<const UniChar *>(customFormatString.characters()), customFormatString.length());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFDateFormatterSetFormat(formatter, customFormatCFString);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFRelease(customFormatCFString);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -184,7 +184,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ASSERT(length <= bufferLength);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (length > bufferLength)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ length = bufferLength;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFStringGetCharacters(string, CFRangeMake(0, length), buffer);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CFStringGetCharacters(string, CFRangeMake(0, length), reinterpret_cast<UniChar *>(buffer));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFRelease(string);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WebCore/platform/graphics/SegmentedFontData.cpp.orig 2017-06-16 05:46:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WebCore/platform/graphics/SegmentedFontData.cpp 2019-10-07 16:34:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -61,7 +61,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UChar32 c;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (int i = 0; i < length; ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- U16_NEXT(characters, i, length, c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ U16_NEXT(characters, i, length, c);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!containsCharacter(c))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WebCore/dom/Document.cpp.orig 2017-06-16 05:46:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WebCore/dom/Document.cpp 2019-10-07 17:30:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3846,12 +3846,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned i = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UChar32 c;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- U16_NEXT(characters, i, length, c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ U16_NEXT(characters, i, length, c);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!isValidNameStart(c))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while (i < length) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- U16_NEXT(characters, i, length, c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ U16_NEXT(characters, i, length, c);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!isValidNamePart(c))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3914,7 +3914,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const UChar* s = qualifiedName.characters();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (unsigned i = 0; i < length;) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UChar32 c;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- U16_NEXT(s, i, length, c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ U16_NEXT(s, i, length, c);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (c == ':') {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (sawColon) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ec = NAMESPACE_ERR;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt513/files/patch-qtwebkit_internal_api.diff b/aqua/qt513/files/patch-qtwebkit_internal_api.diff
</span>new file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..2ce72a2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt513/files/patch-qtwebkit_internal_api.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/QtWebKit/headers.pri.orig 2018-08-12 09:03:41.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/QtWebKit/headers.pri 2018-08-12 09:06:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SYNCQT.HEADER_FILES = WebKit/qt/Api/qwebdatabase.h WebKit/qt/Api/qwebelement.h WebKit/qt/Api/qwebhistory.h WebKit/qt/Api/qwebhistoryinterface.h WebKit/qt/Api/qwebkitglobal.h WebKit/qt/Api/qwebkitplatformplugin.h WebKit/qt/Api/qwebpluginfactory.h WebKit/qt/Api/qwebsecurityorigin.h WebKit/qt/Api/qwebsettings.h ../include/QtWebKit/qtwebkitversion.h ../include/QtWebKit/QtWebKit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-SYNCQT.HEADER_CLASSES = ../include/QtWebKit/QWebDatabase ../include/QtWebKit/QWebElement ../include/QtWebKit/QWebElementCollection ../include/QtWebKit/QWebHistoryItem ../include/QtWebKit/QWebHistory ../include/QtWebKit/QWebHistoryInterface ../include/QtWebKit/QWebSelectData ../include/QtWebKit/QWebSelectMethod ../include/QtWebKit/QWebNotificationData ../include/QtWebKit/QWebNotificationPresenter ../include/QtWebKit/QWebHapticFeedbackPlayer ../include/QtWebKit/QWebTouchModifier ../includ [...]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SYNCQT.GENERATED_HEADER_FILES = QWebDatabase QWebElement QWebElementCollection QWebHistoryItem QWebHistory QWebHistoryInterface QWebSelectData QWebSelectMethod QWebNotificationData QWebNotificationPresenter QWebHapticFeedbackPlayer QWebTouchModifier QWebFullScreenVideoHandler QWebSpellChecker QWebKitPlatformPlugin QWebPluginFactory QWebSecurityOrigin QWebSettings QtWebKitVersion
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SYNCQT.PRIVATE_HEADER_FILES = WebKit/qt/Api/qhttpheader_p.h WebKit/qt/Api/qwebdatabase_p.h WebKit/qt/Api/qwebelement_p.h WebKit/qt/Api/qwebhistory_p.h WebKit/qt/Api/qwebplugindatabase_p.h WebKit/qt/Api/qwebscriptworld.h WebKit/qt/Api/qwebscriptworld_p.h WebKit/qt/Api/qwebsecurityorigin_p.h WebKit2/UIProcess/API/qt/qquicknetworkreply_p.h WebKit2/UIProcess/API/qt/qquicknetworkrequest_p.h WebKit2/UIProcess/API/qt/qquickurlschemedelegate_p.h WebKit2/UIProcess/API/qt/qquickwebpage_p.h WebKit [...]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SYNCQT.INJECTED_PRIVATE_HEADER_FILES =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SYNCQT.QPA_HEADER_FILES =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/QtWebKitWidgets/headers.pri.orig 2018-08-12 09:03:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/QtWebKitWidgets/headers.pri 2018-08-12 09:04:20.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SYNCQT.HEADER_FILES = WebKit/qt/WidgetApi/qgraphicswebview.h WebKit/qt/WidgetApi/qwebframe.h WebKit/qt/WidgetApi/qwebinspector.h WebKit/qt/WidgetApi/qwebpage.h WebKit/qt/WidgetApi/qwebview.h ../include/QtWebKitWidgets/qtwebkitwidgetsversion.h ../include/QtWebKitWidgets/QtWebKitWidgets
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-SYNCQT.HEADER_CLASSES = ../include/QtWebKitWidgets/QGraphicsWebView ../include/QtWebKitWidgets/QWebHitTestResult ../include/QtWebKitWidgets/QWebFrame ../include/QtWebKitWidgets/QWebInspector ../include/QtWebKitWidgets/QWebPage ../include/QtWebKitWidgets/QWebView ../include/QtWebKitWidgets/QtWebKitWidgetsVersion
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SYNCQT.GENERATED_HEADER_FILES = QGraphicsWebView QWebHitTestResult QWebFrame QWebInspector QWebPage QWebView QtWebKitWidgetsVersion
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SYNCQT.PRIVATE_HEADER_FILES = WebKit/qt/WidgetApi/qwebframe_p.h WebKit/qt/WidgetApi/qwebinspector_p.h WebKit/qt/WidgetApi/qwebpage_p.h WebKit/qt/WidgetApi/qwebviewaccessible_p.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SYNCQT.INJECTED_PRIVATE_HEADER_FILES =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SYNCQT.QPA_HEADER_FILES =
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt513/files/patch-qtwebkit_opengl_location.diff b/aqua/qt513/files/patch-qtwebkit_opengl_location.diff
</span>new file mode 100755
<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/qt513/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><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt513/files/patch-shared.diff b/aqua/qt513/files/patch-shared.diff
</span>new file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..95938b2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt513/files/patch-shared.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/macdeployqt/shared/shared.cpp.orig 2015-02-16 21:57:17.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/macdeployqt/shared/shared.cpp 2015-05-31 10:36:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -289,7 +289,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ state = DylibName;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ continue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else if (part < parts.count() && parts.at(part).endsWith(".framework")) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- info.frameworkDirectory += "/" + (qtPath + "lib/").simplified();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ info.frameworkDirectory += "/" + (qtPath + "__MACPORTS_FRAMWORK_DIR__/").simplified();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ state = FrameworkName;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ continue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else if (trimmed.startsWith("/") == false) { // If the line does not contain a full path, the app is using a binary Qt package.
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt513/files/patch-sql_plugins.diff b/aqua/qt513/files/patch-sql_plugins.diff
</span>new file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..559c136
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt513/files/patch-sql_plugins.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- sqlite.pro.orig 2017-06-28 02:54:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ sqlite.pro 2017-09-10 07:26:38.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6,11 +6,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include($$OUT_PWD/../qtsqldrivers-config.pri)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QT_FOR_CONFIG += sqldrivers-private
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-qtConfig(system-sqlite) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#qtConfig(system-sqlite) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_USE += sqlite
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- include($$PWD/../../../3rdparty/sqlite.pri)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include($$PWD/../../../3rdparty/sqlite.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;'>+ OTHER_FILES += sqlite.json
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt513/files/patch-tst_qpluginloader.diff b/aqua/qt513/files/patch-tst_qpluginloader.diff
</span>new file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..fbce2b7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt513/files/patch-tst_qpluginloader.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp.orig 2015-05-30 18:33:03.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp 2015-05-30 18:34:54.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -311,7 +311,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void tst_QPluginLoader::loadMachO_data()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef Q_OF_MACH_O
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(QT_BUILD_INTERNAL) && defined(Q_OF_MACH_O)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QTest::addColumn<int>("parseResult");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QTest::newRow("/dev/null") << int(QMachOParser::NotSuitable);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -347,7 +347,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void tst_QPluginLoader::loadMachO()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef Q_OF_MACH_O
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(QT_BUILD_INTERNAL) && defined(Q_OF_MACH_O)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QFile f(QFINDTESTDATA(QTest::currentDataTag()));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QVERIFY(f.open(QIODevice::ReadOnly));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QByteArray data = f.readAll();
</span></pre><pre style='margin:0'>
</pre>