<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/14c41981b679fe3d8cc67a3518d18e8a5c98ae13">https://github.com/macports/macports-ports/commit/14c41981b679fe3d8cc67a3518d18e8a5c98ae13</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 14c4198 qt5: update 5.6.1->5.6.2 and change Portfile structure
</span>14c4198 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 14c41981b679fe3d8cc67a3518d18e8a5c98ae13
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Nov 13 15:36:50 2016 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5: update 5.6.1->5.6.2 and change Portfile structure
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Normally, structure changes and version updates should be in separate
</span><span style='display:block; white-space:pre;color:#404040;'> commits, but the structure changes alter how versions, revisions, and
</span><span style='display:block; white-space:pre;color:#404040;'> subports are handled.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> It was much more convenient to do both simultaneously.
</span>---
aqua/qt5/Portfile | 2063 +++++++++++++++-----------
aqua/qt5/files/patch-bluetooth.diff | 12 +
aqua/qt5/files/patch-configure.diff | 2 +-
aqua/qt5/files/patch-deployment_target.diff | 24 +
aqua/qt5/files/patch-install_examples.diff | 19 -
aqua/qt5/files/patch-mkspecs.diff | 93 +-
aqua/qt5/files/patch-objc.diff | 11 -
aqua/qt5/files/patch-pc_files.diff | 2 +-
aqua/qt5/files/patch-qtenginio_examples.diff | 73 -
aqua/qt5/files/patch-qtquick1_examples.diff | 81 -
aqua/qt5/files/patch-qtwebkit_examples.diff | 10 -
aqua/qt5/files/patch-ssl.diff | 139 --
aqua/qt5/files/patch-xcrun.diff | 49 -
13 files changed, 1277 insertions(+), 1301 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 1c91a2a..c28cf67 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;'>@@ -4,77 +4,50 @@ PortSystem 1.0
</span>
name qt5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# special case
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${subport} eq "qt5-qtwebkit" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 5.5.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- notes-append "Qt Webkit is no longer supported upstream.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The port ${subport} will be removed if it becomes unfeasible to maintain."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif { ${subport} eq "qt5-qtquick1" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 5.5.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- notes-append "Qt Declarative is no longer supported upstream.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The port ${subport} will be removed if it becomes unfeasible to maintain."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif { ${subport} eq "qt5-qtwebkit-examples" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 5.5.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- notes-append "Qt Webkit is no longer supported upstream.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The port ${subport} will be removed if it becomes unfeasible to maintain."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 5.6.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${subport} eq "qt5-qtbase" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories aqua
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms macosx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers mcalhoun openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license {LGPL-2.1 LGPL-3 GPL-3}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${subport} eq "qt5-mysql-plugin" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage http://qt.io
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${subport} eq "qt5-psql-plugin" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 5.6.2
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${subport} eq "qt5-qtimageformats" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set qt_name ${name}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${subport} eq "qt5-sqlite-plugin" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set just_want_qt5_variables yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup qt5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+unset just_want_qt5_variables
</span>
# get Qt's version numbers
set branch [join [lrange [split ${version} .] 0 1] .]
set qt_major [lindex [split ${version} .] 0]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-categories aqua
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms macosx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers mcalhoun openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license {LGPL-2.1 LGPL-3 GPL-3}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://qt.io
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ http://download.qt.io/official_releases/qt/${branch}/${version}/submodules \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ http://download.qt.io/community_releases/${branch}/${version}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# generate documentation from complete code base
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# generate modules from separate downloads
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${subport} ne "${name}-docs" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites http://download.qt.io/official_releases/qt/${branch}/${version}/submodules
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites http://download.qt.io/official_releases/qt/${branch}/${version}/single/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# file sizes are significantly smaller using xz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${subport} ne ${name} && ${subport} ne "${name}-docs" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_xz yes
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${subport} ne ${name} } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # file sizes are significantly smaller using xz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_xz yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts qt3 qt3-mac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# conflict with all other version of qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach test_qt_name ${available_qt_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${name} ne ${test_qt_name} } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # module exists in this Qt version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts-append ${test_qt_name}-qtbase
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://trac.macports.org/ticket/51358
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts-append libressl libressl-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> ############################################################################### Modules Not Considered
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# No qt5 (Doesn't Install Anything)
</span> # No qtactiveqt (Windows Only)
# No qtandroidextras (Android Only)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# No qtdoc (Doesn't Install Anything)
</span> # No qtwayland (Linux Only)
# No qtx11extras (X11 Only)
# No qtwinextras (Windows Only)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -108,9 +81,6 @@ if { ${subport} ne ${name} } {
</span> # qttools depends on
# qtactiveqt (Windows Only)
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# qtquick1 depends on
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# qtactiveqt (Windows Only)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span> # qtwebkit has tests for libraries in:
# Tools/qmake/mkspecs/features/configure.prf
# Tools/qmake/config.tests/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -120,7 +90,6 @@ if { ${subport} ne ${name} } {
</span> ############################################################################### TODO
#
# TODO: possible to trim dependencies of qtbase?
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# TODO: support older versions of OS X via different versions of Qt 5
</span> #
###############################################################################
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -135,6 +104,7 @@ if { ${subport} ne ${name} } {
</span> # Qt components provided
# included in "standard" installation of Qt (empty string is no, explanation string is yes)
# variant overrides
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# revision number
</span> # }
#
# module info found at https://doc.qt.io/qt-5/qtmodules.html
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -142,284 +112,301 @@ if { ${subport} ne ${name} } {
</span> ###############################################################################
array set modules {
qt3d {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 03d9f6c85f2fedcb1480a6a23e0191c7e6e859fb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ad93015165b1ab1a8b458e08503c8f4c8450c2b58024a3ac074281a1a90ea80d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0bba8e3553b1d4fe603f1d2fde2f8e3626e87288
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a21786db6e0f5c6c70213fe1a3530ed3d7f28f28401a0f793970e9bc860ce941
</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:#e0ffe0;'>+ "revision 0"
</span> }
qtbase {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 3811f2b945e05870ede6ae4eed237e8ba65a4f05
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d01cc1ee2be9ecdb169be3aea9dc9fc019c1c6d0bb87e0c88bb95b5b3dce7264
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 55b2d2d9474cb565e872eed1ab0e8e01bf5031a8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2f6eae93c5d982fe0a387a01aeb3435571433e23e9d9d9246741faf51f1ee787
</span> ""
"port:zlib port:libpng port:jpeg port:fontconfig port:freetype path:bin/dbus-daemon:dbus path:lib/libssl.dylib:openssl 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"}
""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "variant overrides: "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "variant overrides: ~docs"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> }
qtcanvas3d {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 139dcfd920ded3db43b2dd5cd1191b20171ebf2d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 191e2cde0ac8b1ef6616263aac27f12f40335fed2bd60e29987724242b872760
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 12e5460320bd6e7fbe01d85a8f39e24e4ca9a74d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d7584d006b03f99692ccabce922e755a6f12bb1ed1fbc99c2b84842b9e0aa0ad
</span> ""
""
"qtbase qtdeclarative"
{"Qt Canvas 3D"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> }
qtconnectivity {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 79b26da05686ec6cc57188e87383f9f97c309f10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5a35abf6b515091e4b181b78d0ed82249972bf93f227d52c70531417c448d919
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6b4645eaa4fe4cb1e725e2bc445a8909cc470af6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1b672923e0703d62f605ccec97b454b1a04c1f0db47f54b687d009e84eabedf9
</span> ""
""
"qtbase qtdeclarative qtxmlpatterns"
{"Qt Bluetooth" "Qt NFC"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtenginio {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c62811096a313efde96c034673a2bc047419a6d2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 90ffc38d214a75ab0ef90a4760843f12bc073ae49c17de24c677d1d403bddcc3
</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;'>+ {"Enginio"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ""
</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> }
qtdeclarative {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 9a938dd7041a5b542db300491d839ea3bd20fafb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 12fcfd4bc4bad469f07f8c5404d98646f88f61200b014d4fbcb3a0d9e70942b4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3c35a848052f0e228b838ed1277ff53165b33c6a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0086a986bc36b398ba518c404d08cdff0a0d7978c30aa3fa2ab73d71654209da
</span> "port:python27"
""
"qtbase qtxmlpatterns"
{"Qt QML" "Qt Quick" "Qt Quick Widgets"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- qtenginio {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- c67e5bfafc774c19f62db8d1fd1be297de3776c5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 627ddcfbbfc3ec1a83c9dbb5f24287b5cd6cb5d3b9d09af4d1c444c6ac147f0c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtdoc {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a2695d89272018607deb33215d03b8793a3c2a12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f6691eeaa9954f6990c744d246f4fe5a9bdd9936aa78d187e98c12795761e868
</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:#ffe0e0;'>- "variant overrides: "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "qtbase qttools sqlite-plugin"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {"Qt Reference Documentation"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "requires all documentation"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "variant overrides: ~examples ~tests ~debug noarch ~docs"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> }
qtgraphicaleffects {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 16dc294725e0b513ba4afd3e1e6308e85aee54b2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 57e97155da33a8a4023d1b33bc6f7bdef68a64640d04f45ef3db9dec721311d8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c2b77a5ce9b33d85bb50aa722c8de9645c40e99c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1e9f0fac2c72a812d396db74b2d9d12f513d2ec9135d5982ca85aee7f00be75e
</span> ""
""
"qtbase qtdeclarative qtxmlpatterns"
{"Qt Graphical Effects"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> }
qtimageformats {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- d5b695518bd94df2bb3411b9c2466527014f186a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 74f3bce4f9df0f1a94d41877a91405560ce79e4359fc831ee97f0c8248081b08
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4abf0b602430b199e6bfa35ce079c9d48dd584ea
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4fb153be62dac393cbcebab65040b3b9d6edecd1ebbe5e543401b0e45bd147e4
</span> ""
"port:jasper port:libmng port:tiff port:webp"
"qtbase"
{"Qt Image Formats"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> }
qtlocation {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 932c886d3d900f5cc064cc79fd967c3e36ef8909
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d3b5768cf68945cd00c9df32fb87ca3bf85f5364dc2e441780840e2bd4d15061
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a0fa5fad9541a2d7c98392b77ed9ae6b49a00800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7a8995206ed0220f943a33c037527a1a8243d5386f5ca77bf88152675c28d23a
</span> ""
""
"qtbase qtxmlpatterns qtdeclarative qtquickcontrols qtserialport"
{"Qt Location" "Qt Positioning"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> }
qtmacextras {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 91727829f4f415907cb4e9e4f4cdb2b3889f56ca
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- e3b0567be15965244dbe7677abf1610d338f7e373c62e7f254ca83e5ce86fe90
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bb4ca30a9880f5b0d37dc5ce5b1acde0c6489d2f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 855263a9f3daea67eee57a16b6f877d0f4096eb731f9e0f0fd8eee87dbc19015
</span> ""
""
"qtbase"
{"Qt Mac Extras"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> }
qtmultimedia {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- c80dde261404b0d7797f633e0357d34677b1466f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d24b5b5fc9f296cc8446c27f1306a47ce5699b65cf1b821d6a43652cd8100515
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 772af0d21129d9a53e677e6aa3fbbaf46c6ba28e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cb9a70a7c6c0eb5be4a3fcaf9590863479e95a255308bbf07d5b7aa303bb8caf
</span> ""
""
"qtbase qtxmlpatterns qtdeclarative"
{"Qt Multimedia" "Qt Multimedia Widgets"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qtquick1 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dd1c71468426a5b9fe4f5297a6f2b04c9caddc78
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- c812a7e59a8b9f0a87693181059933e15fef04bc875b6486cd653be1b9b51f2c
</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;'>- "qtbase qtscript qtxmlpatterns qtdeclarative qttools qtwebkit"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"Qt Declarative"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "unsupported"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "variant overrides: "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> }
qtquickcontrols {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 04fe72a97db226ee179cbfaee93e6e8f52ea69a8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 012aa6c4a697f352a9dc1373d8c1f37e33a6d956b6d14be7d1f9e4637d46a691
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4ced8969881294afd022bca40da84be4d5f2e32e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5ed0f2292be10222dfb1b57a05472798fd759279f65455d91c02ef4fb746102c
</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:#e0ffe0;'>+ "revision 0"
</span> }
qtquickcontrols2 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 4bc99827e8d249f8ffb57f3cd05ef0cb651fa175
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bba0ddcf1a66c8dec3faeb9c84119992bb1ead09a674aae475d19c35cc8eeb8f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0ba46bb90e625e590ebfa14cef7112244e37c9e9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 09dc1710aa4701aebe145829eb99bab94d0870cf578f7dddcec0af92286dfec1
</span> ""
""
"qtbase qtxmlpatterns qtdeclarative qtquickcontrols qtgraphicaleffects"
{"Qt Labs Controls"}
"technology preview module"
"variant overrides: "
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> }
qtscript {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0a00616ff731512e8960f792c206598590768f11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1cb2ef87aeff3d8d05685279b521c332b752e4559f8e2138fd36d3eb682bf79f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 57a0edd3199a5e93e0eb71be8e98f8c57886444b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e06ef6b271cae2187b57cd4ffdd6759428fd47f94a060e2ed2af024a8c14110e
</span> ""
""
"qtbase"
{"Qt Script" "Qt Script Tools"}
"deprecated in favor QJS* in Qt QML"
"variant overrides: "
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> }
qtsensors {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- b0fff836c9e4ad90829f79a3a6edd34e4904d382
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- c724cd14efc62d935ca822147bf9771e735995032c7b3b13e2e8156d283d942e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 329ea8fc1d4bac44902b79ec666ed5231fea6c8d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a7809081aab4f2f0d7a4f40c3abb02e1690bb390d1dd410d7c6c5019a5053427
</span> ""
""
"qtbase qtxmlpatterns qtdeclarative"
{"Qt Sensors"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> }
qtserialbus {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 5edc4ad2daf573d4cbdc87b04165557989291e59
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bf453fd114131ff64b7ff9a412ef13f6e158d1b5cbebf8fa6b5938bb671bc8c0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 352bba29042cc4ea4d2ad5b0b3eaa8e2797181da
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b39260091691532382935ed51de9ead8e66cfb5f7a6e5410c17cd0695ccaf826
</span> ""
""
"qtbase qtserialport"
{"Qt Serial Bus"}
"technology preview module"
"variant overrides: "
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> }
qtserialport {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ea20c30f1dbb1357d8b30eb6303eb9e5ff5dbc47
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0b74a2e85e34163c92b076a9af2bbb2c832516839f060266f0465f881f1be6c2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5720c53ca1df11c99671a6ad28bc8415be895daf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ af76281bad2c2bd283189635316b46091f6712134b845ae1b9e3016eec94f376
</span> ""
""
"qtbase"
{"Qt Serial Port"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> }
qtsvg {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 9b001db2902268f74cab86136054e1fb4bfcb800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f12e4fd4f169123f7648e45c593b2c5a4556a9b2db3a798467aa9c67c82b8a21
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d7cf472f55d616947b4b7f3cc9c6321aaeaf86de
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f7a361bf661b31ae7779513559dd0b774171911bc57f5cfb6bed6878ddc8bc4e
</span> ""
""
"qtbase"
{"Qt SVG"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> }
qttools {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 209d58f39a1818a320e45efffb6201d11dff4c4b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 77a38895ee2d3fe2d0df4a5e1bbef4d3f8870fe20cd3b2cea27bd2d380c17f71
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ be6defa428764023910ee36097dd708c2faa4888
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ db2bb4318786257a47172c377d9c456d5d5ec760d5d69240a4693dc87989e1b7
</span> ""
""
"qtbase qtxmlpatterns qtdeclarative"
{"Qt Help" "Qt UI Tools" "Qt Designer" }
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> }
qttranslations {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 1fecf04943e743091cb0dc4350e93f91751b015b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 69d52da2691e4c2be7bd5d5a39bdd948bc9dd1c118d417af09e1e30ac0f41c01
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7ad0fb2b75674ae08921e7793135b17b6d4c40e5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7d793b447c1673206e0c5512883ad1435554dbaebf2152475b6d4a7ba6efa421
</span> ""
""
"qtbase qttools"
{"translation files"}
""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "variant overrides: ~examples ~tests ~debug noarch"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "variant overrides: ~examples ~tests ~debug noarch ~docs"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> }
qtwebchannel {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0d27b8c82727fd1c2fb7948545f355723729c551
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f82cb5d1bc7af79453da8327464d800469dc40d92446051b4404047542020807
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 835a31720a47769116e241f5b08bfa78cc2fd4a7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 700efdef5f51bdb77093f4db212afe275ad35a710ea08ba0e9e9cbc8f09f1a52
</span> ""
""
"qtbase qtwebsockets qtdeclarative"
{"Qt WebChannel"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> }
qtwebengine {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8038846361b3ec4a3374fd0f6981f135e5d0f9c4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bdf0ac04b5162502b1c43d0763233c12d5cb73625bec4d90755e73ffa863607b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 442da681b949e3cd0216e29f38d53ec5f1c646e4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2f0a1648e1a8b22bad0134f2b37d69d185074393c398c1a3c6a83b910ff39740
</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:#e0ffe0;'>+ "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtwebkit {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 84ccf4ee1448b29ac967ca51e0dabc2ab2c48bbc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 528a6b8b1c5095367b26e8ce4f3a46bb739e2e9913ff4dfc6ef58a04fcd73966
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "port:python27"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "port:fontconfig port:icu port:leveldb port:webp port:libxml2 port:libxslt port:zlib port:sqlite3"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "qtbase qtxmlpatterns qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {"Qt WebKit" "Qt WebKit Widgets"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "community support only (use Qt WebEngine)"
</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> }
qtwebsockets {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 24aabb801f6f651ec3e5df115779639728082d9b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 551e3a6b8d945a3b1d707755c3d4d5fd6a86808ced492709aecf444fa228723a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ea47648c15f032b45deac9ea841048a958763550
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3cd9d4bbff8e6be5e252f00fc9ecb9ac2d8a193020288c7d1e82583daeb5ba35
</span> ""
""
"qtbase qtdeclarative"
{"Qt WebSockets"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> }
qtwebview {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eddc015d18b61e091e43366efe1affc3365b8b12
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- aa5dfef803ed30d5ff017fbd68acc71da1ae7d227ff0508a6e2dee60284f0661
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b5c91572de5a45f844829a8173678c6df88f6da2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5a7a36cedcbb5f737357d11b7e856d69f7f3dea11a3636bd413cf47038e951d6
</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;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qtwebkit {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0594ec1150f7899d72f57d8ff2f108f3f75faaf9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 77583f9dbd3e6ad874386df71b165dc3ce88efdabbc6e5d97a959ee2187d6d69
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "port:python27"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "port:fontconfig port:icu port:leveldb port:webp port:libxml2 port:libxslt port:zlib port:sqlite3"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "qtbase qtxmlpatterns qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"Qt WebKit" "Qt WebKit Widgets"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "unsupported (use Qt WebEngine)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "variant overrides: "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qtwebkit-examples {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 6d2a3aee163e419fbc6ec56a941c4354e8e93b7d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 098935b42d6d249027d1a635e4e70edc3d2969dd860f825b36aec06fc72e46c6
</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;'>- "qtbase qtwebkit qtscript qtsvg qtxmlpatterns qtdeclarative qttools"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"examples for Qt WebKit"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "unsupported (use Qt WebEngine); doen't provide functionality"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "variant overrides: ++examples"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> }
qtxmlpatterns {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- fe41b133743a852c75f001d4b9e08f4bdfed0d4f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 64f46e22aa17f26fe0542069932efdef84ce5d846a5db40ad8e7ad3eb6148160
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c8a49d54736c571b39515d349da51a3e6bdef384
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7c6df3eebf188d8ce6822a22cebbc63da5ac27047cf1bd7236d5b988244782cc
</span> ""
""
"qtbase"
{"Qt XML Patterns"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -435,7 +422,7 @@ array set modules {
</span> #
###############################################################################
array set sql_plugins {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- {sqlite SQLite} {
</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;'>@@ -444,7 +431,7 @@ array set sql_plugins {
</span> ""
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- {psql PostgreSQL} {
</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;'>@@ -467,7 +454,7 @@ array set sql_plugins {
</span> ""
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- {mysql MySQL} {
</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;'>@@ -476,6 +463,13 @@ array set sql_plugins {
</span> ""
}
{
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ "mysql57"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "port:mysql57"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${prefix}/include/mysql57/mysql"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "-L${prefix}/lib/mysql57/mysql -lmysqlclient_r"
</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> "mysql56"
"port:mysql56"
"${prefix}/include/mysql56/mysql"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -487,12 +481,20 @@ array set sql_plugins {
</span>
foreach {module module_info} [array get modules] {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set revision_string [string trim [lindex ${module_info} 8]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set revision_string [string range ${revision_string} 1+[string last " " ${revision_string}] end]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> subport ${name}-${module} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # sepcial case
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${module} eq "qtenginio" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distname ${module}-opensource-src-1.6.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # special case
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${module} ne "qtenginio" } {
</span> distname ${module}-opensource-src-${version}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname ${module}-opensource-src-1.[join [lrange [split ${version} "."] 1 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 { ${revision_string} ne "0" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision ${revision_string}
</span> }
# see https://bugreports.qt.io/browse/QTBUG-35514
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -511,7 +513,9 @@ foreach {module module_info} [array get modules] {
</span> }
foreach qtdeps [lindex ${module_info} 4] {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${name}-${qtdeps}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${qtdeps} ne "qtbase" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${name}-${qtdeps}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
description Tools and Module(s) for Qt Tool Kit ${qt_major}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -526,39 +530,671 @@ foreach {module module_info} [array get modules] {
</span> }
long_description "Tools and Module(s) for Qt Tool Kit ${qt_major}: ${modules_provided_join}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${module} eq "qtbase" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # this subport uses configure script (NOT qmake)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # use the qt5 group; set 'building_qt5' so that the portgroup
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # does not include certain parts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set building_qt5 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qt5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unset building_qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.platform} ne "darwin" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_warn "${subport} is untested on \"${os.platform}\"."
</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;background:#e0ffe0;'>+ if { [variant_isset universal] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_warn "Multiple architectures is not a Reference Configuration for Qt."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_warn "See http://doc.qt.io/qt-5/supported-platforms.html#reference-configurations"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${configure.build_arch} eq "i386" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_warn "32-bit mode is not a Reference Configuration for Qt."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_warn "See http://doc.qt.io/qt-5/supported-platforms.html#reference-configurations"
</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;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://codereview.qt-project.org/#/c/141654/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-add_sdk.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see http://lists.qt-project.org/pipermail/interest/2015-January/thread.html#14954
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see http://comments.gmane.org/gmane.comp.lib.qt.user/21422
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-fontconfig.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the build system automatically uses OpenGL frameworks (-framework OpenGL -framework AGL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the build system also uses pkgconfig to look for an OpenGL installation (gl.pc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if mesa is installed, the build system will try to use both OpenGL systems
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # later, this will cause problems
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Undefined symbols: "_CGLGetCurrentContext"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # undo part of https://codereview.qt-project.org/#/c/140954/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # .pc files still needed by some port
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://github.com/Homebrew/homebrew-core/blob/master/Formula/qt5.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-pc_files.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see http://stackoverflow.com/questions/14506151/invalid-symbol-redefinition-in-inline-asm-on-llvm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # only runs test code on 32-bit systems
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-tst_benchlibcallgrind.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # this test might still cause problems, but with 5.4.2->5.5.0, it is no longer run
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # tests/auto/corelib/plugin/qpluginloader/qpluginloader.pro:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -macx-*: SUBDIRS += machtest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # +macx-*: contains(QT_CONFIG, private_tests): SUBDIRS += machtest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # When testing, ensure that a universal object file is not inadvertently created.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-machtest.diff
</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 is used for:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 1) building qtbase
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 2) building MacPorts projects via qmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 3) building end-user projects
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 1 & 2 require consistency with the MacPorts environment
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 3 requires consistency with the default Qt installation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 2 can be achieved via environment variables
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # (e.g. QMAKE_MACOSX_DEPLOYMENT_TARGET=${macosx_deployment_target})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the only way 3 can be achieved is if no changes are made to the build system
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the following is an attempt to achieve 1 without destroying 3
</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;'>+ # save default spec files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/mkspecs ${worksrcpath}/mkspecs-save
</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;'>+ # change default compiler flags for the purpose of building qtbase
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-mkspecs.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global qt_save_cxx_stdlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS__CXX_STDLIB__|${qt_save_cxx_stdlib}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/mkspecs/common/clang-mac.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach spec {macx-clang macx-clang-32 macx-g++ macx-g++-32 macx-g++40 macx-g++42 macx-icc macx-llvm} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_DEPLOYMENT_TARGET__|${macosx_deployment_target}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/mkspecs/${spec}/qmake.conf
</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;background:#e0ffe0;'>+ # return modified spec files to the default values
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [variant_exists universal] && [variant_isset universal] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch ${universal_archs_to_use} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move -force ${worksrcpath}-${arch}/mkspecs-save/common/clang-mac.conf ${worksrcpath}-${arch}/mkspecs/common/clang-mac.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach spec {macx-clang macx-clang-32 macx-g++ macx-g++-32 macx-g++40 macx-g++42 macx-icc macx-llvm} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move -force ${worksrcpath}-${arch}/mkspecs-save/${spec}/qmake.conf ${worksrcpath}-${arch}/mkspecs/${spec}/qmake.conf
</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;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move -force ${worksrcpath}/mkspecs-save/common/clang-mac.conf ${worksrcpath}/mkspecs/common/clang-mac.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach spec {macx-clang macx-clang-32 macx-g++ macx-g++-32 macx-g++40 macx-g++42 macx-icc macx-llvm} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move -force ${worksrcpath}/mkspecs-save/${spec}/qmake.conf ${worksrcpath}/mkspecs/${spec}/qmake.conf
</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;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # --prefix is not recognized.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pre_args-delete --prefix=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # --disable-dependency-tracking is not recognized.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.universal_args-delete --disable-dependency-tracking
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Installation options:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #-extprefix SYSROOT/PREFIX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #-hostprefix EXTPREFIX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #-libexecdir ARCHDATADIR/libexec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #-hostbindir HOSTPREFIX/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #-hostlibdir HOSTPREFIX/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -prefix ${qt_dir} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -bindir ${qt_bins_dir} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -headerdir ${qt_includes_dir} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -libdir ${qt_libs_dir} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -archdatadir ${qt_archdata_dir} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -plugindir ${qt_plugins_dir} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -importdir ${qt_imports_dir} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -qmldir ${qt_qml_dir} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -datadir ${qt_data_dir} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -docdir ${qt_docs_dir} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -translationdir ${qt_translations_dir} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -sysconfdir ${qt_sysconf_dir} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -examplesdir ${qt_examples_dir} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -testsdir ${qt_tests_dir} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -hostdatadir ${qt_host_data_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Configure options:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -release \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -opensource \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -confirm-license \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -shared \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -largefile \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -accessibility
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach driver { db2 ibase mysql oci odbc psql sqlite sqlite2 tds } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -no-sql-${driver}
</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 { ![variant_isset universal] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append "-platform ${qt_qmake_spec}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set merger_configure_args(i386) "-platform ${qt_qmake_spec_32}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set merger_configure_args(x86_64) "-platform ${qt_qmake_spec_64}"
</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;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -no-testcocoon \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -no-gcov \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -force-pkg-config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # turn off CFG_CLOEXEC if gnulib is installed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Third Party Libraries:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -system-zlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -no-mtdev \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -no-journald \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -no-syslog \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -system-libpng \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -system-libjpeg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -system-freetype \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -system-harfbuzz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -openssl-linked \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -no-libproxy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -system-pcre \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-xcb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -no-xkbcommon-x11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -no-xkbcommon-evdev \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -no-xinput2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -no-xcb-xlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -glib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -no-pulseaudio \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -no-alsa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -no-gtkstyle
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # from the configure script:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # NOTE: -optimized-tools is not useful in -release mode.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Additional options:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {-make libs} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {-make tools} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {-nomake examples} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {-nomake tests} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -gui \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -widgets \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -no-rpath \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -verbose \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -cups \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -iconv \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -no-evdev \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -no-tslib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -icu \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -fontconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -strip \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -no-pch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -no-ltcg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -dbus-linked \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -no-use-gold-linker \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -no-separate-debug-info \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -no-xcb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -no-eglfs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -no-gbm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -no-directfb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -no-linuxfb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -no-kms \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -no-mirclient \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -no-libinput \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -no-gstreamer \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -no-system-proxies
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # MacOS/iOS options:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -framework
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${configure.sdkroot} ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -sdk [string tolower [join [lrange [split [lindex [split ${configure.sdkroot} "/"] end] "."] 0 end-1] "."]]
</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;'>+ # configure options that don't show up in configure --help
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -no-libudev \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -no-egl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -no-openvg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Qt builds part of the system using environment provided my MacPorts.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # It builds the rest using its own internal environment.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # For consistency, clear MacPorts environment.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # configure.cxx_stdlib value is needed later in a post-patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set qt_save_cxx_stdlib ${configure.cxx_stdlib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxx_stdlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.sdkroot
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cc_archflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxx_archflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.objc_archflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.objcxx_archflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ld_archflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cppflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.objcflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.objcxxflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pipe no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [variant_isset universal] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set merger_arch_flag no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.march
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.mtune
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.universal_ldflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.universal_cflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.universal_cxxflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.universal_cppflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # cofigure script looks for perl but doesn't seem to use it for our configuration
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # configure script uses gawk if it can find it,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # so require it for consistency
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:gawk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # unless overridden, configure script uses gmake if it can find it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append MAKE=${build.cmd}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [variant_isset universal] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # delete preprocessor comments surrounding QT_CPU_FEATURES.i386 and QT_CPU_FEATURES.x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "/^#ifndef.*$/d" ${destroot}${qt_mkspecs_dir}/qmodule.pri
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "/^#else.*$/d" ${destroot}${qt_mkspecs_dir}/qmodule.pri
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "/^#endif.*$/d" ${destroot}${qt_mkspecs_dir}/qmodule.pri
</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;'>+ # The file ${qt_mkspecs_dir}/qconfig.pri is still not properly merged
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # A workaround is to set QT_ARCH and QT_TARGET_ARCH manually (see e.g. the qmake5 PortGroup)
</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;'>+ variant tests description {Enable tests} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace {-nomake tests} {-make tests}
</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;'>+ variant examples description {Build examples} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace {-nomake examples} {-make examples}
</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;'>+ variant debug description {Build both release and debug libraries} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -release -debug-and-release
</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;'>+ variant pulseaudio description {Compile PulseAudio support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:pulseaudio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -no-pulseaudio -pulseaudio
</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;'>+ variant gstreamer description {Compile GStreamer support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:gstreamer1 port:gstreamer1-gst-plugins-base
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -no-gstreamer {-gstreamer 1.0}
</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;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # these subports use qmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # detremint which variants are to be turned off
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set request_examples true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set request_tests true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set def_var ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [lsearch -exact [lindex ${module_info} 7] "~universal"] != -1 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ universal_variant no
</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 { [lsearch -exact [lindex ${module_info} 7] "noarch"] != -1 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ supported_archs noarch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ universal_variant no
</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 { [lsearch -exact [lindex ${module_info} 7] "~debug"] != -1 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set qt5_qmake_request_no_debug true
</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 { [lsearch -exact [lindex ${module_info} 7] "~examples"] != -1 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set request_examples false
</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 { [lsearch -exact [lindex ${module_info} 7] "~tests"] != -1 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set request_tests false
</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 { [lsearch -exact [lindex ${module_info} 7] "++examples"] != -1 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set request_examples true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend def_var "+examples"
</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 { ${request_examples} } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant examples description {Build examples} {}
</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 { ${request_tests} } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant tests description {Enable tests} {}
</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 { ${def_var} ne "" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append ${def_var}
</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;'>+ PortGroup qmake5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # accommodating variant request varies depending on how qtbase was built
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # determine if qmake builds examples by default (set via variants)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[active_variants ${name}-qtbase examples ""]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set base_examples true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set base_examples false
</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;'>+ # determine if qmake runs tests by default (set via varians)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[active_variants ${name}-qtbase tests ""]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set base_tests true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set base_tests false
</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;'>+ # determine if the user wants to build examples
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [variant_exists examples] && [variant_isset examples] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set this_examples true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set this_examples false
</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;'>+ # determine if the user wants to run tests
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [variant_exists tests] && [variant_isset tests] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set this_tests true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set this_tests false
</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;'>+ # determine of qmake's default and user requests are compatible; override qmake if necessary
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${this_examples} && !${base_examples} } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append "QT_BUILD_PARTS+=\"examples\""
</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 { !${this_examples} && ${base_examples} } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append "QT_BUILD_PARTS-=\"examples\""
</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 { ${this_tests} && !${base_tests} } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append "QT_BUILD_PARTS+=\"tests\""
</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 { !${this_tests} && ${base_tests} } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append "QT_BUILD_PARTS-=\"tests\""
</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;background:#e0ffe0;'>+ ###############################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Special Cases
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${module} eq "qtdoc" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.target docs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.target install_docs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # in the process of building the html files, qtdoc looks for all installed modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # with no clear way to select only a subset
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # unless a way is found, ReproducibleBuilds (https://trac.macports.org/wiki/ReproducibleBuilds)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # requires qtdoc depend on all the documentation modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach {module_doc module_doc_info} [array get modules] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [lsearch -exact [lindex ${module_doc_info} 7] "~docs"] == -1 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${name}-${module_doc}-docs
</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;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # special case
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${module} eq "qtlocation" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # qtlocation uses
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Gypsy (https://gypsy.freedesktop.org/wiki/)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if they can be found
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Ensure that test fails even if software is installed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach test { gypsy } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|return 0;|return 0;\\\n#error turn off test|g" ${worksrcpath}/config.tests/${test}/main.cpp
</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;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # special case
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${module} eq "qtwebkit" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup cxx11 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # use MacPorts icu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # qmake uses pkgconfig to look for icu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # this feature does not work without "CONFIG += link_pkgconfig"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-icu.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # qtwebkit uses
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # glx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # libXcomposite
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # libXrender
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if they can be found
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Ensure that test fails even if software is installed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach test { glx libXcomposite libXrender } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|return 0;|return 0;\\\n#error turn off test|g" ${worksrcpath}/Tools/qmake/config.tests/${test}/${test}.cpp
</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;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # special case
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${module} eq "qttools" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # prevent qttools from opportunistically using qtwebkit if it can be found
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-no_qtwebkit.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant qtwebkit description {build with QtWebkit support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-delete patch-no_qtwebkit.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${name}-qtwebkit
</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;'>+ post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # these folders are installed and conflict with ${name}-qttools-docs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${worksrcpath}/examples/assistant/simpletextviewer/documentation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${worksrcpath}/examples/help/contextsensitivehelp/docs
</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;'>+ # see #44934 (and #35067 for the qt4-mac version)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set framework_list [split ${qt_frameworks_dir} '/']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set qt_list [split ${qt_dir} '/']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while {[llength ${qt_list}] && [llength ${framework_list}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set var_qt [lindex $qt_list 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set var_framework [lindex $framework_list 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${var_qt} ne ${var_framework} } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break
</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;'>+ # remove first element from list
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set qt_list [lreplace ${qt_list} 0 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set framework_list [lreplace ${framework_list} 0 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set libreplace [string repeat ../ [llength ${qt_list}]][join ${framework_list} /]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${libreplace} ne "lib" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-shared.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|__MACPORTS_FRAMWORK_DIR__|${libreplace}|g" ${worksrcpath}/src/macdeployqt/shared/shared.cpp
</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;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # special case
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${module} eq "qtwebengine" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see http://doc.qt.io/qt-5/qtwebengine-platform-notes.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup xcodeversion 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ minimum_xcodeversions {13 5.1}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see http://lists.qt-project.org/pipermail/interest/2016-February/thread.html#20946
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 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:#e0ffe0;'>+ # see http://doc.qt.io/qt-5/qtwebengine-platform-notes.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ supported_archs x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # UsingTheRightCompiler (https://trac.macports.org/wiki/UsingTheRightCompiler)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append CXX=${configure.cxx}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append CC=${configure.cc}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append QMAKE_LINK=${configure.cxx}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 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:#e0ffe0;'>+ patchfiles-append patch-bluetooth.diff
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${module} eq "qtsensors" && [variant_isset examples] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [variant_isset debug] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set debug "_debug"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set debug ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fix library path names or MacPorts will try to reinstall
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach dylib "grue/Grue/libdeclarative_grue${debug}.dylib grue/libgruesensor.1.dylib grue/sensors/libqtsensors_grue${debug}.dylib sensor_explorer/Explorer/libdeclarative_explorer${debug}.dylib" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "/usr/bin/install_name_tool -id ${qt_examples_dir}/sensors/${dylib} ${destroot}${qt_examples_dir}/sensors/${dylib}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach dylib "grue/Grue/libdeclarative_grue${debug}.dylib grue/sensors/libqtsensors_grue${debug}.dylib" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "/usr/bin/install_name_tool -change libgruesensor.1.dylib ${qt_examples_dir}/sensors/grue/libgruesensor.1.dylib ${destroot}${qt_examples_dir}/sensors/${dylib}"
</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;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # special case
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${module} eq "qtserialbus" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup cxx11 1.0
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${module} eq "qtconnectivity" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://codereview.qt-project.org/#/c/172619/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtconn-for-10.12.diff
</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:#ffe0e0;'>-}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport ${name}-docs {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distname qt-everywhere-opensource-src-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [lsearch -exact [lindex ${module_info} 7] "~docs"] == -1 } {
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 ee7a838aba61a34e7aa5fdce608d8e1809cf0a21 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0d3cc75d2368ad988c9ec6bcbed6362dbaa8e03fdfd04e679284f4b9af91e565
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subport ${name}-${module}-docs {
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- description Documentation for Qt Tool Kit ${qt_major}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description Documentation for Qt Tool Kit ${qt_major}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ supported_archs noarch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ installs_libs no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ universal_variant no
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- supported_archs noarch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- universal_variant no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # special case
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${module} ne "qtenginio" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname ${module}-opensource-src-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname ${module}-opensource-src-1.[join [lrange [split ${version} "."] 1 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 { ${revision_string} ne "0" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision ${revision_string}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.target docs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.target install_docs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description Documentation for the port ${name}-${module}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description ${description}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # if part of qtwebengine gets built, at least build correctly
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # UsingTheRightCompiler (https://trac.macports.org/wiki/UsingTheRightCompiler)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append CXX=${configure.cxx}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append CC=${configure.cc}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.target docs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.target install_docs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 [lindex ${module_info} 0] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 [lindex ${module_info} 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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}-qttools \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${name}-sqlite-plugin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set qt5_qmake_request_no_debug true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qmake5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # special cases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${module} eq "qtdeclarative" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif { ${module} eq "qtserialbus" } {
</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}-qtserialport
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif { ${module} eq "qtwebview" } {
</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}-qtwebengine
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif { ${module} eq "qttools" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # generated makefiles assume full Qt was built locally
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${worksrcpath}/bin/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${qt_bins_dir}/qdoc ${worksrcpath}/bin/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${qt_bins_dir}/qhelpgenerator ${worksrcpath}/bin/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif { ${module} eq "qtwebengine" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python27 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${name}-qtwebchannel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # UsingTheRightCompiler (https://trac.macports.org/wiki/UsingTheRightCompiler)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append CXX=${configure.cxx}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif { ${module} eq "qtwebkit" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # without this file, the makefile ${worksrcpath}/qtwebkit/Source/WebCore/Makefile.WebCore.Target
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # keeps generating itself over and over again
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # this file is only created when the library is being built, however
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${worksrcpath}/Source/WebCore/generated
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ touch ${worksrcpath}/Source/WebCore/generated/InspectorBackendCommands.qrc
</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;'>+ # avoid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ! Missing GStreamer or QtMultimedia, disabling HTML5 media element support
</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}-qtmultimedia
</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> }
# see http://doc.qt.io/qt-5/sql-driver.html for info on building SQL Database Drivers
foreach {sql_names sql_info} [array get sql_plugins] {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set driver [lindex ${sql_names} 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set dbms [lindex ${sql_names} 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set driver [lindex ${sql_names} 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set dbms [lindex ${sql_names} 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set revision_string [lindex ${sql_names} 2]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set revision_string [string range ${revision_string} 1+[string last " " ${revision_string}] end]
</span>
subport ${name}-${driver}-plugin {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qmake5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> distname qtbase-opensource-src-${version}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${revision_string} ne "0" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision ${revision_string}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> checksums \
rmd160 [lindex $modules(qtbase) 0] \
sha256 [lindex $modules(qtbase) 1]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -620,25 +1256,24 @@ foreach {sql_names sql_info} [array get sql_plugins] {
</span> configure.dir ${worksrcpath}/src/plugins/sqldrivers/${driver}
build.dir ${configure.dir}
destroot.dir ${configure.dir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see #52200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://codereview.qt-project.org/#/c/164673/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-xcrun.diff
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${subport} eq ${name} } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # the main port is Meta-port to install various modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${name}-docs {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # meta-port to install documentation for various modules
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- description Qt Tool Kit ${qt_major}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description Qt Tool Kit: A cross-platform framework \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (headers, data, and libraries) for writing \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cross-platform GUI-based applications.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description Documentation for Qt Tool Kit ${qt_major}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description Documentation for Qt Tool Kit ${qt_major}
</span>
master_sites
distfiles
<span style='display:block; white-space:pre;background:#ffe0e0;'>- installs_libs no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ supported_archs noarch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ installs_libs no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ universal_variant no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build {}
# create a dummy file so the port can be successfully activated
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -652,683 +1287,87 @@ if { ${subport} eq ${name} } {
</span>
foreach {module module_info} [array get modules] {
if { [lindex ${module_info} 6] eq "" } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${name}-${module}
</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;'>- depends_lib-append port:${name}-sqlite-plugin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- supported_archs noarch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- universal_variant no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif { ${subport} ne "${name}-qtbase" && ${subport} ne "${name}-docs" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # these subports use qmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # detremint which variants are to be turned off
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set request_examples true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set request_tests true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set def_var ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set current_module [string range ${subport} [string length "${name}-"] end]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # is subport a module or an SQL plugin?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [info exists modules(${current_module})] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # subport is a module
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set module_info $modules(${current_module})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [lsearch -exact [lindex ${module_info} 7] "~universal"] != -1 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- universal_variant no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [lsearch -exact [lindex ${module_info} 7] "noarch"] != -1 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- supported_archs noarch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- universal_variant no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [lsearch -exact [lindex ${module_info} 7] "~debug"] != -1 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set qt5_qmake_request_no_debug true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [lsearch -exact [lindex ${module_info} 7] "~examples"] != -1 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set request_examples false
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [lsearch -exact [lindex ${module_info} 7] "~tests"] != -1 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set request_tests false
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [lsearch -exact [lindex ${module_info} 7] "++examples"] != -1 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set request_examples true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend def_var "+examples"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [lsearch -exact [lindex ${module_info} 7] "~docs"] == -1 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:${name}-${module}-docs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # subport is an SQL plugin
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${request_examples} } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant examples description {Build examples} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${subport} eq ${name} } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the main port is Meta-port to install various modules
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${request_tests} } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant tests description {Enable tests} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #revision 0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${def_var} ne "" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append ${def_var}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description Qt Tool Kit ${qt_major}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description Qt Tool Kit: A cross-platform framework \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (headers, data, and libraries) for writing \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cross-platform GUI-based applications.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup qmake5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ master_sites
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ supported_archs noarch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ installs_libs no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ universal_variant no
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # special case
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${subport} eq "${name}-qtlocation" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # qtlocation uses
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Gypsy (https://gypsy.freedesktop.org/wiki/)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if they can be found
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Ensure that test fails even if software is installed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach test { gypsy } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|return 0;|return 0;\\\n#error turn off test|g" ${worksrcpath}/config.tests/${test}/main.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build {}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # special case
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${subport} eq "${name}-qtwebkit" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # use MacPorts icu
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # qmake uses pkgconfig to look for icu
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # this feature does not work without "CONFIG += link_pkgconfig"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-icu.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #https://codereview.qt-project.org/#/c/139967/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #https://codereview.qt-project.org/#/c/139968/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #https://codereview.qt-project.org/#/c/139970/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-ssl.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Prevent:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # In file included from llint/LLIntOffsetsExtractor.cpp:26:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # In file included from ./config.h:30:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # In file included from ../WTF/wtf/Platform.h:1087:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # /opt/local/libexec/qt5/lib/QtCore.framework/Headers/qglobal.h:54:10: fatal error: 'QtCore/qconfig.h' file not found
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # #include <QtCore/qconfig.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ^
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 1 error generated.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append QMAKE_CXXFLAGS+=-F${qt_libs_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Prevent conflicting definitions of Objective-C classes in C++ code
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # from ${qt_libs_dir}/QtCore.framework/Headers/qglobal.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-objc.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # qtwebkit uses
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # glx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # libXcomposite
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # libXrender
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if they can be found
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Ensure that test fails even if software is installed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach test { glx libXcomposite libXrender } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|return 0;|return 0;\\\n#error turn off test|g" ${worksrcpath}/Tools/qmake/config.tests/${test}/${test}.cpp
</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:#e0ffe0;'>+ # create a dummy file so the port can be successfully activated
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${destroot}${prefix}/share/doc/${subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set docfile [open ${destroot}${prefix}/share/doc/${subport}/README.txt "w"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${docfile} "Meta-port for ${name}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${docfile} "${long_description}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close ${docfile}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # special case
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${subport} eq "${name}-qttools" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # prevent qttools from opportunistically using qtwebkit if it can be found
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-no_qtwebkit.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant qtwebkit description {build with QtWebkit support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-delete patch-no_qtwebkit.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${name}-qtwebkit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach {module module_info} [array get modules] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [lindex ${module_info} 6] eq "" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:${name}-${module}
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # special case
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${subport} eq "${name}-qtwebengine" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://wiki.qt.io/QtWebEngine
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup xcodeversion 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- minimum_xcodeversions {13 5.1}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><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;'>- supported_archs x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:${name}-sqlite-plugin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # UsingTheRightCompiler (https://trac.macports.org/wiki/UsingTheRightCompiler)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append CXX=${configure.cxx}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append CC=${configure.cc}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append QMAKE_LINK=${configure.cxx}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_framework ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set depends_check ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { [info exists depends_build] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set depends_check "${depends_check} ${depends_build}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { [info exists depends_lib] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set depends_check "${depends_check} ${depends_lib}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # special case
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${subport} eq "${name}-qtwebengine" || ${subport} eq "${name}-qtdeclarative" || ${subport} eq "${name}-qtwebkit" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # version 5.5.1 (at least) of qtwebengine must find a python version in the interval [2.7, 3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # (see tools/qmake/mkspecs/features/functions.prf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach deps ${depends_check} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [string first ":python27" ${deps}] >= 0 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # If Qt components use Python, ensure that MacPorts python27 is used
</span> #
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # a better solution would be to force qtwebengine to use a specific python program
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # a better solution would be to force components to use a specific python program
</span> # how to accomplish such a thing is not entirely clear
#
# see #49838
#
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # version 5.5.1 (at least) of qtwebengine must find a python version in the interval [2.7, 3)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # (see tools/qmake/mkspecs/features/functions.prf)
</span> # versions 5.5.1 of qtdeclarative and qtwebkit also use python with no way of specifying which one
#
set python_framework ${frameworks_dir}/Python.framework/Versions/2.7
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PATH=${python_framework}/bin:$env(PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append PATH=${python_framework}/bin:$env(PATH)
</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 { ${subport} eq "${name}-qtwebkit-examples" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # as of 5.6.1, avoid "... is lacking an install target"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://codereview.qt-project.org/#/c/156610/1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-qtwebkit_examples.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ![variant_isset examples] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # create a dummy file so the port can be successfully activated
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 0755 ${destroot}${prefix}/share/doc/${subport}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set docfile [open ${destroot}${prefix}/share/doc/${subport}/README.txt "w"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${docfile} "Without the examples variant, no examples are installed"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${docfile} "${long_description}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- close ${docfile}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # special case
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${subport} eq "${name}-qtsensors" && [variant_isset examples] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [variant_isset debug] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set debug "_debug"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set debug ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # fix library path names or MacPorts will try to reinstall
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach dylib "grue/Grue/libdeclarative_grue${debug}.dylib grue/libgruesensor.1.dylib grue/sensors/libqtsensors_grue${debug}.dylib sensor_explorer/Explorer/libdeclarative_explorer${debug}.dylib" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "/usr/bin/install_name_tool -id ${qt_examples_dir}/sensors/${dylib} ${destroot}${qt_examples_dir}/sensors/${dylib}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach dylib "grue/Grue/libdeclarative_grue${debug}.dylib grue/sensors/libqtsensors_grue${debug}.dylib" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "/usr/bin/install_name_tool -change libgruesensor.1.dylib ${qt_examples_dir}/sensors/grue/libgruesensor.1.dylib ${destroot}${qt_examples_dir}/sensors/${dylib}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # special case
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${subport} eq "${name}-qtwebkit" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup cxx11 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # in ${worksrcdir}/Source/JavaScriptCore/API/JSBase.h, JSC_OBJC_API_ENABLED is set to FALSE for __MAC_OS_X_VERSION_MIN_REQUIRED < 1090
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # the default for Qt is to set -mmacosx-version-min=10.7, so JSC_OBJC_API_ENABLED is expected to be FALSE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if QMAKE_MACOSX_DEPLOYMENT_TARGET is changed, then JSC_OBJC_API_ENABLED is TRUE and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ${worksrcdir}/Source/JavaScriptCore/API/ObjCCallbackFunction.h attempts to find JavaScriptCore/JSCallbackFunction.h, which it can not
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete QMAKE_MACOSX_DEPLOYMENT_TARGET=${macosx_deployment_target}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # -mmacosx-version-min=10.7 sets the stdlib to libstdc++ unless -stdlib=libc++ is set
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # QMAKE_CXXFLAGS+=-stdlib=${configure.cxx_stdlib} is insufficient since order of switches matters
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_CXXFLAGS_CXX11-=-stdlib=libc++ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_LFLAGS_CXX11-=-stdlib=libc++
</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 { ${subport} eq "${name}-qtenginio" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # as of 5.6.1, avoid "... is lacking an install target"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://codereview.qt-project.org/#/c/156610/1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-qtenginio_examples.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 { ${subport} eq "${name}-qtquick1" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # as of 5.6.1, avoid "... installs target to unexpected location"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # as of 5.6.1, avoid "... is lacking an install target"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://codereview.qt-project.org/#/c/156610/1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-qtquick1_examples.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 { ${subport} eq "${name}-qtserialbus" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup cxx11 1.0
</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 { ${subport} eq "${name}-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;'>- # accommodating variant request varies depending on how qtbase was built
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # determine if qmake builds examples by default (set via variants)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[active_variants ${name}-qtbase examples ""]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set base_examples true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set base_examples false
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # determine if qmake runs tests by default (set via varians)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[active_variants ${name}-qtbase tests ""]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set base_tests true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set base_tests false
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # determine if the user wants to build examples
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [variant_exists examples] && [variant_isset examples] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set this_examples true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set this_examples false
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # determine if the user wants to run tests
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [variant_exists tests] && [variant_isset tests] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set this_tests true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set this_tests false
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # determine of qmake's default and user requests are compatible; override qmake if necessary
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${this_examples} && !${base_examples} } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append "QT_BUILD_PARTS+=\"examples\""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { !${this_examples} && ${base_examples} } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append "QT_BUILD_PARTS-=\"examples\""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${this_tests} && !${base_tests} } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append "QT_BUILD_PARTS+=\"tests\""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { !${this_tests} && ${base_tests} } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append "QT_BUILD_PARTS-=\"tests\""
</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;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # these subports do NOT use qmake (they use configure script)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # use the qt5 group; set 'building_qt5' so that the portgroup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # does not include certain parts
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set building_qt5 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup qt5 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # In Qt 4.7, c++-11 support will be required
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #PortGroup cxx11 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.platform} ne "darwin" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_warn "${subport} is untested on \"${os.platform}\"."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif { ${os.major} < ${qt5_min_tested_version} } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "OS X prior to 10.8 (Mountain Lion) is not a Reference Configuration for Qt."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "OS X prior to 10.8 (Mountain Lion) is not even tested."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "See http://doc.qt.io/qt-5/supported-platforms.html#reference-configurations"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "unsupported OS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif { ${os.major} > ${qt5_max_reference_version} } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_warn "OS X subsequent to 10.10 (Yosemite) 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;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ${qt5_min_tested_version} <= ${os.major} <= ${qt5_max_reference_version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [variant_isset universal] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_warn "Multiple architectures 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;'>- } 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><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;'>- conflicts qt3 qt3-mac
</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 { ${subport} eq "${name}-qtbase" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://codereview.qt-project.org/#/c/141654/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-add_sdk.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see http://lists.qt-project.org/pipermail/interest/2015-January/thread.html#14954
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see http://comments.gmane.org/gmane.comp.lib.qt.user/21422
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-fontconfig.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # the build system automatically uses OpenGL frameworks (-framework OpenGL -framework AGL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # the build system also uses pkgconfig to look for an OpenGL installation (gl.pc)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if mesa is installed, the build system will try to use both OpenGL systems
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # later, this will cause problems
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Undefined symbols: "_CGLGetCurrentContext"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-configure.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # undo part of https://codereview.qt-project.org/#/c/140954/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # .pc files still needed by some port
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://github.com/Homebrew/homebrew-core/blob/master/Formula/qt5.rb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-pc_files.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # as of 5.6.1, avoid "... is lacking an install target"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://codereview.qt-project.org/#/c/156610/1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-install_examples.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see #52200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://codereview.qt-project.org/#/c/164673/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-xcrun.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;'>- # qtbase is used for:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 1) building qtbase
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 2) building MacPorts projects via qmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 3) building end-user projects
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 1 & 2 require consistency with the MacPorts environment
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 3 requires consistency with the default Qt installation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 2 can be achieved via environment variables
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # (e.g. QMAKE_MACOSX_DEPLOYMENT_TARGET=${macosx_deployment_target})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # the only way 3 can be achieved is if no changes are made to the build system
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # the following is an attempt to achieve 1 without destroying 3
</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;'>- # save default spec files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/mkspecs ${worksrcpath}/mkspecs-save
</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;'>- # change default compiler flags for the purpose of building qtbase
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-mkspecs.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global qt_save_cxx_stdlib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|__MACPORTS__CXX_STDLIB__|${qt_save_cxx_stdlib}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/mkspecs/common/clang-mac.conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach spec {macx-clang macx-clang-32} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|__MACPORTS_DEPLOYMENT_TARGET__|${macosx_deployment_target}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/mkspecs/${spec}/qmake.conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # return modified spec files to the default values
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [variant_exists universal] && [variant_isset universal] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach arch ${universal_archs_to_use} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move -force ${worksrcpath}-${arch}/mkspecs-save/common/clang-mac.conf ${worksrcpath}-${arch}/mkspecs/common/clang-mac.conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach spec {macx-clang macx-clang-32} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move -force ${worksrcpath}-${arch}/mkspecs-save/${spec}/qmake.conf ${worksrcpath}-${arch}/mkspecs/${spec}/qmake.conf
</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;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move -force ${worksrcpath}/mkspecs-save/common/clang-mac.conf ${worksrcpath}/mkspecs/common/clang-mac.conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach spec {macx-clang macx-clang-32} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move -force ${worksrcpath}/mkspecs-save/${spec}/qmake.conf ${worksrcpath}/mkspecs/${spec}/qmake.conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #-----------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [variant_isset tests] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${configure.build_arch} eq "i386" || [variant_isset universal] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see http://stackoverflow.com/questions/14506151/invalid-symbol-redefinition-in-inline-asm-on-llvm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # only runs test code on 32-bit systems
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-tst_benchlibcallgrind.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # this test might still cause problems, but with 5.4.2->5.5.0, it is no longer run
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # tests/auto/corelib/plugin/qpluginloader/qpluginloader.pro:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # -macx-*: SUBDIRS += machtest
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # +macx-*: contains(QT_CONFIG, private_tests): SUBDIRS += machtest
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # When testing, ensure that a universal object file is not inadvertently created.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-machtest.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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # --prefix is not recognized.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.pre_args-delete --prefix=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # --disable-dependency-tracking is not recognized.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.universal_args-delete --disable-dependency-tracking
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Installation options:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #-extprefix SYSROOT/PREFIX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #-hostprefix EXTPREFIX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #-libexecdir ARCHDATADIR/libexec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #-hostbindir HOSTPREFIX/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #-hostlibdir HOSTPREFIX/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -prefix ${qt_dir} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -bindir ${qt_bins_dir} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -headerdir ${qt_includes_dir} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -libdir ${qt_libs_dir} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -archdatadir ${qt_archdata_dir} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -plugindir ${qt_plugins_dir} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -importdir ${qt_imports_dir} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -qmldir ${qt_qml_dir} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -datadir ${qt_data_dir} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -docdir ${qt_docs_dir} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -translationdir ${qt_translations_dir} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -sysconfdir ${qt_sysconf_dir} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -examplesdir ${qt_examples_dir} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -testsdir ${qt_tests_dir} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -hostdatadir ${qt_host_data_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Configure options:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -release \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -opensource \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -confirm-license \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -shared \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -largefile \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -accessibility
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach driver { db2 ibase mysql oci odbc psql sqlite sqlite2 tds } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -no-sql-${driver}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ![variant_isset universal] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append "-platform ${qt_qmake_spec}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set merger_configure_args(i386) "-platform ${qt_qmake_spec_32}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set merger_configure_args(x86_64) "-platform ${qt_qmake_spec_64}"
</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;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-testcocoon \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-gcov \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -force-pkg-config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # turn off CFG_CLOEXEC if gnulib is installed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Third Party Libraries:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -system-zlib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-mtdev \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-journald \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-syslog \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -system-libpng \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -system-libjpeg \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -system-freetype \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -system-harfbuzz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -openssl-linked \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-libproxy \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -system-pcre \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-xcb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-xkbcommon-x11 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-xkbcommon-evdev \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-xinput2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-xcb-xlib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -glib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-pulseaudio \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-alsa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-gtkstyle
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # from the configure script:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # NOTE: -optimized-tools is not useful in -release mode.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Additional options:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {-make libs} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {-make tools} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {-nomake examples} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {-nomake tests} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -gui \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -widgets \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-rpath \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -verbose \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -nis \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -cups \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -iconv \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-evdev \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-tslib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -icu \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -fontconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -strip \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-pch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-ltcg \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -dbus-linked \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-use-gold-linker \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-separate-debug-info \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-xcb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-eglfs \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-gbm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-directfb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-linuxfb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-kms \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-mirclient \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-libinput \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-gstreamer \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-system-proxies
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # MacOS/iOS options:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -framework
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.sdkroot} ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -sdk [string tolower [join [lrange [split [lindex [split ${configure.sdkroot} "/"] end] "."] 0 end-1] "."]]
</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;'>- # configure options that don't show up in configure --help
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-libudev \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-egl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-openvg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Qt builds part of the system using environment provided my MacPorts.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # It builds the rest using its own internal environment.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # For consistency, clear MacPorts environment.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # configure.cxx_stdlib value is needed later in a post-patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set qt_save_cxx_stdlib ${configure.cxx_stdlib}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxx_stdlib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.sdkroot
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cc_archflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxx_archflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.objc_archflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.objcxx_archflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ld_archflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cppflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxxflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.objcflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.objcxxflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.pipe no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [variant_isset universal] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set merger_arch_flag no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.march
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.mtune
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.universal_ldflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.universal_cflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.universal_cxxflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.universal_cppflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # cofigure script looks for perl but doesn't seem to use it for our configuration
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # configure script uses gawk if it can find it,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # so require it for consistency
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:gawk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # unless overridden, configure script uses gmake if it can find it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append MAKE=${build.cmd}
</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 { ${subport} eq "${name}-qtbase" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [variant_isset universal] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # delete preprocessor comments surrounding QT_CPU_FEATURES.i386 and QT_CPU_FEATURES.x86_64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "/^#ifndef.*$/d" ${destroot}${qt_mkspecs_dir}/qmodule.pri
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "/^#else.*$/d" ${destroot}${qt_mkspecs_dir}/qmodule.pri
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "/^#endif.*$/d" ${destroot}${qt_mkspecs_dir}/qmodule.pri
</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;'>- # The file ${qt_mkspecs_dir}/qconfig.pri is still not properly merged
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # A workaround is to set QT_ARCH and QT_TARGET_ARCH manually (see e.g. the qmake5 PortGroup)
</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;'>- variant tests description {Enable tests} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace {-nomake tests} {-make tests}
</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;'>- variant examples description {Build examples} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace {-nomake examples} {-make examples}
</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;'>- variant debug description {Build both release and debug libraries} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -release -debug-and-release
</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;'>- variant pulseaudio description {Compile PulseAudio support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:pulseaudio
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -no-pulseaudio -pulseaudio
</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;'>- variant gstreamer description {Compile GStreamer support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:gstreamer1 port:gstreamer1-gst-plugins-base
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -no-gstreamer {-gstreamer 1.0}
</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 { ${subport} eq "${name}-docs" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python_framework ${frameworks_dir}/Python.framework/Versions/2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${python_framework} ne "" } {
</span> configure.env-append PATH=${python_framework}/bin:$env(PATH)
build.env-append PATH=${python_framework}/bin:$env(PATH)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+unset python_framework
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:${qt_bins_dir}/qdoc:${name}-qtbase \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:${qt_plugins_dir}/sqldrivers/libqsqlite.dylib:${name}-sqlite-plugin \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:${qt_bins_dir}/qhelpgenerator:${name}-qttools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # generated makefiles assume full Qt was built locally
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 0755 ${worksrcpath}/qttools/bin/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${qt_bins_dir}/qdoc ${worksrcpath}/qttools/bin/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${qt_bins_dir}/qhelpgenerator ${worksrcpath}/qttools/bin/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${qt_bins_dir}/rcc ${worksrcpath}/qtbase/bin/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ![exists universal_variant] || [option universal_variant] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup muniversal 1.0
</span> }
if { [variant_exists universal] && [variant_isset universal] } {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> merger-post-destroot {
foreach arch ${universal_archs_to_use} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1374,107 +1413,325 @@ if { [variant_exists universal] && [variant_isset universal] } {
</span> reinplace "s|${worksrcpath}-${arch}|${worksrcpath}|g" ${dir}${qt_examples_dir}/multimedia/spectrum/spectrum.app/Contents/Frameworks/fftreal.framework/fftreal.prl
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [file exists ${dir}${qt_examples_dir}/sensors/grue/libgruesensor.prl ] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [file exists ${dir}${qt_examples_dir}/sensors/grue/libgruesensor.prl] } {
</span> reinplace "s|${worksrcpath}-${arch}|${worksrcpath}|g" ${dir}${qt_examples_dir}/sensors/grue/libgruesensor.prl
}
}
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# see #44934 (and #35067 for the qt4-mac version)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${subport} eq "${name}-qttools" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set framework_list [split ${qt_frameworks_dir} '/']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set qt_list [split ${qt_dir} '/']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see #44204
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f [glob -nocomplain -tails -directory ${destroot}${qt_libs_dir} *.framework] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set framework [file rootname ${f}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set include_list [split ${qt_includes_dir} '/']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set framework_list [split ${qt_libs_dir} '/']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while {[llength ${include_list}] && [llength ${framework_list}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set var_include [lindex $include_list 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set var_framework [lindex $framework_list 0]
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- while {[llength ${qt_list}] && [llength ${framework_list}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set var_qt [lindex $qt_list 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set var_framework [lindex $framework_list 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${var_include} ne ${var_framework} } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${var_qt} ne ${var_framework} } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # remove first element from list
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set include_list [lreplace ${include_list} 0 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set framework_list [lreplace ${framework_list} 0 0]
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # remove first element from list
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set qt_list [lreplace ${qt_list} 0 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set framework_list [lreplace ${framework_list} 0 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${destroot}${qt_includes_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s [string repeat ../ [llength ${include_list}]][join ${framework_list} /]/${f}/Headers ${destroot}${qt_includes_dir}/${framework}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set libreplace [string repeat ../ [llength ${qt_list}]][join ${framework_list} /]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${libreplace} ne "lib" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-shared.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__MACPORTS_FRAMWORK_DIR__|${libreplace}|g" ${worksrcpath}/src/macdeployqt/shared/shared.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # .app and non-.app programs are both put in qt_bins_dir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # put a link of any .app programs in the ${qt_apps_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${qt_bins_dir} ne ${qt_apps_dir} } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${destroot}${qt_apps_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach app [glob -nocomplain -tails -directory ${destroot}${qt_bins_dir} *.app] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${qt_bins_dir}/${app} ${destroot}${qt_apps_dir}
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${subport} ne ${name} } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see #44204
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f [glob -nocomplain -tails -directory ${destroot}${qt_libs_dir} *.framework] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set framework [file rootname ${f}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # put configuration files in places they will be found automatically
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${qt_libs_dir} ne "${prefix}/lib" } {
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set include_list [split ${qt_includes_dir} '/']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set framework_list [split ${qt_libs_dir} '/']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- while {[llength ${include_list}] && [llength ${framework_list}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set var_include [lindex $include_list 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set var_framework [lindex $framework_list 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${var_include} ne ${var_framework} } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # put link to pkgconfig files in place where pkgconfig will find it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # most Qt 5 pkgconfig files begin with Qt5, so link should not conflict with any other Qt installations
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # exceptions: Enginio (new in Qt 5.3, removed in Qt 5.7)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${destroot}${prefix}/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach pcfile [glob -nocomplain -tails -directory ${destroot}${qt_libs_dir}/pkgconfig *.pc] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${qt_libs_dir}/pkgconfig/${pcfile} ${destroot}${prefix}/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # remove first element from list
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set include_list [lreplace ${include_list} 0 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set framework_list [lreplace ${framework_list} 0 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # put link to cmake files in place where cmake will find it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # most Qt 5 cmake directories begin with Qt5, so link should not conflict with any other Qt installations
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # exceptions: Enginio (new in Qt 5.3, removed in Qt 5.7)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${destroot}${prefix}/lib/cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach cmakedir [glob -type d -nocomplain -tails -directory ${destroot}${qt_libs_dir}/cmake *] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${destroot}${prefix}/lib/cmake/${cmakedir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach cmakefile [glob -tails -directory ${destroot}${qt_libs_dir}/cmake/${cmakedir} *.cmake] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${qt_libs_dir}/cmake/${cmakedir}/${cmakefile} ${destroot}${prefix}/lib/cmake/${cmakedir}/
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 0755 ${destroot}${qt_includes_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s [string repeat ../ [llength ${include_list}]][join ${framework_list} /]/${f}/Headers ${destroot}${qt_includes_dir}/${framework}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # .app and non-.app programs are both put in qt_bins_dir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # put a link of any .app programs in the ${qt_apps_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${qt_bins_dir} ne ${qt_apps_dir} } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 0755 ${destroot}${qt_apps_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach app [glob -nocomplain -tails -directory ${destroot}${qt_bins_dir} *.app] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${qt_bins_dir}/${app} ${destroot}${qt_apps_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if cmake finds configuration files in ${prefix}/lib/cmake, CMAKE_CURRENT_LIST_DIR expands to ${prefix}/lib/cmake/xxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # cmake configuration files actually installed in ${qt_cmake_module_dir}/xxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach cmakedir [glob -type d -nocomplain -tails -directory ${destroot}${qt_libs_dir}/cmake *] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach cmakefile [glob -nocomplain -directory ${destroot}${qt_libs_dir}/cmake/${cmakedir} *.cmake] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|\\\${CMAKE_CURRENT_LIST_DIR}|${qt_cmake_module_dir}/${cmakedir}|g" ${cmakefile}
</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:#ffe0e0;'>- # put configuration files in places they will be found automatically
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${qt_libs_dir} ne "${prefix}/lib" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type regex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url http://download.qt.io/archive/qt/${branch}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex (\\d+(\\.\\d+)+)
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # put link to pkgconfig files in place where pkgconfig will find it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # most Qt 5 pkgconfig files begin with Qt5, so link should not conflict with any other Qt installations
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # exceptions: Enginio (new in Qt 5.3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 0755 ${destroot}${prefix}/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach pcfile [glob -nocomplain -tails -directory ${destroot}${qt_libs_dir}/pkgconfig *.pc] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${qt_libs_dir}/pkgconfig/${pcfile} ${destroot}${prefix}/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+############################################################################### Component Format
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# "Qt Component Name" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Qt version introduced
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Qt version removed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# blank if module; "-plugin" if plugin
</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;'>+# module info found at https://doc.qt.io/qt-5/qtmodules.html
</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;'>+array set all_qt_components {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt3d {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6.0
</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 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6.0
</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;'>+ qtcanvas3d {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6.0
</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;'>+ qtcharts {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6.0
</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;'>+ qtconnectivity {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6.0
</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;'>+ qtdatavis3d {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6.0
</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;'>+ qtdeclarative {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6.0
</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;'>+ qtdeclarative-render2d {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.8
</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;'>+ qtdoc {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6.0
</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;'>+ qtgamepad {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6.0
</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;'>+ qtenginio {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.7
</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;'>+ qtgraphicaleffects {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6.0
</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;'>+ qtimageformats {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6.0
</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;'>+ qtlocation {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6.0
</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;'>+ qtmacextras {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6.0
</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;'>+ qtmultimedia {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6.0
</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;'>+ qtpurchasing {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6.0
</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;'>+ qtquick1 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.6
</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;'>+ qtquickcontrols {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6.0
</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;'>+ qtquickcontrols2 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6.0
</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;'>+ qtscript {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6.0
</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;'>+ qtscxml {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6.0
</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;'>+ qtsensors {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6.0
</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;'>+ qtserialbus {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6.0
</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;'>+ qtserialport {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6.0
</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;'>+ qtsvg {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6.0
</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;'>+ qttools {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6.0
</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;'>+ qttranslations {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6.0
</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;'>+ qtvirtualkeyboard {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6.0
</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;'>+ qtwebchannel {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6.0
</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;'>+ qtwebengine {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6.0
</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;'>+ qtwebkit {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6.0
</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;'>+ qtwebkit-examples {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.6
</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;'>+ qtwebsockets {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6.0
</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;'>+ qtwebview {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6.0
</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;'>+ qtxmlpatterns {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6.0
</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;'>+ sqlite {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "-plugin"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ psql {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "-plugin"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mysql {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "-plugin"
</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;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#qtjsbackend {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# 5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# 5.2
</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;background:#e0ffe0;'>+# qtwebkit: official support dropped in 5.6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# as of 5.7, still maintained by community
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # put link to cmake files in place where cmake will find it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # most Qt 5 cmake directories begin with Qt5, so link should not conflict with any other Qt installations
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # exceptions: Enginio (new in Qt 5.3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 0755 ${destroot}${prefix}/lib/cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach cmakedir [glob -type d -nocomplain -tails -directory ${destroot}${qt_libs_dir}/cmake *] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 0755 ${destroot}${prefix}/lib/cmake/${cmakedir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach cmakefile [glob -tails -directory ${destroot}${qt_libs_dir}/cmake/${cmakedir} *.cmake] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${qt_libs_dir}/cmake/${cmakedir}/${cmakefile} ${destroot}${prefix}/lib/cmake/${cmakedir}/
</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:#e0ffe0;'>+foreach {component component_info} [array get all_qt_components] {
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # if cmake finds configuration files in ${prefix}/lib/cmake, CMAKE_CURRENT_LIST_DIR expands to ${prefix}/lib/cmake/xxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # cmake configuration files actually installed in ${qt_cmake_module_dir}/xxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach cmakedir [glob -type d -nocomplain -tails -directory ${destroot}${qt_libs_dir}/cmake *] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach cmakefile [glob -nocomplain -directory ${destroot}${qt_libs_dir}/cmake/${cmakedir} *.cmake] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|\\\${CMAKE_CURRENT_LIST_DIR}|${qt_cmake_module_dir}/${cmakedir}|g" ${cmakefile}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set suffix [lindex ${component_info} 2]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set qt_version ${version}
</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 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [vercmp ${qt_version_removed} ${qt_version}] <= 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subport ${name}-${component}${suffix} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup obsolete 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #revision 0
</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} ne "qtquick1" && ${component} ne "qtwebkit-examples" && ${component} ne "qtdoc" && ${suffix} ne "-plugin" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subport ${name}-${component}${suffix}-docs {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup obsolete 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #revision 0
</span> }
}
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url http://download.qt.io/archive/qt/${branch}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex (\\d+(\\.\\d+)+)
</span><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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..6c5d809
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-bluetooth.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+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:#e0ffe0;'>+index e45ab43..1ba35cb 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/chromium/base/mac/sdk_forward_declarations.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/chromium/base/mac/sdk_forward_declarations.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15,6 +15,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import <CoreWLAN/CoreWLAN.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import <ImageCaptureCore/ImageCaptureCore.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import <IOBluetooth/IOBluetooth.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#import <CoreBluetooth/CoreBluetooth.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "base/base_export.h"
</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-configure.diff b/aqua/qt5/files/patch-configure.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index a7b6c71..680196b 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;'>-@@ -4301,7 +4301,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4319,7 +4319,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-deployment_target.diff b/aqua/qt5/files/patch-deployment_target.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..95122ee
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-deployment_target.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/JavaScriptCore/API/JSBase.h.orig 2015-10-12 21:37:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/JavaScriptCore/API/JSBase.h 2016-11-13 06:22:44.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -141,7 +141,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Enable the Objective-C API for platforms with a modern runtime. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if !defined(JSC_OBJC_API_ENABLED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define JSC_OBJC_API_ENABLED (defined(__clang__) && defined(__APPLE__) && defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090 && !defined(__i386__))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define JSC_OBJC_API_ENABLED 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* JSBase_h */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WebKit2/Platform/CoreIPC/mac/ConnectionMac.cpp.orig 2015-10-12 21:37:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WebKit2/Platform/CoreIPC/mac/ConnectionMac.cpp 2016-11-13 08:00:01.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -423,10 +419,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OwnPtr<MessageDecoder> decoder = createMessageDecoder(header);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ASSERT(decoder);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- decoder->setImportanceAssertion(ImportanceAssertion::create(header));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (decoder->messageReceiverName() == "IPC" && decoder->messageName() == "InitializeConnection") {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ASSERT(m_isServer);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ASSERT(!m_isConnected);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-install_examples.diff b/aqua/qt5/files/patch-install_examples.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 649f2d3..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-install_examples.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,19 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- examples/widgets/mac/qmaccocoaviewcontainer/qmaccocoaviewcontainer.pro.orig 2016-05-25 08:46:17.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ examples/widgets/mac/qmaccocoaviewcontainer/qmaccocoaviewcontainer.pro 2016-06-13 06:37:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5,3 +5,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QT += widgets
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/mac/qmaccocoaviewcontainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+INSTALLS += target
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- examples/widgets/mac/qmacnativewidget/qmacnativewidget.pro.orig 2016-05-25 08:46:17.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ examples/widgets/mac/qmacnativewidget/qmacnativewidget.pro 2016-06-13 06:39:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5,3 +5,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QT += widgets
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #QT += widgets-private gui-private core-private
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/mac/qmacnativewidget
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+INSTALLS += target
</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 230efcb..e07283a 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,15 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/common/clang-mac.conf.orig 2016-01-08 05:58:40.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/common/clang-mac.conf 2016-01-08 06:01:16.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6,5 +6,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_XCODE_GCC_VERSION = com.apple.compilers.llvm.clang.1_0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_CXXFLAGS += -stdlib=libc++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_LFLAGS += -stdlib=libc++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+QMAKE_CXXFLAGS += -stdlib=__MACPORTS__CXX_STDLIB__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+QMAKE_LFLAGS += -stdlib=__MACPORTS__CXX_STDLIB__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/macx-clang/qmake.conf.orig 2016-01-08 05:56:17.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/macx-clang/qmake.conf 2016-01-08 06:02:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/macx-clang/qmake.conf.orig 2016-10-31 19:10:55.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/macx-clang/qmake.conf 2016-10-31 19:12:23.000000000 -0700
</span> @@ -11,6 +11,6 @@
include(../common/clang.conf)
include(../common/clang-mac.conf)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,8 +8,8 @@
</span> +QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
load(qt_config)
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/macx-clang-32/qmake.conf.orig 2016-01-08 05:56:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/macx-clang-32/qmake.conf 2016-01-08 06:02:20.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/macx-clang-32/qmake.conf.orig 2016-10-31 19:11:03.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/macx-clang-32/qmake.conf 2016-10-31 19:13:21.000000000 -0700
</span> @@ -11,7 +11,7 @@
include(../common/clang.conf)
include(../common/clang-mac.conf)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,3 +19,78 @@
</span>
QMAKE_CFLAGS += -arch i386
QMAKE_CXXFLAGS += -arch i386
<span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/macx-g++/qmake.conf.orig 2016-10-31 19:11:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/macx-g++/qmake.conf 2016-10-31 19:13:33.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14,6 +14,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(../common/gcc-base-mac.conf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(../common/g++-macx.conf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ load(qt_config)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/macx-g++-32/qmake.conf.orig 2016-10-31 19:11:18.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/macx-g++-32/qmake.conf 2016-10-31 19:13:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14,7 +14,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(../common/gcc-base-mac.conf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(../common/g++-macx.conf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_CFLAGS += -arch i386
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_CXXFLAGS += -arch i386
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/macx-g++40/qmake.conf.orig 2016-10-31 19:11:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/macx-g++40/qmake.conf 2016-10-31 19:14:40.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14,7 +14,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(../common/gcc-base-mac.conf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(../common/g++-macx.conf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_CC = gcc-4.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_CXX = g++-4.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/macx-g++42/qmake.conf.orig 2016-10-31 19:11:33.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/macx-g++42/qmake.conf 2016-10-31 19:14:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14,7 +14,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(../common/gcc-base-mac.conf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(../common/g++-macx.conf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_CC = gcc-4.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_CXX = g++-4.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/macx-icc/qmake.conf.orig 2016-10-31 19:11:43.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/macx-icc/qmake.conf 2016-10-31 19:15:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -83,7 +83,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(../common/macx.conf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/macx-llvm/qmake.conf.orig 2016-10-31 19:11:55.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/macx-llvm/qmake.conf 2016-10-31 19:15:50.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14,7 +14,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(../common/gcc-base-mac.conf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(../common/llvm.conf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_XCODE_GCC_VERSION = com.apple.compilers.llvmgcc42
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/common/clang-mac.conf.orig 2016-10-31 19:35:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/common/clang-mac.conf 2016-10-31 19:35:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6,5 +6,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_XCODE_GCC_VERSION = com.apple.compilers.llvm.clang.1_0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_CXXFLAGS += -stdlib=libc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_LFLAGS += -stdlib=libc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_CXXFLAGS += -stdlib=__MACPORTS__CXX_STDLIB__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_LFLAGS += -stdlib=__MACPORTS__CXX_STDLIB__
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-objc.diff b/aqua/qt5/files/patch-objc.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e173549..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-objc.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;'>---- Source/WTF/wtf/Compiler.h.orig 2015-10-12 21:37:08.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Source/WTF/wtf/Compiler.h 2016-05-02 17:07:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -315,7 +315,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef __OBJC__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define OBJC_CLASS @class
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define OBJC_CLASS class
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define OBJC_CLASS typedef struct objc_object
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</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;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 e8f9849..e61d7b5 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;'>-@@ -244,7 +244,7 @@ load(qt_installs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -245,7 +245,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-qtenginio_examples.diff b/aqua/qt5/files/patch-qtenginio_examples.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index cff91e4..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-qtenginio_examples.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,73 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- examples/enginio/quick/todos/todos.pro.orig 2015-12-15 05:15:16.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ examples/enginio/quick/todos/todos.pro 2016-06-14 05:05:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11,3 +11,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OTHER_FILES += todo.qml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RESOURCES += todo.qrc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+target.path = $$[QT_INSTALL_EXAMPLES]/enginio/quick/todos
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+INSTALLS += target
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- examples/enginio/widgets/image-gallery-cpp/image-gallery-cpp.pro.orig 2015-12-15 05:15:16.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ examples/enginio/widgets/image-gallery-cpp/image-gallery-cpp.pro 2016-06-14 05:10:38.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15,3 +15,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mainwindow.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- imageobject.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- imagemodel.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+target.path = $$[QT_INSTALL_EXAMPLES]/enginio/widgets/image-gallery-cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+INSTALLS += target
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- examples/enginio/widgets/cloudaddressbook/cloudaddressbook.pro.orig 2015-12-15 05:15:16.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ examples/enginio/widgets/cloudaddressbook/cloudaddressbook.pro 2016-06-14 05:13:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -16,3 +16,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FORMS += \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mainwindow.ui
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+target.path = $$[QT_INSTALL_EXAMPLES]/enginio/widgets/cloudaddressbook
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+INSTALLS += target
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- examples/enginio/widgets/todos-cpp/todos-cpp.pro.orig 2015-12-15 05:15:16.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ examples/enginio/widgets/todos-cpp/todos-cpp.pro 2016-06-14 05:15:26.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13,3 +13,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HEADERS += \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mainwindow.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- todosmodel.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+target.path = $$[QT_INSTALL_EXAMPLES]/enginio/widgets/todos-cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+INSTALLS += target
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- examples/enginio/quick/image-gallery/image-gallery.pro.orig 2015-12-15 05:15:16.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ examples/enginio/quick/image-gallery/image-gallery.pro 2016-06-14 05:23:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13,3 +13,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RESOURCES += \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gallery.qrc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+target.path = $$[QT_INSTALL_EXAMPLES]/enginio/quick/image-gallery
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+INSTALLS += target
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- examples/enginio/quick/users/users.pro.orig 2015-12-15 05:15:16.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ examples/enginio/quick/users/users.pro 2016-06-14 05:18:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10,4 +10,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mac: CONFIG -= app_bundle
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OTHER_FILES += users.qml Browse.qml Login.qml Register.qml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--RESOURCES += users.qrc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-\ No newline at end of file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+RESOURCES += users.qrc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+target.path = $$[QT_INSTALL_EXAMPLES]/enginio/quick/users
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+INSTALLS += target
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- examples/enginio/quick/socialtodos/socialtodos.pro.orig 2015-12-15 05:15:16.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ examples/enginio/quick/socialtodos/socialtodos.pro 2016-06-14 05:36:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,3 +19,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- socialtodos.qml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RESOURCES += socialtodos.qrc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+target.path = $$[QT_INSTALL_EXAMPLES]/enginio/quick/socialtodos
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+INSTALLS += target
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtquick1_examples.diff b/aqua/qt5/files/patch-qtquick1_examples.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fb41028..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-qtquick1_examples.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,81 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- examples/declarative/cppextensions/imageprovider/imageprovider.pro.orig 2015-10-12 21:37:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ examples/declarative/cppextensions/imageprovider/imageprovider.pro 2016-06-15 06:30:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7,11 +7,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SOURCES += imageprovider.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--target.path = $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/imageprovider/ImageProviderCore
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+target.path = $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/imageprovider
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qml.files = imageprovider-example.qml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qml.path = $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/imageprovider
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qml2.files = ImageProviderCore/qmldir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--qml2.path = $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/imageprovider/ImageProviderCore
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+qml2.path = $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/imageprovider
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALLS = qml qml2 target
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- examples/declarative/cppextensions/plugins/plugins.pro.orig 2015-10-12 21:37:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ examples/declarative/cppextensions/plugins/plugins.pro 2016-06-15 06:45:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7,7 +7,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SOURCES += plugin.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--target.path += $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/plugins/org/qtproject/TimeExample
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+target.path += $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/plugins
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qdeclarativesources.files += \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- org/qtproject/TimeExample/qmldir \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -16,7 +16,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- org/qtproject/TimeExample/Clock.qml \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- org/qtproject/TimeExample/hour.png \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- org/qtproject/TimeExample/minute.png
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--qdeclarativesources.path += $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/plugins/org/qtproject/TimeExample
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+qdeclarativesources.path += $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/plugins
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qml.files += plugins.qml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qml.path += $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/plugins
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- examples/declarative/cppextensions/qwidgets/qwidgets.pro.orig 2015-10-12 21:37:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ examples/declarative/cppextensions/qwidgets/qwidgets.pro 2016-06-15 06:53:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10,9 +10,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qml.files = qwidgets.qml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qml.path += $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/qwidgets
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qml2.files = QWidgets/qmldir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--qml2.path += $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/plugins/QWidgets
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+qml2.path += $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/qwidgets
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--target.path += $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/plugins
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+target.path += $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/qwidgets
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALLS += target qml qml2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.pro.orig 2015-10-12 21:37:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.pro 2016-06-15 07:00:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,3 +2,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SOURCES += main.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RESOURCES += layoutitem.qrc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+target.path = $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/qgraphicslayouts/layoutitem
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+INSTALLS += target
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- examples/declarative/animation/behaviors/wigglytext/wigglytext.pro.orig 2015-10-12 21:37:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ examples/declarative/animation/behaviors/wigglytext/wigglytext.pro 2016-06-15 07:05:49.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26,7 +26,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SOURCES += main.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Please do not modify the following two lines. Required for deployment.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/animation/wigglytext/wigglytext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/animation/behaviors/wigglytext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qtcAddDeployment()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/filedialog.pro.orig 2015-10-12 21:37:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/filedialog.pro 2016-06-15 07:17:40.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15,3 +15,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SOURCES += directory.cpp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file.cpp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dialogPlugin.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+target.path = $$[QT_INSTALL_EXAMPLES]/declarative/tutorials/gettingStarted/parts/part5/filedialog
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+INSTALLS += target
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtwebkit_examples.diff b/aqua/qt5/files/patch-qtwebkit_examples.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c15302d..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-qtwebkit_examples.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- examples/webkitwidgets/imageanalyzer/imageanalyzer.pro.orig 2015-10-12 21:37:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ examples/webkitwidgets/imageanalyzer/imageanalyzer.pro 2016-06-14 07:41:43.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11,4 +11,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXAMPLE_FILES += html/index.html ../webkit-bridge-tutorial.qdoc outline.txt
</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;'>-+# install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+target.path = $$[QT_INSTALL_EXAMPLES]/webkitwidgets/imageanalyzer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+INSTALLS += target
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-ssl.diff b/aqua/qt5/files/patch-ssl.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1709dd6a..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-ssl.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,139 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 06b0ebd66fb1a7c536c96572ad8a3b55b713b177 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Florian Bruhin <git@the-compiler.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 4 Nov 2015 21:35:31 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Check QT_NO_SSL in SocketStreamHandleQt.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Since Qt 5.5, Secure Transport is used instead of OpenSSL on OS X. This means
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-secure websockets (wss://) were disabled on OS X despite QSslSocket being
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-available.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Change-Id: Ic584a6ed81b625c84a85e54dba84c8fc920b861a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Task-number: QTBUG-49027
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: Richard J. Moore <rich@kde.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Source/WebCore/platform/network/qt/SocketStreamHandlePrivate.h | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp | 8 ++++----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2 files changed, 5 insertions(+), 5 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/Source/WebCore/platform/network/qt/SocketStreamHandlePrivate.h b/Source/WebCore/platform/network/qt/SocketStreamHandlePrivate.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index f447cc2..647c4ef 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Source/WebCore/platform/network/qt/SocketStreamHandlePrivate.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Source/WebCore/platform/network/qt/SocketStreamHandlePrivate.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -60,7 +60,7 @@ public Q_SLOTS:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void socketError(QAbstractSocket::SocketError);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void socketClosedCallback();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void socketErrorCallback(int);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef QT_NO_OPENSSL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef QT_NO_SSL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void socketSslErrors(const QList<QSslError>&);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp b/Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d4cbdc7..cd71190 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -48,7 +48,7 @@ SocketStreamHandlePrivate::SocketStreamHandlePrivate(SocketStreamHandle* streamH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool isSecure = url.protocolIs("wss");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (isSecure) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef QT_NO_OPENSSL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef QT_NO_SSL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_socket = new QSslSocket(this);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -63,7 +63,7 @@ SocketStreamHandlePrivate::SocketStreamHandlePrivate(SocketStreamHandle* streamH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QString host = url.host();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (isSecure) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef QT_NO_OPENSSL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef QT_NO_SSL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static_cast<QSslSocket*>(m_socket)->connectToHostEncrypted(host, port);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -88,7 +88,7 @@ void SocketStreamHandlePrivate::initConnections()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- connect(m_socket, SIGNAL(readyRead()), this, SLOT(socketReadyRead()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- connect(m_socket, SIGNAL(disconnected()), this, SLOT(socketClosed()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- connect(m_socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(socketError(QAbstractSocket::SocketError)));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef QT_NO_OPENSSL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef QT_NO_SSL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (qobject_cast<QSslSocket*>(m_socket))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- connect(m_socket, SIGNAL(sslErrors(const QList<QSslError>&)), this, SLOT(socketSslErrors(const QList<QSslError>&)));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -176,7 +176,7 @@ void SocketStreamHandlePrivate::socketErrorCallback(int error)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef QT_NO_OPENSSL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef QT_NO_SSL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void SocketStreamHandlePrivate::socketSslErrors(const QList<QSslError>& error)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMetaObject::invokeMethod(this, "socketErrorCallback", Qt::QueuedConnection, Q_ARG(int, error[0].error()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.6.2.2.g1b5ffa3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 11ce03bd807504559961dc69bdf6ccc382b61812 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Florian Bruhin <git@the-compiler.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 4 Nov 2015 21:49:48 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Check QT_NO_SSL for QtWebKit user agent.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-MIME-Version: 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Content-Type: text/plain; charset=utf8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Content-Transfer-Encoding: 8bit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-When QT_NO_OPENSSL is checked, the user agent says "no SSL support" even when
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-there *is* SSL support via Secure Transport on OS X.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Change-Id: Idb8bf3ee95689f60adab332b3cbac7b6bdf6a738
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Source/WebCore/platform/qt/UserAgentQt.cpp | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/Source/WebCore/platform/qt/UserAgentQt.cpp b/Source/WebCore/platform/qt/UserAgentQt.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 6f1da23..80996a2 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Source/WebCore/platform/qt/UserAgentQt.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Source/WebCore/platform/qt/UserAgentQt.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -74,7 +74,7 @@ String UserAgentQt::standardUserAgent(const String &applicationNameForUserAgent,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Security strength.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QString securityStrength;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(QT_NO_OPENSSL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(QT_NO_SSL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- securityStrength = QLatin1String("N; ");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ua = ua.arg(securityStrength);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.6.2.2.g1b5ffa3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 2caa61dc485dc7d38c847ed6c6cff774fcf80061 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Florian Bruhin <git@the-compiler.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 4 Nov 2015 21:32:42 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1/1] Check m_socket in SocketStreamHandlePrivate::close.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-m_socket can be set to 0 in the constructor, e.g. when Qt is compiled without
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-SSL support.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Change-Id: Ic3bb18f6c801d463e2277b4c19ef2c790216bf69
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Task-number: QTBUG-49027
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: Richard J. Moore <rich@kde.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp b/Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index ca7b60c..d4cbdc7 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -127,7 +127,7 @@ int SocketStreamHandlePrivate::send(const char* data, int len)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void SocketStreamHandlePrivate::close()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (m_streamHandle && m_streamHandle->m_state == SocketStreamHandleBase::Connecting) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (m_socket && m_streamHandle && m_streamHandle->m_state == SocketStreamHandleBase::Connecting) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_socket->abort();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_streamHandle->client()->didCloseSocketStream(m_streamHandle);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.6.2.2.g1b5ffa3
</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-xcrun.diff b/aqua/qt5/files/patch-xcrun.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 70ead46..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-xcrun.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,49 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 77a71c32c9d19b87f79b208929e71282e8d8b5d9 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Thu, 7 Jul 2016 16:00:17 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1/1] configure and mkspecs: Don't try to find xcrun with xcrun
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-MIME-Version: 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Content-Type: text/plain; charset=utf8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Content-Transfer-Encoding: 8bit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Since Xcode 8 (beta 2) that tool is no longer available
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-through xcrun. We resort to xcodebuild instead.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Change-Id: If9d7b535c1cbac2caae0112b2003283aeff34fb9
</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;'>-Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mkspecs/features/mac/default_pre.prf | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2 files changed, 2 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/configure b/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index a1f0a8f..f4c7813 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -543,7 +543,7 @@ if [ "$BUILD_ON_MAC" = "yes" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ! /usr/bin/xcrun -find xcrun >/dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ! /usr/bin/xcrun -find xcodebuild >/dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo >&2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " Xcode not set up properly. You may need to confirm the license" >&2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " agreement by running /usr/bin/xcodebuild without arguments." >&2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0cc8cd6..5df99d1 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/features/mac/default_pre.prf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/features/mac/default_pre.prf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12,7 +12,7 @@ isEmpty(QMAKE_XCODE_DEVELOPER_PATH) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Make sure Xcode is set up properly
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- isEmpty($$list($$system("/usr/bin/xcrun -find xcrun 2>/dev/null"))): \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ isEmpty($$list($$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null"))): \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- error("Xcode not set up properly. You may need to confirm the license agreement by running /usr/bin/xcodebuild.")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.7.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>