<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/0e351f83b623acd1c753e20acff18cffebbd8f65">https://github.com/macports/macports-ports/commit/0e351f83b623acd1c753e20acff18cffebbd8f65</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0e351f83b623acd1c753e20acff18cffebbd8f65
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Wed Nov 7 12:39:14 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt59*: update version 5.9.6->5.9.7
</span>---
aqua/qt59/Portfile | 205 ++++++++++++-------------
aqua/qt59/files/patch-qtwebengine_xcode10.diff | 67 --------
2 files changed, 101 insertions(+), 171 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt59/Portfile b/aqua/qt59/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f37c428..6902453 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt59/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt59/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@ license {LGPL-3 GPL-3 OpenSSLException}
</span>
homepage https://www.qt.io
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 5.9.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 5.9.7
</span> if { ${subport} eq "${name}-qtwebkit" ||
${subport} eq "${name}-qtwebkit-examples" ||
${subport} eq "${name}-qtwebkit-docs" } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -137,9 +137,9 @@ if { ${os.major} == 14 } {
</span> array set modules {
qt3d {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 5261293ccce164db182a054177ff223b550a56a5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- c89cbc12fde5a279e5b127651a194cae75003ba8113f9e7e7b24e67495ecff09
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 83722792
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 51558591063fcfa701413f3cfb832726e22972bd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 141911559889ced585d3e8a45178eac519bda3a0435d9a383bc93b2ac5b96d6a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 83723376
</span> }
""
"port:assimp"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -152,9 +152,9 @@ array set modules {
</span> }
qtbase {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 32c41b2ac54ed62f98888a0d61e7cf7235e6be70
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- eed620cb268b199bd83b3fc6a471c51d51e1dc2dbb5374fc97a0cc75facbe36f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 45129248
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 30e16c6bad897b2d60360c882a286f8557d14282
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 36dd9574f006eaa1e5af780e4b33d11fe39d09fd7c12f3b9d83294174bd28f00
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 45223368
</span> }
""
"port:zlib port:libpng port:jpeg port:freetype path:bin/dbus-daemon:dbus port:tiff port:libmng path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre2 port:harfbuzz"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -167,9 +167,9 @@ array set modules {
</span> }
qtcanvas3d {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- f9553ba939491f14a323462c87e58de76fcc4770
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 9da45991f62152c2c76931aed8a6059375fdce441b38752991e1ad2c77507c22
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 10890412
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6d04d98e428189208c78812b1f70080fc7e2fcfd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 98b30cb5b8203655a15821b3f69033dcee87a19263e4d5e665475bd91ae63f8c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10890776
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -182,9 +182,9 @@ array set modules {
</span> }
qtcharts {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 07a783e7ea2a43ca520ec03d98c95b44ce0e7b36
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5fd60f08b1815b0e7b813c75a0ec726bffc7cc686b160bebf1e710e882ceadab
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4155980
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bb674f9ec67bc9aaef126c54e6421528c8a6d165
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 16cd367241b2e0cd3bc8aea6f874598cd18ad83b72eed89f2713b777272572e6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4156056
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -197,9 +197,9 @@ array set modules {
</span> }
qtconnectivity {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 134f467d209793d2f9366028c347d4b1a412b3c3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 6c696855c2d4e63709ba81d22c85cab30f66418eac2fb2810a02a4b47a531c57
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2712048
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 02fe95e0ead4a44e8bd53df85e67d6e83cdf8d4c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 74f81fe5e7957246488fbd41b710ecb4bbfb1705aec1e28f9a523f671d15ef38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2712240
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -212,9 +212,9 @@ array set modules {
</span> }
qtdatavis3d {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- c0cc7dd25269875ed54034ea345c71858c2bedca
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bd34c7ca5614f171d6858c899afbac76c461d5695dfb3426e0838f4aece77ad0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5162724
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 826ee8e7bcf33206ec8495f370331ce64885eefe
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9b124a37c4d87787e2466bb44e651f700e38fb62432662033cd5b3ee17aa5621
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5162652
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -227,9 +227,9 @@ array set modules {
</span> }
qtdeclarative {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 3b908d4f125fd059da3bdae51ea8e54ade70d7f4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 058fd99a779a753fc5f5e887f1afb799aa53b9f010faa06374b1cfb6fc8bad8a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 21417200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c42d8d7689b7c6547cee4b64fa82b271b3fcfd68
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 68423765a849d105ded56893706ce5541c3b8e8221697edc82738ce54c62465c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 21416388
</span> }
"port:python27"
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -242,9 +242,9 @@ array set modules {
</span> }
qtdoc {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 9a5f701bd31431b6fd436e61e5cea291eab03e07
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- b310ebb9521bd075d887cd9ad81effdc0af555e58988bdeb02d8127083f23214
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2892408
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f1517fee82c1d8dea6c9c835833cc043f81a1897
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d2ff5d42eedbab3150c550292b278e74252e2f58d1227aa12bc6b256816f46ef
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2892556
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -257,9 +257,9 @@ array set modules {
</span> }
qtgamepad {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 89b9675d767584b8bf9038769f3242b95f47cbd6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 252e7dcef82dc52fa2f103dbb6cb25ad9d6ef6dce3254e7255e1e6e4f3cf685c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 365056
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e5441ec48d9221e09c64c2cfe25b94af87ad53fb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2e7547d708e59bae8d2d44ce07345f2d2423622495e8102c58e6cb0407328208
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 365048
</span> }
""
"port:libsdl2"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -272,9 +272,9 @@ array set modules {
</span> }
qtgraphicaleffects {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 12205cdf536b501b0d89156d63a74b112cc5c503
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5f98bc62e8f27bd13853e90306e7e10f47fb06d7cd38f2e7be76bd907ef37154
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 14226968
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 805a39b3f273822255d4b95259f7ac1c6b92038f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4decdcf3ee07986116d4d71f74ef50021c7fa6bf030f656862d66d39e2501dfa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 14226924
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -287,9 +287,9 @@ array set modules {
</span> }
qtimageformats {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 2727721f13bcb8dbcb9aecbfc92d8b2c86623798
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 158272da5e49a388b43423399592372968984323bfd543a5a992bbd466ff4060
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2107828
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6141a51ff2f402b4b3bcdd635828546909a7d1da
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 62053e66014c12edb56a05d2406c78c6b96fc66c2b5aa633e984c9fef398c0aa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2108328
</span> }
""
"port:jasper port:libmng port:tiff port:webp"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -302,9 +302,9 @@ array set modules {
</span> }
qtlocation {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 5da85115cd22da53d7a52a40e2cff01b31473ff1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7d65c8e155c617719e2fb56d39f11cf2bc911a43cf6667c124d86cc1a12619c9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5405652
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ eb65049a79502617e7f63153ea1fb7a45dce1f49
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 82b5b3d7f3f07b3033d3381ea940b6026cda0ec1500f618ea4a15f308cfde652
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5405156
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -317,8 +317,8 @@ array set modules {
</span> }
qtmacextras {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7c7bf910e79aceac634ccb533d3afb56df6ace30
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ff1cb739d723d191030e488a3cceb4d91fbf099c3ba1ecf8c3556fab825da6bd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1a35a663110df0e28f0b64d0ee3e13c68ceb837e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2735492c444e660512921d90242bfaf745a592be951921140d0432b518b31f2c
</span> 48572
}
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -332,9 +332,9 @@ array set modules {
</span> }
qtmultimedia {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 6a7f5ca8ecdff88dadcda912f4e9f0e567477c68
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 9edc11d74e10e4ef857ab38a66700259829e6b5baa4ab0b30655f549d8939fff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3585964
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5f7d1cf42b3a401d82d4231be54b863419a4cc0c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bdf707ff907e51839754710deb70539c2c820628c512bec93cf908fa068b0f18
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3588588
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -347,9 +347,9 @@ array set modules {
</span> }
qtnetworkauth {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- cb9087a00bcf8e72ad7b3e57c0fdf4a67a23abdc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 96247352e73cdfd5ed178cb3267a818eea1c1fc3e8af54a0373a72efa2e2616a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 112188
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5cb8aaf39b8667557a20d365ad162e121b45cc33
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 17643ca32a37332920080b405de2e3eaebed5ae4829019f2317c1decf5e7c892
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 112224
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -362,9 +362,9 @@ array set modules {
</span> }
qtpurchasing {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 777cfea0fb48ab4338988453340ab532db7dd07b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 88b8f6cb55a2050740678e4cbd98e051dc9ec218bb0c3c213f1b892fac730664
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 187600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c68a82508ff293e0b1e3ca957520c20b5f1938e5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d1904a600fbe77f04ac08a0e5b0576b051ba8ae41b2ea93ef09880ac40d47de3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 187780
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -377,9 +377,9 @@ array set modules {
</span> }
qtquickcontrols {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- e091c9245b26981befefc8a82bc3b232619201bf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- da4dd353802197c2bb53c92a36cf7749c7d9dc29b4acc919b692683e9c1c3313
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 6013760
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d3a136b1ef19ecc16102b787baf2f3f8f1c20b8e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e0f380cdd5c5201f401412fae154d4e07af03b768a2ccef7d4f5f7cfc5127fca
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6015248
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -392,9 +392,9 @@ array set modules {
</span> }
qtquickcontrols2 {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 99d5b53b8c6dc5822c43daa3576cfdb3fddd5e80
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 24b41ae6acec9372190147736ba31bf0b4467c71cc4b14817e3a82a750481679
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4158180
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 258611c228afceddb8554821f2bbce740e78208c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 607d7383a5896721502a519fc683b0f2f07f1ed7a72fbee056896da4cec13971
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4160168
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -407,9 +407,9 @@ array set modules {
</span> }
qtremoteobjects {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 2ec6fe6d37ee817a6c12b525d5b6fe1fb057aca6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d127bb32641a5bfa3365fa587d902a84b14e5831356fc05828f280dd22db2a26
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 282372
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6d6d5336bfd4813c7f1707653ba6b74fb7a312ea
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9c0eca8d71999292450e092c58c1f734d0eacc89ff17547655d94d491cd336da
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 282420
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -422,9 +422,9 @@ array set modules {
</span> }
qtscript {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 1e0abc14e2d2a671150e7458b1934b0d1d51dad7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8dbf41abee35be4eb34a56ca3276fac83f3b8671db54c3c7e91c877225727220
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2607812
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9249d82295b784cfdc179e3794546f91728e15ce
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c7d41104a2c0953fec451dcab95cbe2b20c4b4925b2bd7e3c1502959831a6357
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2605820
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -437,8 +437,8 @@ array set modules {
</span> }
qtscxml {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- e7e9981e2a4a8567bd5a768cbece083a881f35ca
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 33947621fd6675c68d67ba11325746a82e7d582599ca0f04e03da4f60d82339a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a3f788253007fb1ee2b41e095d9076562812ec3f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 302e806f7dfa2596ef90338b0920e3045bbd00f33f5b007a7f83d84097c0e277
</span> 414120
}
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -452,9 +452,9 @@ array set modules {
</span> }
qtsensors {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- a75a748f8ab93cd320cc2c7384c88abb0489aa2c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 047fac53c555e685c346be53faacf581cb98d9e2a3193cb55f4e7e81fc51de27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1994404
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5deae95e2127979e344f11cb2b7ea0a1c6173b58
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 19b955cd1fc92a92a9deacea42324df741411fab34f46f234f50f79f3225d05d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1994776
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -467,9 +467,9 @@ array set modules {
</span> }
qtserialbus {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8fac43e402a630c9a6a246f3625d47a33fcbfb68
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f3e8d0e6ff836198c9fc5b9a2a89dea3c5d604c63a62126fab6d11c2763f172a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 278920
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7f05cd10d76018c4edd4408fa1c7cae7da8a4755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2bd088c30069f5f2eec6b76e4773e0356505c876e82f6e6bcfeb81da9529df58
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 279012
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -482,9 +482,9 @@ array set modules {
</span> }
qtserialport {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 78605adad2bb4156b019cd8d5e819da4bce63628
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 741dfe9d132aed411ad163304fd4485df2da0b40fe57ebce2f6ed4b4043dfcb9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 268344
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 05a94d4c591a7f301d0d6881ac6dc3605ddef7b8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 50a7302c7cdedc61e81a2ef252ef9dc9bfaae98a27b5e39481abc87243251e17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 268432
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -497,9 +497,9 @@ array set modules {
</span> }
qtspeech {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 71a099420eaa598d010186dda0a2230739d9fd2d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3a8ffea889f8852e9c46e123baab7438b6bdf4b5af1f46ab4a69478b9e7ad011
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 80716
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 63fef83f3f2b49da82fc3cc87aa5355c908dddbd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e07c96e50c206239131a949b8a14ec26a02c371a9a5905ef36826f14a0c5cb5a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 80704
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -512,9 +512,9 @@ array set modules {
</span> }
qtsvg {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 5d1f6dae5926c56c098175067ca810cc65ad15e9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4318ce3c1f94ca865e3405aefb927f257ca824c5adc482302f1449ed34dbd8b8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1778688
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1f459b65f66dc26995ff4ec27835e05f3e211ea1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 628f22b8472e96ed8033d5491286ce2ab5b2c7b9fe0fe468acd78b458dc75564
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1779320
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -527,9 +527,9 @@ array set modules {
</span> }
qttools {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7ba61b8bd1023fb282e433549e026cfd78501f5a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 50e75417ec0c74bb8b1989d1d8e981ee83690dce7dfc0c2169f7c00f397e5117
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 9575188
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 501e1144c2d6838f2c8b227969159cc5d538659e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d62e0f70d99645d6704dbb8976fb2222443061743689943d40970c52c49367a1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9575492
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -542,9 +542,9 @@ array set modules {
</span> }
qttranslations {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 5868ade188b429f58913e0d6001f058386fdba35
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 9822084f8e2d2939ba39f4af4c0c2320e45d5996762a9423f833055607604ed8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1376088
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 50e6931b29273f974734e31512cf8610e226bf36
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b36da7d93c3ab6fca56b32053bb73bc619c8b192bb89b74e3bcde2705f1c2a14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1376104
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -557,9 +557,9 @@ array set modules {
</span> }
qtvirtualkeyboard {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 01a2a92a2645d33c7c55f94ff9a9373138e831a0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 217d8502f3f53b62e6e9108e0afb3694cf1d8ae8a6348d3625e3192fc126128c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 10045984
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f90e65a6ae675bf700dc10ddde2fa8e0e0cb9957
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4751fe819cbed946de7151016257caeebf3fd73eb8c948de253b8ff2983592e1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10044468
</span> }
""
"port:hunspell"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -572,9 +572,9 @@ array set modules {
</span> }
qtwebchannel {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 35379891e88987a920e69b6a08f1e66a226ecc01
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 222df712c661d4003eebf28806cfd25047721e1c21b70ca320c5978c4a2c7ba5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 147564
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 538e1469f2fb746ec1a3187d874b2829c7981a48
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 12a31c4810ad3aecb374ea3e9078853ba42b71f6863835395daeb51ebb9b38a1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 147696
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -587,9 +587,9 @@ array set modules {
</span> }
qtwebengine {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- d39a68c5e625790d87f7d4f8ccb94120d86491fd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4766707f5d8c174a284c0ed813bc6163db0220d69736424d3370b44b640443a1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 216733460
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3fc4a3dbce5ae958aa72e1368b7111231ee1d357
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 628bd3f099ce387e7048720a03dcf4a915573245c864b8dea9390558f47cf74f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 216738284
</span> }
"port:python27 port:py27-ply port:ninja"
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -632,9 +632,9 @@ array set modules {
</span> }
qtwebsockets {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 98458c6220cfb5e83752042eebfd095893df06a1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7609eba33ebc9c6954644470ebbb1292cdae50f36d0c8ff5ab068b249e4a3c8e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 199624
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e961926ba73037f2118143d2d47b84e94c1859ca
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3d9d9f59fa766d57d23d8cc310d76203b02297e22daa56c3c15dd4e3b0691be3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 199688
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -647,9 +647,9 @@ array set modules {
</span> }
qtwebview {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- b47773a0fdbd971e478fc1f37969c7de3d8fdd42
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 17ce9b1062b0e0cbf08560407b0a471877ae3f3fecd9d7e4215017a4d3d43bfa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 108724
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 308c2db6422df02c24bf0f9548b5e80ced5e3e6d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 226474842fe2b6e5a606ed7c3f2119eafd0ad2878057e71a1cc891197f9d98ff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 108776
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -662,9 +662,9 @@ array set modules {
</span> }
qtxmlpatterns {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 3593961e0da913ac575c7815b66b701a37fd567c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 6a435b14b85e17268b7acf764e7ed92430045a7bb6eb741a1ea200d2df0986dc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1344204
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5a84f4095635e2310d74c039621f189ee0081814
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c5b4737d5eb3b9d24cc8f51bc743402da8e9b51463000f257bac70eeefec1948
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1344440
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1419,9 +1419,6 @@ foreach {module module_info} [array get modules] {
</span> build.env-append CC=${configure.cc}
configure.args-append QMAKE_LINK=${configure.cxx}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://trac.macports.org/ticket/56829
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-qtwebengine_xcode10.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # the following libraries, even when available, do not seem to affect the build
# so turn them off
configure.post_args-append \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt59/files/patch-qtwebengine_xcode10.diff b/aqua/qt59/files/patch-qtwebengine_xcode10.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3efc28c..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt59/files/patch-qtwebengine_xcode10.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,67 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 9bc7fd3ad241daf464fe065667ded711fdaee160 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Alexandru Croitor <alexandru.croitor@qt.io>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 16 Jul 2018 13:24:51 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fix Xcode version check to work with major versions >= 10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-MIME-Version: 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Content-Type: text/plain; charset=UTF-8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Content-Transfer-Encoding: 8bit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-We used lessThan for the Xcode version check, which started to fail
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-when comparing Xcode 10 with Xcode 7.3, because lessThan first tries
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-to convert the arguments to ints and if that fails, it does string
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-comparison instead.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Rewrite the code to be similar to the SDK checks.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-We can't use the qmake versionAtLeast function because it was added
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-in Qt 5.10, and we still need to be able to build against Qt 5.9.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Task-number: QTBUG-69476
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Change-Id: I831a683ee676838a4d531a4d6e715182e9e4193d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: Michael Brüning <michael.bruning@qt.io>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(cherry picked from commit 0fc07d2943753f444f3eeccd9fb1dfde0938cb70)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mkspecs/features/functions.prf | 22 +++++++++++++++++++++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/3rdparty | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2 files changed, 22 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b78d2a11..ac0c9837 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/features/functions.prf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/features/functions.prf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -38,7 +38,7 @@ defineTest(isPlatformSupported) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return(false)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else:osx {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- lessThan(QMAKE_XCODE_VERSION, 5.1) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ !isMinXcodeVersion(5, 1) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- skipBuild("Using XCode version $$QMAKE_XCODE_VERSION, but at least version 5.1 is required to build Qt WebEngine.")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return(false)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -241,6 +241,26 @@ defineTest(isMinOSXSDKVersion) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return(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;'>-+defineTest(isMinXcodeVersion) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ requested_major = $$1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ requested_minor = $$2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ requested_patch = $$3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ isEmpty(requested_minor): requested_minor = 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ isEmpty(requested_patch): requested_patch = 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_var = QMAKE_XCODE_VERSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ major_version = $$section($$target_var, ., 0, 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ minor_version = $$section($$target_var, ., 1, 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ patch_version = $$section($$target_var, ., 2, 2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ isEmpty(minor_version): minor_version = 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ isEmpty(patch_version): patch_version = 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ greaterThan(major_version, $$requested_major):return(true)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ equals(major_version, $$requested_major):greaterThan(minor_version, $$requested_minor):return(true)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ equals(major_version, $$requested_major):equals(minor_version, $$requested_minor):!lessThan(patch_version, $$requested_patch):return(true)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return(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;'>- defineTest(isMinWinSDKVersion) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- requested_major = $$1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- requested_minor = $$2
</span></pre><pre style='margin:0'>
</pre>