<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/cc51f644ad999fce174ce540fbcb9f5fb6f285cd">https://github.com/macports/macports-ports/commit/cc51f644ad999fce174ce540fbcb9f5fb6f285cd</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit cc51f644ad999fce174ce540fbcb9f5fb6f285cd
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Mon Dec 11 04:59:38 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5: update version 5.9.3->5.10.0
</span>---
_resources/port1.0/group/qt5-1.0.tcl | 8 +-
aqua/qt5/Portfile | 200 +++++++++++-----------
aqua/qt5/files/patch-mkspecs.diff | 2 +-
aqua/qt5/files/patch-pc_files.diff | 2 +-
aqua/qt5/files/patch-qtvirtualkeyboard_noxcb.diff | 2 +-
5 files changed, 110 insertions(+), 104 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/qt5-1.0.tcl b/_resources/port1.0/group/qt5-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 2989ba0..4b37ccc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/qt5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/qt5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +36,7 @@
</span>
global available_qt_versions
array set available_qt_versions {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- qt5 {qt5-qtbase 5.9}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5 {qt5-qtbase 5.10}
</span> qt59 {qt59-qtbase 5.9}
qt58 {qt58-qtbase 5.8}
qt57 {qt57-qtbase 5.7}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -512,6 +512,12 @@ namespace eval qt5pg {
</span> lib/pkgconfig/Qt5WebEngine.pc
""
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtwebglplugin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lib/cmake/Qt5Gui/Qt5Gui_QWebGLIntegrationPlugin.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> qtwebkit {
5.0
6.0
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/Portfile b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a948dbb..ca4c5c5 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,11 +13,13 @@ license {LGPL-3 GPL-3 OpenSSLException}
</span>
homepage http://qt.io
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 5.9.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 5.10.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set middle_name everywhere
</span> if { ${subport} eq "${name}-qtwebkit" ||
${subport} eq "${name}-qtwebkit-examples" ||
${subport} eq "${name}-qtwebkit-docs" } {
version 5.9.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set middle_name opensource
</span> }
set just_want_qt5_variables yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,7 +77,7 @@ foreach {qt_test_name qt_test_info} [array get available_qt_versions] {
</span> # port provides `find ./ -name \*.dylib -exec otool -L {} \; | grep /opt/local/libexec/qt5 | cut -d ' ' -f1` | cut -d : -f2 | sort -u
# port provides `find ./ -name \*.dylib -exec otool -L {} \; | grep /opt/local/lib/ | cut -d ' ' -f1` | cut -d : -f2 | sort -u
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# http://code.qt.io/cgit/qt/qt5.git/tree/.gitmodules?h=5.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# http://code.qt.io/cgit/qt/qt5.git/tree/.gitmodules?h=5.10
</span> #
###############################################################################
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -120,16 +122,16 @@ foreach {qt_test_name qt_test_info} [array get available_qt_versions] {
</span> # license replacement
# }
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# module info found at http://doc.qt.io/qt-5.9/qtmodules.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# module info found at http://doc.qt.io/qt-5.10/qtmodules.html
</span> #
###############################################################################
array set modules {
qt3d {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ff0732da9e87ea951e3b8eb1e2f2a3baba597e55
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 97925132f0583ccd76f5e104c849341df3abba73dd4d9b647622a23bdae6273f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1b94473f2879a5722aa88c6e6d49d4c1deeb077f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 12457e7227c793274329371c60b9028ab3e44db837e875e2c460367c1dbd34ab
</span> ""
"port:assimp"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "qtdeclarative qtimageformats qtgamepad"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "qtbase qtdeclarative qtimageformats qtgamepad"
</span> {"Qt 3D"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -137,8 +139,8 @@ array set modules {
</span> "License: "
}
qtbase {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 9b7edd7badceb34deeb7df2c1afad3ed02475e62
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 9e7c44005e7691dc7c85165bd4510282c47f0163521f4973eab71dbdb39a9982
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d6f9ab8526ebe50791b9b948930806dc8b3be73b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fd5578cd320a13617c12cf2b19439386b203d6d45548e855f94e07be9829f762
</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;'>@@ -149,8 +151,8 @@ array set modules {
</span> "License: "
}
qtcanvas3d {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7ad2cdbd5b42866dde4af8da836ff969f4609e79
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5e38b17844af801be57844da0379cc6882750b9019034f4fe884aae70c300abc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dd4d3c00cf8dc8e145623770c6e8a7e41e7ca739
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d289626f06236f2c0e3065416fd6a8a72b8895cb5253ee2d9b6320df5b452987
</span> ""
""
"qtdeclarative"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -161,8 +163,8 @@ array set modules {
</span> "License: "
}
qtcharts {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 183998a61c1becae8e69a0c8648efff4fd4c30fc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ec1783a81d5715fc48a3276e67b90a66cac3e283ac14fc3bf88b2058994d69e9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1a308f61bbd6aec4d849969d18d09a3a71cef9df
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 12ce2c4a8467d349ecfdba831cc03c539f2b207aa21082a4e1043dcf8f1b31ef
</span> ""
""
"qtbase qtdeclarative qtmultimedia"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -173,8 +175,8 @@ array set modules {
</span> "License: {GPL-3 OpenSSLException}"
}
qtconnectivity {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 3a0505aa5f108c1bbdc449f1731598258cd1bf0f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- e2891e6e8d91e82e3c4d5667f3146062458067c0b706d65ac0fc7562afce0649
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9e71190290667b9aeb17e7464c46a4decfb74670
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2e3fe2e872449065ec3326955fb97c629106f62b9441e8dfd2e0adfc9fb169a6
</span> ""
""
"qtbase qtdeclarative"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -185,8 +187,8 @@ array set modules {
</span> "License: "
}
qtdatavis3d {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ca154084765901084e4ff3eb3d51b139b2f5c4a3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 709f69487dea9a8b44764c0dc92d65080bc0949038ed774897792a427a34c368
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fccf07827153d1432d865dedb9cb1d9018524ba4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9206c4d7a093a20b57d0e5013aadd6fc52bccb321eb0d3329efccc44481f6618
</span> ""
""
"qtbase qtdeclarative qtmultimedia"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -197,8 +199,8 @@ array set modules {
</span> "License: {GPL-3 OpenSSLException}"
}
qtdeclarative {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- d6568c002df20b6e7c72c8b56506c5677c0ed485
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 505f66d2062c1d84ce743a0b4969531e1cf94e30970dc64efffe10f74f989407
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 31620cce613a92d6933c827bd4759443cacb5a39
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5ccb4dbca5046554037bcffbb05918f6efcff321c44cd1c39b1c47be7e67711e
</span> "port:python27"
""
"qtbase qtsvg qtxmlpatterns"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -209,8 +211,8 @@ array set modules {
</span> "License: "
}
qtdoc {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7d1f9d513ccc2239d0e0ab296d28d8cf2a4deb77
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- e569aa76c2a682618d2088307dfadbf3ff74e5300861963c0279d4ac442a712a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 304a217c9b6c43e523d6c2cad774f5231d443c5a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d6c9b058ce185c6df1c238692746549de889a98864ee5bdcafa95b9bf18ce407
</span> ""
""
"qtdeclarative qttools sqlite-plugin"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -221,8 +223,8 @@ array set modules {
</span> "License: "
}
qtgamepad {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 201fb083882a936bd9709670dc396449ecd896b9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- c69fcacdc81338e1eba43138ecedf3e7a1b34315349522c0070a04cc4acc6a93
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a5300a34821dd0b0fc04d7ca560b4265281ce29f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 537550f988a71942392b3df21044e4cd566378bad2d9727663c9e8e7743e87e6
</span> ""
"port:libsdl2"
"qtbase qtdeclarative"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -233,8 +235,8 @@ array set modules {
</span> "License: "
}
qtgraphicaleffects {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 5fcd3418a6eded9a05915588e379ceccc2795bca
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 790b029bc8bdbb5c9548ecad2ff6e73b7da3deabbdba6bacac4a6aacd3a0f0d9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b4aeade2f04fcad002612cdcc862a100a8e04a77
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 97b969112f21161fc924c1b1c98f1dad2bf7027e31b27ea9eec532db7b045e30
</span> ""
""
"qtdeclarative"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -245,8 +247,8 @@ array set modules {
</span> "License: "
}
qtimageformats {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- db72800e2126f5b2013f3dd4d01d0066379705c8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d4b309ddbac2275cafadffc62047a26ed8f169bde015925761894843eae725dd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ aa80332b81c908c8b04f39b654b3cd2575bf0848
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 91bfb884f965af6d6c187f8ac4f9bb1f9fe0af59cbbe36e035ee5f5510b7f4fc
</span> ""
"port:jasper port:libmng port:tiff port:webp"
"qtbase"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -257,8 +259,8 @@ array set modules {
</span> "License: "
}
qtlocation {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- d536bdd5a71c9161203a3798613cde95a249df3f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 80fd425cde8747c1fc79aa90994a9caf921d7c79ff41babec692fe43cdc74ce1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0a76830417abf3fd8022f2bdd4c7df6ba5e5481b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d84dcec7cfbc99a13e048f935783b0c2e1cb540defc82d77ac869a5b76aa85c7
</span> ""
""
"qtbase qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -269,8 +271,8 @@ array set modules {
</span> "License: "
}
qtmacextras {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 9b0423181feab8f7f0235386f1b23d46e47e2f2a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3e36b8695e3c7410d53e6341b73c8089543502673fb2d89ceaf2c29d081e3b5e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8a048bd355e769d449050e3b532316eb317d6a1d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 63fd3469c2e003638efb0aecd27ad94ad412123cda6116372c81256986b2c822
</span> ""
""
"qtbase"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -281,8 +283,8 @@ array set modules {
</span> "License: "
}
qtmultimedia {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 6954e52ef5fcd56a5eaeebd0d5299e272f6e9ab8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- e79558d24ace9b4444d91d807b85778b6a0a592e7d1500ffadf45f7d3b8238a6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac464e9289e75bb72134f452d1aaf10db7cfd316
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 008333fdc3bc2d87977392397d38ebaae1329059997319cb1b0613fb6489806f
</span> ""
""
"qtbase qtdeclarative"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -293,20 +295,20 @@ array set modules {
</span> "License: "
}
qtnetworkauth {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- f9c06985fb70f45787acf77bc6957be57c270058
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- df22376e35e837e5d9f633ed245275e94a826fdff0d312eb9031ae7e082ebf39
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 13922ff0ee9b8b06e90a6622f1fd260f2c0f6c5f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ecdafbe8fabce386f1aab2bcf6a0d9fd6a1a9083b1554645bc45267f7188d8d2
</span> ""
""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "qtbase qtwebview"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "qtbase"
</span> {"Qt Network Authorization"}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "technology preview module"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ""
</span> "variant overrides: "
"revision 0"
"License: "
}
qtpurchasing {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8468e6c693e550cf0f554df6e1e2e832d4f6ce23
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1268781935d6f8a1eb9fcfe5d2e8eb4b116658b07e039db43bee6507406bce03
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6e70230e12a5694d749548b42386049888371fea
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8c773d399cab724b02cb1d7c9d352b181bb4d6f08bd2672f65da308c18d57d56
</span> ""
""
"qtbase qtdeclarative"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -317,8 +319,8 @@ array set modules {
</span> "License: {GPL-3 OpenSSLException}"
}
qtquickcontrols {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 94962c503a11a466265d3ece2095a79817dbf490
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 300eeebd7d2c243c0123bc2324b5643b3f967c0816aead0ba7b993aeeac0e226
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 07b91a62f8887d2007c1432937e1d3d01f7a1da0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a133ef7724d5d2eef4085920d463af78024f327d0ae320f24202a51b554e6129
</span> ""
""
"qtdeclarative qtgraphicaleffects"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -329,11 +331,11 @@ array set modules {
</span> "License: "
}
qtquickcontrols2 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 64b4a9c35b4e7d814f8da9ef9080aeeaed4246a6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 21aaa26956ad0ccc3ce86ced7925ceae4b4cef25c6c5ef2f7ded608431420843
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 98d0e5a9cdff2e475d15d7506bc4ff3301c24303
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 818770247a3a211714dfc17f7f5a07c6cf49999ff405d36fd00fab1d5559a1a1
</span> ""
""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "qtgraphicaleffects"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "qtgraphicaleffects qtimageformats"
</span> {"Qt Quick Controls 2"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -341,11 +343,11 @@ array set modules {
</span> "License: "
}
qtremoteobjects {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 452dcdadfca3bf3dbc959b00f5c4f0662c60ea0d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- b31167c64846b96aeadbd94d4040c4add684e19a93daa9737b47991cd068d87c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 39ef0bf0962ed73581b2f878ea290338d94f296e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ df36a69fdbedf9e3612b60a22222c44a4b227d09be6f543e478dac8ea70f6e05
</span> ""
""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "qtdeclarative"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "qtbase qtdeclarative"
</span> {"Qt Remote Objects"}
"technology preview module"
"variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -353,8 +355,8 @@ array set modules {
</span> "License: "
}
qtscript {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 623ff86cbdbb77f29dfa35738e84e10d7e6b3ae5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- b80bfaaf58f154b68101e438a1881f669cb9974026926be7755adb00af355566
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 697b731696cefc883e4fe8db75baa1e4ab358fe0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6cf2f2f09ccafa9c9cd5d16641ae2b75b7f98947de6ec0ec1717489f3a09cafc
</span> ""
""
"qtbase qttools"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -365,8 +367,8 @@ array set modules {
</span> "License: "
}
qtscxml {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 029284339d2f0af6c326ead7f0c559e276b8ec1f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d8f51fa8eddd09fef29d8fad6e570e9ca9403469543ab10cb5cfad738786a81b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e040e15b81ceb53738438818a1c9d74d5ce1b1c6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4bbb19d6b169ab04aec62d09ed4324639cda13d2c25cf584c9061c5d9af65890
</span> ""
""
"qtbase qtdeclarative"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -377,8 +379,8 @@ array set modules {
</span> "License: "
}
qtsensors {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7a0be1311550301be48ad788e66beb649a44f694
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- b95ea20b3d616655435357671558631da6fe6970500b7e6d35d1111f0b8cdac1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 540ffd9cc3e87748a30983be9cb27432227eb838
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd98c5afb25bdb243b03a8e1da1a9643fbad334549c8128328446d0818fe3971
</span> ""
""
"qtbase qtdeclarative"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -389,8 +391,8 @@ array set modules {
</span> "License: "
}
qtserialbus {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- d1faf1176f09fa0cabc7a44094f875dff107cbc8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ef62745e1793515e03fa586171de13eb17ee7699c9eb626f76a4dc5a00c46938
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4cee157ebd0bd01faae83ca63f6a18aeb0429f0b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3f594784d952dd40e6d7740cd6267a9259a877330cecd83feebef81f5200391b
</span> ""
""
"qtserialport"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -401,8 +403,8 @@ array set modules {
</span> "License: "
}
qtserialport {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- b0b3f249b7e46ba0200ec7e41c4654dec026e1aa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4cdd3e9157ec3e91078f993cd28651989fa2429a409e19d398fb9cced231abdf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4812afa01ccf90d0d45d8c69ae383a2fcdbdeb88
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e580fed9ffd2a978df72775205a96b21d619b5fd5f5754f653864a206e831457
</span> ""
""
"qtbase"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -413,20 +415,20 @@ array set modules {
</span> "License: "
}
qtspeech {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 51515da549fc0228d51d51667b24f73dad0a2a65
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 01526024437dfc1e4f652e0b883fc3333260321aacee4c51774018bf86bb99b0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 171a335f111de39ef484589579aaf7436a102cb9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 79159e1a9502ccb67145e0f6bdc43e3c2248835ff22be04a10c18db15a845ac1
</span> ""
""
"qtbase qtdeclarative qtmultimedia"
{"Qt Speech"}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "technology preview module"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ""
</span> "variant overrides: "
"revision 0"
"License: "
}
qtsvg {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 9bcb326da2fcf98c41bb70f440f60fcf7f31d996
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- df6628a60c8fbbcff99e6a24955c29494268d741509a3367a2294031ab4f5df2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3b14b32963d5aab1764ed3d96e408129261a2119
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4a2aa7cae70a3156846655422b9ed884d8b08b3707b95858e49c7cf9afe5e7b0
</span> ""
""
"qtbase"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -437,8 +439,8 @@ array set modules {
</span> "License: "
}
qttools {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 6c266e4b69bfcb56b422daa5c593f1cabb6e9f06
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 442c38de3e35f9dcc355dadff35436e23a5a7abd7dd1167a3bf6325e3d9284ff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3becf8ae2a7e27255a8043fa3768d1f2c6b698e2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1ff5dc747b7935de85257673424dfdffb231f3409f09a5f833d37e2f625cfe32
</span> ""
""
"qtbase qtdeclarative"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -449,8 +451,8 @@ array set modules {
</span> "License: "
}
qttranslations {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- cb91a4efa0ad28f78b395dc5e0de4d0f6ee77b3b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 40ac57ec79dd4fd27dff7a9d8abe8ebe2106c19a4b60daf007353f4671909bd9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b1241f6cef22688f73a10548dd956090e6b7ede5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ec4dbd3601afe06d1814f4bc81af9cffbbe7de2b9f4aef4eb4595b049c8eb9be
</span> ""
""
"qttools"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -461,8 +463,8 @@ array set modules {
</span> "License: "
}
qtvirtualkeyboard {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 88bc2c491e3b1b104a9ecdd11f3357d8409f17b5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- b9313f744026f0dcf6e1008212880cd34851499d8b6bc9fc9fbaa1e4e52532ff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 73761a7a6db46bc5a909c7a2374ea6c8848fb4c0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2c2ddd65a335ecdd15e9ff1032a1634330e0d2359760f2a968b21dbc9f4e0b57
</span> ""
"port:hunspell"
"qtbase qtdeclarative qtsvg qtmultimedia qtquickcontrols"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -473,8 +475,8 @@ array set modules {
</span> "License: {GPL-3 OpenSSLException}"
}
qtwebchannel {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- b8ba311c200b526d02c49d1f3664bdb5c8fbc32f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 632795b293f1318e9aaa1e124b6a39b1625c8c1e35b0a9f05a02ea0066458358
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 676da446eef3fd240b00a962cdde0fa077ba8a37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f22424dc6235110bb7f587b01ce692738af1497fba2a9739fa90a5e57ba135a3
</span> ""
""
"qtbase qtdeclarative qtwebsockets"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -485,8 +487,8 @@ array set modules {
</span> "License: "
}
qtwebengine {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- b55fdcde3d02a3080ed16c7ee489f927546a4a04
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 45ae1142fd87271c100f4d7889427738e774e86db5d8f6bcf9ceb99d18571d37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c7f1f40f0bfea822aa2dbbad079dbdf797d0f5b6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a8bf5989ef847a249bbc1f391743a36971825b896747d073e30dbcdefc9567f9
</span> "port:python27 port:py27-ply port:ninja"
""
"qtquickcontrols qtwebchannel qtlocation qttools"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -496,6 +498,18 @@ array set modules {
</span> "revision 0"
"License: "
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtwebglplugin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d3fb1ab022bdc870f4d609360112df349039f5c7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 670a75984698d51e0d1182a999e07d26021b3c01ba0e69ed2c470c4a6959fc41
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "qtbase qtwebsockets qtdeclarative"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {"QPA plugin for running an application via a browser using streamed WebGL commands"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "technology preview module; GPLv3 license only"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "variant overrides: ~docs ~examples"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "License: {GPL-3 OpenSSLException}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> qtwebkit {
72cab2a8473801dcbbe8fc41ecf8dc45775f8b18
28a560becd800a4229bfac317c2e5407cd3cc95308bc4c3ca90dba2577b052cf
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -521,8 +535,8 @@ array set modules {
</span> "License: "
}
qtwebsockets {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- d2ec99f4320e6d65fdebff34b2bdad79826157e6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ce069dff5b552bc6039bcf17e211d2c8837757e2194773bb54054105866111de
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e3674dcf35d0165ce0537f328fc3f950c71844d2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 17ab0fa22007e5485bf98cb5fef5387628274548d5e96923f45d097838f49403
</span> ""
""
"qtbase qtdeclarative"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -533,8 +547,8 @@ array set modules {
</span> "License: "
}
qtwebview {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 1c241fd003229fe49d0f1ae0cdc486c6f30a9269
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ee5663e4294c09e7c762c6cc8ed7cf8e7bd9776ac557c29c76b7f967907729c5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c2a5ec2c4ed37cea238cc86336ce8153f3cc2138
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ aa8f69e507467f8d0c1ccb6f5cb4d8a6b41af2f9f358e1813a4d0875d874a5a4
</span> ""
""
"qtdeclarative qtwebengine"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -545,8 +559,8 @@ array set modules {
</span> "License: "
}
qtxmlpatterns {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 4be9febb27404556a50583821a5900a7edbcf970
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cf9c66a612a963382f7b4b51ac8ee5e920bd035b26ecb5c5957f8f3d3286f0ba
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 08834dd53ccedb25889c58094a68701cd1fdef49
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b08abca6227e942a128e478b2eb81416c40925418d89064ee151c155e3d203c3
</span> ""
""
"qtbase"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -669,7 +683,7 @@ foreach {module module_info} [array get modules] {
</span>
subport ${name}-${module} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- distname ${module}-opensource-src-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname ${module}-${middle_name}-src-${version}
</span>
if { ${revision_string} ne "0" } {
revision ${revision_string}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -732,13 +746,6 @@ foreach {module module_info} [array get modules] {
</span> ui_warn "Multiple architectures is not a Reference Configuration for Qt."
ui_warn "See http://doc.qt.io/qt-5/supported-platforms.html#reference-configurations"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${configure.build_arch} eq "i386" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_warn "32-bit mode is not a Reference Configuration for Qt."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_warn "See http://doc.qt.io/qt-5/supported-platforms.html#reference-configurations"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
# https://codereview.qt-project.org/#/c/141654/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1213,6 +1220,12 @@ foreach {module module_info} [array get modules] {
</span> }
# special case
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${module} eq "qtdeclarative" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # attempts to link against installed version, which causes an error when upgrading 5.9.3->5.10.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5.frameworkpaths-append ${worksrcpath}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # special case
</span> if { ${module} eq "qtlocation" } {
# qtlocation uses
# Gypsy (https://gypsy.freedesktop.org/wiki/)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1290,11 +1303,6 @@ foreach {module module_info} [array get modules] {
</span>
# special case
if { ${module} eq "qtwebengine" } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # see http://lists.qt-project.org/pipermail/interest/2016-February/thread.html#20946
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see http://googleappsupdates.blogspot.co.uk/2014/09/google-chrome-64-bit-for-mac-and-windows.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see http://doc.qt.io/qt-5/qtwebengine-platform-notes.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- supported_archs x86_64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # UsingTheRightCompiler (https://trac.macports.org/wiki/UsingTheRightCompiler)
build.env-append CXX=${configure.cxx}
build.env-append CC=${configure.cc}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1384,14 +1392,6 @@ foreach {module module_info} [array get modules] {
</span> # see https://trac.macports.org/ticket/54453
patchfiles-append patch-qtscript_ceil.diff
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # special case
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${module} eq "qtwebkit-examples" ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${module} eq "qtwebview" ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${module} eq "qtnetworkauth" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # dependents of qtwebengine
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- supported_archs x86_64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1403,7 +1403,7 @@ foreach {module module_info} [array get modules] {
</span> installs_libs no
universal_variant no
<span style='display:block; white-space:pre;background:#ffe0e0;'>- distname ${module}-opensource-src-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname ${module}-${middle_name}-src-${version}
</span>
if { ${revision_string} ne "0" } {
revision ${revision_string}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1472,7 +1472,7 @@ foreach {sql_names sql_info} [array get sql_plugins] {
</span>
PortGroup qmake5 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- distname qtbase-opensource-src-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname qtbase-${middle_name}-src-${version}
</span>
if { ${revision_string} ne "0" } {
revision ${revision_string}
<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 108b643..3507ac0 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;'>@@ -52,7 +52,7 @@
</span> include(../common/gcc-base-mac.conf)
--- mkspecs/macx-icc/qmake.conf.orig 2017-06-28 02:54:29.000000000 -0700
+++ mkspecs/macx-icc/qmake.conf 2017-08-27 07:16:51.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -95,9 +95,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -98,9 +98,9 @@
</span> QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden
QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-pc_files.diff b/aqua/qt5/files/patch-pc_files.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index ee116a2..29d9b90 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-pc_files.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-pc_files.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ diff --git i/qtbase/mkspecs/features/qt_module.prf w/qtbase/mkspecs/features/qt_
</span> index bb28af97..36bb6483 100644
--- mkspecs/features/qt_module.prf
+++ mkspecs/features/qt_module.prf
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -264,7 +264,7 @@ load(qt_installs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -266,7 +266,7 @@ load(qt_installs)
</span> load(qt_targets)
# this builds on top of qt_common
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtvirtualkeyboard_noxcb.diff b/aqua/qt5/files/patch-qtvirtualkeyboard_noxcb.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 7e89b16..d68317d 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;'>-@@ -214,10 +214,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -296,10 +296,10 @@
</span> SOURCES += desktopinputpanel.cpp inputview.cpp
HEADERS += desktopinputpanel.h inputview.h
DEFINES += QT_VIRTUALKEYBOARD_DESKTOP
</pre><pre style='margin:0'>
</pre>