<pre style='margin:0'>
MarcusCalhoun-Lopez pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5bcc0ae291c67f4dcbfd46770328eefde6628a35">https://github.com/macports/macports-ports/commit/5bcc0ae291c67f4dcbfd46770328eefde6628a35</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 5bcc0ae qt5*: update Qt version 5.6.2->5.7.1
</span>5bcc0ae is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5bcc0ae291c67f4dcbfd46770328eefde6628a35
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Mar 12 14:06:26 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5*: update Qt version 5.6.2->5.7.1
</span>---
aqua/qt5/Portfile | 345 ++++++++++++++----------
aqua/qt5/files/patch-add_sdk.diff | 6 +-
aqua/qt5/files/patch-bluetooth.diff | 12 -
aqua/qt5/files/patch-configure.diff | 2 +-
aqua/qt5/files/patch-firstObject.diff | 15 --
aqua/qt5/files/patch-mkspecs.diff | 24 +-
aqua/qt5/files/patch-qnetworkproxy_mac.cpp.diff | 11 -
aqua/qt5/files/patch-qtconn-for-10.12.diff | 68 -----
aqua/qt5/files/patch-tst_benchlibcallgrind.diff | 2 +-
aqua/qt56/Portfile | 9 +
10 files changed, 225 insertions(+), 269 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/Portfile b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7f6754a..c7b9853 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;'>@@ -9,11 +9,11 @@ platforms macosx
</span> maintainers mcalhoun openmaintainer
# for OpenSSLException, see source and header files in src/network/ssl of qtbase
<span style='display:block; white-space:pre;background:#ffe0e0;'>-license {LGPL-2.1 LGPL-3 GPL-3 OpenSSLException}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license {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.7.1
</span>
set qt_name ${name}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +25,7 @@ unset just_want_qt5_variables
</span> set branch [join [lrange [split ${version} .] 0 1] .]
set qt_major [lindex [split ${version} .] 0]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Qt builds differently when it detects C++-11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://wiki.qt.io/New_Features_in_Qt_5.7
</span> PortGroup cxx11 1.1
master_sites \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -118,327 +118,399 @@ foreach test_qt_name ${available_qt_versions} {
</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;'>+ 6d3028b51ef3009c2dae79698400d9671a0ab087
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1d74cf431777b8086d771ab0d4d2c01f9c28eb14cc2d73d7f838a665d1f707ea
</span> ""
"port:assimp"
"qtbase qtxmlpatterns qtdeclarative qtimageformats"
{"Qt3D Core" "Qt3D Input" "Qt3D Logic" "Qt3D Renderer"}
"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;'>+ b26efab64209d4fe5b0532690c9d3902e7a70102
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ edcdf549d94d98aff08e201dcb3ca25bc3628a37b1309e320d5f556b6b66557e
</span> ""
"port:zlib port:libpng port:jpeg port:fontconfig port:freetype path:bin/dbus-daemon:dbus port:tiff port:libmng path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre port:libiconv port:harfbuzz"
""
{"Qt Gui" "Qt Widgets" "Qt Print Support" "Qt OpenGL" "Qt Core" "Qt XML" "Qt SQL" "Qt Network" "Qt Test" "Qt D-Bus" "Qt Concurrent" "Qt Platform Headers"}
""
"variant overrides: ~docs"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 4"
</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;'>+ add50851a85a4ea7716b327d50ac17aab3ad5966
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a887083817b77710f6b5401cec4713a03147ed16fa5cf5fb8de4495807bebdb4
</span> ""
""
"qtbase qtdeclarative"
{"Qt Canvas 3D"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtcharts {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ca932d8c263b79b1ded26db3454a3c887093649e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 85feee6992cdef1ab42947a83cbf806a29224d704ee5dc97ee5038c75b633fe3
</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 qtdeclarative"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {"Qt Charts"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "GPLv3 license only"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "variant overrides: "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "License: {GPL-3 OpenSSLException}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> 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;'>+ c0ab063f114d1e68085165fecc8414407266b4f2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b3e8b9068304dc5605a8fdf0695102032fd1a216f2c2d4d53a7e4d4dda3ab966
</span> ""
""
"qtbase qtdeclarative qtxmlpatterns"
{"Qt Bluetooth" "Qt NFC"}
""
"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: "
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- qtenginio {
</span><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;'>+ qtdatavis3d {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1fbcf4eacc25fc559f3d6cb92754e52dc85407e8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1bff85dcdeed98ad8f0e191f77e7c0e9d57af719c51791044b9c15e939b800f8
</span> ""
""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "qtbase qtdeclarative qtxmlpatterns"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"Enginio"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "qtbase qtdeclarative qtxmlpatterns qtmultimedia"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {"Qt Data Visualization"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "GPLv3 license only"
</span> "variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "License: "
</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> }
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;'>+ 5b775aa0fee5cbbf540c85ea42a6f832f588e7e4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fd13dd3059d20694a857ed30ee56a2ade908c0cb93246f9804a65f7a2d775d56
</span> "port:python27"
""
"qtbase qtxmlpatterns"
{"Qt QML" "Qt Quick" "Qt Quick Widgets"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtdeclarative-render2d {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2ff009c9755d49e2b08250f001465ef860fa4397
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 831913488bb887993ae8701e5966f53875667a774c0230fc5dc39d6077828c7f
</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 qtdeclarative"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {"Qt Quick 2D Renderer"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "GPLv3 license only"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "variant overrides: "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "License: {GPL-3 OpenSSLException}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> 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;'>+ 441b718a9e038a0ece9fcf452a71ad12ac0a14e7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 55fb0134d7bb26e261bbb30f674e4a88fbcc6bc17e8bb030134aa236b87bd9db
</span> ""
""
"qtbase qttools sqlite-plugin"
{"Qt Reference Documentation"}
"requires all documentation"
"variant overrides: ~examples ~tests ~debug noarch ~docs"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "License: "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtgamepad {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b999fea16af38585e7a9f21b902e7b5d1b2001df
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bb2b2165e3bcbf37a7e03c3e1cac4fe9771b087dad7ab9566ba5f7f4f4929182
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "port:libsdl2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "qtbase qtdeclarative qtxmlpatterns"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {"Qt Game Pad"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "technology preview module"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "variant overrides: "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "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;'>+ 0602426e52d16ae24c8d75bd4f4d465f8ea120f7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2c68fabe599fa2f318562dc22003df6797e91d00761dbf1f337cdc7fbacd4dc8
</span> ""
""
"qtbase qtdeclarative qtxmlpatterns"
{"Qt Graphical Effects"}
""
"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: "
}
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;'>+ a4b2191f0c5831ae651da0105665e5595af52610
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4f97a2a2b269f8a45576256ad9f452320c9c9de6d9c7cc1751fdeac36b0f77f4
</span> ""
"port:jasper port:libmng port:tiff port:webp"
"qtbase"
{"Qt Image Formats"}
""
"variant overrides: "
<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: "
}
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;'>+ 1c4d23ad85295eb0b2a18a98cf55cfb80586b570
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f9e9e64e757008c2341504a1916a219ee0cf2b1b42bfa72156e62dfe9dfbf39f
</span> ""
""
"qtbase qtxmlpatterns qtdeclarative qtquickcontrols qtserialport"
{"Qt Location" "Qt Positioning"}
""
"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: "
}
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;'>+ 667211d10808f45bf05e863c2457fa7eeb9d6870
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1dcad3d9b5ffeece985afc595b95f6b8b1a1aac7fa1f84193d042f2303b52667
</span> ""
""
"qtbase"
{"Qt Mac Extras"}
""
"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: "
}
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;'>+ 47e2e0ea325c93fadb3e6a460952ae6bbd4b437d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a52b177fbf02600a0c8bd995ce7c2041c673bc1332c02b60e0e95bb9ebab7def
</span> ""
""
"qtbase qtxmlpatterns qtdeclarative"
{"Qt Multimedia" "Qt Multimedia Widgets"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "License: "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtpurchasing {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2ae0d16152b4d55fa1ea0ae5b2753b9079f869b8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f694757929cefa31643daab4bde1fbda8d76c79eda0ee6094e1d86efd4cb7b42
</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 qtdeclarative"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {"Qt Purchasing"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "in-app purchases is of limited value on desktop"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "variant overrides: "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "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;'>+ 78ed13596d62342447f3086483a331fdaf388d21
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6feb1a736bf93af98c40d04cde6b36c113e4cdf84ccb9b306ca92ef9b1779e9d
</span> ""
""
"qtbase qtdeclarative qtxmlpatterns qtgraphicaleffects"
{"Qt Quick Controls" "Qt Quick Dialogs" "Qt Quick Layouts" "Qt Quick Extras"}
""
"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: "
}
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;'>+ 75c7942e4b6fa60b555fd9c9858f4cf41cf861f6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f2e8acd0badbf604f28258b063c94ba71e28147c53c435ae9eb484497cf3e7ec
</span> ""
""
"qtbase qtxmlpatterns qtdeclarative qtquickcontrols qtgraphicaleffects"
{"Qt Labs Controls"}
"technology preview module"
"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: "
}
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;'>+ b449e5954caaa493b0163506a58e3ea7e49751a1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5bf91a1c53020d91d454d4bb0f930ada98c5fc008fda78f2d7171152920da426
</span> ""
""
"qtbase"
{"Qt Script" "Qt Script Tools"}
"deprecated in favor QJS* in Qt QML"
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "License: "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtscxml {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e389198b8023e0c478f2d9c9b01e39dcff76daa7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9dad4ab220a715b6a63df1d4a196bfa963a1ce7e6e57e7b36462c5dab09db38c
</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 qtdeclarative qtxmlpatterns"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {"Qt SCXML"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "technology preview module"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "variant overrides: "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "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;'>+ 8d2871b427c14d943c79f8918214f09e5adfdc27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ccb3942edb5e615e9a43c147d87a09f19690eafbc56be0cdf4f73b7e510f3b10
</span> ""
""
"qtbase qtxmlpatterns qtdeclarative"
{"Qt Sensors"}
""
"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: "
}
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;'>+ fc9b652c1bfac92cb1c884d51d89b4198d198dda
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 727edbe0f29659119cfcfbc9ce7c7063af319ec441bc9a5156ebda28e820b157
</span> ""
""
"qtbase qtserialport"
{"Qt Serial Bus"}
"technology preview module"
"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: "
}
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;'>+ 28d52ddb120bc260668c51e24d0f84ea0ff14fcd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 76d5e19bd392b72602ba3bfe3c0d03c10962674604cf814efa2c910f98cf5a26
</span> ""
""
"qtbase"
{"Qt Serial Port"}
""
"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: "
}
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;'>+ bdfe992b16536caf05fe49b5b26e9dbca16afbaa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b0f017db8cf18e655e8a6635bc4ddbdbad6f8ef839857451b78942630a4c3947
</span> ""
""
"qtbase"
{"Qt SVG"}
""
"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: "
}
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;'>+ e882f6e43708305242aba7502554b6be5f9ff12e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 64197022686c3d8b11a8639f102e2caf03cc325a30e7a32ba66881648ac2dfac
</span> ""
""
"qtbase qtxmlpatterns qtdeclarative sqlite-plugin"
{"Qt Help" "Qt UI Tools" "Qt Designer"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
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;'>+ f1e1040035310813b94ce32b251d6cd4a0ae1585
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 16ecdb09532724e80fa6202e5604d80877923b652b771b6020cea36bee0258e7
</span> ""
""
"qtbase qttools"
{"translation files"}
""
"variant overrides: ~examples ~tests ~debug noarch ~docs"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtvirtualkeyboard {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bbfb719ec76ee67fb89d38e4956be70f88c25b61
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b28b8b937ed15d794c5ebc93e9556d08a0c9761a434864ebf2b454554e652add
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "port:hunspell"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {"Qt Virtual Keyboard"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "GPLv3 license only"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "variant overrides: "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "License: {GPL-3 OpenSSLException}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> 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;'>+ edbff4aea7ddd25ed0404511760ddc5cfefd99c3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 63ab3ac76ff993009cfa978162a764e05b763cacb70d1a862893f8de4492319b
</span> ""
""
"qtbase qtwebsockets qtdeclarative"
{"Qt WebChannel"}
""
"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: "
}
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;'>+ 07bf263f775ac2a72f8db18ef53862b62be873a0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2101883e3d632b50133a14e3bbdc1d4d649e405c9618f2eef1b72a7b821ccc2b
</span> "port:python27 port:py27-ply"
""
"qtbase qtdeclarative qtxmlpatterns qtquickcontrols qtwebchannel"
{"Qt WebEngine" "Qt WebEngine Widgets"}
"very large and relatively new; requires newer version of OS X"
"variant overrides: ~universal"
<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: "
}
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;'>+ 45d764449491dc875838fb8b2e79c90cf3b0653a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a46cf7c89339645f94a5777e8ae5baccf75c5fc87ab52c9dafc25da3327b5f03
</span> "port:python27"
"port:fontconfig port:icu port:leveldb port:webp port:libxml2 port:libxslt port:zlib port:sqlite3"
"qtbase qtxmlpatterns qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel"
{"Qt WebKit" "Qt WebKit Widgets"}
"community support only (use Qt WebEngine)"
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
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;'>+ 4f3d6eea1cd01b961f7914160afe3ad5ac964285
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5c2a75b68e7f2e98530659b33bb08edee83013832dbf99cc5b40afc8a90652d1
</span> ""
""
"qtbase qtdeclarative"
{"Qt WebSockets"}
""
"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: "
}
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;'>+ 17993359df0685eec533610ae81926a6c4795c62
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b3bcf9693e0205263f5d227f2204cf12c3a3d1e200b3114723511ee3bdf2159f
</span> ""
""
"qtbase qtdeclarative qtwebengine"
{"Qt WebView"}
"new in 5.6.0; requires qtwebengine"
"variant overrides: ~universal"
<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: "
}
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;'>+ 5891531cab954807cc32a289df3511637d5cf101
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a805938c2ab1379d7dc83dcec606edd7950b5155c073b9eb53c53e62deb5f8e5
</span> ""
""
"qtbase"
{"Qt XML Patterns"}
""
"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: "
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -455,7 +527,7 @@ array set modules {
</span> #
###############################################################################
array set sql_plugins {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- {sqlite SQLite "revision 1"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {sqlite SQLite "revision 0"} {
</span> {
"sqlite3"
"port:sqlite3"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -464,7 +536,7 @@ array set sql_plugins {
</span> ""
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- {psql PostgreSQL "revision 1"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {psql PostgreSQL "revision 0"} {
</span> {
"postgresql95"
"port:postgresql95"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -487,7 +559,7 @@ array set sql_plugins {
</span> ""
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- {mysql MySQL "revision 1"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {mysql MySQL "revision 0"} {
</span> {
"mariadb55"
"port:mariadb"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -519,12 +591,7 @@ foreach {module module_info} [array get modules] {
</span>
subport ${name}-${module} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # special case
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${module} ne "qtenginio" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distname ${module}-opensource-src-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distname ${module}-opensource-src-1.[join [lrange [split ${version} "."] 1 end] "."]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname ${module}-opensource-src-${version}
</span>
if { ${revision_string} ne "0" } {
revision ${revision_string}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -601,26 +668,15 @@ foreach {module module_info} [array get modules] {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Qt uses CFRunLoopTimerCreateWithHandler, which was not introduced until Mac OS X 10.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://developer.apple.com/reference/corefoundation/1542555-cfrunlooptimercreatewithhandler?language=objc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} < 11 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the Qt 5.7 class QUuid requires NSUUID, which was introduced in OS X 10.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://developer.apple.com/reference/foundation/nsuuid?language=objc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.major} < 12 } {
</span> pre-fetch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${subport} requires OS X 10.7 or later"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "${subport} requires OS X 10.8 or later"
</span> return -code error "incompatible OS version"
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Qt uses TLS protocols introduced in OS X 10.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://developer.apple.com/reference/security/sslprotocol/ktlsprotocol11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://developer.apple.com/reference/security/sslprotocol?language=objc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} == 11 && ![variant_isset openssl] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "using Secure Transport requires OS X 10.8 or later"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "please use openssl variant"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "incompatible variant choice"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # https://codereview.qt-project.org/#/c/141654/
patchfiles-append patch-add_sdk.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -652,11 +708,6 @@ foreach {module module_info} [array get modules] {
</span> # When testing, ensure that a universal object file is not inadvertently created.
patchfiles-append patch-machtest.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # prior to 10.8, CFNetwork was part of CoreServices
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} < 12 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-qnetworkproxy_mac.cpp.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> #-----------------------------------------------------------------------------
# qtbase is used for:
# 1) building qtbase
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -850,7 +901,7 @@ foreach {module module_info} [array get modules] {
</span> -glib \
-no-pulseaudio \
-no-alsa \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-gtkstyle
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -no-gtk
</span>
# from the configure script:
# NOTE: -optimized-tools is not useful in -release mode.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1182,7 +1233,7 @@ foreach {module module_info} [array get modules] {
</span> if { ${module} eq "qtwebengine" } {
# see http://doc.qt.io/qt-5/qtwebengine-platform-notes.html
PortGroup xcodeversion 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- minimum_xcodeversions {13 5.1}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ minimum_xcodeversions {13 6.1}
</span> if { ${os.major} < 13 } {
pre-fetch {
ui_error "${subport} requires OS X 10.9 or later"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1199,11 +1250,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;'>@@ -1223,20 +1269,6 @@ foreach {module module_info} [array get modules] {
</span> }
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # special case
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${module} eq "qtconnectivity" } {
</span><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><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # special case
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${module} eq "qtmultimedia" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} < 12 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://trac.macports.org/ticket/52922
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-firstObject.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1248,12 +1280,7 @@ foreach {module module_info} [array get modules] {
</span> installs_libs no
universal_variant no
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # special case
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${module} ne "qtenginio" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distname ${module}-opensource-src-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distname ${module}-opensource-src-1.[join [lrange [split ${version} "."] 1 end] "."]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname ${module}-opensource-src-${version}
</span>
if { ${revision_string} ne "0" } {
revision ${revision_string}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1281,6 +1308,9 @@ foreach {module module_info} [array get modules] {
</span> if { ${module} eq "qtdeclarative" } {
depends_build-append \
port:python27
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif { ${module} eq "qtvirtualkeyboard" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${name}-qtsvg
</span> } elseif { ${module} eq "qtserialbus" } {
depends_build-append \
port:${name}-qtserialport
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1297,7 +1327,7 @@ foreach {module module_info} [array get modules] {
</span> } elseif { ${module} eq "qtwebengine" } {
# see http://doc.qt.io/qt-5/qtwebengine-platform-notes.html
PortGroup xcodeversion 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- minimum_xcodeversions {13 5.1}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ minimum_xcodeversions {13 6.1}
</span> if { ${os.major} < 13 } {
pre-fetch {
ui_error "${subport} requires OS X 10.9 or later"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1667,3 +1697,26 @@ foreach {component component_info} [array get qt5pg::qt5_component_lib] {
</span> }
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Qt 5.7 will not work on Mac OS X 10.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# replace qt5-XYZ port with qt56-XYZ port
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.major} < 12 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set suffix [string range ${subport} [string last - ${subport}] end]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${suffix} eq "-docs" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set component [string range ${subport} 4 end-5]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set component [string range ${subport} 4 end]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${component} eq "" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replaced_by qt56[string range ${subport} 3 end]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set component_info $qt5pg::qt5_component_lib(${component})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set qt_version_introduced [lindex ${component_info} 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set qt_version_removed [lindex ${component_info} 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [vercmp ${qt_version_introduced} 5.6] <= 0 && [vercmp ${qt_version_removed} 5.6] > 0 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replaced_by qt56[string range ${subport} 3 end]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-add_sdk.diff b/aqua/qt5/files/patch-add_sdk.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index f8d4800..7e3f4e7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-add_sdk.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-add_sdk.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,12 +19,12 @@ diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf
</span> index e238f8e..624366a 100644
--- mkspecs/features/mac/sdk.prf
+++ mkspecs/features/mac/sdk.prf
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -42,7 +42,7 @@ QMAKE_INCDIR_OPENGL = $$sysrootified
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,7 +37,7 @@ QMAKE_INCDIR_OPENGL = $$sysrootified
</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/qt5/files/patch-bluetooth.diff b/aqua/qt5/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/qt5/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/qt5/files/patch-configure.diff b/aqua/qt5/files/patch-configure.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 680196b..b6afb15 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- configure.orig 2015-10-12 21:35:07.000000000 -0700
+++ configure 2015-10-18 12:19:26.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4319,7 +4319,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4264,7 +4264,7 @@
</span>
local incdir_raw incdir_mod cflags
local libdir_raw libdir_mod libs
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-firstObject.diff b/aqua/qt5/files/patch-firstObject.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7b42bb9..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-firstObject.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/plugins/avfoundation/camera/avfcamerautility.mm.orig 2016-09-12 03:58:51.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/plugins/avfoundation/camera/avfcamerautility.mm 2016-12-28 09:44:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -42,6 +42,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <algorithm>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <limits>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// see https://trac.macports.org/ticket/52922
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// from the 10.9 SDK
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@interface NSArray (MacPortsCompatibilityFirstObject)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+- (id)firstObject NS_AVAILABLE(10_6, 4_0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QT_BEGIN_NAMESPACE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AVFPSRange qt_connection_framerates(AVCaptureConnection *videoConnection)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-mkspecs.diff b/aqua/qt5/files/patch-mkspecs.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 31fa02b..35258b4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-mkspecs.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-mkspecs.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/macx-clang/qmake.conf.orig 2016-10-31 19:10:55.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/macx-clang/qmake.conf 2016-10-31 19:12:23.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/macx-clang/qmake.conf.orig 2016-09-15 22:49:42.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/macx-clang/qmake.conf 2016-12-24 08:54:33.000000000 -0700
</span> @@ -11,6 +11,10 @@
include(../common/clang.conf)
include(../common/clang-mac.conf)
<span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
</span> +QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
+
+QMAKE_CFLAGS += -arch x86_64
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,18 +18,18 @@
</span> include(../common/clang.conf)
include(../common/clang-mac.conf)
<span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
</span> +QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
QMAKE_CFLAGS += -arch i386
QMAKE_CXXFLAGS += -arch i386
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/macx-g++/qmake.conf.orig 2016-10-31 19:11:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/macx-g++/qmake.conf 2016-10-31 19:13:33.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/macx-g++/qmake.conf.orig 2016-09-15 22:49:42.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/macx-g++/qmake.conf 2016-12-24 08:56:11.000000000 -0700
</span> @@ -14,6 +14,10 @@
include(../common/gcc-base-mac.conf)
include(../common/g++-macx.conf)
<span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
</span> +QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
+
+QMAKE_CFLAGS += -arch x86_64
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,7 +43,7 @@
</span> include(../common/gcc-base-mac.conf)
include(../common/g++-macx.conf)
<span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
</span> +QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
QMAKE_CFLAGS += -arch i386
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,7 +54,7 @@
</span> include(../common/gcc-base-mac.conf)
include(../common/g++-macx.conf)
<span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
</span> +QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
QMAKE_CC = gcc-4.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,14 +65,14 @@
</span> include(../common/gcc-base-mac.conf)
include(../common/g++-macx.conf)
<span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
</span> +QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
QMAKE_CC = gcc-4.2
QMAKE_CXX = g++-4.2
--- mkspecs/macx-icc/qmake.conf.orig 2016-10-31 19:11:43.000000000 -0700
+++ mkspecs/macx-icc/qmake.conf 2016-10-31 19:15:29.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -83,7 +83,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -90,7 +90,7 @@
</span> QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden
QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,7 +87,7 @@
</span> include(../common/gcc-base-mac.conf)
include(../common/llvm.conf)
<span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
</span> +QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
QMAKE_XCODE_GCC_VERSION = com.apple.compilers.llvmgcc42
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qnetworkproxy_mac.cpp.diff b/aqua/qt5/files/patch-qnetworkproxy_mac.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 84a54c3..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-qnetworkproxy_mac.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/network/kernel/qnetworkproxy_mac.cpp.orig 2016-12-01 01:17:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/network/kernel/qnetworkproxy_mac.cpp 2017-02-05 08:04:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -41,7 +41,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef QT_NO_NETWORKPROXY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <CFNetwork/CFNetwork.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <CoreServices/CoreServices.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <CoreFoundation/CoreFoundation.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <SystemConfiguration/SystemConfiguration.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/qt5/files/patch-qtconn-for-10.12.diff b/aqua/qt5/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/qt5/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><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-tst_benchlibcallgrind.diff b/aqua/qt5/files/patch-tst_benchlibcallgrind.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 7141fd6..e23a639 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-tst_benchlibcallgrind.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-tst_benchlibcallgrind.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- tests/auto/testlib/selftests/benchlibcallgrind/tst_benchlibcallgrind.cpp.orig 2014-06-28 00:25:11.000000000 -0700
+++ tests/auto/testlib/selftests/benchlibcallgrind/tst_benchlibcallgrind.cpp 2014-06-19 03:08:01.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73,9 +73,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -68,9 +68,9 @@
</span> QBENCHMARK {
__asm__ __volatile__(
"mov $100000000,%%eax \n"
<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 0dd271a..36ab3c2 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;'>@@ -1644,3 +1644,12 @@ post-destroot {
</span> livecheck.type regex
livecheck.url http://download.qt.io/archive/qt/${branch}/
livecheck.regex (\\d+(\\.\\d+)+)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# ugly hack to allow Mac OS X 10.7 users to have qt5-XYZ be replaced by qt56-XYZ
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Qt version 5.7 does not work on macOS prior to 10.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# since only needed for upgrading, should be removed on 3/12/2018
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.major} < 12 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![catch {set installed [lindex [registry_active qt5-qtbase] 0]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts-delete qt5-qtbase
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span></pre><pre style='margin:0'>
</pre>