<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/2e9b5e1391e18745fbc1458101a8bb4dd9c4361d">https://github.com/macports/macports-ports/commit/2e9b5e1391e18745fbc1458101a8bb4dd9c4361d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 2e9b5e1391e18745fbc1458101a8bb4dd9c4361d
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Oct 12 23:26:20 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5*: update version 5.9.1->5.9.2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/55028
</span>---
aqua/qt5/Portfile | 162 ++++++++++------------
aqua/qt5/files/patch-32bit.diff | 95 -------------
aqua/qt5/files/patch-add_sdk.diff | 2 +-
aqua/qt5/files/patch-mkspecs.diff | 2 +-
aqua/qt5/files/patch-qtconnectivity-sdk10_13.diff | 74 ----------
aqua/qt5/files/patch-qtvirtualkeyboard_noxcb.diff | 2 +-
aqua/qt5/files/patch-sdk10_13.diff | 46 ------
7 files changed, 80 insertions(+), 303 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/Portfile b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f435119..83ff845 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,12 @@ license {LGPL-3 GPL-3 OpenSSLException}
</span>
homepage http://qt.io
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 5.9.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 5.9.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${subport} eq "${name}-qtwebkit" ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${subport} eq "${name}-qtwebkit-examples" ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${subport} eq "${name}-qtwebkit-docs" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 5.9.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
set just_want_qt5_variables yes
PortGroup qt5 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -120,8 +125,8 @@ foreach {qt_test_name qt_test_info} [array get available_qt_versions] {
</span> ###############################################################################
array set modules {
qt3d {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0c4bea3a2155d277121c37a03610e37c7d6f1e6d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4f1fe5b812d78987341b854e7f2907f0375dc188cfa6cf9db101b26e9dfd4996
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1311dbfb2a3efb58e77cfaaefb4acbae25dfa2ea
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c955a92fe2f3f2f03493ae0e9d973ebe1c4b1e037b58f18092fa2040f5b50783
</span> ""
"port:assimp"
"qtdeclarative qtimageformats qtgamepad"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -132,20 +137,20 @@ array set modules {
</span> "License: "
}
qtbase {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 1513b037a71e2328bb1d54d2406a327bb5351106
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bc9a21e9f6fff9629019fdf9f989f064751d5073c3a28dc596def92f4d4275c6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2862c7d39f86f625b0f4dfdb2dbce647504a03f6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7fe2bb468955f633c71b3ddd3c269e68a2c4137a4e5b8dd12dcdb34cbc6d609b
</span> ""
"port:zlib port:libpng port:jpeg port:freetype path:bin/dbus-daemon:dbus port:tiff port:libmng path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre2 port:harfbuzz"
""
{"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 2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtcanvas3d {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- d48f601e97655a80048aeaf3db9ae382b3dc7b31
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4b8bf09330f03d2b3998f5447991546704715478c54f4f8d82d00bee3047de81
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c9edc98be8246f553c03e54b35c9cc33b7e768a0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 84a8d66c2c35b67af84376037cac71fe77a105df09ffef7906a9cb1aeafb3eea
</span> ""
""
"qtdeclarative"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -156,8 +161,8 @@ array set modules {
</span> "License: "
}
qtcharts {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 04869b051e685a21eb7c18fe2f286db2bf4a15cb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7328cbdc138a0b40f874bb8db36e0aee7cdf1c93263e3a184471867876710da0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 02af7ee2d580e4fa391ffb5324d14af973ad7b20
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4e7af70a73828ee1eb9606bd2c071cc7347c5f928aaf07b420dce7376b1c6aa4
</span> ""
""
"qtbase qtdeclarative qtmultimedia"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -168,8 +173,8 @@ array set modules {
</span> "License: {GPL-3 OpenSSLException}"
}
qtconnectivity {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 018c034d752e10e8b4a988fbd42179034d1bad24
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 40638b715517bff8509fe9fe1e6a4e45e0f66e68920605048e080dd023ae7fd5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 43f7a6297bf54da74d2bed1b1db8282b62bb63b0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2c759597ec959d54f29a3f628896d9208cf1f4e2269d8e01a9d3036f6995f3cc
</span> ""
""
"qtbase qtdeclarative"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -180,8 +185,8 @@ array set modules {
</span> "License: "
}
qtdatavis3d {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0d07cf0f5b5db1f08ae7a8717d4ef344489e1375
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 233cab90fa35c926717bf697e7259b4e5bc7af6a26183657b006dac80fc0a191
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 109e8a374f091cd74f475ea76d496b0c4ee96fc9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 06ae5699872d048e8bb99464c420db3749c8b7601e9f855ce8b1e156d792b2b2
</span> ""
""
"qtbase qtdeclarative qtmultimedia"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -192,8 +197,8 @@ array set modules {
</span> "License: {GPL-3 OpenSSLException}"
}
qtdeclarative {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 61616d617e0a40e53af118805fdeea367a734cb7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d2fe6c9c1a9f19af6e96553c6d75366ab8f397bc232acd67d31476955fee94ff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f8fd05b8a2143bb0be1fcaff91752e9e9e34934c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0d40fd4de9c73b9173d8308c0dc37952bf5c747d87ff221962dd2f848d820b08
</span> "port:python27"
""
"qtbase qtsvg qtxmlpatterns"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -204,8 +209,8 @@ array set modules {
</span> "License: "
}
qtdoc {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- e2558628b07755d8c999d00fa0eaffbc94723402
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5d9c312910669e880bf4e5bf01287dc218a20639cedb83ae0a4688fa799a53b4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7f4c8638ad1831eeb0e2bb68bde9df66fe1f65e2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8919149d1507f60784ffc1bbc5b0285e46e66867b82001e3d79727872052db35
</span> ""
""
"qtdeclarative qttools sqlite-plugin"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -216,8 +221,8 @@ array set modules {
</span> "License: "
}
qtgamepad {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 382bd291cab8afa11950f174474b3e02549b4860
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f10714df314b3ef992060454db62e07d0b6a1fc7cf8a4175c023c59f8821bc14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6466249e1ceab81e4326d79f781600aa583f1425
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 76d1e90d9015a189b6d77b3eeac1a8927cdb6a6d92b574d847f9387d07d9a552
</span> ""
"port:libsdl2"
"qtbase qtdeclarative"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -228,8 +233,8 @@ array set modules {
</span> "License: "
}
qtgraphicaleffects {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 4ef5acd1434196f354c4454ab164373589f7438a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5f86c38e36d9553049cfbe56d4869e73cf8ab920905402cbcafb56dd8a1a59ff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3ad6e332c39cf7a1d9da63b44b8e54d46443160a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 14594e7eb4b704dd69bf336828306fe8e6537c321d49ee0b701b3b1cdd8bfb76
</span> ""
""
"qtdeclarative"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -240,8 +245,8 @@ array set modules {
</span> "License: "
}
qtimageformats {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 98eea6c68cc88519d660d9e0f9e30ebc23d45013
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 79fee307310a66100bd3d907ea69bd039dcd727c15f27e990167e7a27d1b8a47
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7dab9414525fe2276d3a102c8e8dce5e4bca33a8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3a626ca0ac7ffc56b59c4b3f66aac6bc76954054cedb6938b961562228eb9df3
</span> ""
"port:jasper port:libmng port:tiff port:webp"
"qtbase"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -252,8 +257,8 @@ array set modules {
</span> "License: "
}
qtlocation {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7a4eaa97485c212fb8c9d2e8e86bf129be26cf07
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4bc43c1df69c5322f982588711d4a65f8408b71a36e43ba19b39d1aae87e1515
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9838cd96b09ea8814dd55a649576fa334188350d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c81a42e44ebd4e9c33f7195e86af3deab9fde72ef0ad8dcb04acee250d356b0c
</span> ""
""
"qtbase qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -264,8 +269,8 @@ array set modules {
</span> "License: "
}
qtmacextras {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 74a7395d063404d85745cfafd326f2a922f7f892
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 216ca6f97a4a5b87677a52fa2fff2b6b7bdb26cc874fe93ee5517328687a2601
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 503fa06fdd29c485615534da6cc5b0183a5d5d24
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ be0ecdfc9e1158cc2b3933f9fc33b2de12cd9a323b332629df2dd696d5ec2438
</span> ""
""
"qtbase"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -276,8 +281,8 @@ array set modules {
</span> "License: "
}
qtmultimedia {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8956947b2369ae2a2c8e7dde8cf5a47e6aeb523f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- e48fbe71b4418eb7caba5ef5aa422483fb28d0e894cbc41f3d8b73b3d7fee6e4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d4987d5da144ae3c057f43e522549aefc596157d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c9a62700024871f204e5f107894c3a339bd645bf6dbac2bcf1bff8ce46842520
</span> ""
""
"qtbase qtdeclarative"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -288,8 +293,8 @@ array set modules {
</span> "License: "
}
qtnetworkauth {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 863dbf05b92850a5d1cb01fc510f9b936f4f0d81
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2aff7ec9d12e686d0d0ea6bb957ac09d0f39afb31d072b7e129f617aeee8eab9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a103250476bc4f43efe82bcbcf589a727ce28e7c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a003f05aaa330605c6572212b4df869c026eabbbeb241c991031fad2511d239a
</span> ""
""
"qtbase qtwebview"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -300,8 +305,8 @@ array set modules {
</span> "License: "
}
qtpurchasing {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- c6aec029f9be603c39e641fd8b1ac887c25fae2d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5a8f270158b901d926086667d9d84eee5f46a7110d4f04cd32edac6cb0a2302c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1aa31c894b9517618d82608230ac63c0d934befb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8a71057d9f71f24370b032521441ee0a1e894b28b51ac12f689364868f47c211
</span> ""
""
"qtbase qtdeclarative"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -312,8 +317,8 @@ array set modules {
</span> "License: {GPL-3 OpenSSLException}"
}
qtquickcontrols {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 10f69be3dfbd96b73f963d43e2381c8afa378c2e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 520ed0e110f9d0977eb873ea0e05a3d205c9c1b1ad2dd606875708848b21ec2e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dfae938f006702a07f5483278f85918358aba6e0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5f09ecf8648acd8abed20d727b8517e0c53cf945e83a992ee58d4baadd84bd1f
</span> ""
""
"qtdeclarative qtgraphicaleffects"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -324,8 +329,8 @@ array set modules {
</span> "License: "
}
qtquickcontrols2 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 2f51cfa841402f9b0eb71a5de8fd336d240ee22f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 203be0321112d1513b722fce463f9e30d7d00befb33349901d9517f4f13408ff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e48713efbeb622305c157110a1acd78ce18d9aec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2b55dd3dd53b4a6abb0ceb74b7fb98a5e52e9056c71a6cdbaead5cdf9d1ac8d2
</span> ""
""
"qtgraphicaleffects"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -335,10 +340,9 @@ array set modules {
</span> "revision 0"
"License: "
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- qtremoteobjects
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- e1350cc3bb42977b03376666a89b6d6a611ee9bc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a04ef16017903050a4afefb64f1d6a88fadb3c9b3668b320d6dfc4fa1cc07c82
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtremoteobjects {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 967a14f3600adac21a66c30850b9f74ad9811c8b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e68c10ea12b0162cf4a55ccd89ee131082e6701790c79eea259e0c1d798397fa
</span> ""
""
"qtdeclarative"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -349,8 +353,8 @@ array set modules {
</span> "License: "
}
qtscript {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 078d24d5e9dd6032e8224c41402e5d2deca0d585
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 176a08865d5f66437b0f279fc5d7f381f359f20bafbffcebdcac61e86415188f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fc6c9c5a5dcf570cad3d047c71aa5e7653096825
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 47807db5c2684609a0252601fda0a153530a2c97abb8c96df30f4e7897cd40f1
</span> ""
""
"qtbase qttools"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -361,8 +365,8 @@ array set modules {
</span> "License: "
}
qtscxml {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- e17e6b704c1303f0b1fcd334b52d2d94575f938b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 409758206d1381f262e879d8bde72c147f36f04af2be58986b5a61581e376bd4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b8106ec73f5ef59977db166505c340ce2e3ad2bb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9d2b1292bc632305aa1963bfbfc06e8b4489ca0f9ed380ea6410c9dc38aeb15d
</span> ""
""
"qtbase qtdeclarative"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -373,8 +377,8 @@ array set modules {
</span> "License: "
}
qtsensors {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- d833b229bf8e7cf1a00bf84f22c161baf76ffb43
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5af19397aa8ccd88c1fbb7cda4ee2a583f05bdf8ae090eb616bb276ff2e9e29c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 495720ce91c75434aeafbb32fcf7f428f9a628c4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 79441588c9c8bd1b34b91481441614077ea335a0005e79a1dc68ad964284b5d3
</span> ""
""
"qtbase qtdeclarative"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -385,8 +389,8 @@ array set modules {
</span> "License: "
}
qtserialbus {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 26d0f06aba9edf883a7176a6a406fcd0ae4b8525
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- caa9feefbf1d51b38d6bc923428009d524c0c5eb77f30e4b6d84fec1ce19f3c3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ab31528873329dc177ce888dc0593daa0b3b34e7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bbc24bdafd0191fc808e08b19f378e74bedbb79faf4e396b66ba7ca9fed9be08
</span> ""
""
"qtserialport"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -397,8 +401,8 @@ array set modules {
</span> "License: "
}
qtserialport {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- c0fbee9d5f3861e0835684ff0de72764a7d54f6b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- e1fe85bf292929c3a62cb4d21efaaa4e89f70f48ea10914da07d0670ec617a69
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f9c5eefb56647603b78604caf4899422201c7953
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 50ed9cc22db1615bc00267d24b0819813b854af3651ab6e5ffaa7f7c7e62cd42
</span> ""
""
"qtbase"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -409,8 +413,8 @@ array set modules {
</span> "License: "
}
qtspeech {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 477f4b10c511b55dc7abf5319ab054bc3f4446e6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac9cef10637b54fa8d0bfe83f5b98c1c295cb68e63cf0973b2c6f188dcecaa01
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd5285a5ad0913930060a7e735704d3255fbd4c7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ef7a84ec5a30c7c79d390b5cc56d476baa7c8b9f3b36f8b76d079fe85c1b0333
</span> ""
""
"qtbase qtdeclarative qtmultimedia"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -421,8 +425,8 @@ array set modules {
</span> "License: "
}
qtsvg {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 1f28e4ee48cc060b50bfede5e7fd99ff5f294e0c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 99f294f874b13553e4ed49cd9465580ad0c9b92e29cdfa47b2e4096835c1e2e5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f31b57c9f0a74eb79e7bad18a1f182446eff2611
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ba96ebfbb60d2793547295b7122a127d21ba44cf586bfd3c8212c59d68661108
</span> ""
""
"qtbase"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -433,8 +437,8 @@ array set modules {
</span> "License: "
}
qttools {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ca550fa94039268c717df1b6ca4f61f7fb8c715b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- c4eb56cf24a75661b8317b566be37396c90357b4f6730ef12b8c97a7079ca0e8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 42d6cdcaf62ca929d840ba8204acec0cc9b05bec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2bb996118b68e9939c185a593837e5a41bb3667bf5d4d5134fac02598bd2d81a
</span> ""
""
"qtbase qtdeclarative"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -445,8 +449,8 @@ array set modules {
</span> "License: "
}
qttranslations {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- c8b1fb904752b7b51662f75737e755b7812fb3d5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4a12528a14ed77f31672bd7469cad30624e7b672f241b8f19ad59510298eb269
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2b06cbebf56d90bb9e4578a9a98ba09b2092886b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5df16ddf9da0f42a3040aef2a92ad7da67381e2e4c132632fddf3a7a8026d12f
</span> ""
""
"qttools"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -457,8 +461,8 @@ array set modules {
</span> "License: "
}
qtvirtualkeyboard {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 9e50a4c58cd02b7501e52d5f543529019f1af518
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 6b746a6dc3ab54edf3007d0f6a2f8f31281aed03629830f59acfbc8514d6e94c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 81ca8b7679f467282e67ec7431f4e5726d58afb0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e836ca0348b21df28635e541713726444abed7b53a0acf3358cc90532e64c6fc
</span> ""
"port:hunspell"
"qtbase qtdeclarative qtsvg qtmultimedia qtquickcontrols"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -469,8 +473,8 @@ array set modules {
</span> "License: {GPL-3 OpenSSLException}"
}
qtwebchannel {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- f257071597212f8f7faeb9f786ff197d92a66a15
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 80425f5a6df8784f5221809ffd664486ed38427f514ab4ec174e20456b027000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 30fc5b155dfcbe78ba80baac9e81ae4ffb43c44f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9c1b4defecadd7f9ee15d5815d464abef0961fc565cc7831720fc7c0c0d13a26
</span> ""
""
"qtbase qtdeclarative qtwebsockets"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -481,8 +485,8 @@ array set modules {
</span> "License: "
}
qtwebengine {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- e72fdf99c99038c4f7e7dd85699c52ff00f6b459
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f6a37eeb9188474a16d29ede498fce959396ab80329a0a83eaeb925251686401
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b60c140d540f84b53f155fb30f953b5f35c896f5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cab069e4589f806640bebe4077c70e5cd5ffeb146c6e8caca6c4454fc0c4a108
</span> "port:python27 port:py27-ply port:ninja"
""
"qtquickcontrols qtwebchannel qtlocation qttools"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -517,8 +521,8 @@ array set modules {
</span> "License: "
}
qtwebsockets {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7f6e3fe8c1eabc0e340737b31afcf345b1974e50
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 01277362430b5a75c19a16ded8cf4c53a3bccddcc0ba2f50648e0f2985f23464
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b00ea2c4b98e9815994d4bfaf2e91187dd92928b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ afddc1bd915ea47ccbec968a7af02e2a5405c717830e4671924fe35b55e81674
</span> ""
""
"qtbase qtdeclarative"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -529,8 +533,8 @@ array set modules {
</span> "License: "
}
qtwebview {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 39c2ad2f65b32a25220cd00a2dd9474663581d85
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d6f77bfa60033561d123b1224679178c956319549666e84d4736c5e109ccbd62
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 80140b033da97fc19974670b0b0ec2e5827abf86
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fccaec79c73c62010f90bdd1a85b31d5caa63e0a1a28983bb74f6127afe1b8b1
</span> ""
""
"qtdeclarative qtwebengine"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -541,8 +545,8 @@ array set modules {
</span> "License: "
}
qtxmlpatterns {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- afcfed44662f4213d3e8395060baa6544bc383aa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- b584686496ad1b1b3426d642bd705cab3fc02313b067a33d1b826a27aee29c24
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 11988432520bbd974b9bae21dabe5d3841667d42
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0aa6aa83087d5754cfefaa3d119454009fc2dd5f266c1eb2ea7a434cef22d34e
</span> ""
""
"qtbase"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -749,9 +753,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;'>- # see https://bugreports.qt.io/browse/QTBUG-62266
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-sdk10_13.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> #-----------------------------------------------------------------------------
# qtbase is used for:
# 1) building qtbase
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -893,9 +894,6 @@ foreach {module module_info} [array get modules] {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://bugreports.qt.io/browse/QTBUG-62056
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-32bit.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # return modified spec files to the default values
post-build {
foreach conf {clang.conf macx.conf clang-mac.conf gcc-base.conf} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1331,19 +1329,13 @@ foreach {module module_info} [array get modules] {
</span> if { ${module} eq "qtgamepad" } {
# /System/Library/Frameworks/GameController.framework is 64-bit only
if {![variant_isset universal] && ${build_arch} eq "i386" } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-qtgamepad_i386.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtgamepad_i386.diff
</span> } else {
patchfiles-append patch-qtgamepad_64bit.diff
}
}
# special case
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${module} eq "qtconnectivity" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://bugreports.qt.io/browse/QTBUG-62658
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-qtconnectivity-sdk10_13.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # special case
</span> if { ${module} eq "qtmultimedia" } {
# In the file config.tests/openal/openal.pro, defining HEADER_OPENAL_PREFIX means
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-32bit.diff b/aqua/qt5/files/patch-32bit.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ca31c11..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-32bit.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,95 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 922e410ebbf3b589385863b70e261e267968b9a4 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Jake Petroules <jake.petroules@qt.io>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 19 Jul 2017 16:07:34 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fix 32-bit build on macOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Some customers still need this for interoperability with legacy code.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Let's continue to keep it working in 5.9.x, and then move to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-64-bit exclusive features (thus dropping 32-bit entirely) in 5.10.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Task-number: QTBUG-58401
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Change-Id: Ibb7200c1885e9caba70439df5f7c86c81b1312b5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/plugins/platforms/cocoa/qcocoahelpers.h | 7 ++++++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/plugins/platforms/cocoa/qcocoahelpers.mm | 5 +++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/plugins/platforms/cocoa/qnswindowdelegate.mm | 4 ++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/widgets/styles/qmacstyle_mac.mm | 8 ++++----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4 files changed, 17 insertions(+), 7 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-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:#ffe0e0;'>-index a2e0876073..4478895538 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/plugins/platforms/cocoa/qcocoahelpers.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/plugins/platforms/cocoa/qcocoahelpers.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -167,7 +167,12 @@ QT_END_NAMESPACE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (void)onCancelClicked;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@interface QT_MANGLE_NAMESPACE(QNSPanelContentsWrapper) : NSView
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@interface QT_MANGLE_NAMESPACE(QNSPanelContentsWrapper) : NSView {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSButton *_okButton;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSButton *_cancelButton;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSView *_panelContents;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSEdgeInsets _panelContentsMargins;
</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;'>- @property (nonatomic, readonly) NSButton *okButton;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @property (nonatomic, readonly) NSButton *cancelButton;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-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:#ffe0e0;'>-index 232e40769b..5d0f13c5a9 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/plugins/platforms/cocoa/qcocoahelpers.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/plugins/platforms/cocoa/qcocoahelpers.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -303,6 +303,11 @@ QString qt_mac_removeAmpersandEscapes(QString s)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @implementation QNSPanelContentsWrapper
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@synthesize okButton = _okButton;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@synthesize cancelButton = _cancelButton;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@synthesize panelContents = _panelContents;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@synthesize panelContentsMargins = _panelContentsMargins;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (instancetype)initWithPanelDelegate:(id<QT_MANGLE_NAMESPACE(QNSPanelDelegate)>)panelDelegate
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ((self = [super initWithFrame:NSZeroRect])) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-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:#ffe0e0;'>-index 8295d4a36c..1224d138d9 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/plugins/platforms/cocoa/qnswindowdelegate.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/plugins/platforms/cocoa/qnswindowdelegate.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -75,7 +75,7 @@ - (NSRect)windowWillUseStandardFrame:(NSWindow *)window defaultFrame:(NSRect)new
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // window.screen.visibleFrame directly, as that ensures we have the same
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // behavior for both use-cases/APIs.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Q_ASSERT(window == m_cocoaWindow->nativeWindow());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return m_cocoaWindow->screen()->availableGeometry().toCGRect();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return NSRectFromCGRect(m_cocoaWindow->screen()->availableGeometry().toCGRect());
</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;'>- - (BOOL)window:(NSWindow *)window shouldPopUpDocumentPathMenu:(NSMenu *)menu
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-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:#ffe0e0;'>-index 99526683dd..6e8796970f 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/widgets/styles/qmacstyle_mac.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/widgets/styles/qmacstyle_mac.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -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:#ffe0e0;'>- NSBezierPath *focusRingPath;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (radius > 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const CGFloat roundedRectInset = -1.5;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- focusRingPath = [NSBezierPath bezierPathWithRoundedRect:CGRectInset(focusRingRect, roundedRectInset, roundedRectInset)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ focusRingPath = [NSBezierPath bezierPathWithRoundedRect:NSRectFromCGRect(CGRectInset(focusRingRect, roundedRectInset, roundedRectInset))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xRadius:radius
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- yRadius:radius];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const CGFloat outerClipInset = -focusRingWidth / 2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NSBezierPath *focusRingClipPath = [NSBezierPath bezierPathWithRect:CGRectInset(focusRingRect, outerClipInset, outerClipInset)];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSBezierPath *focusRingClipPath = [NSBezierPath bezierPathWithRect:NSRectFromCGRect(CGRectInset(focusRingRect, outerClipInset, outerClipInset))];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const CGFloat innerClipInset = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NSBezierPath *focusRingInnerClipPath = [NSBezierPath bezierPathWithRect:CGRectInset(focusRingRect, innerClipInset, innerClipInset)];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSBezierPath *focusRingInnerClipPath = [NSBezierPath bezierPathWithRect:NSRectFromCGRect(CGRectInset(focusRingRect, innerClipInset, innerClipInset))];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [focusRingClipPath appendBezierPath:focusRingInnerClipPath.bezierPathByReversingPath];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [focusRingClipPath setClip];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- focusRingPath = [NSBezierPath bezierPathWithRect:focusRingRect];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ focusRingPath = [NSBezierPath bezierPathWithRect:NSRectFromCGRect(focusRingRect)];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- focusRingPath.lineJoinStyle = NSRoundLineJoinStyle;
</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;'>-2.11.0 (Apple Git-81)
</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-add_sdk.diff b/aqua/qt5/files/patch-add_sdk.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index f12875a..68189f7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-add_sdk.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-add_sdk.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,7 +19,7 @@ diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf
</span> index e238f8e..624366a 100644
--- mkspecs/features/mac/sdk.prf
+++ mkspecs/features/mac/sdk.prf
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,7 +31,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -40,7 +40,7 @@
</span> QMAKESPEC_NAME = $$basename(QMAKESPEC)
# Resolve SDK version of various tools
<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 2cc69f6..108b643 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;'>@@ -86,5 +86,5 @@
</span> -QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
+QMAKE_CFLAGS_OPTIMIZE_SIZE = __MACPORTS_OPTFLAGS__
<span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_CFLAGS += -pipe
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !equals(QMAKE_HOST.os, Windows): QMAKE_CFLAGS += -pipe
</span> QMAKE_CFLAGS_DEPS += -M
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtconnectivity-sdk10_13.diff b/aqua/qt5/files/patch-qtconnectivity-sdk10_13.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9521ece..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-qtconnectivity-sdk10_13.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,74 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/bluetooth/osx/osxbtcentralmanager.mm.orig 2016-12-08 00:08:08.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/bluetooth/osx/osxbtcentralmanager.mm 2017-09-25 16:10:08.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1032,13 +1032,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace OSXBluetooth;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if QT_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__IPHONE_10_0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if QT_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__IPHONE_10_0) || QT_OSX_PLATFORM_SDK_EQUAL_OR_ABOVE(101300)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const CBManagerState state = central.state;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const CBCentralManagerState state = central.state;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if QT_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__IPHONE_10_0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if QT_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__IPHONE_10_0) || QT_OSX_PLATFORM_SDK_EQUAL_OR_ABOVE(101300)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (state == CBManagerStateUnknown
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- || state == CBManagerStateResetting) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1054,7 +1054,7 @@
</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;'>- // Let's check some states we do not like first:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if QT_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__IPHONE_10_0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if QT_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__IPHONE_10_0) || QT_OSX_PLATFORM_SDK_EQUAL_OR_ABOVE(101300)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (state == CBManagerStateUnsupported || state == CBManagerStateUnauthorized) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (state == CBCentralManagerStateUnsupported || state == CBCentralManagerStateUnauthorized) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1074,7 +1074,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</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 QT_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__IPHONE_10_0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if QT_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__IPHONE_10_0) || QT_OSX_PLATFORM_SDK_EQUAL_OR_ABOVE(101300)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (state == CBManagerStatePoweredOff) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (state == CBCentralManagerStatePoweredOff) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1093,7 +1093,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</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 QT_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__IPHONE_10_0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if QT_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__IPHONE_10_0) || QT_OSX_PLATFORM_SDK_EQUAL_OR_ABOVE(101300)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (state == CBManagerStatePoweredOn) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (state == CBCentralManagerStatePoweredOn) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/bluetooth/osx/osxbtledeviceinquiry.mm.orig 2016-12-08 00:08:08.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/bluetooth/osx/osxbtledeviceinquiry.mm 2017-09-25 16:10:16.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -233,7 +233,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dispatch_queue_t leQueue(qt_LE_queue());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Q_ASSERT(leQueue);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if QT_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__IPHONE_10_0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if QT_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__IPHONE_10_0) || QT_OSX_PLATFORM_SDK_EQUAL_OR_ABOVE(101300)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const CBManagerState state(central.state);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (state == CBManagerStatePoweredOn) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -260,7 +260,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [manager scanForPeripheralsWithServices:nil options:nil];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } // Else we ignore.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if QT_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__IPHONE_10_0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if QT_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__IPHONE_10_0) || QT_OSX_PLATFORM_SDK_EQUAL_OR_ABOVE(101300)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else if (state == CBManagerStateUnsupported || state == CBManagerStateUnauthorized) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else if (state == CBCentralManagerStateUnsupported || state == CBCentralManagerStateUnauthorized) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -277,7 +277,7 @@
</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;'>- [manager setDelegate:nil];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if QT_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__IPHONE_10_0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if QT_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__IPHONE_10_0) || QT_OSX_PLATFORM_SDK_EQUAL_OR_ABOVE(101300)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else if (state == CBManagerStatePoweredOff) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else if (state == CBCentralManagerStatePoweredOff) {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtvirtualkeyboard_noxcb.diff b/aqua/qt5/files/patch-qtvirtualkeyboard_noxcb.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 9413c11..7e89b16 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-qtvirtualkeyboard_noxcb.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-qtvirtualkeyboard_noxcb.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- src/virtualkeyboard/virtualkeyboard.pro.orig 2016-11-28 02:45:25.000000000 -0700
+++ src/virtualkeyboard/virtualkeyboard.pro 2017-06-20 07:13:44.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -207,10 +207,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -214,10 +214,10 @@
</span> SOURCES += desktopinputpanel.cpp inputview.cpp
HEADERS += desktopinputpanel.h inputview.h
DEFINES += QT_VIRTUALKEYBOARD_DESKTOP
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-sdk10_13.diff b/aqua/qt5/files/patch-sdk10_13.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 76f791a..0000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,46 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gui/painting/qcoregraphics.mm.orig 2017-01-18 07:20:58.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gui/painting/qcoregraphics.mm 2017-09-25 15:59:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -72,17 +72,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- image.bytesPerLine(), dataProvider, NULL, false);
</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;'>--OSStatus qt_mac_drawCGImage(CGContextRef inContext, const CGRect *inBounds, CGImageRef inImage)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void qt_mac_drawCGImage(CGContextRef inContext, const CGRect *inBounds, CGImageRef inImage)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- // Verbatim copy if HIViewDrawCGImage (as shown on Carbon-Dev)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- OSStatus err = noErr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef Q_OS_MACOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- require_action(inContext != NULL, InvalidContext, err = paramErr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- require_action(inBounds != NULL, InvalidBounds, err = paramErr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- require_action(inImage != NULL, InvalidImage, err = paramErr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CGContextSaveGState( inContext );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CGContextTranslateCTM (inContext, 0, inBounds->origin.y + CGRectGetMaxY(*inBounds));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CGContextScaleCTM(inContext, 1, -1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -90,13 +81,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CGContextDrawImage(inContext, *inBounds, inImage);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CGContextRestoreGState(inContext);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef Q_OS_MACOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--InvalidImage:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--InvalidBounds:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--InvalidContext:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return err;
</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;'>- QImage qt_mac_toQImage(CGImageRef image)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gui/painting/qcoregraphics_p.h.orig 2017-01-18 07:20:58.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gui/painting/qcoregraphics_p.h 2017-09-25 16:00:17.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -71,7 +71,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Q_GUI_EXPORT CGImageRef qt_mac_toCGImageMask(const QImage &qImage);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Q_GUI_EXPORT QImage qt_mac_toQImage(CGImageRef image);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--Q_GUI_EXPORT OSStatus qt_mac_drawCGImage(CGContextRef inContext, const CGRect *inBounds, CGImageRef inImage);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Q_GUI_EXPORT void qt_mac_drawCGImage(CGContextRef inContext, const CGRect *inBounds, CGImageRef inImage);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Q_GUI_EXPORT CGColorSpaceRef qt_mac_genericColorSpace();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Q_GUI_EXPORT CGColorSpaceRef qt_mac_colorSpaceForDeviceType(const QPaintDevice *paintDevice);
</span></pre><pre style='margin:0'>
</pre>