<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/3170b19030ad9fe48df6a401379a9312c995bf1f">https://github.com/macports/macports-ports/commit/3170b19030ad9fe48df6a401379a9312c995bf1f</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 3170b19 qt5*: update 5.10.1->5.11.1
</span>3170b19 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3170b19030ad9fe48df6a401379a9312c995bf1f
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Aug 16 04:20:36 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5*: update 5.10.1->5.11.1
</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/56927
</span>---
aqua/qt5/Portfile | 274 +++++++++++-----------
aqua/qt5/files/patch-add_sdk.diff | 33 ---
aqua/qt5/files/patch-init_priority.diff | 11 -
aqua/qt5/files/patch-mkspecs.diff | 17 +-
aqua/qt5/files/patch-pc_files.diff | 2 +-
aqua/qt5/files/patch-qtgamepad_64bit.diff | 8 -
aqua/qt5/files/patch-qtgamepad_i386.diff | 9 -
aqua/qt5/files/patch-qtvirtualkeyboard_noxcb.diff | 2 +-
aqua/qt5/files/patch-qtwebengine_xcode10.diff | 2 +-
aqua/qt5/files/patch-qtwebkit_internal_api.diff | 18 ++
aqua/qt5/files/patch-qualified_reference.diff | 11 -
11 files changed, 167 insertions(+), 220 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/Portfile b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 32674ed0..b637e68 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@ license {LGPL-3 GPL-3 OpenSSLException}
</span>
homepage https://www.qt.io
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 5.10.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 5.11.1
</span> set middle_name everywhere
if { ${subport} eq "${name}-qtwebkit" ||
${subport} eq "${name}-qtwebkit-examples" ||
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,7 +77,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.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://code.qt.io/cgit/qt/qt5.git/tree/.gitmodules?h=5.11
</span> #
###############################################################################
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -125,15 +125,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.10/qtmodules.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# module info found at https://doc.qt.io/qt-5.11/qtmodules.html
</span> #
###############################################################################
array set modules {
qt3d {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7102dff3d200983277d0b94387b27584f9492cc7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 041fb42536a72bbf9be17a6f52d4b73ce93fb98b456fd63503cc47d80d196b3b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 28788336
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b2933b790ffe52b09c425f588be86c32f19d0a68
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cb8659e1e5541bea4c3684ac76a496f8e0cd6e3aa9e4e22eba1910095f5ed30d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 84763568
</span> }
""
"port:assimp"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -146,9 +146,9 @@ array set modules {
</span> }
qtbase {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- b0587af8736bedc9b80ceb85f10ece64389a904c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d8660e189caa5da5142d5894d328b61a4d3ee9750b76d61ad74e4eee8765a969
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 46024708
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0da6d6fda6770279313218185225bdcda8ea53ff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a0d047b2da5782c8332c59ae203984b64e4d5dc5f4ba9c0884fdbe753d0afb46
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 46860400
</span> }
""
"port:zlib port:libpng port:jpeg port:freetype path:bin/dbus-daemon:dbus port:tiff port:libmng path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre2 port:harfbuzz"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -156,14 +156,14 @@ array set modules {
</span> {"Qt Core" "Qt GUI" "Qt Network" "Qt SQL" "Qt Test" "Qt Widgets" "Qt Concurrent" "Qt D-Bus" "Qt OpenGL" "Qt Platform Headers" "Qt Print Support" "Qt XML"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtcanvas3d {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- a3db2f43e1fe67fdc60362478cb62d6321c0aa41
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- de829a8e6aa4b8496048e9b6f3bff306a80c35935855a94426025ddfb8bcb0c0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 10883148
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cc5693fa06e449cbf963a441a8930f4eb72eb6db
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0fb51102bdd595673e2cc4f4878b8fb8b7da4c8b1f026885a75912e2421d2ede
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10931700
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -176,9 +176,9 @@ array set modules {
</span> }
qtcharts {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 6e147716a3555796fca164978999804676b8cd5e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4f0d577bf73dd2bbb2765c2cfb493a2d68790fc2c64f42544d31dba806321ec9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4244768
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fc82887553939a276b81aa435024941e01136583
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 62f65f08b08c1fdce4f358103be1f7d7aba54d21774e1a9bfff91314ad667a2b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4245496
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -191,9 +191,9 @@ array set modules {
</span> }
qtconnectivity {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 183280d18858e06c0d89ee248ee0a9831e5eefa6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 652821dc6819658ec4bc1a6bf149fd7a61008748ff4745b54f038ccf276d3ec9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2754972
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3bcc1eda3e441cbbbe5d91775ff4b94f670c2cb2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 738ed4eb058334fe7cfd6d68f2e2e7c9b2a97f3477b36ae26ed82703dcaae657
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2734864
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -206,9 +206,9 @@ array set modules {
</span> }
qtdatavis3d {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 1105320bd4bb1a07f108bcbccf570e859108accc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 63811fef1427f2ed4fd8bea4e1fc100a4b58982709f14f277c4e54999091c85b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5183624
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 83e476c507df484f5a684eff6a94d04db7fa5783
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1c9da0876e0058bff1c24e0088505aff469e2e2cc983143acdae17f075035e3d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5206688
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -221,9 +221,9 @@ array set modules {
</span> }
qtdeclarative {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 4c1d12bd6d314de993f2bd000b61590b157569de
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3af9ed51bce5b5c6f04c4a67a6008f98765ccde897c43fff670621ab70789553
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 22041236
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bb7dc3b6b40a67a9f981ff1eed6ba6cf719cc214
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9ecf5ef6bf618fcb6719a4b22e3d9f9ce7623c2344667038171d5662624c4f3a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 22203488
</span> }
"port:python27"
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -236,9 +236,9 @@ array set modules {
</span> }
qtdoc {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 1f00dab43b1f28bb488c1714baf6557d052348a4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 18dbb784cb89cb85d507ec8bd2ea50061cf719ed1b29da1dcbd29091991286be
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4577092
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 039aef1dc656ed5c7c357996ffd117d186601133
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ acde1b7c1d1d0bdaef492fed39aee12c949050d42fa2d89827aff00b6cc51afc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3328164
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -251,9 +251,9 @@ array set modules {
</span> }
qtgamepad {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 6df746520c3a95270af54590609821e9b35ea55e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 85c72801f56f7d5f55caff8ef23137978abe01637bb179566dd5976d6f5346f7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 385472
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 63b5090a73beefd5b04d0441dddfcd687e12c361
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ aaf219667f87d07a216bd30374013f97deea964471d827f7fc15bdc572e227d9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 387640
</span> }
""
"port:libsdl2"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -266,9 +266,9 @@ array set modules {
</span> }
qtgraphicaleffects {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 3de058bb55f3a12f757ef0b6c927fa4eaf89b98a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3f3b0631b579630bf58e99f3ca0d8dfdb6a44153c63cf90ac9e07041b4b1847f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 14513764
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 16a5cf6dab9d03edf923041f8419c6fcb7182a7b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d9d27236696221098e832d6fee8c0fbb2834b1670d9ca1e5bf3d0fbc8e5448f3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 14272760
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -281,9 +281,9 @@ array set modules {
</span> }
qtimageformats {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 00f9b677cfb534a82ab110fb11e428479fe47772
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2804baa2779eae015096820e233d7f86bb7fde9853b7c9150a321a453422a283
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2137288
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3d548c33e3a8b31b785a88934ae75186ff3d83d3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ eb50deeccce12ede0a5faeb3e411f34920ba43092c65f063ab23d37970f65616
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2191408
</span> }
""
"port:jasper port:libmng port:tiff port:webp"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -296,9 +296,9 @@ array set modules {
</span> }
qtlocation {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 27e396697cbc0a95f729d529133410e49630be6f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5e5cc05517c701a2c8ebba1fbe3ddff2b6b90d5aa554d307b1c477fe0cfd72c9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5444192
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ aef55997be298042c248d45b824c25f69771f303
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 172c9a39e8267739e20d60bda45de3db02b13163245776bdc696d8c5ab5f790f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5593144
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -311,9 +311,9 @@ array set modules {
</span> }
qtmacextras {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 87a3592b0b5f7d50d1ee515b5626af9fa534be75
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- c73a9984e8c83c27861187a2cff106d0614bbdd101dd64cb6d215ba4f48f7fca
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 69084
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f2f654d11b6f864b96fc8eb77420ca018d8a559c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f63e31ec68d72c185ad7374f3c74c1e8693dabaf14212cadac0fbd476cb1c3f1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 70976
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -326,9 +326,9 @@ array set modules {
</span> }
qtmultimedia {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 3104811796a0c0059c463635fab75e84d5f684e8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a1fa98015ee5a6b81f2d337abc98d8b297c6718f7714a1f13fccfd2934c23649
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3678332
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9aef23a9a578e7cb16184890055c5d713992cbfa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f28bb57890b4666a9aafaa116a30c51dedb0f23b60a510280a27eb032b58c90c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3711548
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -341,9 +341,9 @@ array set modules {
</span> }
qtnetworkauth {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 779ce1e4c33fcd3ecde9f8def8d415fa438814da
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 97231c319bd623d81eebaa1b5cdba4064bc4e69332c695a15cf8792b54b5dcdc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 138092
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b1b0374db0b1c5c1c1f8c627b8c70f5a7684acc9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 02b405e9b1af27e3dd986f9a2e4ed987bd9586bcdb2a529a08a6cc71ddbee416
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 140468
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -356,9 +356,9 @@ array set modules {
</span> }
qtpurchasing {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 42d3d6fc7a9ef4de6276c93fa021d5e700e9819a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 723491abdd8db0f313a4ac5647623ee39f647d0e2bfb4273cc84dc557caf0f24
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 208016
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 426b842a2f844e6a3df394a12db7e0a13866f1e3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac99abb83194b3b38f1bd7fd4458a4b32765e7dc7d515941d016abe45d1a3533
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 209828
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -371,9 +371,9 @@ array set modules {
</span> }
qtquickcontrols {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 1e3cc7119e44e91ce36739498097655a8a443ad6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d231a1993dc6a3f0dbc60a21d01fc0be15b0c26e881bd0631573952ea61682b7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5977000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 78dee5f3b939eab3ccc38f5be689773d95520731
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ baea7f59513ffade3f8041c1756722334b7d04245667fa8faaeace07a430c656
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6058072
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -386,9 +386,9 @@ array set modules {
</span> }
qtquickcontrols2 {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- e8527c6d06fa5052d34eacf787e915dc76754391
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5dc64a1b901e418b76fd3bf65dfa87a0cb11338741fb8970211c1df6df0e604a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 9022816
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 573d499b3fc63496fc14c45dbab1ac3d08b2d64b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bdb066fa0d51ad36a2c756d4cba63892587638e5df9b9b6ee63b963ff39ec442
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9032192
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -401,9 +401,9 @@ array set modules {
</span> }
qtremoteobjects {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 500aeb783a30fc1ccee1cd53f4b928cce71a0752
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- e9da0b8aca4223c2d2f6ab5b5c9ff6c9acfe47003837bab08169919d8f504e14
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 304296
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ aef08431c117f7b44dda79ae40f4b9edf5dc3feb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ eb2d69c662cd828a11d248e61742e3e494507e640757ec63dc64db24867069fb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 321092
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -416,9 +416,9 @@ array set modules {
</span> }
qtscript {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 6ae4ef3f7b4b491a6f8eda2bb50d78fd6d8406e2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- e0618af7cb1f1f30d292c04cf484e3507cf6f4815f79870e35d2b0ce7ac9532d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2674904
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7ec180957d0e4ada3189b1fae06f5a4db0664c54
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1c430fd06e8eb25dbca43422453a16588d1aade936770df2e4b4e8961659da7c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2671428
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -431,9 +431,9 @@ array set modules {
</span> }
qtscxml {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- d288c31b60165eed4084b29c22ebac971e6ecf61
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0b42d201e4f96af1c404a61f01da6726bab9bfba4e280cc4a82c717f0db26103
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 434272
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3e6081fdbbeadcf242b032f075369204e150ece2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f0463f02c0bb81d214b04ec82ff0d22744cdae1966cd8dfb53cd2b31ad233338
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 436148
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -446,9 +446,9 @@ array set modules {
</span> }
qtsensors {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 07265415803e7ed70ae81ccb273b0b42d1b1bed1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bb0df76c0e53cf2b39d10dbf0964706a264413aae74a4596119143ab4d165c96
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2022208
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 80eb1fced496f688db013d936882ddf9cca676dd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cbe90f58b73c344d67098eaa333f2d2562fa7a9f1794448e7543ff696831c0fa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2033508
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -461,9 +461,9 @@ array set modules {
</span> }
qtserialbus {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- d78d9f973ab65d123750c2d5ef6e8729f39f6a02
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0650a17950f140130ec20520b06592618850cc5673a815cb4fd585590d922257
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 306380
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 300b9552dd54d89ebc842a229eee88c019eb34e9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d3bbee3c579a6d7a06956d653bcdfc2e2cd054d639dcaff08f45efb94d6b554a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 320844
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -476,9 +476,9 @@ array set modules {
</span> }
qtserialport {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8e122f0dcc1a8a3d64f589d139e1cb7736c09528
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 08e4cb13bbf165eb99857301f3cffe280a4946ff58a34ccc542ad1f790194a9e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 296124
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ff03a91ce1665b46347502490c584e662c210115
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 56a7993821d556d84494c6dfc22759eb6f2a979e21685403a2b9da75f0ba64a3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 301692
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -491,9 +491,9 @@ array set modules {
</span> }
qtspeech {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 18ce9ee051d42287321b3ad0ffc03d4369af027d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 85775c773330492e7193ea7e1888af30bbf2b5a39899d5cf740453bd8667941d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 101592
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9263344e9b38c3c4b7f3aabe0e9c2aae4a1a06ef
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dcc782c7d6693b0874881cf6ccc7269681bd8bf5f6e1a83c4ab18c27a35a9bdb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 101732
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -506,9 +506,9 @@ array set modules {
</span> }
qtsvg {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8dea4f90080c6337938f660d4b8493c3d78108f1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 00e00c04abcc8363cf7d94ca8b16af61840995a4af23685d49fa4ccafa1c7f5a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1827620
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 904b69cda299e9a20c929d5410178f757a8361ea
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1d6aff3e3304ceec670c0f19029771ff21279553d561158063436b26c18b3037
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1843216
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -521,12 +521,12 @@ array set modules {
</span> }
qttools {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- f288781f5643c7b076ac7beac2ba341f43af924f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f1ea441e5fe138756e6de3b60ab7d8d3051799eabe85a9408c995dfd4d048a53
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 9864504
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6aaaf4f6db3f823d4d00dfce62d585dbd820820a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b7fb186f92aedb922c4e7f57ff276bbf90caf0087a2a980f704bad9ac44514fe
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9720996
</span> }
""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "port:clang-6.0"
</span> "qtbase qtdeclarative"
{"Qt Designer" "Qt Help" "Qt UI Tools"}
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -536,9 +536,9 @@ array set modules {
</span> }
qttranslations {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 4321c118ac1a8b01a8fe627bcd7fa09c7392b3d6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1f6d840e3d04b00b976bc1a86ea2be9d61051b7c3455dc2b891fae61772643fd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1486500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 576dfd1b011c134dacce809614ba762358537202
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 12d89b2afa64dce4d32c9e680135243c579d99aa9279d2aafc5602c15a697106
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1428808
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -551,9 +551,9 @@ array set modules {
</span> }
qtvirtualkeyboard {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 08fc3a3ab18116a5511289c16965de251e1bf2fe
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4319f90e68a571974d03f39507dde548971412e31f971081ca7eaf388187d52e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 10128548
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1276f69108349783bfc6e4e8ba237e179816d1d6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5b330dcc770976a2cfb8d85711d72a57c9764c1a9efb889c91e81f6071bbbf9b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10648700
</span> }
""
"port:hunspell"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -566,9 +566,9 @@ array set modules {
</span> }
qtwebchannel {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7ab402cf6c9e18e06e290d006cda6b1cb76ab407
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- c22c449fecb052597d12f8dd59498db39767037f9098123f3defc04eb20a3764
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 173612
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 56120b2e56218866f34eea7ff83071fd06c71087
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b9a476af15ae0c68a930f0b0aa8d988b8dc3e63c3d2134abebbf2148d6942e87
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 179700
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -581,9 +581,9 @@ array set modules {
</span> }
qtwebengine {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 02a127721700daa6ffc0778b743abbff8640318f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 12644f8d2ba8354a2a533d5a7f3f5139c6ff168c2f51aa3e21b701db6dbc01de
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 209844952
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 783d24997f0a802fc2763cf3f183672fad79e84a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 389d9f42ca393ac11ec8932ce9771766dec91a4c761ffb685cc429c2a760d48c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 233633572
</span> }
"port:python27 port:py27-ply port:ninja"
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -596,9 +596,9 @@ array set modules {
</span> }
qtwebglplugin {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 14f84aa121bb3151782ddb4f819919c777d96cb4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5479208173fa954933770509a61aa6624b57b012e34362e753c695a878f5bfc1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 64688
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1c79a0b725d923646d236440b578e12f202e9e05
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7d94c31ee172c49400f646e52b0d4cbd02b1764c46cd4babf6a119a947841e81
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 69652
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -621,7 +621,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 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 2"
</span> "License: "
}
qtwebkit-examples {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -636,14 +636,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 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 2"
</span> "License: "
}
qtwebsockets {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- e834767800646b82d597f24071c6c7ebba2aec04
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 6ecf790955ffe42dce731e10557f4ba625e359e867953d73f7fb453c0bad53ea
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 225504
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 559b812279e0431a4252c49f46ede166d2583ca8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7aaa12f719e853a195a670ff51697b73914e37c94ed2216d53a2d9e0861748ae
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 231468
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -656,9 +656,9 @@ array set modules {
</span> }
qtwebview {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 445dcb4ef0785c27b48bfd5bd08a3b1da907d0f3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0b58209dd60f8d403473b0dbce551fc0ff7c2543676ff01b5f01b32108e31584
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 129184
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 933cbedb981723026a35196163d43b4d59d68e0a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 77c9bb78d3626789c31ef84056652daec1fbcad9e9ad6ad61e625d3e8232aaa1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 132948
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -671,9 +671,9 @@ array set modules {
</span> }
qtxmlpatterns {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 9f7ba868db8d0cf96f376489128f9fe880b1e588
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3cdef59ce96a796606e5adc5756c63c8607fb29b281fddb38acee3e674d5e9fe
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1385256
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2d6a7f8d40f435542c53949524a605b09b321adc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6117e120c87b32dd07877dd0a6bf862b6285cb0d8b547190882980682f53af58
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1378340
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -781,11 +781,9 @@ build.env-append \
</span> PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Qt 5.9 requires LSCopyDefaultApplicationURLForURL, which was introduced in macOS 10.10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://developer.apple.com/library/content/documentation/General/Reference/APIDiffsMacOSX10_10SeedDiff/frameworks/CoreServices.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} < 14 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.major} < 15 } {
</span> pre-fetch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${subport} requires OS X 10.10 or later"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "${subport} requires OS X 10.11 or later"
</span> return -code error "incompatible OS version"
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -863,9 +861,6 @@ foreach {module module_info} [array get modules] {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://codereview.qt-project.org/#/c/141654/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-add_sdk.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # undo part of https://codereview.qt-project.org/#/c/140954/
# .pc files still needed by some port
# see https://github.com/Homebrew/homebrew-core/blob/master/Formula/qt5.rb
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -875,11 +870,6 @@ foreach {module module_info} [array get modules] {
</span> # only runs test code on 32-bit systems
patchfiles-append patch-tst_benchlibcallgrind.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # avoid non-standard C++ that Xcode Clang accepts but other compilers do not
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://lists.llvm.org/pipermail/llvm-bugs/2017-January/053481.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=11764
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-qualified_reference.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # find the Rez program
patchfiles-append patch-find_rez.diff
post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -889,9 +879,6 @@ foreach {module module_info} [array get modules] {
</span> mkspecs/features/mac/rez.prf
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://codereview.qt-project.org/#/c/221071/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-init_priority.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> #-----------------------------------------------------------------------------
# qtbase is used for:
# 1) building qtbase
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1023,6 +1010,15 @@ foreach {module module_info} [array get modules] {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # use MacPorts X11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach spec {macx-clang} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_PREFIX__|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/mkspecs/${spec}/qmake.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # return modified spec files to the default values
post-build {
foreach conf {clang.conf macx.conf clang-mac.conf gcc-base.conf} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1369,6 +1365,11 @@ foreach {module module_info} [array get modules] {
</span> # this feature does not work without "CONFIG += link_pkgconfig"
patchfiles-append patch-icu.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # QtWebKit is supported by the community and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # relies on "implementation detail[s]," which
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # "may change from version to version"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtwebkit_internal_api.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # qtwebkit uses
# glx
# libXcomposite
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1421,6 +1422,10 @@ foreach {module module_info} [array get modules] {
</span> reinplace "s|__MACPORTS_FRAMWORK_DIR__|${libreplace}|g" ${worksrcpath}/src/macdeployqt/shared/shared.cpp
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # qdoc now uses libclang for parsing C/C++ code
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://wiki.qt.io/New_Features_in_Qt_5.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append LLVM_INSTALL_DIR=${prefix}/libexec/llvm-6.0
</span> }
# special case
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1463,16 +1468,6 @@ foreach {module module_info} [array get modules] {
</span> }
# special case
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${module} eq "qtgamepad" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # /System/Library/Frameworks/GameController.framework is 64-bit only
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset universal] && ${build_arch} eq "i386" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-qtgamepad_i386.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-qtgamepad_64bit.diff
</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;'>- # special case
</span> if { ${module} eq "qtmultimedia" } {
# In the file config.tests/openal/openal.pro, defining HEADER_OPENAL_PREFIX means
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1898,11 +1893,6 @@ if { ${os.major} < 15} {
</span> set qt_replace_version 5.8
} else {
set qt_replace_version 5.9
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${version} eq "5.10.1"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # increase revision for replaced_by to work
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # do not force *all* OSs to rebuild
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision [incr ${revision}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
set qt_replace_name qt[join [split ${qt_replace_version} .] ""]
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-add_sdk.diff b/aqua/qt5/files/patch-add_sdk.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 68189f7..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-add_sdk.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,33 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From dd5bed5198bda65930d4ea406e29006f0deb6018 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Marcus Calhoun-Lopez <marcuscalhounlopez@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sun, 22 Nov 2015 10:24:04 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] OS X: resolve SDK version of QMAKE_LINK_C and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_LINK_C_SHLIB
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-On OS X, both compilers and linkers are given an absolute path.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-For consistency, the same should be done with the C linkers.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The change is also a convenience to the MacPorts project,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-which actively discourages ambiguous compiler names.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(https://trac.macports.org/wiki/UsingTheRightCompiler).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Change-Id: Ic1885aed825340696e9fde766788eebf51de3ff6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mkspecs/features/mac/sdk.prf | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e238f8e..624366a 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/features/mac/sdk.prf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/features/mac/sdk.prf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -40,7 +40,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKESPEC_NAME = $$basename(QMAKESPEC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Resolve SDK version of various tools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--for(tool, $$list(QMAKE_CC QMAKE_CXX QMAKE_FIX_RPATH QMAKE_AR QMAKE_RANLIB QMAKE_LINK QMAKE_LINK_SHLIB QMAKE_ACTOOL)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+for(tool, $$list(QMAKE_CC QMAKE_CXX QMAKE_FIX_RPATH QMAKE_AR QMAKE_RANLIB QMAKE_LINK QMAKE_LINK_SHLIB QMAKE_ACTOOL QMAKE_LINK_C QMAKE_LINK_C_SHLIB)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tool_variable = QMAKE_MAC_SDK.$${QMAKESPEC_NAME}.$${QMAKE_MAC_SDK}.$${tool}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- !isEmpty($$tool_variable) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $$tool = $$eval($$tool_variable)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.6.2.2.g1b5ffa3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-init_priority.diff b/aqua/qt5/files/patch-init_priority.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 25146f7..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-init_priority.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/corelib/global/qglobal.h.orig 2018-02-08 11:24:48.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/corelib/global/qglobal.h 2018-05-18 20:48:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -508,7 +508,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define Q_ALWAYS_INLINE inline
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef Q_CC_GNU
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(Q_CC_GNU) && defined(Q_OS_WIN)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define QT_INIT_METAOBJECT __attribute__((init_priority(101)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define QT_INIT_METAOBJECT
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-mkspecs.diff b/aqua/qt5/files/patch-mkspecs.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 3507ac0..a8da4ed 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-mkspecs.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-mkspecs.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,12 +28,23 @@
</span> # qmake configuration for Clang on OS X
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.11
</span> +QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
-QMAKE_APPLE_DEVICE_ARCHS = x86_64
+QMAKE_APPLE_DEVICE_ARCHS = __MACPORTS_DEVICE_ARCHS__
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Opt-in xcb QPA support with XQuartz:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25,8 +25,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> include(../common/macx.conf)
include(../common/gcc-base-mac.conf)
--- mkspecs/macx-g++/qmake.conf.orig 2017-06-28 02:54:29.000000000 -0700
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,7 +53,7 @@
</span> CONFIG += app_bundle incremental global_init_link_order lib_version_first
QMAKE_INCREMENTAL_STYLE = sublib
<span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.11
</span> +QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
-QMAKE_APPLE_DEVICE_ARCHS = x86_64
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,7 +67,7 @@
</span> QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden
QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
<span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.11
</span> +QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
-QMAKE_APPLE_DEVICE_ARCHS = x86_64
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-pc_files.diff b/aqua/qt5/files/patch-pc_files.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 29d9b90..dd49655 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-pc_files.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-pc_files.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ diff --git i/qtbase/mkspecs/features/qt_module.prf w/qtbase/mkspecs/features/qt_
</span> index bb28af97..36bb6483 100644
--- mkspecs/features/qt_module.prf
+++ mkspecs/features/qt_module.prf
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -266,7 +266,7 @@ load(qt_installs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -265,7 +265,7 @@ load(qt_installs)
</span> load(qt_targets)
# this builds on top of qt_common
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtgamepad_64bit.diff b/aqua/qt5/files/patch-qtgamepad_64bit.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2132e9b..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-qtgamepad_64bit.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/plugins/gamepads/darwin/darwin.pro.orig 2017-06-22 23:35:28.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/plugins/gamepads/darwin/darwin.pro 2017-09-09 20:54:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17,3 +17,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OTHER_FILES += \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- darwin.json
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+QMAKE_APPLE_DEVICE_ARCHS-=i386
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtgamepad_i386.diff b/aqua/qt5/files/patch-qtgamepad_i386.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1fe4d2e..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-qtgamepad_i386.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/plugins/gamepads/gamepads.pro.orig 2017-06-22 23:35:28.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/plugins/gamepads/gamepads.pro 2017-09-09 20:17:12.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3,5 +3,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qtConfig(sdl2): SUBDIRS += sdl2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- !android: qtConfig(evdev): SUBDIRS += evdev
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- win32: !wince*: SUBDIRS += xinput
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--darwin: !watchos: SUBDIRS += darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#darwin: !watchos: SUBDIRS += darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- android: !android-embedded: SUBDIRS += android
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtvirtualkeyboard_noxcb.diff b/aqua/qt5/files/patch-qtvirtualkeyboard_noxcb.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d68317d..b41828c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-qtvirtualkeyboard_noxcb.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-qtvirtualkeyboard_noxcb.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- src/virtualkeyboard/virtualkeyboard.pro.orig 2016-11-28 02:45:25.000000000 -0700
+++ src/virtualkeyboard/virtualkeyboard.pro 2017-06-20 07:13:44.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -296,10 +296,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -297,10 +297,10 @@
</span> SOURCES += desktopinputpanel.cpp inputview.cpp
HEADERS += desktopinputpanel.h inputview.h
DEFINES += QT_VIRTUALKEYBOARD_DESKTOP
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtwebengine_xcode10.diff b/aqua/qt5/files/patch-qtwebengine_xcode10.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index fc5040d..84adaaf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-qtwebengine_xcode10.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-qtwebengine_xcode10.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +35,7 @@ index 614f7fc92..c790c9fa6 100644
</span> skipBuild("Using Xcode version $$QMAKE_XCODE_VERSION, but at least version 7.3 is required to build Qt WebEngine.")
return(false)
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -128,6 +128,26 @@ defineTest(isMinOSXSDKVersion) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -126,6 +126,26 @@ defineTest(isMinOSXSDKVersion) {
</span> return(false)
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtwebkit_internal_api.diff b/aqua/qt5/files/patch-qtwebkit_internal_api.diff
</span>new file mode 100644
<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/qt5/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/qt5/files/patch-qualified_reference.diff b/aqua/qt5/files/patch-qualified_reference.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f31e23f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-qualified_reference.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm.orig 2017-10-02 01:43:38.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm 2017-10-24 16:36:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -830,7 +830,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QFixed QCoreTextFontEngine::emSquareSize() const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return QFixed::QFixed(int(CTFontGetUnitsPerEm(ctfont)));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return QFixed(int(CTFontGetUnitsPerEm(ctfont)));
</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;'>- QFontEngine *QCoreTextFontEngine::cloneWithSize(qreal pixelSize) const
</span></pre><pre style='margin:0'>
</pre>