<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/986bd7cc3098a0e777d92ff915c7feac5a991abf">https://github.com/macports/macports-ports/commit/986bd7cc3098a0e777d92ff915c7feac5a991abf</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 986bd7cc3098a0e777d92ff915c7feac5a991abf
</span>Author: Marcus Calhoun-Lopez <marcuscalhounlopez@gmail.com>
AuthorDate: Fri Sep 29 07:57:37 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt56: update version 5.6.2->5.6.3
</span>---
aqua/qt56/Portfile | 123 +++++++++++++---------------
aqua/qt56/files/patch-add_sdk.diff | 4 +-
aqua/qt56/files/patch-bluetooth.diff | 12 ---
aqua/qt56/files/patch-qtconn-for-10.12.diff | 68 ---------------
4 files changed, 60 insertions(+), 147 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt56/Portfile b/aqua/qt56/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bdd40ee..2f80b20 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt56/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt56/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@ license {LGPL-2.1 LGPL-3 GPL-3 OpenSSLException}
</span>
homepage http://qt.io
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 5.6.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 5.6.3
</span>
set just_want_qt5_variables yes
PortGroup qt5 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -129,32 +129,32 @@ if { ${os.major} < 12 } {
</span> ###############################################################################
array set modules {
qt3d {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0bba8e3553b1d4fe603f1d2fde2f8e3626e87288
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a21786db6e0f5c6c70213fe1a3530ed3d7f28f28401a0f793970e9bc860ce941
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ da369c1a03dc6b9243d2987acbb267936377751e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10d05a30e925fcad971126c7f47a5e32c39f007dab96b298b2094501f9607ffe
</span> ""
"port:assimp"
"qtdeclarative qtimageformats"
{"Qt 3D"}
"technology preview modules"
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtbase {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 55b2d2d9474cb565e872eed1ab0e8e01bf5031a8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2f6eae93c5d982fe0a387a01aeb3435571433e23e9d9d9246741faf51f1ee787
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4a143f2862fda1a93d3da25de48f962fbb7b099f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fef48529a6fc2617a30d75d952cb327c6be341fd104154993922184b3b3b4da1
</span> ""
"port:zlib port:libpng port:jpeg port:freetype path:bin/dbus-daemon:dbus port:tiff port:libmng path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre port:harfbuzz"
""
{"Qt Core" "Qt GUI" "Qt Network" "Qt SQL" "Qt Test" "Qt Widgets" "Qt Concurrent" "Qt D-Bus" "Qt OpenGL" "Qt Platform Headers" "Qt Print Support" "Qt XML"}
""
"variant overrides: ~docs"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 3"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtcanvas3d {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 12e5460320bd6e7fbe01d85a8f39e24e4ca9a74d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d7584d006b03f99692ccabce922e755a6f12bb1ed1fbc99c2b84842b9e0aa0ad
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ad9c346c65e398f26b51e04ec5708be0da71999e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e99e0e159f2fba539b7947a1921072f6807f20958d32809edbf12aac571f56ff
</span> ""
""
"qtdeclarative"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -165,8 +165,8 @@ array set modules {
</span> "License: "
}
qtconnectivity {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 6b4645eaa4fe4cb1e725e2bc445a8909cc470af6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1b672923e0703d62f605ccec97b454b1a04c1f0db47f54b687d009e84eabedf9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a1d609b9f23dc11027eebec2adb8fbf34b0b53e4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fa406e3d63fa4a2acc8ecae6d110f20c766f19a21c7061a12f3c167deb07ccde
</span> ""
""
"qtbase qtdeclarative"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -177,8 +177,8 @@ array set modules {
</span> "License: "
}
qtenginio {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- c62811096a313efde96c034673a2bc047419a6d2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 90ffc38d214a75ab0ef90a4760843f12bc073ae49c17de24c677d1d403bddcc3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 67ff48aff9b74d6fe77e4e141b4718fe891d65fa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d907060b355512ceb7a8c3f6980e3979c20d54320b6804303b6c5e8ed42d3912
</span> ""
""
"qtdeclarative"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -189,8 +189,8 @@ array set modules {
</span> "License: "
}
qtdeclarative {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 3c35a848052f0e228b838ed1277ff53165b33c6a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0086a986bc36b398ba518c404d08cdff0a0d7978c30aa3fa2ab73d71654209da
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 02faf14af65e03f6d143423acc3dcc2e846f7e72
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f63fc053d0d16b8a9ca9308f8ead77874b470ae31b66057e2bd336bf648191fc
</span> "port:python27"
""
"qtbase qtsvg qtxmlpatterns"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -201,8 +201,8 @@ array set modules {
</span> "License: "
}
qtdoc {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- a2695d89272018607deb33215d03b8793a3c2a12
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f6691eeaa9954f6990c744d246f4fe5a9bdd9936aa78d187e98c12795761e868
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8902ee28dafdb4108390f268928db6c1726c7f1a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ eec025b5f3928f544bb629e7867b8e22263f3d3eae927a070e1453887ca6f087
</span> ""
""
"qtdeclarative qttools sqlite-plugin"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -213,8 +213,8 @@ array set modules {
</span> "License: "
}
qtgraphicaleffects {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- c2b77a5ce9b33d85bb50aa722c8de9645c40e99c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1e9f0fac2c72a812d396db74b2d9d12f513d2ec9135d5982ca85aee7f00be75e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 46df7685a24bd9325b123f0f77d23e7612facc6c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c742592d5e45b122b29df60b69be23ba7c817f2dc471db86e054f6ea24a999ed
</span> ""
""
"qtdeclarative"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -225,8 +225,8 @@ array set modules {
</span> "License: "
}
qtimageformats {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 4abf0b602430b199e6bfa35ce079c9d48dd584ea
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4fb153be62dac393cbcebab65040b3b9d6edecd1ebbe5e543401b0e45bd147e4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 525ce01d11462af5f5e6f3efb09ff25a9c2dd19e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ efe4da3c90c976c9b9a2eb6b081d2b8e1435935695104456276ce98e8a5848c3
</span> ""
"port:jasper port:libmng port:tiff port:webp"
"qtbase"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -237,8 +237,8 @@ array set modules {
</span> "License: "
}
qtlocation {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- a0fa5fad9541a2d7c98392b77ed9ae6b49a00800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7a8995206ed0220f943a33c037527a1a8243d5386f5ca77bf88152675c28d23a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6a238bca25ce57a362f34ae7902b7f1cc213a16d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b7a81c58cc331fb15bea8fba21d3c9a59f6dc6ad2e4855e30a14ce59a2af1466
</span> ""
""
"qtbase qtdeclarative qtquickcontrols qtserialport"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -249,8 +249,8 @@ array set modules {
</span> "License: "
}
qtmacextras {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- bb4ca30a9880f5b0d37dc5ce5b1acde0c6489d2f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 855263a9f3daea67eee57a16b6f877d0f4096eb731f9e0f0fd8eee87dbc19015
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3ecf36aded0f65516877ec84781ac1a2e60531f7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 51a011d2480dd52706295c7f3b9b28a675c01cf1f7b5f49e39d36c8f0a506283
</span> ""
""
"qtbase"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -261,8 +261,8 @@ array set modules {
</span> "License: "
}
qtmultimedia {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 772af0d21129d9a53e677e6aa3fbbaf46c6ba28e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cb9a70a7c6c0eb5be4a3fcaf9590863479e95a255308bbf07d5b7aa303bb8caf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 262142da46355bc6ac128e7a32182146f6193aac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ae36039ea8037742342f1615687e0ca2188f3ed0d700627a5e5be546c15e1b46
</span> ""
""
"qtbase qtdeclarative"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -273,8 +273,8 @@ array set modules {
</span> "License: "
}
qtquickcontrols {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 4ced8969881294afd022bca40da84be4d5f2e32e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5ed0f2292be10222dfb1b57a05472798fd759279f65455d91c02ef4fb746102c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ba040c15855e75c5dd0a66ad0dfad69b7c78281e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 31bb0fc8f21b855af6ff02c415be3246128b523d0ef7c05e248e92281ab0db8e
</span> ""
""
"qtdeclarative qtgraphicaleffects"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -285,8 +285,8 @@ array set modules {
</span> "License: "
}
qtquickcontrols2 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0ba46bb90e625e590ebfa14cef7112244e37c9e9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 09dc1710aa4701aebe145829eb99bab94d0870cf578f7dddcec0af92286dfec1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f705d313f3363d1b29e3faf98c14e242df2aa727
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ec5078470abe2da888c2be5d1749b5961ef5132487c180ce4d4aa19ea7ff81cb
</span> ""
""
"qtquickcontrols"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -297,8 +297,8 @@ array set modules {
</span> "License: "
}
qtscript {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 57a0edd3199a5e93e0eb71be8e98f8c57886444b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- e06ef6b271cae2187b57cd4ffdd6759428fd47f94a060e2ed2af024a8c14110e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ca1063758c3ff3c0773a10734944dac265d9b5e1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f08720dd0e3a70377c1cb7fa3b129e24f4cdedade279e51b67c9271ab470b389
</span> ""
""
"qtbase qttools"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -309,8 +309,8 @@ array set modules {
</span> "License: "
}
qtsensors {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 329ea8fc1d4bac44902b79ec666ed5231fea6c8d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a7809081aab4f2f0d7a4f40c3abb02e1690bb390d1dd410d7c6c5019a5053427
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0a89029bb4fa339a69587d1ce8aa767093c115d1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7502d4dc5571865a7eea2a4180c3be396dfb8ce22df4c4f3d7e9ff32ab334973
</span> ""
""
"qtbase qtdeclarative"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -321,8 +321,8 @@ array set modules {
</span> "License: "
}
qtserialbus {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 352bba29042cc4ea4d2ad5b0b3eaa8e2797181da
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- b39260091691532382935ed51de9ead8e66cfb5f7a6e5410c17cd0695ccaf826
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dd30b3882ea66ac61f696b4e500971d2ff1ad76c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 71c89be3879414e2a11cad93a4882758f9259b1c0aec980560309192c99f9a9e
</span> ""
""
"qtserialport"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -333,8 +333,8 @@ array set modules {
</span> "License: "
}
qtserialport {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 5720c53ca1df11c99671a6ad28bc8415be895daf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- af76281bad2c2bd283189635316b46091f6712134b845ae1b9e3016eec94f376
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0617abfaf99f9ab0b9542012335ef20fbfabac5e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 082d1fee2703aed19f840c4e4031e37c9b929e5bd8ebef2ebac4b28c509bae1a
</span> ""
""
"qtbase"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -345,8 +345,8 @@ array set modules {
</span> "License: "
}
qtsvg {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- d7cf472f55d616947b4b7f3cc9c6321aaeaf86de
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f7a361bf661b31ae7779513559dd0b774171911bc57f5cfb6bed6878ddc8bc4e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fbc38682446a80ad85531a9ba00713cac1245bef
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 100f183517b46554079beabd8d2cabe3070a74dd0a2e64b6a304eac71cfadcec
</span> ""
""
"qtbase"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -357,8 +357,8 @@ array set modules {
</span> "License: "
}
qttools {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- be6defa428764023910ee36097dd708c2faa4888
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- db2bb4318786257a47172c377d9c456d5d5ec760d5d69240a4693dc87989e1b7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f88aa02a3d3d2aded156cc5f32bb8924bb778a2a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1a63ba838058d73cb540040589b235ded77f76402693decfd6d4d3c75ea67926
</span> ""
""
"qtbase qtdeclarative"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -369,8 +369,8 @@ array set modules {
</span> "License: "
}
qttranslations {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7ad0fb2b75674ae08921e7793135b17b6d4c40e5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7d793b447c1673206e0c5512883ad1435554dbaebf2152475b6d4a7ba6efa421
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7d8eb8650b6ebb2f6819822614249802266d0a7e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6ded4e0162c2e4f092f824f98cd35bc46d0b0d4b08e21ca200b3af14ab776cab
</span> ""
""
"qttools"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -381,8 +381,8 @@ array set modules {
</span> "License: "
}
qtwebchannel {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 835a31720a47769116e241f5b08bfa78cc2fd4a7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 700efdef5f51bdb77093f4db212afe275ad35a710ea08ba0e9e9cbc8f09f1a52
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b07d514d69e76784075a32604e3876b161d6ce93
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8eb1b0ac2286653c7932758c21e7760788a5d7cfd6162da09afa926d5be50713
</span> ""
""
"qtbase qtdeclarative qtwebsockets"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -393,8 +393,8 @@ array set modules {
</span> "License: "
}
qtwebengine {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 442da681b949e3cd0216e29f38d53ec5f1c646e4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2f0a1648e1a8b22bad0134f2b37d69d185074393c398c1a3c6a83b910ff39740
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7afc0f181d710736eecef1b867f34e6023675f2d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 009d69fb39f6c0e2b0cd89a7e9302cd0ae1872d02c787d3a37f2cacca5ddb7a7
</span> "port:python27 port:py27-ply"
""
"qtquickcontrols qtwebchannel qtlocation"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -405,20 +405,20 @@ array set modules {
</span> "License: "
}
qtwebkit {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 84ccf4ee1448b29ac967ca51e0dabc2ab2c48bbc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 528a6b8b1c5095367b26e8ce4f3a46bb739e2e9913ff4dfc6ef58a04fcd73966
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3a9f31f6e268d8d75df160dfdd0ea7ab8e6a35ec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 098c6bb25798fbf1b619b540621287787064efc9b586d76ac0ce7e39b87a3896
</span> "port:python27"
"port:fontconfig port:icu port:leveldb port:webp port:libxml2 port:libxslt port:zlib port:sqlite3"
"qtbase qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns"
{"Qt WebKit" "Qt WebKit Widgets"}
"community support only (use Qt WebEngine)"
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtwebsockets {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ea47648c15f032b45deac9ea841048a958763550
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3cd9d4bbff8e6be5e252f00fc9ecb9ac2d8a193020288c7d1e82583daeb5ba35
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0154df10fe162c593384a6b78ecf9646bbbea469
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a2439045616c89dfe06333734ff4726075c92e01db6e6b6863bc138e39c028eb
</span> ""
""
"qtbase qtdeclarative"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -429,8 +429,8 @@ array set modules {
</span> "License: "
}
qtwebview {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- b5c91572de5a45f844829a8173678c6df88f6da2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5a7a36cedcbb5f737357d11b7e856d69f7f3dea11a3636bd413cf47038e951d6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9fd1b93141b93e95ed344ad417b23d471e758c4e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 768a456e89f0fd7cbf39ac6b282e078a098e7426651c0b3d453b10c5c44bd81c
</span> ""
""
"qtdeclarative qtwebengine"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -441,8 +441,8 @@ array set modules {
</span> "License: "
}
qtxmlpatterns {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- c8a49d54736c571b39515d349da51a3e6bdef384
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7c6df3eebf188d8ce6822a22cebbc63da5ac27047cf1bd7236d5b988244782cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ edaff4fc5def6fc9a25ac41e1b312cdbe6d0c6ec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a461ff9f0d7310de9b9904ff9cd34919e958bf4071a6fc7096450b8990ab51f6
</span> ""
""
"qtbase"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1230,11 +1230,6 @@ foreach {module module_info} [array get modules] {
</span> build.env-append CXX=${configure.cxx}
build.env-append CC=${configure.cc}
configure.args-append QMAKE_LINK=${configure.cxx}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} > 13 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see http://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/chromium/base/mac/sdk_forward_declarations.h?h=53-based&id=28b1110370900897ab652cb420c371fab8857ad4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-bluetooth.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
# special case
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1257,8 +1252,6 @@ foreach {module module_info} [array get modules] {
</span>
# special case
if { ${module} eq "qtconnectivity" } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://codereview.qt-project.org/#/c/172619/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-qtconn-for-10.12.diff
</span> }
# special case
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt56/files/patch-add_sdk.diff b/aqua/qt56/files/patch-add_sdk.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index f8d4800..3b4f233 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt56/files/patch-add_sdk.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt56/files/patch-add_sdk.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,8 +23,8 @@ index e238f8e..624366a 100644
</span> QMAKESPEC_NAME = $$basename(QMAKESPEC)
# Resolve SDK version of various tools
<span style='display:block; white-space:pre;background:#ffe0e0;'>--for(tool, $$list(QMAKE_CC QMAKE_CXX QMAKE_FIX_RPATH QMAKE_AR QMAKE_RANLIB QMAKE_LINK QMAKE_LINK_SHLIB)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+for(tool, $$list(QMAKE_CC QMAKE_CXX QMAKE_FIX_RPATH QMAKE_AR QMAKE_RANLIB QMAKE_LINK QMAKE_LINK_SHLIB QMAKE_LINK_C QMAKE_LINK_C_SHLIB)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-for(tool, $$list(QMAKE_CC QMAKE_CXX QMAKE_FIX_RPATH QMAKE_AR QMAKE_RANLIB QMAKE_LINK QMAKE_LINK_SHLIB QMAKE_ACTOOL)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++for(tool, $$list(QMAKE_CC QMAKE_CXX QMAKE_FIX_RPATH QMAKE_AR QMAKE_RANLIB QMAKE_LINK QMAKE_LINK_SHLIB QMAKE_ACTOOL QMAKE_LINK_C QMAKE_LINK_C_SHLIB)) {
</span> tool_variable = QMAKE_MAC_SDK.$${QMAKESPEC_NAME}.$${QMAKE_MAC_SDK}.$${tool}
!isEmpty($$tool_variable) {
$$tool = $$eval($$tool_variable)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt56/files/patch-bluetooth.diff b/aqua/qt56/files/patch-bluetooth.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6c5d809..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt56/files/patch-bluetooth.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/qtwebengine/src/3rdparty/chromium/base/mac/sdk_forward_declarations.h b/qtwebengine/src/3rdparty/chromium/base/mac/sdk_forward_declarations.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e45ab43..1ba35cb 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/3rdparty/chromium/base/mac/sdk_forward_declarations.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/3rdparty/chromium/base/mac/sdk_forward_declarations.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15,6 +15,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #import <CoreWLAN/CoreWLAN.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #import <ImageCaptureCore/ImageCaptureCore.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #import <IOBluetooth/IOBluetooth.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#import <CoreBluetooth/CoreBluetooth.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "base/base_export.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt56/files/patch-qtconn-for-10.12.diff b/aqua/qt56/files/patch-qtconn-for-10.12.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 842853d..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt56/files/patch-qtconn-for-10.12.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,68 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 462323dba4f963844e8c9911da27a0d21e4abf43 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Samuel Gaist <samuel.gaist@edeltech.ch>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sun, 2 Oct 2016 21:19:39 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fixed build with MaxOSX10.12 SDK
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This patch adds missing includes that allows to build the module with
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-the 10.12 SDK and Xcode 8.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Change-Id: Ieab48f6a0582b916ceecbbb9a01a4169d6ba53f5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: Jake Petroules <jake.petroules@qt.io>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/bluetooth/osx/osxbtcentralmanager_p.h | 8 ++++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/bluetooth/osx/osxbtledeviceinquiry.mm | 5 +++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/bluetooth/osx/osxbtutility.mm | 3 +++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3 files changed, 16 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/bluetooth/osx/osxbtcentralmanager_p.h src/bluetooth/osx/osxbtcentralmanager_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 1ff33c1..68b32f3 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/bluetooth/osx/osxbtcentralmanager_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/bluetooth/osx/osxbtcentralmanager_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -61,6 +61,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "corebluetoothwrapper_p.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if QT_MAC_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_12, __IPHONE_NA)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <CoreBluetooth/CBService.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <CoreBluetooth/CBCharacteristic.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <CoreBluetooth/CBDescriptor.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <CoreBluetooth/CBCentralManager.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <CoreBluetooth/CBPeripheral.h>
</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;'>- @class QT_MANGLE_NAMESPACE(OSXBTCentralManager);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QT_BEGIN_NAMESPACE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/bluetooth/osx/osxbtledeviceinquiry.mm src/bluetooth/osx/osxbtledeviceinquiry.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 5cf9b19..5a2f2db 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/bluetooth/osx/osxbtledeviceinquiry.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/bluetooth/osx/osxbtledeviceinquiry.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -42,6 +42,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "corebluetoothwrapper_p.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if QT_MAC_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_12, __IPHONE_NA)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#import <CoreBluetooth/CBCentralManager.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#import <CoreBluetooth/CBPeripheral.h>
</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;'>- QT_BEGIN_NAMESPACE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace OSXBluetooth {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/bluetooth/osx/osxbtutility.mm src/bluetooth/osx/osxbtutility.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 08ff699..32f6f74 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/bluetooth/osx/osxbtutility.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/bluetooth/osx/osxbtutility.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -41,6 +41,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef QT_IOS_BLUETOOTH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #import <IOBluetooth/objc/IOBluetoothSDPUUID.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if QT_MAC_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_12, __IPHONE_NA)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#import <CoreBluetooth/CBUUID.h>
</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;'>- #endif
</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.10.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>