<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/ac4c68ed32941102dfdf0bb7936692a497678b1e">https://github.com/macports/macports-ports/commit/ac4c68ed32941102dfdf0bb7936692a497678b1e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ac4c68ed32941102dfdf0bb7936692a497678b1e
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Oct 1 06:57:36 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5: update version 5.8.0->5.9.1
</span>---
_resources/port1.0/group/qt5-1.0.tcl | 11 +-
aqua/qt5/Portfile | 444 +++++++++------------
aqua/qt5/files/patch-32bit.diff | 95 +++++
aqua/qt5/files/patch-NSRect.diff | 55 ---
aqua/qt5/files/patch-machtest.diff | 15 -
aqua/qt5/files/patch-mkspecs.diff | 123 ++----
aqua/qt5/files/patch-opengl.diff | 13 -
aqua/qt5/files/patch-pc_files.diff | 2 +-
aqua/qt5/files/patch-qcocoahelpers.diff | 2 +-
aqua/qt5/files/patch-qmake_flags.diff | 13 +
aqua/qt5/files/patch-qt_module.prf.diff | 15 -
aqua/qt5/files/patch-qtgamepad_64bit.diff | 8 +
aqua/qt5/files/patch-qtgamepad_i386.diff | 8 +-
.../files/patch-qtwebengine_deployment_target.diff | 9 -
aqua/qt5/files/patch-qtwebengine_external.diff | 7 -
aqua/qt5/files/patch-sdk10_13.diff | 6 +-
aqua/qt5/files/patch-sql_plugins.diff | 10 +-
17 files changed, 374 insertions(+), 462 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 ee88511..0870d84 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;'>@@ -36,7 +36,8 @@
</span>
global available_qt_versions
array set available_qt_versions {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- qt5 {qt5-qtbase 5.8}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5 {qt5-qtbase 5.9}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt58 {qt58-qtbase 5.8}
</span> qt57 {qt57-qtbase 5.7}
qt56 {qt56-qtbase 5.6}
qt55 {qt55-qtbase 5.5}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -108,7 +109,7 @@ proc qt5.get_default_name {} {
</span> # Qt 5.7: Supported
# Qt 5.6: Supported
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return qt58
</span> #
} elseif { ${os.major} <= 15 } {
#
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -419,6 +420,12 @@ namespace eval qt5pg {
</span> lib/pkgconfig/Qt5QuickControls2.pc
""
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtremoteobjects {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lib/pkgconfig/Qt5RemoteObjects.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> qtscript {
5.0
6.0
<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 5e244ae..c6a3910 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 http://qt.io
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 5.8.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 5.9.1
</span>
set just_want_qt5_variables yes
PortGroup qt5 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,8 +27,7 @@ set qt_major [lindex [split ${version} .] 0]
</span> PortGroup cxx11 1.1
master_sites \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- http://download.qt.io/official_releases/qt/${branch}/${version}/submodules \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- http://download.qt.io/community_releases/${branch}/${version}-final
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ http://download.qt.io/official_releases/qt/${branch}/${version}/submodules
</span>
# file sizes are significantly smaller using xz
if { ${subport} ne ${name} && ${subport} ne "${name}-docs" } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,7 +70,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;'>-# http://code.qt.io/cgit/qt/qt5.git/tree/.gitmodules?h=5.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# http://code.qt.io/cgit/qt/qt5.git/tree/.gitmodules?h=5.9
</span> #
###############################################################################
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -116,37 +115,37 @@ 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 http://doc.qt.io/archives/qt-5.8/qtmodules.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# module info found at http://doc.qt.io/qt-5/qtmodules.html
</span> #
###############################################################################
array set modules {
qt3d {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ffd237991652c6425b3ff1e45344119b73c6f03b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3a224576fc922195ac0063b5b351cd6b9d13afcde9cec14317be0347d10c8ae5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0c4bea3a2155d277121c37a03610e37c7d6f1e6d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4f1fe5b812d78987341b854e7f2907f0375dc188cfa6cf9db101b26e9dfd4996
</span> ""
"port:assimp"
"qtdeclarative qtimageformats qtgamepad"
{"Qt 3D"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtbase {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- d395139af720a9c3bf00f962e2c3ebe01cd75702
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- c17111ae02a44dc7be1ec2cf979a47ee9e58edf4904041a525c21f4fa53fc005
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1513b037a71e2328bb1d54d2406a327bb5351106
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bc9a21e9f6fff9629019fdf9f989f064751d5073c3a28dc596def92f4d4275c6
</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:pcre port:harfbuzz"
""
{"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: ~docs"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtcanvas3d {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- d9529b6042b750f8f58ca2e92f0cfd00a4e3cb7b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5446f790f526f582df7790e1e1442357f61aac9c23ea9b00d4a791c9d78ccaa3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d48f601e97655a80048aeaf3db9ae382b3dc7b31
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4b8bf09330f03d2b3998f5447991546704715478c54f4f8d82d00bee3047de81
</span> ""
""
"qtdeclarative"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -157,8 +156,8 @@ array set modules {
</span> "License: "
}
qtcharts {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- e26012a821355159b4b250ad9da95ee93bdf5d98
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 03e8acbe6d0a1ea421b28aba3e171648ec833381e6991f6617dfdcd85d78a586
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 04869b051e685a21eb7c18fe2f286db2bf4a15cb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7328cbdc138a0b40f874bb8db36e0aee7cdf1c93263e3a184471867876710da0
</span> ""
""
"qtbase qtdeclarative qtmultimedia"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -169,8 +168,8 @@ array set modules {
</span> "License: {GPL-3 OpenSSLException}"
}
qtconnectivity {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7dacd93e8e8a9014fb33505e3a6c792fc9945542
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7b2d01e9d67f6390a9e64bdae62e81a965b0f0b21137cf1a021e08a28bb227f1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 018c034d752e10e8b4a988fbd42179034d1bad24
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 40638b715517bff8509fe9fe1e6a4e45e0f66e68920605048e080dd023ae7fd5
</span> ""
""
"qtbase qtdeclarative"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -181,8 +180,8 @@ array set modules {
</span> "License: "
}
qtdatavis3d {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8ca22a991964fa625b27719dc04fa98f163c1bee
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 77f1e7698cc2bade94183d05cf4c879a1c9c12ca6aedc565ee29df638d6b5bd8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0d07cf0f5b5db1f08ae7a8717d4ef344489e1375
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 233cab90fa35c926717bf697e7259b4e5bc7af6a26183657b006dac80fc0a191
</span> ""
""
"qtbase qtdeclarative qtmultimedia"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -193,8 +192,8 @@ array set modules {
</span> "License: {GPL-3 OpenSSLException}"
}
qtdeclarative {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- f060a9626295e93e7f5dd58d5bb69d1a792c16ec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 32941eb9ad12d8735dfc64de8b50b5ab830a6d8705a421c57369de7cb5708a46
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 61616d617e0a40e53af118805fdeea367a734cb7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d2fe6c9c1a9f19af6e96553c6d75366ab8f397bc232acd67d31476955fee94ff
</span> "port:python27"
""
"qtbase qtsvg qtxmlpatterns"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -205,8 +204,8 @@ array set modules {
</span> "License: "
}
qtdoc {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 133ec7402ca876be3acb97eabbe05883c56e02e6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3112c44c49820f236316bdcadb22c2231bc1232d7d0c202472bbb30613ad578e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e2558628b07755d8c999d00fa0eaffbc94723402
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5d9c312910669e880bf4e5bf01287dc218a20639cedb83ae0a4688fa799a53b4
</span> ""
""
"qtdeclarative qttools sqlite-plugin"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -217,20 +216,20 @@ array set modules {
</span> "License: "
}
qtgamepad {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 2397828e13aa338502c20396e90703e68b1db51b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- b2f0ae3cda03942ad7971cfeebd0dd7e64faa24320104892f90220080cce8c37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 382bd291cab8afa11950f174474b3e02549b4860
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f10714df314b3ef992060454db62e07d0b6a1fc7cf8a4175c023c59f8821bc14
</span> ""
"port:libsdl2"
"qtbase qtdeclarative"
{"Qt Gamepad"}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "technology preview module"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ""
</span> "variant overrides: "
"revision 0"
"License: "
}
qtgraphicaleffects {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7a3dbcf7bbb600eafd901f719391a8f0965680c9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5f2a9b50530ac83d7c2b2ce73fbdf03ac61f83a9521e9d4b796fa17a969dd919
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4ef5acd1434196f354c4454ab164373589f7438a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5f86c38e36d9553049cfbe56d4869e73cf8ab920905402cbcafb56dd8a1a59ff
</span> ""
""
"qtdeclarative"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -241,8 +240,8 @@ array set modules {
</span> "License: "
}
qtimageformats {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- f0ac09e19c5ca637f67daffad981a7e075814fb3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 75045eeac11c96194260badbdb4d3e9eb7b7f9972d18d3491230ea820be4606f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 98eea6c68cc88519d660d9e0f9e30ebc23d45013
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 79fee307310a66100bd3d907ea69bd039dcd727c15f27e990167e7a27d1b8a47
</span> ""
"port:jasper port:libmng port:tiff port:webp"
"qtbase"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -253,11 +252,11 @@ array set modules {
</span> "License: "
}
qtlocation {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7b161c72dd8a05f7b54a845a586da0e082730d52
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 48a1e39ed989f0133aeacaa379e9c3958ec9b08c043626bba503619891d21abb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7a4eaa97485c212fb8c9d2e8e86bf129be26cf07
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4bc43c1df69c5322f982588711d4a65f8408b71a36e43ba19b39d1aae87e1515
</span> ""
""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "qtbase qtdeclarative qtquickcontrols qtserialport"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "qtbase qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport"
</span> {"Qt Location" "Qt Positioning"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -265,8 +264,8 @@ array set modules {
</span> "License: "
}
qtmacextras {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 434deaf47735fe5abeb8403c0ea6ea99a08a3ec4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ee27998f5e0f109bc7604b3754ac435760d0e3722bf67f62f467776f7c5f3411
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 74a7395d063404d85745cfafd326f2a922f7f892
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 216ca6f97a4a5b87677a52fa2fff2b6b7bdb26cc874fe93ee5517328687a2601
</span> ""
""
"qtbase"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -277,32 +276,32 @@ array set modules {
</span> "License: "
}
qtmultimedia {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 2ec53aff67f3cf5fd45b3d9f5d71899dc102f395
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a8bc044834f95208261915feefe5e2fdb6761b76f0f99e21062963bd9f9d4a07
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8956947b2369ae2a2c8e7dde8cf5a47e6aeb523f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e48fbe71b4418eb7caba5ef5aa422483fb28d0e894cbc41f3d8b73b3d7fee6e4
</span> ""
""
"qtbase qtdeclarative"
{"Qt Multimedia" "Qt Multimedia Widgets"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtnetworkauth {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 844e74ebcd3e69f31fa95c79ae984bc73d5068c1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 615581c3a989167a207215c790825873fa24d83738c083c136252a462aa3e4c3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 863dbf05b92850a5d1cb01fc510f9b936f4f0d81
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2aff7ec9d12e686d0d0ea6bb957ac09d0f39afb31d072b7e129f617aeee8eab9
</span> ""
""
"qtbase qtwebview"
{"Qt Network Authorization"}
"technology preview module"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "variant overrides: ~universal"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "variant overrides: "
</span> "revision 0"
"License: "
}
qtpurchasing {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- cc71fe017debfe7f32128affc673d3c8f215b33f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- b3fd8793525f4e3bf354db927e8b4c9ba1157ae080f2e16afa9a85eec7e1b355
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c6aec029f9be603c39e641fd8b1ac887c25fae2d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5a8f270158b901d926086667d9d84eee5f46a7110d4f04cd32edac6cb0a2302c
</span> ""
""
"qtbase qtdeclarative"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -313,8 +312,8 @@ array set modules {
</span> "License: {GPL-3 OpenSSLException}"
}
qtquickcontrols {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 2d1c99030e8345e87488609c9452d316951f0d8e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 04e70d0ccfd9ba882691a5e8f81e3428ae1b72a76bb9f43ba242f1c33bd7b326
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10f69be3dfbd96b73f963d43e2381c8afa378c2e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 520ed0e110f9d0977eb873ea0e05a3d205c9c1b1ad2dd606875708848b21ec2e
</span> ""
""
"qtdeclarative qtgraphicaleffects"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -325,8 +324,8 @@ array set modules {
</span> "License: "
}
qtquickcontrols2 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- b3468bd4b29975cf89630685ed9e24bb971d9aeb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- b099866ec74f13cf0047274c61f0486d1eba27716fa07b69f682c54d3a4ade1b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2f51cfa841402f9b0eb71a5de8fd336d240ee22f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 203be0321112d1513b722fce463f9e30d7d00befb33349901d9517f4f13408ff
</span> ""
""
"qtgraphicaleffects"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -336,21 +335,34 @@ array set modules {
</span> "revision 0"
"License: "
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtremoteobjects
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e1350cc3bb42977b03376666a89b6d6a611ee9bc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a04ef16017903050a4afefb64f1d6a88fadb3c9b3668b320d6dfc4fa1cc07c82
</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;'>+ "qtdeclarative"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {"Qt Remote Objects"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "technology preview module"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "variant overrides: "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "License: "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> qtscript {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- acd09e718eaf024a287ef1e747e657d3fb5b419a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 293ab91d2d189d889dc80609aa259190fb7de636d360e904784a5ce1a45e5ad3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 078d24d5e9dd6032e8224c41402e5d2deca0d585
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 176a08865d5f66437b0f279fc5d7f381f359f20bafbffcebdcac61e86415188f
</span> ""
""
"qtbase qttools"
{"Qt Script" "Qt Script Tools"}
"deprecated in favor QJS* in Qt QML"
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtscxml {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- aeef913be45b60be7ad8f8985425f12f39d4ed71
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- b6bb9d397396e7e2667d400c4d904d2d1dd9c1573c37ebe1aa62448289a09dc4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e17e6b704c1303f0b1fcd334b52d2d94575f938b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 409758206d1381f262e879d8bde72c147f36f04af2be58986b5a61581e376bd4
</span> ""
""
"qtbase qtdeclarative"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -361,8 +373,8 @@ array set modules {
</span> "License: "
}
qtsensors {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 295b773ac70732c99a13415f4f76ae86f406cb44
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3a5d0639ecf8cd30c8ca349c353a8f3c424889b53831e70b6d8c481fc45de796
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d833b229bf8e7cf1a00bf84f22c161baf76ffb43
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5af19397aa8ccd88c1fbb7cda4ee2a583f05bdf8ae090eb616bb276ff2e9e29c
</span> ""
""
"qtbase qtdeclarative"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -373,8 +385,8 @@ array set modules {
</span> "License: "
}
qtserialbus {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 649d786ab283c0ff9feb0d6b66a512dff24a1dac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 58343dd9f2e339d4900a2d4b54ee25ed959cf62bacb012fe61e6b99d7958c10a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 26d0f06aba9edf883a7176a6a406fcd0ae4b8525
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ caa9feefbf1d51b38d6bc923428009d524c0c5eb77f30e4b6d84fec1ce19f3c3
</span> ""
""
"qtserialport"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -385,8 +397,8 @@ array set modules {
</span> "License: "
}
qtserialport {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 79004f8e1f2db0d6be966dffafacce73fa875fd6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 52317fded73ad0beb0a2ecf93124a8e2dfdcf14270a762c1f4fd06fb075506ad
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c0fbee9d5f3861e0835684ff0de72764a7d54f6b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e1fe85bf292929c3a62cb4d21efaaa4e89f70f48ea10914da07d0670ec617a69
</span> ""
""
"qtbase"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -397,8 +409,8 @@ array set modules {
</span> "License: "
}
qtspeech {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- f907e9af09b3d31b193e1e72490feb7495be33e5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f16a81593dfe1ad84c2e6bd42316042fe0bc9609f638baca35456a6d56e84c44
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 477f4b10c511b55dc7abf5319ab054bc3f4446e6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac9cef10637b54fa8d0bfe83f5b98c1c295cb68e63cf0973b2c6f188dcecaa01
</span> ""
""
"qtbase qtdeclarative qtmultimedia"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -409,8 +421,8 @@ array set modules {
</span> "License: "
}
qtsvg {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 6d68b42a973e02b9b69721e49e3194ae1c389bd5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 9873191c211ab4da9c0bc47b1e3549f475db4d448bba3175e0f86b24eefadc89
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1f28e4ee48cc060b50bfede5e7fd99ff5f294e0c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 99f294f874b13553e4ed49cd9465580ad0c9b92e29cdfa47b2e4096835c1e2e5
</span> ""
""
"qtbase"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -421,8 +433,8 @@ array set modules {
</span> "License: "
}
qttools {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 91000c61fc853b7985373d5c7bcdf72d1ab935c3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 95ec8e76d393b6ba26ffff5041fce41946d2bf3aec1402c6533e24d9fc269d83
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ca550fa94039268c717df1b6ca4f61f7fb8c715b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c4eb56cf24a75661b8317b566be37396c90357b4f6730ef12b8c97a7079ca0e8
</span> ""
""
"qtbase qtdeclarative"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -433,8 +445,8 @@ array set modules {
</span> "License: "
}
qttranslations {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 41e8c4bbe38cc0b222c585516d2e7d515d9cc307
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3b7cf72ec50bc2a02bf4e4427b184febac909dba0e02e1861321ca1629c3fc2e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c8b1fb904752b7b51662f75737e755b7812fb3d5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4a12528a14ed77f31672bd7469cad30624e7b672f241b8f19ad59510298eb269
</span> ""
""
"qttools"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -445,8 +457,8 @@ array set modules {
</span> "License: "
}
qtvirtualkeyboard {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- a102a5a0788e509357bdd5a44816851e1cd8b496
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 35fdf5b39d930935b6299ac59f347bea89b983e16bd7961fee3f1b8e16f4e21c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9e50a4c58cd02b7501e52d5f543529019f1af518
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6b746a6dc3ab54edf3007d0f6a2f8f31281aed03629830f59acfbc8514d6e94c
</span> ""
"port:hunspell"
"qtbase qtdeclarative qtsvg qtmultimedia qtquickcontrols"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -457,8 +469,8 @@ array set modules {
</span> "License: {GPL-3 OpenSSLException}"
}
qtwebchannel {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- bddd059128b9af69e81f7324621b68b8f338a3c8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5bf5b15413baa235ee2cbfd136ea3b9303b32879b54f9f25bfb4dc96d37d0b4a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f257071597212f8f7faeb9f786ff197d92a66a15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 80425f5a6df8784f5221809ffd664486ed38427f514ab4ec174e20456b027000
</span> ""
""
"qtbase qtdeclarative qtwebsockets"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -469,20 +481,20 @@ array set modules {
</span> "License: "
}
qtwebengine {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- cb0789067b954fb14e950b1704450dc513fd1181
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 223d22f1660811e60677afe0a85f2f385823e25157689561489700c5d1da79be
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "port:python27 port:py27-ply"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e72fdf99c99038c4f7e7dd85699c52ff00f6b459
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f6a37eeb9188474a16d29ede498fce959396ab80329a0a83eaeb925251686401
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "port:python27 port:py27-ply port:ninja"
</span> ""
"qtquickcontrols qtwebchannel qtlocation qttools"
{"Qt WebEngine"}
"very large and relatively new; requires newer version of OS X"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "variant overrides: ~universal"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "variant overrides: "
</span> "revision 0"
"License: "
}
qtwebkit {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- db6e8a239c744c213033a9a7087b9323cac6014c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 79ae8660086bf92ffb0008b17566270e6477c8fa0daf9bb3ac29404fb5911bec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 72cab2a8473801dcbbe8fc41ecf8dc45775f8b18
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 28a560becd800a4229bfac317c2e5407cd3cc95308bc4c3ca90dba2577b052cf
</span> "port:python27"
"port:fontconfig port:icu port:leveldb port:webp port:libxml2 port:libxslt port:zlib port:sqlite3"
"qtbase qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -493,20 +505,20 @@ array set modules {
</span> "License: "
}
qtwebkit-examples {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- bd38487740e78b95bd19172b13c5dbf8603509a0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 84c7ae197040b1a9171d0d7ae04384f826da2b0c1b3f0ef2a8768af16a1959a1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 21e9ec7d6b6ebe0e96dde0f59324a814b57048bc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e4ce4de6b468243abad2baabbe8ddfb05d25b186529bfe88cb8662fc983f54d0
</span> ""
""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "qtbase qtwebkit qtscript qtsvg qtxmlpatterns qtdeclarative qttools"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "qtdeclarative qtlocation qttools qtwebchannel qtwebengine"
</span> {"examples for Qt WebKit"}
"community support only (use Qt WebEngine)"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "variant overrides: ++examples ~docs"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "variant overrides: ++examples ~docs "
</span> "revision 0"
"License: "
}
qtwebsockets {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- fb8b1ac9c9d49cd988fe2af337c2e30dde4b605a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- aa110af297d0d3239f346c3ee0cd43621adf463eb62a04941bbfe3fcccb845f5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7f6e3fe8c1eabc0e340737b31afcf345b1974e50
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 01277362430b5a75c19a16ded8cf4c53a3bccddcc0ba2f50648e0f2985f23464
</span> ""
""
"qtbase qtdeclarative"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -517,20 +529,20 @@ array set modules {
</span> "License: "
}
qtwebview {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 5ec41c5413b4ec16913b3716d4c4e9da1927d212
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- b7d8d4dc8c11f4e70668da509d827c7342b3e5864e8d83f3a0fa56b9cd527fd3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 39c2ad2f65b32a25220cd00a2dd9474663581d85
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d6f77bfa60033561d123b1224679178c956319549666e84d4736c5e109ccbd62
</span> ""
""
"qtdeclarative qtwebengine"
{"Qt WebView"}
"new in 5.6.0; requires qtwebengine"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "variant overrides: ~universal"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "variant overrides: "
</span> "revision 0"
"License: "
}
qtxmlpatterns {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- da29dc37f5463817420113d05b41a9d303822bfe
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7bffa65ea52e54fb1314b45222888612d55eaf51a936a6119b8756266439da04
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ afcfed44662f4213d3e8395060baa6544bc383aa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b584686496ad1b1b3426d642bd705cab3fc02313b067a33d1b826a27aee29c24
</span> ""
""
"qtbase"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -716,11 +728,11 @@ foreach {module module_info} [array get modules] {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # the Qt 5.8 requires NSWindowDidChangeOcclusionStateNotification, which was introduced in 10.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://developer.apple.com/library/content/releasenotes/General/APIDiffsMacOSX10_9/AppKit.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} < 13 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Qt 5.9 requires LSCopyDefaultApplicationURLForURL, which was introduced in macOS 10.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://developer.apple.com/library/content/documentation/General/Reference/APIDiffsMacOSX10_10SeedDiff/frameworks/CoreServices.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.major} < 14 } {
</span> pre-fetch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${subport} requires OS X 10.9 or later"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "${subport} requires OS X 10.10 or later"
</span> return -code error "incompatible OS version"
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -728,15 +740,6 @@ foreach {module module_info} [array get modules] {
</span> # https://codereview.qt-project.org/#/c/141654/
patchfiles-append patch-add_sdk.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://codereview.qt-project.org/#/c/184053/1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-qt_module.prf.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # the build system uses pkgconfig to look for an OpenGL installation (gl.pc)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if mesa is installed, the build system will try to use it instead of -framework OpenGL -framework AGL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # when building qtmultimedia, this will cause problems
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Undefined symbols: "_CGLGetCurrentContext"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-opengl.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;'>@@ -746,14 +749,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;'>- # this test might still cause problems, but with 5.4.2->5.5.0, it is no longer run
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # tests/auto/corelib/plugin/qpluginloader/qpluginloader.pro:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # -macx-*: SUBDIRS += machtest
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # +macx-*: contains(QT_CONFIG, private_tests): SUBDIRS += machtest
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # When testing, ensure that a universal object file is not inadvertently created.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-machtest.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # see https://bugreports.qt.io/browse/QTBUG-62266
patchfiles-append patch-sdk10_13.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -779,6 +774,28 @@ foreach {module module_info} [array get modules] {
</span> copy ${worksrcpath}/mkspecs ${worksrcpath}/mkspecs-save
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ensure qmake builds for the correct architecture
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qmake_flags.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_CXX_ARCH_FLAGS__|[portconfigure::configure_get_archflags cxx]|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/qmake/Makefile.unix.macos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_LD_ARCH_FLAGS__|[portconfigure::configure_get_ld_archflags]|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/qmake/Makefile.unix.macos
</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;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_CXX_ARCH_FLAGS__|[portconfigure::configure_get_universal_cflags]|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/qmake/Makefile.unix.macos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_LD_ARCH_FLAGS__|[portconfigure::configure_get_universal_ldflags]|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/qmake/Makefile.unix.macos
</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> # respect MacPorts build variables
patchfiles-append patch-mkspecs.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -827,7 +844,7 @@ foreach {module module_info} [array get modules] {
</span> ${worksrcpath}/mkspecs/common/clang-mac.conf
# respect macosx_deployment_target
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach spec {macx-clang macx-clang-32 macx-g++ macx-g++-32 macx-g++40 macx-g++42 macx-icc macx-llvm} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach spec {macx-clang macx-g++ macx-icc} {
</span> reinplace \
"s|__MACPORTS_DEPLOYMENT_TARGET__|${macosx_deployment_target}|g" \
${worksrcpath}/mkspecs/${spec}/qmake.conf
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -851,33 +868,39 @@ foreach {module module_info} [array get modules] {
</span> ${worksrcpath}/mkspecs/common/macx.conf
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://bugreports.qt.io/browse/QTBUG-58401
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see http://code.qt.io/cgit/qt/qtbase.git/commit/?id=8f06124b70bad709b2f99789f2416529db5f153d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-NSRect.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # respect configure.universal_archs or build_arch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant universal {
</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 macx-g++ macx-icc} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_DEVICE_ARCHS__|${configure.universal_archs}|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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ![variant_isset universal] } {
</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 macx-g++ macx-icc} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_DEVICE_ARCHS__|${build_arch}|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>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # autogeneration works differently on 64-bit and 32-bit builds
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-qcocoahelpers.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://bugreports.qt.io/browse/QTBUG-62056
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-32bit.diff
</span>
# return modified spec files to the default values
post-build {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [variant_exists universal] && [variant_isset universal] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach arch ${universal_archs_to_use} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move -force ${worksrcpath}-${arch}/mkspecs-save/common/clang-mac.conf ${worksrcpath}-${arch}/mkspecs/common/clang-mac.conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move -force ${worksrcpath}-${arch}/mkspecs-save/common/macx.conf ${worksrcpath}-${arch}/mkspecs/common/macx.conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach spec {macx-clang macx-clang-32 macx-g++ macx-g++-32 macx-g++40 macx-g++42 macx-icc macx-llvm} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move -force ${worksrcpath}-${arch}/mkspecs-save/${spec}/qmake.conf ${worksrcpath}-${arch}/mkspecs/${spec}/qmake.conf
</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;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move -force ${worksrcpath}/mkspecs-save/common/clang-mac.conf ${worksrcpath}/mkspecs/common/clang-mac.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move -force ${worksrcpath}/mkspecs-save/common/clang.conf ${worksrcpath}/mkspecs/common/clang.conf
</span> move -force ${worksrcpath}/mkspecs-save/common/macx.conf ${worksrcpath}/mkspecs/common/macx.conf
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ move -force ${worksrcpath}/mkspecs-save/common/clang-mac.conf ${worksrcpath}/mkspecs/common/clang-mac.conf
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach spec {macx-clang macx-clang-32 macx-g++ macx-g++-32 macx-g++40 macx-g++42 macx-icc macx-llvm} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach spec {macx-clang macx-g++ macx-icc} {
</span> move -force ${worksrcpath}/mkspecs-save/${spec}/qmake.conf ${worksrcpath}/mkspecs/${spec}/qmake.conf
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span>
# --prefix is not recognized.
configure.pre_args-delete --prefix=${prefix}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -920,12 +943,10 @@ foreach {module module_info} [array get modules] {
</span> configure.args-append -no-sql-${driver}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ![variant_isset universal] } {
</span> configure.args-append "-platform ${qt_qmake_spec}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set merger_configure_args(i386) "-platform ${qt_qmake_spec_32}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set merger_configure_args(x86_64) "-platform ${qt_qmake_spec_64}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # use -Os instead of -O2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -optimize-size
</span>
configure.args-append \
-no-testcocoon \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -948,10 +969,6 @@ foreach {module module_info} [array get modules] {
</span> -no-libproxy \
-system-pcre \
--disable-xcb \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-xkbcommon-x11 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-xkbcommon-evdev \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-xinput2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-xcb-xlib \
</span> -glib \
-no-gtk
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1024,9 +1041,6 @@ foreach {module module_info} [array get modules] {
</span> configure.objcxxflags
configure.ldflags
configure.pipe no
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [variant_isset universal] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set merger_arch_flag no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> configure.march
configure.mtune
configure.universal_ldflags
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1043,19 +1057,6 @@ foreach {module module_info} [array get modules] {
</span> # unless overridden, configure script uses gmake if it can find it
configure.env-append MAKE=${build.cmd}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [variant_isset universal] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # delete preprocessor comments surrounding QT_CPU_FEATURES.i386 and QT_CPU_FEATURES.x86_64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "/^#ifndef.*$/d" ${destroot}${qt_mkspecs_dir}/qmodule.pri
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "/^#else.*$/d" ${destroot}${qt_mkspecs_dir}/qmodule.pri
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "/^#endif.*$/d" ${destroot}${qt_mkspecs_dir}/qmodule.pri
</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;'>- # The file ${qt_mkspecs_dir}/qconfig.pri is still not properly merged
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # A workaround is to set QT_ARCH and QT_TARGET_ARCH manually (see e.g. the qmake5 PortGroup)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant tests description {Enable tests} {
configure.args-replace {-nomake tests} {-make tests}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1189,7 +1190,7 @@ foreach {module module_info} [array get modules] {
</span> # requires qtdoc depend on all the documentation modules
foreach {module_doc module_doc_info} [array get modules] {
if { [lsearch -exact [lindex ${module_doc_info} 7] "~docs"] == -1 } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} >= 13 || (${module_doc} ne "qtwebengine" && ${module_doc} ne "qtwebview") } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.major} >= 13 || (${module_doc} ne "qtwebengine" && ${module_doc} ne "qtwebview" && ${module_doc} ne "qtnetworkauth") } {
</span> depends_lib-append port:${name}-${module_doc}-docs
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1197,6 +1198,12 @@ foreach {module module_info} [array get modules] {
</span> }
# special case
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${module} eq "qtquickcontrols2" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # attempts to link against installed version, which causes an error when upgrading 5.8.0->5.9.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5.frameworkpaths-append ${worksrcpath}/lib
</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;'>+ # special case
</span> if { ${module} eq "qtlocation" } {
# qtlocation uses
# Gypsy (https://gypsy.freedesktop.org/wiki/)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1276,7 +1283,7 @@ foreach {module module_info} [array get modules] {
</span> if { ${module} eq "qtwebengine" } {
# see http://doc.qt.io/qt-5/qtwebengine-platform-notes.html
PortGroup xcodeversion 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- minimum_xcodeversions {13 5.1}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ minimum_xcodeversions {13 6.1}
</span> if { ${os.major} < 13 } {
pre-fetch {
ui_error "${subport} requires OS X 10.9 or later"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1299,13 +1306,15 @@ foreach {module module_info} [array get modules] {
</span>
# the following libraries, even when available, do not seem to affect the build
# so turn them off
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-qtwebengine_external.diff
</span> configure.post_args-append \
-- \
-no-pulseaudio \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-alsa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -no-alsa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -qt-webengine-icu \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -qt-ffmpeg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -qt-opus \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -qt-webp
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-qtwebengine_deployment_target.diff
</span> }
# special case
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1317,24 +1326,10 @@ foreach {module module_info} [array get modules] {
</span> # special case
if { ${module} eq "qtgamepad" } {
# /System/Library/Frameworks/GameController.framework is 64-bit only
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset universal] && ${build_arch} eq "i386" } {
</span> patchfiles-append patch-qtgamepad_i386.diff
<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><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${module} eq "qtsensors" && [variant_isset examples] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [variant_isset debug] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set debug "_debug"
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set debug ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # fix library path names or MacPorts will try to reinstall
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach dylib "grue/Grue/libdeclarative_grue${debug}.dylib grue/libgruesensor.1.dylib grue/sensors/libqtsensors_grue${debug}.dylib sensor_explorer/Explorer/libdeclarative_explorer${debug}.dylib" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "/usr/bin/install_name_tool -id ${qt_examples_dir}/sensors/${dylib} ${destroot}${qt_examples_dir}/sensors/${dylib}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach dylib "grue/Grue/libdeclarative_grue${debug}.dylib grue/sensors/libqtsensors_grue${debug}.dylib" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "/usr/bin/install_name_tool -change libgruesensor.1.dylib ${qt_examples_dir}/sensors/grue/libgruesensor.1.dylib ${destroot}${qt_examples_dir}/sensors/${dylib}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtgamepad_64bit.diff
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1374,6 +1369,15 @@ foreach {module module_info} [array get modules] {
</span> }
# special case
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${module} eq "qt3d" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the following libraries, even when available, do not seem to affect the build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # so turn them off
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.post_args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -- \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -system-assimp
</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;'>+ # special case
</span> if { ${module} eq "qtwebkit-examples" && ![variant_isset examples] } {
# create a dummy file so the port can be successfully activated
post-destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1392,7 +1396,8 @@ foreach {module module_info} [array get modules] {
</span> }
# special case
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${module} eq "qtwebview" ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${module} eq "qtwebkit-examples" ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${module} eq "qtwebview" ||
</span> ${module} eq "qtnetworkauth" } {
# dependents of qtwebengine
supported_archs x86_64
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1451,6 +1456,8 @@ foreach {module module_info} [array get modules] {
</span> } elseif { ${module} eq "qtwebengine" } {
# UsingTheRightCompiler (https://trac.macports.org/wiki/UsingTheRightCompiler)
build.env-append CXX=${configure.cxx}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append CC=${configure.cc}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append QMAKE_LINK=${configure.cxx}
</span> } elseif { ${module} eq "qtwebkit" } {
post-extract {
# without this file, the makefile ${worksrcpath}/qtwebkit/Source/WebCore/Makefile.WebCore.Target
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1488,7 +1495,10 @@ foreach {sql_names sql_info} [array get sql_plugins] {
</span> description ${dbms} Database Driver for Qt Tool Kit ${qt_major}
long_description ${dbms} Database Driver for Qt Tool Kit ${qt_major}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # special case
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${driver} eq "sqlite"} {
</span> patchfiles-append patch-sql_plugins.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
# if there is more than one version of the database system, create variants for each version
if { [llength ${sql_info}] > 1 } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1542,22 +1552,18 @@ foreach {sql_names sql_info} [array get sql_plugins] {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # for single architecture, easier to use
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # worksrcdir ${worksrcdir}/qtbase/src/plugins/sqldrivers/${driver},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # but doesn't work for universal build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.dir ${worksrcpath}/src/plugins/sqldrivers/${driver}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.dir ${configure.dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.dir ${configure.dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # see https://trac.macports.org/ticket/53248
<span style='display:block; white-space:pre;background:#ffe0e0;'>- qt5.top_level ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # N.B.: changing worksrcdir must come *after* changing qt5.top_level
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5.top_level ${worksrcpath}/src/plugins/sqldrivers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ worksrcdir ${worksrcdir}/src/plugins/sqldrivers/${driver}
</span> }
}
subport ${name}-docs {
# meta-port to install documentation for various modules
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #revision 0
</span>
description Documentation for Qt Tool Kit ${qt_major}
long_description Documentation for Qt Tool Kit ${qt_major}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1592,7 +1598,7 @@ subport ${name}-docs {
</span> if { ${subport} eq ${name} } {
# the main port is Meta-port to install various modules
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #revision 0
</span>
description Qt Tool Kit ${qt_major}
long_description Qt Tool Kit: A cross-platform framework \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1645,7 +1651,7 @@ foreach deps ${depends_check} {
</span> # see #49838
#
# version 5.5.1 (at least) of qtwebengine must find a python version in the interval [2.7, 3)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # (see tools/qmake/mkspecs/features/functions.prf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # (see mkspecs/features/functions.prf)
</span> # versions 5.5.1 of qtdeclarative and qtwebkit also use python with no way of specifying which one
#
set python_framework ${frameworks_dir}/Python.framework/Versions/2.7
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1657,64 +1663,6 @@ if { ${python_framework} ne "" } {
</span> }
unset python_framework
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ![exists universal_variant] || [option universal_variant] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup muniversal 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 { [variant_exists universal] && [variant_isset universal] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- merger-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach arch ${universal_archs_to_use} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set dir ${destroot}-${arch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach prlfl [glob -nocomplain ${dir}${qt_libs_dir}/*.framework/*.prl] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|${worksrcpath}-${arch}|${worksrcpath}|g" ${prlfl}
</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;'>- foreach prlfl [glob -nocomplain ${dir}${qt_libs_dir}/*.prl] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|${worksrcpath}-${arch}|${worksrcpath}|g" ${prlfl}
</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;'>- foreach prlfl [glob -nocomplain ${dir}${qt_examples_dir}/widgets/tools/plugandpaint/plugins/*.prl] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|${worksrcpath}-${arch}|${worksrcpath}|g" ${prlfl}
</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 { [file exists ${dir}${qt_libs_dir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|macx-clang-32|macx-clang|g" ${dir}${qt_libs_dir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
</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;'>- # Libs.private contains the value of ${worksrcpath}-${arch}, which prevents merging
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [file exists ${dir}${qt_libs_dir}/pkgconfig/Qt5WebKit.pc] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|${worksrcpath}-${arch}|${worksrcpath}|g" ${dir}${qt_libs_dir}/pkgconfig/Qt5WebKit.pc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [file exists ${dir}${qt_libs_dir}/pkgconfig/Qt5WebEngineCore.pc] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|${worksrcpath}-${arch}|${worksrcpath}|g" ${dir}${qt_libs_dir}/pkgconfig/Qt5WebEngineCore.pc
</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 { [file exists ${dir}${qt_examples_dir}/declarative/tutorials/gettingStarted/parts/part5/filedialog/Makefile] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|${worksrcpath}-${arch}|${worksrcpath}|g" ${dir}${qt_examples_dir}/declarative/tutorials/gettingStarted/parts/part5/filedialog/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "/\\w*-arch \\\\/d" ${dir}${qt_examples_dir}/declarative/tutorials/gettingStarted/parts/part5/filedialog/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "/\\w*${arch} \\\\/d" ${dir}${qt_examples_dir}/declarative/tutorials/gettingStarted/parts/part5/filedialog/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E {s:-arch +[^ ]+::g} ${dir}${qt_examples_dir}/declarative/tutorials/gettingStarted/parts/part5/filedialog/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|macx-clang-32|macx-clang|g" ${dir}${qt_examples_dir}/declarative/tutorials/gettingStarted/parts/part5/filedialog/Makefile
</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 { [file exists ${dir}${qt_examples_dir}/multimedia/spectrum/fftreal.framework/fftreal.prl] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|${worksrcpath}-${arch}|${worksrcpath}|g" ${dir}${qt_examples_dir}/multimedia/spectrum/fftreal.framework/fftreal.prl
</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 { [file exists ${dir}${qt_examples_dir}/multimedia/spectrum/spectrum.app/Contents/Frameworks/fftreal.framework/fftreal.prl] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|${worksrcpath}-${arch}|${worksrcpath}|g" ${dir}${qt_examples_dir}/multimedia/spectrum/spectrum.app/Contents/Frameworks/fftreal.framework/fftreal.prl
</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 { [file exists ${dir}${qt_examples_dir}/sensors/grue/libgruesensor.prl] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|${worksrcpath}-${arch}|${worksrcpath}|g" ${dir}${qt_examples_dir}/sensors/grue/libgruesensor.prl
</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> post-destroot {
# see #44204
foreach f [glob -nocomplain -tails -directory ${destroot}${qt_libs_dir} *.framework] {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1810,13 +1758,16 @@ foreach {component component_info} [array get qt5pg::qt5_component_lib] {
</span>
# Qt 5.7 will not work on Mac OS X 10.7
# Qt 5.8 will not work on Mac OS X 10.8
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# replace qt5-XYZ port with qt5{6,7}-XYZ port
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} < 13 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Qt 5.9 will not work on Mac OS X 10.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# replace qt5-XYZ port with qt5{6,7,8}-XYZ port
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.major} < 14 } {
</span>
if { ${os.major} < 12 } {
set qt_replace_version 5.6
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif { ${os.major} < 13 } {
</span> set qt_replace_version 5.7
<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.8
</span> }
set qt_replace_name qt[join [split ${qt_replace_version} .] ""]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1846,6 +1797,7 @@ if { ${os.major} < 13 } {
</span>
# see https://trac.macports.org/ticket/53789
# see https://trac.macports.org/wiki/PortfileRecipes#deactivatehack
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# special case
</span> if { ${subport} eq "qt5-qtdeclarative" } {
pre-activate {
if {![catch {set installed [lindex [registry_active qt5-qtquickcontrols] 0]}]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-32bit.diff b/aqua/qt5/files/patch-32bit.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ca31c11
</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-32bit.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,95 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 922e410ebbf3b589385863b70e261e267968b9a4 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Jake Petroules <jake.petroules@qt.io>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 19 Jul 2017 16:07:34 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Fix 32-bit build on macOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Some customers still need this for interoperability with legacy code.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Let's continue to keep it working in 5.9.x, and then move to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+64-bit exclusive features (thus dropping 32-bit entirely) in 5.10.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Task-number: QTBUG-58401
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Change-Id: Ibb7200c1885e9caba70439df5f7c86c81b1312b5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/plugins/platforms/cocoa/qcocoahelpers.h | 7 ++++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/plugins/platforms/cocoa/qcocoahelpers.mm | 5 +++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/plugins/platforms/cocoa/qnswindowdelegate.mm | 4 ++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/widgets/styles/qmacstyle_mac.mm | 8 ++++----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4 files changed, 17 insertions(+), 7 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/plugins/platforms/cocoa/qcocoahelpers.h b/src/plugins/platforms/cocoa/qcocoahelpers.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a2e0876073..4478895538 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/plugins/platforms/cocoa/qcocoahelpers.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/plugins/platforms/cocoa/qcocoahelpers.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -167,7 +167,12 @@ QT_END_NAMESPACE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - (void)onCancelClicked;
</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;'>+-@interface QT_MANGLE_NAMESPACE(QNSPanelContentsWrapper) : NSView
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@interface QT_MANGLE_NAMESPACE(QNSPanelContentsWrapper) : NSView {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NSButton *_okButton;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NSButton *_cancelButton;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NSView *_panelContents;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NSEdgeInsets _panelContentsMargins;
</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;'>+ @property (nonatomic, readonly) NSButton *okButton;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @property (nonatomic, readonly) NSButton *cancelButton;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/plugins/platforms/cocoa/qcocoahelpers.mm b/src/plugins/platforms/cocoa/qcocoahelpers.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 232e40769b..5d0f13c5a9 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/plugins/platforms/cocoa/qcocoahelpers.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/plugins/platforms/cocoa/qcocoahelpers.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -303,6 +303,11 @@ QString qt_mac_removeAmpersandEscapes(QString s)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @implementation QNSPanelContentsWrapper
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@synthesize okButton = _okButton;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@synthesize cancelButton = _cancelButton;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@synthesize panelContents = _panelContents;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@synthesize panelContentsMargins = _panelContentsMargins;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - (instancetype)initWithPanelDelegate:(id<QT_MANGLE_NAMESPACE(QNSPanelDelegate)>)panelDelegate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((self = [super initWithFrame:NSZeroRect])) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/plugins/platforms/cocoa/qnswindowdelegate.mm b/src/plugins/platforms/cocoa/qnswindowdelegate.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8295d4a36c..1224d138d9 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/plugins/platforms/cocoa/qnswindowdelegate.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/plugins/platforms/cocoa/qnswindowdelegate.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -75,7 +75,7 @@ - (NSRect)windowWillUseStandardFrame:(NSWindow *)window defaultFrame:(NSRect)new
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // window.screen.visibleFrame directly, as that ensures we have the same
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // behavior for both use-cases/APIs.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Q_ASSERT(window == m_cocoaWindow->nativeWindow());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return m_cocoaWindow->screen()->availableGeometry().toCGRect();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return NSRectFromCGRect(m_cocoaWindow->screen()->availableGeometry().toCGRect());
</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;'>+ - (BOOL)window:(NSWindow *)window shouldPopUpDocumentPathMenu:(NSMenu *)menu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/widgets/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 99526683dd..6e8796970f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/widgets/styles/qmacstyle_mac.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/widgets/styles/qmacstyle_mac.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1002,17 +1002,17 @@ static QAquaWidgetSize qt_aqua_guess_size(const QWidget *widg, QSize large, QSiz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSBezierPath *focusRingPath;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (radius > 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const CGFloat roundedRectInset = -1.5;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- focusRingPath = [NSBezierPath bezierPathWithRoundedRect:CGRectInset(focusRingRect, roundedRectInset, roundedRectInset)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ focusRingPath = [NSBezierPath bezierPathWithRoundedRect:NSRectFromCGRect(CGRectInset(focusRingRect, roundedRectInset, roundedRectInset))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xRadius:radius
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ yRadius:radius];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const CGFloat outerClipInset = -focusRingWidth / 2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NSBezierPath *focusRingClipPath = [NSBezierPath bezierPathWithRect:CGRectInset(focusRingRect, outerClipInset, outerClipInset)];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NSBezierPath *focusRingClipPath = [NSBezierPath bezierPathWithRect:NSRectFromCGRect(CGRectInset(focusRingRect, outerClipInset, outerClipInset))];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const CGFloat innerClipInset = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NSBezierPath *focusRingInnerClipPath = [NSBezierPath bezierPathWithRect:CGRectInset(focusRingRect, innerClipInset, innerClipInset)];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NSBezierPath *focusRingInnerClipPath = [NSBezierPath bezierPathWithRect:NSRectFromCGRect(CGRectInset(focusRingRect, innerClipInset, innerClipInset))];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [focusRingClipPath appendBezierPath:focusRingInnerClipPath.bezierPathByReversingPath];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [focusRingClipPath setClip];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- focusRingPath = [NSBezierPath bezierPathWithRect:focusRingRect];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ focusRingPath = [NSBezierPath bezierPathWithRect:NSRectFromCGRect(focusRingRect)];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ focusRingPath.lineJoinStyle = NSRoundLineJoinStyle;
</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;'>+2.11.0 (Apple Git-81)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-NSRect.diff b/aqua/qt5/files/patch-NSRect.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5bdc3ad..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-NSRect.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,55 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/plugins/platforms/cocoa/qcocoadrag.mm.orig 2017-01-18 07:20:58.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/plugins/platforms/cocoa/qcocoadrag.mm 2017-05-14 07:58:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -132,7 +132,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QPixmap pm = dragPixmap(m_drag, hotSpot);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QSize pmDeviceIndependentSize = pm.size() / pm.devicePixelRatio();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSImage *nsimage = qt_mac_create_nsimage(pm);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [nsimage setSize:pmDeviceIndependentSize.toCGSize()];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [nsimage setSize:NSSizeFromCGSize(pmDeviceIndependentSize.toCGSize())];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMacPasteboard dragBoard((CFStringRef) NSDragPboard, QMacInternalPasteboardMime::MIME_DND);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_drag->mimeData()->setData(QLatin1String("application/x-qt-mime-type-name"), QByteArray("dummy"));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/plugins/platforms/cocoa/qcocoawindow.mm.orig 2017-01-18 07:20:58.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/plugins/platforms/cocoa/qcocoawindow.mm 2017-05-14 08:00:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -491,7 +491,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSRect screenRect = [[m_view window] convertRectToScreen:NSMakeRect(windowPoint.x, windowPoint.y, 1, 1)];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSPoint screenPoint = screenRect.origin;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QPoint position = qt_mac_flipPoint(screenPoint).toPoint();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- QSize size = QRectF::fromCGRect([m_view bounds]).toRect().size();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ QSize size = QRectF::fromCGRect(NSRectToCGRect([m_view bounds])).toRect().size();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return QRect(position, size);
</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;'>-@@ -1095,7 +1095,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QSize sizeIncrement = windowSizeIncrement();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (sizeIncrement.isEmpty())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sizeIncrement = QSize(1, 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [m_nsWindow setResizeIncrements:sizeIncrement.toCGSize()];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [m_nsWindow setResizeIncrements:NSSizeFromCGSize(sizeIncrement.toCGSize())];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QRect rect = geometry();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QSize baseSize = windowBaseSize();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/plugins/platforms/cocoa/qnsview.mm.orig 2017-01-18 07:20:58.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/plugins/platforms/cocoa/qnsview.mm 2017-05-14 08:02:06.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -336,10 +336,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- geometry = QRect(windowRect.origin.x, qt_mac_flipYCoordinate(windowRect.origin.y + rect.size.height), rect.size.width, rect.size.height);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else if (m_platformWindow->m_viewIsToBeEmbedded) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // embedded child window, use the frame rect ### merge with case below
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- geometry = QRectF::fromCGRect([self bounds]).toRect();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ geometry = QRectF::fromCGRect(NSRectToCGRect([self bounds])).toRect();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // child window, use the frame rect
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- geometry = QRectF::fromCGRect([self frame]).toRect();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ geometry = QRectF::fromCGRect(NSRectToCGRect([self frame])).toRect();
</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 (m_platformWindow->m_nsWindow && geometry == m_platformWindow->geometry())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -553,7 +553,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (void) drawRect:(NSRect)dirtyRect
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- qCDebug(lcQpaCocoaWindow) << "[QNSView drawRect:]" << m_platformWindow->window() << QRectF::fromCGRect(dirtyRect);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ qCDebug(lcQpaCocoaWindow) << "[QNSView drawRect:]" << m_platformWindow->window() << QRectF::fromCGRect(NSRectToCGRect(dirtyRect));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef QT_NO_OPENGL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (m_glContext && m_shouldSetGLContextinDrawRect) {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-machtest.diff b/aqua/qt5/files/patch-machtest.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 93c63b6..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-machtest.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tests/auto/corelib/plugin/qpluginloader/machtest/machtest.pro.orig 2015-07-05 12:53:46.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tests/auto/corelib/plugin/qpluginloader/machtest/machtest.pro 2015-07-05 12:53:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7,10 +7,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- load(qt)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- i386.target = good.i386.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--i386.commands = $(CXX) $(CXXFLAGS) -shared -arch i386 -o $@ -I$(INCPATH) $<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+i386.commands = $(CXX) $(filter-out -arch i386 x86_64,$(CXXFLAGS)) -shared -arch i386 -o $@ -I$(INCPATH) $<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- i386.depends += $$PWD/../fakeplugin.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- x86_64.target = good.x86_64.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--x86_64.commands = $(CXX) $(CXXFLAGS) -shared -arch x86_64 -o $@ -I$(INCPATH) $<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+x86_64.commands = $(CXX) $(filter-out -arch i386 x86_64,$(CXXFLAGS)) -shared -arch x86_64 -o $@ -I$(INCPATH) $<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- x86_64.depends += $$PWD/../fakeplugin.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Current Mac OS X toolchains have no compiler for PPC anymore
</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 52000af..11bb28e 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;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/common/clang.conf.orig 2016-12-01 01:17:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/common/clang.conf 2016-12-26 05:05:56.000000000 -0700
</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> @@ -4,8 +4,8 @@
QMAKE_COMPILER = gcc clang llvm # clang pretends to be gcc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,113 +11,62 @@
</span>
QMAKE_LINK_C = $$QMAKE_CC
QMAKE_LINK_C_SHLIB = $$QMAKE_CC
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/common/macx.conf.orig 2016-12-01 01:17:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/common/macx.conf 2017-02-05 05:10:55.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3,6 +3,6 @@
</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,7 +3,7 @@
</span> #
QMAKE_PLATFORM += macos osx macx
-QMAKE_MAC_SDK = macosx
+QMAKE_MAC_SDK = __MACPORTS_MAC_SDK__
<span style='display:block; white-space:pre;background:#ffe0e0;'>- include(mac.conf)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/macx-clang/qmake.conf.orig 2016-09-15 22:49:42.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/macx-clang/qmake.conf 2016-12-24 08:54:33.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7,6 +7,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include(../common/clang.conf)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include(../common/clang-mac.conf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ device.sdk = macosx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ device.target = device
</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;'>+@@ -2,9 +2,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # qmake configuration for Clang on OS X
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+QMAKE_CFLAGS += -arch x86_64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+QMAKE_CXXFLAGS += -arch x86_64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+QMAKE_LFLAGS += -arch x86_64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- load(qt_config)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/macx-clang-32/qmake.conf.orig 2016-10-31 19:11:03.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/macx-clang-32/qmake.conf 2016-10-31 19:13:21.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7,7 +7,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include(../common/clang.conf)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include(../common/clang-mac.conf)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.10
</span> +QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
<span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_CFLAGS += -arch i386
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_CXXFLAGS += -arch i386
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/macx-g++/qmake.conf.orig 2016-09-15 22:49:42.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/macx-g++/qmake.conf 2016-12-24 08:56:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14,6 +14,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include(../common/gcc-base-mac.conf)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include(../common/g++-macx.conf)
</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_APPLE_DEVICE_ARCHS = __MACPORTS_DEVICE_ARCHS__
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+QMAKE_CFLAGS += -arch x86_64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+QMAKE_CXXFLAGS += -arch x86_64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+QMAKE_LFLAGS += -arch x86_64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- load(qt_config)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/macx-g++-32/qmake.conf.orig 2016-10-31 19:11:18.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/macx-g++-32/qmake.conf 2016-10-31 19:13:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14,7 +14,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(../common/macx.conf)
</span> include(../common/gcc-base-mac.conf)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- include(../common/g++-macx.conf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/macx-g++/qmake.conf.orig 2017-06-28 02:54:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/macx-g++/qmake.conf 2017-08-27 07:14:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10,9 +10,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONFIG += app_bundle incremental global_init_link_order lib_version_first
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_INCREMENTAL_STYLE = sublib
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.10
</span> +QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
<span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_CFLAGS += -arch i386
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_CXXFLAGS += -arch i386
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/macx-g++40/qmake.conf.orig 2016-10-31 19:11:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/macx-g++40/qmake.conf 2016-10-31 19:14:40.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14,7 +14,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include(../common/gcc-base-mac.conf)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include(../common/g++-macx.conf)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
</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_APPLE_DEVICE_ARCHS = __MACPORTS_DEVICE_ARCHS__
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_CC = gcc-4.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_CXX = g++-4.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/macx-g++42/qmake.conf.orig 2016-10-31 19:11:33.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/macx-g++42/qmake.conf 2016-10-31 19:14:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14,7 +14,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(../common/macx.conf)
</span> include(../common/gcc-base-mac.conf)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- include(../common/g++-macx.conf)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_CC = gcc-4.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_CXX = g++-4.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/macx-icc/qmake.conf.orig 2016-10-31 19:11:43.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/macx-icc/qmake.conf 2016-10-31 19:15:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -90,7 +90,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/macx-icc/qmake.conf.orig 2017-06-28 02:54:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/macx-icc/qmake.conf 2017-08-27 07:16:51.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -95,9 +95,9 @@
</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.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.10
</span> +QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
<span style='display:block; white-space:pre;background:#ffe0e0;'>- include(../common/macx.conf)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/macx-llvm/qmake.conf.orig 2016-10-31 19:11:55.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/macx-llvm/qmake.conf 2016-10-31 19:15:50.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14,7 +14,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include(../common/gcc-base-mac.conf)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include(../common/llvm.conf)
</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_APPLE_DEVICE_ARCHS = __MACPORTS_DEVICE_ARCHS__
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_XCODE_GCC_VERSION = com.apple.compilers.llvmgcc42
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(../common/macx.conf)
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/common/clang-mac.conf.orig 2017-05-06 08:49:54.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/common/clang-mac.conf 2017-05-06 08:51:06.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6,6 +6,6 @@
</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>
QMAKE_XCODE_GCC_VERSION = com.apple.compilers.llvm.clang.1_0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -126,3 +75,5 @@
</span> +QMAKE_CXXFLAGS += -stdlib=__MACPORTS_CXX_STDLIB__
+QMAKE_LFLAGS += -stdlib=__MACPORTS_CXX_STDLIB__
QMAKE_AR_LTCG = libtool -static -o
<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;color:#808080;'>diff --git a/aqua/qt5/files/patch-opengl.diff b/aqua/qt5/files/patch-opengl.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e4a5259..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-opengl.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gui/configure.json.orig 2017-01-18 07:20:58.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gui/configure.json 2017-06-11 06:11:53.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -182,8 +182,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "label": "Desktop OpenGL",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "test": "unix/opengldesktop",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "sources": [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- { "type": "pkgConfig", "args": "gl" },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- { "type": "makeSpec", "spec": "OPENGL" }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { "type": "makeSpec", "spec": "OPENGL" },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { "type": "pkgConfig", "args": "gl" }
</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;'>- "opengl_es2": {
</span><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 11492c9..ee116a2 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;'>-@@ -249,7 +249,7 @@ load(qt_installs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -264,7 +264,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-qcocoahelpers.diff b/aqua/qt5/files/patch-qcocoahelpers.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 6a72973..fb7d083 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-qcocoahelpers.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-qcocoahelpers.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,7 +17,7 @@
</span> @property (nonatomic, readonly) NSButton *cancelButton;
--- src/plugins/platforms/cocoa/qcocoahelpers.mm.orig 2017-01-18 07:20:58.000000000 -0700
+++ src/plugins/platforms/cocoa/qcocoahelpers.mm 2017-05-14 12:37:30.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -312,6 +312,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -303,6 +303,13 @@
</span> */
@implementation QNSPanelContentsWrapper
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qmake_flags.diff b/aqua/qt5/files/patch-qmake_flags.diff
</span>new file mode 100644
<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/qt5/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/qt5/files/patch-qt_module.prf.diff b/aqua/qt5/files/patch-qt_module.prf.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 73b5dce..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-qt_module.prf.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/features/qt_module.prf.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/features/qt_module.prf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -68,9 +68,9 @@ load(qt_build_paths)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- header_module {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEMPLATE = aux
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CONFIG += \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- force_qt \ # Needed for the headers_clean tests.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- qt_no_install_library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CONFIG += force_qt # Needed for the headers_clean tests.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ !lib_bundle: \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CONFIG += qt_no_install_library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEMPLATE = lib
</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-qtgamepad_64bit.diff b/aqua/qt5/files/patch-qtgamepad_64bit.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..2132e9b
</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-qtgamepad_64bit.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/plugins/gamepads/darwin/darwin.pro.orig 2017-06-22 23:35:28.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/plugins/gamepads/darwin/darwin.pro 2017-09-09 20:54:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,3 +17,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OTHER_FILES += \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ darwin.json
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++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><span style='display:block; white-space:pre;color:#808080;'>index 5f5c454..1fe4d2e 100644
</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;'>+++ b/aqua/qt5/files/patch-qtgamepad_i386.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/plugins/gamepads/gamepads.pro.orig 2016-11-29 05:16:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/plugins/gamepads/gamepads.pro 2017-06-20 22:40:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/plugins/gamepads/gamepads.pro.orig 2017-06-22 23:35:28.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/plugins/gamepads/gamepads.pro 2017-09-09 20:17:12.000000000 -0700
</span> @@ -3,5 +3,5 @@
qtConfig(sdl2): SUBDIRS += sdl2
!android: qtConfig(evdev): SUBDIRS += evdev
win32: !wince*: SUBDIRS += xinput
-darwin: !watchos: SUBDIRS += darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+darwin: !watchos: !equals(QT_ARCH, i386): SUBDIRS += darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- android: SUBDIRS += android
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#darwin: !watchos: SUBDIRS += darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ android: !android-embedded: SUBDIRS += android
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtwebengine_deployment_target.diff b/aqua/qt5/files/patch-qtwebengine_deployment_target.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5427f90..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-qtwebengine_deployment_target.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;'>---- tools/qmake/mkspecs/features/default_pre.prf.orig 2017-01-03 03:35:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tools/qmake/mkspecs/features/default_pre.prf 2017-06-17 11:38:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # We depend on libc++ to build chromium so our macosx-version-min has to be 10.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QTWEBENGINEPROCESS_NAME_RELEASE = QtWebEngineProcess
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- debug_and_release {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtwebengine_external.diff b/aqua/qt5/files/patch-qtwebengine_external.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6657bc2..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-qtwebengine_external.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tools/qmake/config.tests/libvpx/libvpx.pro.orig 2017-01-03 03:35:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tools/qmake/config.tests/libvpx/libvpx.pro 2017-06-19 11:03:15.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,3 +1,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--SOURCES += libvpx.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+linux:SOURCES += libvpx.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PKGCONFIG += libvpx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CONFIG -= qt
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-sdk10_13.diff b/aqua/qt5/files/patch-sdk10_13.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 3cffa13..76f791a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-sdk10_13.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-sdk10_13.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- src/gui/painting/qcoregraphics.mm.orig 2017-01-18 07:20:58.000000000 -0700
+++ src/gui/painting/qcoregraphics.mm 2017-09-25 15:59:30.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -65,17 +65,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -72,17 +72,8 @@
</span> image.bytesPerLine(), dataProvider, NULL, false);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,7 +19,7 @@
</span> CGContextSaveGState( inContext );
CGContextTranslateCTM (inContext, 0, inBounds->origin.y + CGRectGetMaxY(*inBounds));
CGContextScaleCTM(inContext, 1, -1);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -83,13 +74,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -90,13 +81,6 @@
</span> CGContextDrawImage(inContext, *inBounds, inImage);
CGContextRestoreGState(inContext);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +35,7 @@
</span> QImage qt_mac_toQImage(CGImageRef image)
--- src/gui/painting/qcoregraphics_p.h.orig 2017-01-18 07:20:58.000000000 -0700
+++ src/gui/painting/qcoregraphics_p.h 2017-09-25 16:00:17.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -65,7 +65,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -71,7 +71,7 @@
</span> Q_GUI_EXPORT CGImageRef qt_mac_toCGImageMask(const QImage &qImage);
Q_GUI_EXPORT QImage qt_mac_toQImage(CGImageRef image);
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-sql_plugins.diff b/aqua/qt5/files/patch-sql_plugins.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b8ca2cc..559c136 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-sql_plugins.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-sql_plugins.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/plugins/sqldrivers/sqlite/sqlite.pro.orig 2017-01-18 07:20:58.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/plugins/sqldrivers/sqlite/sqlite.pro 2017-06-22 04:52:40.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5,11 +5,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HEADERS += $$PWD/qsql_sqlite_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SOURCES += $$PWD/qsql_sqlite.cpp $$PWD/smain.cpp
</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>
-qtConfig(system-sqlite) {
+#qtConfig(system-sqlite) {
</pre><pre style='margin:0'>
</pre>