<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/b5783a88fb71978303325fc0ac7929665fb5cbb4">https://github.com/macports/macports-ports/commit/b5783a88fb71978303325fc0ac7929665fb5cbb4</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b5783a88fb71978303325fc0ac7929665fb5cbb4
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Jul 8 16:20:11 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5: version update 5.7.1->5.8.0
</span>---
_resources/port1.0/group/qt5-1.0.tcl | 14 +-
aqua/qt5/Portfile | 328 ++++++++++++---------
aqua/qt5/files/patch-NSRect.diff | 55 ++++
aqua/qt5/files/patch-add_sdk.diff | 2 +-
...mpile.test-support-linker-flags-in-LDFLAGS.diff | 24 --
aqua/qt5/files/patch-firstObject.diff | 16 -
aqua/qt5/files/patch-freetype.diff | 22 --
aqua/qt5/files/patch-icu.diff | 2 +-
aqua/qt5/files/patch-mkspecs.diff | 25 +-
aqua/qt5/files/patch-opengl.diff | 24 +-
aqua/qt5/files/patch-pc_files.diff | 2 +-
aqua/qt5/files/patch-qcocoahelpers.diff | 33 +++
aqua/qt5/files/patch-qt_module.prf.diff | 15 +
aqua/qt5/files/patch-qtgamepad_i386.diff | 9 +
aqua/qt5/files/patch-qtvirtualkeyboard_noxcb.diff | 17 ++
.../files/patch-qtwebengine_deployment_target.diff | 9 +
aqua/qt5/files/patch-qtwebengine_external.diff | 7 +
aqua/qt5/files/patch-sql_plugins.diff | 18 ++
18 files changed, 394 insertions(+), 228 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/qt5-1.0.tcl b/_resources/port1.0/group/qt5-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 768b0b8..fd0ea1f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/qt5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/qt5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,7 +93,7 @@ proc qt5.get_default_name {} {
</span> # Qt 5.7: Supported (except QtWebEngine)
# Qt 5.6: Supported
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return qt57
</span> #
} elseif { ${os.major} == 13 } {
#
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -366,6 +366,12 @@ namespace eval qt5pg {
</span> lib/pkgconfig/Qt5Multimedia.pc
""
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtnetworkauth {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lib/pkgconfig/Qt5NetworkAuth.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> qtpurchasing {
5.7
6.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -420,6 +426,12 @@ namespace eval qt5pg {
</span> lib/pkgconfig/Qt5SerialPort.pc
""
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtspeech {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lib/pkgconfig/Qt5TextToSpeech.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> qtsvg {
5.0
6.0
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/Portfile b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 39154ba..fd743de 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@ license {LGPL-3 GPL-3 OpenSSLException}
</span>
homepage http://qt.io
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 5.7.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 5.8.0
</span>
set qt_name ${name}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +30,7 @@ PortGroup cxx11 1.1
</span>
master_sites \
http://download.qt.io/official_releases/qt/${branch}/${version}/submodules \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- http://download.qt.io/community_releases/${branch}/${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ http://download.qt.io/community_releases/${branch}/${version}-final
</span>
# file sizes are significantly smaller using xz
if { ${subport} ne ${name} && ${subport} ne "${name}-docs" } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,7 +77,7 @@ foreach test_qt_name ${available_qt_versions} {
</span> # port provides `find ./ -name \*.dylib -exec otool -L {} \; | grep /opt/local/libexec/qt5 | cut -d ' ' -f1` | cut -d : -f2 | sort -u
# port provides `find ./ -name \*.dylib -exec otool -L {} \; | grep /opt/local/lib/ | cut -d ' ' -f1` | cut -d : -f2 | sort -u
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# http://code.qt.io/cgit/qt/qt5.git/tree/.gitmodules?h=5.7.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# http://code.qt.io/cgit/qt/qt5.git/tree/.gitmodules?h=5.8
</span> #
###############################################################################
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -122,13 +122,13 @@ foreach test_qt_name ${available_qt_versions} {
</span> # license replacement
# }
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# module info found at http://doc.qt.io/archives/qt-5.7/qtmodules.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# module info found at http://doc.qt.io/archives/qt-5.8/qtmodules.html
</span> #
###############################################################################
array set modules {
qt3d {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 6d3028b51ef3009c2dae79698400d9671a0ab087
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1d74cf431777b8086d771ab0d4d2c01f9c28eb14cc2d73d7f838a665d1f707ea
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ffd237991652c6425b3ff1e45344119b73c6f03b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3a224576fc922195ac0063b5b351cd6b9d13afcde9cec14317be0347d10c8ae5
</span> ""
"port:assimp"
"qtdeclarative qtimageformats qtgamepad"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -139,20 +139,20 @@ array set modules {
</span> "License: "
}
qtbase {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- b26efab64209d4fe5b0532690c9d3902e7a70102
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- edcdf549d94d98aff08e201dcb3ca25bc3628a37b1309e320d5f556b6b66557e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d395139af720a9c3bf00f962e2c3ebe01cd75702
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c17111ae02a44dc7be1ec2cf979a47ee9e58edf4904041a525c21f4fa53fc005
</span> ""
"port:zlib port:libpng port:jpeg port:freetype path:bin/dbus-daemon:dbus port:tiff port:libmng path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre port:harfbuzz"
""
{"Qt Core" "Qt GUI" "Qt Network" "Qt SQL" "Qt Test" "Qt Widgets" "Qt Concurrent" "Qt D-Bus" "Qt OpenGL" "Qt Platform Headers" "Qt Print Support" "Qt XML"}
""
"variant overrides: ~docs"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 3"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtcanvas3d {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- add50851a85a4ea7716b327d50ac17aab3ad5966
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a887083817b77710f6b5401cec4713a03147ed16fa5cf5fb8de4495807bebdb4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d9529b6042b750f8f58ca2e92f0cfd00a4e3cb7b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5446f790f526f582df7790e1e1442357f61aac9c23ea9b00d4a791c9d78ccaa3
</span> ""
""
"qtdeclarative"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -163,8 +163,8 @@ array set modules {
</span> "License: "
}
qtcharts {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ca932d8c263b79b1ded26db3454a3c887093649e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 85feee6992cdef1ab42947a83cbf806a29224d704ee5dc97ee5038c75b633fe3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e26012a821355159b4b250ad9da95ee93bdf5d98
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 03e8acbe6d0a1ea421b28aba3e171648ec833381e6991f6617dfdcd85d78a586
</span> ""
""
"qtbase qtdeclarative qtmultimedia"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -175,8 +175,8 @@ array set modules {
</span> "License: {GPL-3 OpenSSLException}"
}
qtconnectivity {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- c0ab063f114d1e68085165fecc8414407266b4f2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- b3e8b9068304dc5605a8fdf0695102032fd1a216f2c2d4d53a7e4d4dda3ab966
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7dacd93e8e8a9014fb33505e3a6c792fc9945542
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7b2d01e9d67f6390a9e64bdae62e81a965b0f0b21137cf1a021e08a28bb227f1
</span> ""
""
"qtbase qtdeclarative"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -187,8 +187,8 @@ array set modules {
</span> "License: "
}
qtdatavis3d {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 1fbcf4eacc25fc559f3d6cb92754e52dc85407e8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1bff85dcdeed98ad8f0e191f77e7c0e9d57af719c51791044b9c15e939b800f8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8ca22a991964fa625b27719dc04fa98f163c1bee
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 77f1e7698cc2bade94183d05cf4c879a1c9c12ca6aedc565ee29df638d6b5bd8
</span> ""
""
"qtbase qtdeclarative qtmultimedia"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -199,8 +199,8 @@ array set modules {
</span> "License: {GPL-3 OpenSSLException}"
}
qtdeclarative {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 5b775aa0fee5cbbf540c85ea42a6f832f588e7e4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fd13dd3059d20694a857ed30ee56a2ade908c0cb93246f9804a65f7a2d775d56
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f060a9626295e93e7f5dd58d5bb69d1a792c16ec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 32941eb9ad12d8735dfc64de8b50b5ab830a6d8705a421c57369de7cb5708a46
</span> "port:python27"
""
"qtbase qtsvg qtxmlpatterns"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -210,21 +210,9 @@ array set modules {
</span> "revision 0"
"License: "
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- qtdeclarative-render2d {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2ff009c9755d49e2b08250f001465ef860fa4397
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 831913488bb887993ae8701e5966f53875667a774c0230fc5dc39d6077828c7f
</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 qtdeclarative"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"Qt Quick 2D Renderer"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "GPLv3 license only"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "variant overrides: "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 0"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "License: {GPL-3 OpenSSLException}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> qtdoc {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 441b718a9e038a0ece9fcf452a71ad12ac0a14e7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 55fb0134d7bb26e261bbb30f674e4a88fbcc6bc17e8bb030134aa236b87bd9db
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 133ec7402ca876be3acb97eabbe05883c56e02e6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3112c44c49820f236316bdcadb22c2231bc1232d7d0c202472bbb30613ad578e
</span> ""
""
"qtdeclarative qttools sqlite-plugin"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -235,8 +223,8 @@ array set modules {
</span> "License: "
}
qtgamepad {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- b999fea16af38585e7a9f21b902e7b5d1b2001df
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bb2b2165e3bcbf37a7e03c3e1cac4fe9771b087dad7ab9566ba5f7f4f4929182
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2397828e13aa338502c20396e90703e68b1db51b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b2f0ae3cda03942ad7971cfeebd0dd7e64faa24320104892f90220080cce8c37
</span> ""
"port:libsdl2"
"qtbase qtdeclarative"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -247,8 +235,8 @@ array set modules {
</span> "License: "
}
qtgraphicaleffects {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0602426e52d16ae24c8d75bd4f4d465f8ea120f7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2c68fabe599fa2f318562dc22003df6797e91d00761dbf1f337cdc7fbacd4dc8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7a3dbcf7bbb600eafd901f719391a8f0965680c9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5f2a9b50530ac83d7c2b2ce73fbdf03ac61f83a9521e9d4b796fa17a969dd919
</span> ""
""
"qtdeclarative"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -259,8 +247,8 @@ array set modules {
</span> "License: "
}
qtimageformats {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- a4b2191f0c5831ae651da0105665e5595af52610
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4f97a2a2b269f8a45576256ad9f452320c9c9de6d9c7cc1751fdeac36b0f77f4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f0ac09e19c5ca637f67daffad981a7e075814fb3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 75045eeac11c96194260badbdb4d3e9eb7b7f9972d18d3491230ea820be4606f
</span> ""
"port:jasper port:libmng port:tiff port:webp"
"qtbase"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -271,11 +259,11 @@ array set modules {
</span> "License: "
}
qtlocation {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 1c4d23ad85295eb0b2a18a98cf55cfb80586b570
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f9e9e64e757008c2341504a1916a219ee0cf2b1b42bfa72156e62dfe9dfbf39f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7b161c72dd8a05f7b54a845a586da0e082730d52
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 48a1e39ed989f0133aeacaa379e9c3958ec9b08c043626bba503619891d21abb
</span> ""
""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "qtdeclarative qtquickcontrols qtserialport"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "qtbase qtdeclarative qtquickcontrols qtserialport"
</span> {"Qt Location" "Qt Positioning"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -283,8 +271,8 @@ array set modules {
</span> "License: "
}
qtmacextras {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 667211d10808f45bf05e863c2457fa7eeb9d6870
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1dcad3d9b5ffeece985afc595b95f6b8b1a1aac7fa1f84193d042f2303b52667
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 434deaf47735fe5abeb8403c0ea6ea99a08a3ec4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ee27998f5e0f109bc7604b3754ac435760d0e3722bf67f62f467776f7c5f3411
</span> ""
""
"qtbase"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -295,8 +283,8 @@ array set modules {
</span> "License: "
}
qtmultimedia {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 47e2e0ea325c93fadb3e6a460952ae6bbd4b437d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a52b177fbf02600a0c8bd995ce7c2041c673bc1332c02b60e0e95bb9ebab7def
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2ec53aff67f3cf5fd45b3d9f5d71899dc102f395
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a8bc044834f95208261915feefe5e2fdb6761b76f0f99e21062963bd9f9d4a07
</span> ""
""
"qtbase qtdeclarative"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -306,9 +294,21 @@ array set modules {
</span> "revision 0"
"License: "
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtnetworkauth {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 844e74ebcd3e69f31fa95c79ae984bc73d5068c1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 615581c3a989167a207215c790825873fa24d83738c083c136252a462aa3e4c3
</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 qtwebview"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {"Qt Network Authorization"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "technology preview module"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "variant overrides: ~universal"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "License: "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> qtpurchasing {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 2ae0d16152b4d55fa1ea0ae5b2753b9079f869b8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f694757929cefa31643daab4bde1fbda8d76c79eda0ee6094e1d86efd4cb7b42
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cc71fe017debfe7f32128affc673d3c8f215b33f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b3fd8793525f4e3bf354db927e8b4c9ba1157ae080f2e16afa9a85eec7e1b355
</span> ""
""
"qtbase qtdeclarative"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -319,8 +319,8 @@ array set modules {
</span> "License: {GPL-3 OpenSSLException}"
}
qtquickcontrols {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 78ed13596d62342447f3086483a331fdaf388d21
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 6feb1a736bf93af98c40d04cde6b36c113e4cdf84ccb9b306ca92ef9b1779e9d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2d1c99030e8345e87488609c9452d316951f0d8e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 04e70d0ccfd9ba882691a5e8f81e3428ae1b72a76bb9f43ba242f1c33bd7b326
</span> ""
""
"qtdeclarative qtgraphicaleffects"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -331,8 +331,8 @@ array set modules {
</span> "License: "
}
qtquickcontrols2 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 75c7942e4b6fa60b555fd9c9858f4cf41cf861f6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f2e8acd0badbf604f28258b063c94ba71e28147c53c435ae9eb484497cf3e7ec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b3468bd4b29975cf89630685ed9e24bb971d9aeb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b099866ec74f13cf0047274c61f0486d1eba27716fa07b69f682c54d3a4ade1b
</span> ""
""
"qtgraphicaleffects"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -343,8 +343,8 @@ array set modules {
</span> "License: "
}
qtscript {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- b449e5954caaa493b0163506a58e3ea7e49751a1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5bf91a1c53020d91d454d4bb0f930ada98c5fc008fda78f2d7171152920da426
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ acd09e718eaf024a287ef1e747e657d3fb5b419a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 293ab91d2d189d889dc80609aa259190fb7de636d360e904784a5ce1a45e5ad3
</span> ""
""
"qtbase qttools"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -355,20 +355,20 @@ array set modules {
</span> "License: "
}
qtscxml {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- e389198b8023e0c478f2d9c9b01e39dcff76daa7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 9dad4ab220a715b6a63df1d4a196bfa963a1ce7e6e57e7b36462c5dab09db38c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ aeef913be45b60be7ad8f8985425f12f39d4ed71
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b6bb9d397396e7e2667d400c4d904d2d1dd9c1573c37ebe1aa62448289a09dc4
</span> ""
""
"qtbase qtdeclarative"
{"Qt SCXML"}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "technology preview module"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ""
</span> "variant overrides: "
"revision 0"
"License: "
}
qtsensors {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8d2871b427c14d943c79f8918214f09e5adfdc27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ccb3942edb5e615e9a43c147d87a09f19690eafbc56be0cdf4f73b7e510f3b10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 295b773ac70732c99a13415f4f76ae86f406cb44
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3a5d0639ecf8cd30c8ca349c353a8f3c424889b53831e70b6d8c481fc45de796
</span> ""
""
"qtbase qtdeclarative"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -379,20 +379,20 @@ array set modules {
</span> "License: "
}
qtserialbus {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- fc9b652c1bfac92cb1c884d51d89b4198d198dda
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 727edbe0f29659119cfcfbc9ce7c7063af319ec441bc9a5156ebda28e820b157
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 649d786ab283c0ff9feb0d6b66a512dff24a1dac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 58343dd9f2e339d4900a2d4b54ee25ed959cf62bacb012fe61e6b99d7958c10a
</span> ""
""
"qtserialport"
{"Qt Serial Bus"}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "technology preview module"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ""
</span> "variant overrides: "
"revision 0"
"License: "
}
qtserialport {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 28d52ddb120bc260668c51e24d0f84ea0ff14fcd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 76d5e19bd392b72602ba3bfe3c0d03c10962674604cf814efa2c910f98cf5a26
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 79004f8e1f2db0d6be966dffafacce73fa875fd6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 52317fded73ad0beb0a2ecf93124a8e2dfdcf14270a762c1f4fd06fb075506ad
</span> ""
""
"qtbase"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -402,9 +402,21 @@ array set modules {
</span> "revision 0"
"License: "
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtspeech {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f907e9af09b3d31b193e1e72490feb7495be33e5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f16a81593dfe1ad84c2e6bd42316042fe0bc9609f638baca35456a6d56e84c44
</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 qtmultimedia"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {"Qt Speech"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "technology preview module"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "variant overrides: "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "License: "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> qtsvg {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- bdfe992b16536caf05fe49b5b26e9dbca16afbaa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- b0f017db8cf18e655e8a6635bc4ddbdbad6f8ef839857451b78942630a4c3947
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6d68b42a973e02b9b69721e49e3194ae1c389bd5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9873191c211ab4da9c0bc47b1e3549f475db4d448bba3175e0f86b24eefadc89
</span> ""
""
"qtbase"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -415,8 +427,8 @@ array set modules {
</span> "License: "
}
qttools {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- e882f6e43708305242aba7502554b6be5f9ff12e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 64197022686c3d8b11a8639f102e2caf03cc325a30e7a32ba66881648ac2dfac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 91000c61fc853b7985373d5c7bcdf72d1ab935c3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 95ec8e76d393b6ba26ffff5041fce41946d2bf3aec1402c6533e24d9fc269d83
</span> ""
""
"qtbase qtdeclarative"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -427,8 +439,8 @@ array set modules {
</span> "License: "
}
qttranslations {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- f1e1040035310813b94ce32b251d6cd4a0ae1585
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 16ecdb09532724e80fa6202e5604d80877923b652b771b6020cea36bee0258e7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 41e8c4bbe38cc0b222c585516d2e7d515d9cc307
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3b7cf72ec50bc2a02bf4e4427b184febac909dba0e02e1861321ca1629c3fc2e
</span> ""
""
"qttools"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -439,8 +451,8 @@ array set modules {
</span> "License: "
}
qtvirtualkeyboard {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- bbfb719ec76ee67fb89d38e4956be70f88c25b61
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- b28b8b937ed15d794c5ebc93e9556d08a0c9761a434864ebf2b454554e652add
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a102a5a0788e509357bdd5a44816851e1cd8b496
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 35fdf5b39d930935b6299ac59f347bea89b983e16bd7961fee3f1b8e16f4e21c
</span> ""
"port:hunspell"
"qtbase qtdeclarative qtsvg qtmultimedia qtquickcontrols"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -451,8 +463,8 @@ array set modules {
</span> "License: {GPL-3 OpenSSLException}"
}
qtwebchannel {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- edbff4aea7ddd25ed0404511760ddc5cfefd99c3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 63ab3ac76ff993009cfa978162a764e05b763cacb70d1a862893f8de4492319b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bddd059128b9af69e81f7324621b68b8f338a3c8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5bf5b15413baa235ee2cbfd136ea3b9303b32879b54f9f25bfb4dc96d37d0b4a
</span> ""
""
"qtbase qtdeclarative qtwebsockets"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -463,11 +475,11 @@ array set modules {
</span> "License: "
}
qtwebengine {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 07bf263f775ac2a72f8db18ef53862b62be873a0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2101883e3d632b50133a14e3bbdc1d4d649e405c9618f2eef1b72a7b821ccc2b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cb0789067b954fb14e950b1704450dc513fd1181
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 223d22f1660811e60677afe0a85f2f385823e25157689561489700c5d1da79be
</span> "port:python27 port:py27-ply"
""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "qtquickcontrols qtwebchannel qtlocation"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "qtquickcontrols qtwebchannel qtlocation qttools"
</span> {"Qt WebEngine"}
"very large and relatively new; requires newer version of OS X"
"variant overrides: ~universal"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -475,20 +487,20 @@ array set modules {
</span> "License: "
}
qtwebkit {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 45d764449491dc875838fb8b2e79c90cf3b0653a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a46cf7c89339645f94a5777e8ae5baccf75c5fc87ab52c9dafc25da3327b5f03
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ db6e8a239c744c213033a9a7087b9323cac6014c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 79ae8660086bf92ffb0008b17566270e6477c8fa0daf9bb3ac29404fb5911bec
</span> "port:python27"
"port:fontconfig port:icu port:leveldb port:webp port:libxml2 port:libxslt port:zlib port:sqlite3"
"qtbase qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns"
{"Qt WebKit" "Qt WebKit Widgets"}
"community support only (use Qt WebEngine)"
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtwebsockets {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 4f3d6eea1cd01b961f7914160afe3ad5ac964285
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5c2a75b68e7f2e98530659b33bb08edee83013832dbf99cc5b40afc8a90652d1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fb8b1ac9c9d49cd988fe2af337c2e30dde4b605a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ aa110af297d0d3239f346c3ee0cd43621adf463eb62a04941bbfe3fcccb845f5
</span> ""
""
"qtbase qtdeclarative"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -499,8 +511,8 @@ array set modules {
</span> "License: "
}
qtwebview {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 17993359df0685eec533610ae81926a6c4795c62
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- b3bcf9693e0205263f5d227f2204cf12c3a3d1e200b3114723511ee3bdf2159f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5ec41c5413b4ec16913b3716d4c4e9da1927d212
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b7d8d4dc8c11f4e70668da509d827c7342b3e5864e8d83f3a0fa56b9cd527fd3
</span> ""
""
"qtdeclarative qtwebengine"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -511,8 +523,8 @@ array set modules {
</span> "License: "
}
qtxmlpatterns {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 5891531cab954807cc32a289df3511637d5cf101
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a805938c2ab1379d7dc83dcec606edd7950b5155c073b9eb53c53e62deb5f8e5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ da29dc37f5463817420113d05b41a9d303822bfe
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7bffa65ea52e54fb1314b45222888612d55eaf51a936a6119b8756266439da04
</span> ""
""
"qtbase"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -529,8 +541,9 @@ array set modules {
</span> # {
# variant name
# dependency, library
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# include path
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# link requirement
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# include directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# library directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# library name
</span> # obsolete? (empty string is no)
# }
#
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -541,7 +554,8 @@ array set sql_plugins {
</span> "sqlite3"
"port:sqlite3"
"${prefix}/include"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "-L${prefix}/lib -lsqlite3"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${prefix}/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "-lsqlite3"
</span> ""
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -550,28 +564,32 @@ array set sql_plugins {
</span> "postgresql96"
"port:postgresql96"
"${prefix}/include/postgresql96"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "-L${prefix}/lib/postgresql96 -lpq"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${prefix}/lib/postgresql96"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "-lpq"
</span> ""
}
{
"postgresql95"
"port:postgresql95"
"${prefix}/include/postgresql95"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "-L${prefix}/lib/postgresql95 -lpq"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${prefix}/lib/postgresql95"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "-lpq"
</span> ""
}
{
"postgresql94"
"port:postgresql94"
"${prefix}/include/postgresql94"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "-L${prefix}/lib/postgresql94 -lpq"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${prefix}/lib/postgresql94"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "-lpq"
</span> ""
}
{
"postgresql84"
"port:postgresql84"
"${prefix}/include/postgresql84"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "-L${prefix}/lib/postgresql84 -lpq"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${prefix}/lib/postgresql84"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "-lpq"
</span> ""
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -580,21 +598,24 @@ array set sql_plugins {
</span> "mariadb55"
"port:mariadb"
"${prefix}/include/mariadb/mysql"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "-L${prefix}/lib/mariadb/mysql -lmysqlclient_r"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${prefix}/lib/mariadb/mysql"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "-lmysqlclient_r"
</span> ""
}
{
"mysql57"
"port:mysql57"
"${prefix}/include/mysql57/mysql"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "-L${prefix}/lib/mysql57/mysql -lmysqlclient_r"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${prefix}/lib/mysql57/mysql"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "-lmysqlclient_r"
</span> ""
}
{
"mysql56"
"port:mysql56"
"${prefix}/include/mysql56/mysql"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "-L${prefix}/lib/mysql56/mysql -lmysqlclient_r"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${prefix}/lib/mysql56/mysql"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "-lmysqlclient_r"
</span> ""
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -684,11 +705,11 @@ foreach {module module_info} [array get modules] {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # the Qt 5.7 class QUuid requires NSUUID, which was introduced in OS X 10.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://developer.apple.com/reference/foundation/nsuuid?language=objc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} < 12 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the Qt 5.8 requires NSWindowDidChangeOcclusionStateNotification, which was introduced in 10.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://developer.apple.com/library/content/releasenotes/General/APIDiffsMacOSX10_9/AppKit.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.major} < 13 } {
</span> pre-fetch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${subport} requires OS X 10.8 or later"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "${subport} requires OS X 10.9 or later"
</span> return -code error "incompatible OS version"
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -696,15 +717,11 @@ foreach {module module_info} [array get modules] {
</span> # https://codereview.qt-project.org/#/c/141654/
patchfiles-append patch-add_sdk.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # allow system freetype to satisfy freetype dependency
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-freetype.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_PREFIX__|${prefix}|g" ${worksrcpath}/src/3rdparty/freetype_dependency.pri
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://codereview.qt-project.org/#/c/184053/1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qt_module.prf.diff
</span>
# the build system uses pkgconfig to look for an OpenGL installation (gl.pc)
<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;'>- # if mesa is installed, the build system will try to use both OpenGL systems
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if mesa is installed, the build system will try to use it instead of -framework OpenGL -framework AGL
</span> # when building qtmultimedia, this will cause problems
# Undefined symbols: "_CGLGetCurrentContext"
patchfiles-append patch-opengl.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -726,10 +743,6 @@ foreach {module module_info} [array get modules] {
</span> # When testing, ensure that a universal object file is not inadvertently created.
patchfiles-append patch-machtest.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Support direct linker flags. Newer glib versions seem to use -Wl,framework,...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # or -Wl,framework -Wl,...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-config.tests_unix_compile.test-support-linker-flags-in-LDFLAGS.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> #-----------------------------------------------------------------------------
# qtbase is used for:
# 1) building qtbase
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -825,6 +838,13 @@ foreach {module module_info} [array get modules] {
</span> ${worksrcpath}/mkspecs/common/macx.conf
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://bugreports.qt.io/browse/QTBUG-58401
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see http://code.qt.io/cgit/qt/qtbase.git/commit/?id=8f06124b70bad709b2f99789f2416529db5f153d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-NSRect.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # autogeneration works differently on 64-bit and 32-bit builds
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qcocoahelpers.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # return modified spec files to the default values
post-build {
if { [variant_exists universal] && [variant_isset universal] } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -881,7 +901,6 @@ foreach {module module_info} [array get modules] {
</span> -opensource \
-confirm-license \
-shared \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -largefile \
</span> -accessibility
foreach driver { db2 ibase mysql oci odbc psql sqlite sqlite2 tds } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -921,8 +940,6 @@ foreach {module module_info} [array get modules] {
</span> -no-xinput2 \
-no-xcb-xlib \
-glib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-pulseaudio \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-alsa \
</span> -no-gtk
# from the configure script:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -961,7 +978,6 @@ foreach {module module_info} [array get modules] {
</span> -no-kms \
-no-mirclient \
-no-libinput \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-gstreamer \
</span> -no-system-proxies
# MacOS/iOS options:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -975,8 +991,7 @@ foreach {module module_info} [array get modules] {
</span> # configure options that don't show up in configure --help
configure.args-append \
-no-libudev \
<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:#e0ffe0;'>+ -no-egl
</span>
# Qt builds part of the system using environment provided my MacPorts.
# It builds the rest using its own internal environment.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1040,16 +1055,6 @@ foreach {module module_info} [array get modules] {
</span> configure.args-replace -release -debug-and-release
}
<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;'>-
</span> variant openssl description {Use OpenSSL instead of Secure Transport} {
configure.args-delete -securetransport -no-openssl
configure.args-append -openssl-linked
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1278,6 +1283,28 @@ foreach {module module_info} [array get modules] {
</span> build.env-append CXX=${configure.cxx}
build.env-append CC=${configure.cc}
configure.args-append QMAKE_LINK=${configure.cxx}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the following libraries, even when available, do not seem to affect the build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # so turn them off
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtwebengine_external.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.post_args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -- \
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtwebengine_deployment_target.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 "qtvirtualkeyboard" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # do not opportunistically use xcb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtvirtualkeyboard_noxcb.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 "qtgamepad" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # /System/Library/Frameworks/GameController.framework is 64-bit only
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtgamepad_i386.diff
</span> }
# special case
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1300,10 +1327,22 @@ foreach {module module_info} [array get modules] {
</span>
# special case
if { ${module} eq "qtmultimedia" } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} < 13 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://trac.macports.org/ticket/52922
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://trac.macports.org/ticket/53949
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-firstObject.diff
</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;'>+ }
</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;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # for commands must follow -spec set in PortGroup
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.post_args-append --
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ![variant_isset pulseaudio] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.post_args-append -no-pulseaudio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ![variant_isset gstreamer] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.post_args-append -no-gstreamer
</span> }
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1353,7 +1392,7 @@ foreach {module module_info} [array get modules] {
</span> post-extract {
# generated makefiles assume full Qt was built locally
xinstall -d -m 0755 ${worksrcpath}/bin/
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach bin {qdoc qhelpgenerator} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach bin {qdoc qhelpgenerator qtattributionsscanner} {
</span> ln -s ${qt_bins_dir}/${bin} ${worksrcpath}/bin/
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1397,6 +1436,8 @@ foreach {sql_names sql_info} [array get sql_plugins] {
</span> description ${dbms} Database Driver for Qt Tool Kit ${qt_major}
long_description ${dbms} Database Driver for Qt Tool Kit ${qt_major}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-sql_plugins.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # if there is more than one version of the database system, create variants for each version
if { [llength ${sql_info}] > 1 } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1433,15 +1474,19 @@ foreach {sql_names sql_info} [array get sql_plugins] {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # as of Qt 5.8, QMAKE_USE is used to find external libraries
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set use_name [string toupper ${driver}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> foreach variant_info ${sql_info} {
set varName [lindex ${variant_info} 0]
if { ( [variant_exists ${varName}] && [variant_isset ${varName}] ) || [llength ${sql_info}]==1 } {
depends_lib-append [lindex ${variant_info} 1]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [subst INCLUDEPATH+=\"[lindex ${variant_info} 2]\"] \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [subst LIBS+=\"[lindex ${variant_info} 3]\"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [subst QMAKE_INCDIR_${use_name}+=\"[lindex ${variant_info} 2]\"] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [subst QMAKE_LIBDIR_${use_name}+=\"[lindex ${variant_info} 3]\"] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [subst QMAKE_LIBS_${use_name}+=\"[lindex ${variant_info} 4]\"]
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1495,7 +1540,7 @@ subport ${name}-docs {
</span> if { ${subport} eq ${name} } {
# the main port is Meta-port to install various modules
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #revision 0
</span>
description Qt Tool Kit ${qt_major}
long_description Qt Tool Kit: A cross-platform framework \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1712,10 +1757,15 @@ foreach {component component_info} [array get qt5pg::qt5_component_lib] {
</span> }
# Qt 5.7 will not work on Mac OS X 10.7
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# replace qt5-XYZ port with qt56-XYZ port
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} < 12 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Qt 5.8 will not work on Mac OS X 10.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# replace qt5-XYZ port with qt5{6,7}-XYZ port
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.major} < 13 } {
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set qt_replace_version 5.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.major} < 12 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set qt_replace_version 5.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set qt_replace_version 5.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
set qt_replace_name qt[join [split ${qt_replace_version} .] ""]
set qt_replace_port ${qt_replace_name}[string range ${subport} 3 end]
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-NSRect.diff b/aqua/qt5/files/patch-NSRect.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..5bdc3ad
</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-NSRect.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,55 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/plugins/platforms/cocoa/qcocoadrag.mm.orig 2017-01-18 07:20:58.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/plugins/platforms/cocoa/qcocoadrag.mm 2017-05-14 07:58:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -132,7 +132,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QPixmap pm = dragPixmap(m_drag, hotSpot);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QSize pmDeviceIndependentSize = pm.size() / pm.devicePixelRatio();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSImage *nsimage = qt_mac_create_nsimage(pm);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [nsimage setSize:pmDeviceIndependentSize.toCGSize()];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [nsimage setSize:NSSizeFromCGSize(pmDeviceIndependentSize.toCGSize())];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMacPasteboard dragBoard((CFStringRef) NSDragPboard, QMacInternalPasteboardMime::MIME_DND);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_drag->mimeData()->setData(QLatin1String("application/x-qt-mime-type-name"), QByteArray("dummy"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/plugins/platforms/cocoa/qcocoawindow.mm.orig 2017-01-18 07:20:58.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/plugins/platforms/cocoa/qcocoawindow.mm 2017-05-14 08:00:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -491,7 +491,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSRect screenRect = [[m_view window] convertRectToScreen:NSMakeRect(windowPoint.x, windowPoint.y, 1, 1)];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSPoint screenPoint = screenRect.origin;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QPoint position = qt_mac_flipPoint(screenPoint).toPoint();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QSize size = QRectF::fromCGRect([m_view bounds]).toRect().size();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QSize size = QRectF::fromCGRect(NSRectToCGRect([m_view bounds])).toRect().size();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return QRect(position, size);
</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;'>+@@ -1095,7 +1095,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QSize sizeIncrement = windowSizeIncrement();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (sizeIncrement.isEmpty())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sizeIncrement = QSize(1, 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [m_nsWindow setResizeIncrements:sizeIncrement.toCGSize()];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [m_nsWindow setResizeIncrements:NSSizeFromCGSize(sizeIncrement.toCGSize())];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QRect rect = geometry();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QSize baseSize = windowBaseSize();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/plugins/platforms/cocoa/qnsview.mm.orig 2017-01-18 07:20:58.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/plugins/platforms/cocoa/qnsview.mm 2017-05-14 08:02:06.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -336,10 +336,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ geometry = QRect(windowRect.origin.x, qt_mac_flipYCoordinate(windowRect.origin.y + rect.size.height), rect.size.width, rect.size.height);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else if (m_platformWindow->m_viewIsToBeEmbedded) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // embedded child window, use the frame rect ### merge with case below
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- geometry = QRectF::fromCGRect([self bounds]).toRect();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ geometry = QRectF::fromCGRect(NSRectToCGRect([self bounds])).toRect();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // child window, use the frame rect
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- geometry = QRectF::fromCGRect([self frame]).toRect();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ geometry = QRectF::fromCGRect(NSRectToCGRect([self frame])).toRect();
</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 (m_platformWindow->m_nsWindow && geometry == m_platformWindow->geometry())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -553,7 +553,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - (void) drawRect:(NSRect)dirtyRect
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- qCDebug(lcQpaCocoaWindow) << "[QNSView drawRect:]" << m_platformWindow->window() << QRectF::fromCGRect(dirtyRect);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ qCDebug(lcQpaCocoaWindow) << "[QNSView drawRect:]" << m_platformWindow->window() << QRectF::fromCGRect(NSRectToCGRect(dirtyRect));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef QT_NO_OPENGL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (m_glContext && m_shouldSetGLContextinDrawRect) {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-add_sdk.diff b/aqua/qt5/files/patch-add_sdk.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 7e3f4e7..f12875a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-add_sdk.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-add_sdk.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,7 +19,7 @@ diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf
</span> index e238f8e..624366a 100644
--- mkspecs/features/mac/sdk.prf
+++ mkspecs/features/mac/sdk.prf
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -37,7 +37,7 @@ QMAKE_INCDIR_OPENGL = $$sysrootified
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,7 +31,7 @@
</span> QMAKESPEC_NAME = $$basename(QMAKESPEC)
# Resolve SDK version of various tools
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-config.tests_unix_compile.test-support-linker-flags-in-LDFLAGS.diff b/aqua/qt5/files/patch-config.tests_unix_compile.test-support-linker-flags-in-LDFLAGS.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8711bf8..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-config.tests_unix_compile.test-support-linker-flags-in-LDFLAGS.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,24 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- config.tests/unix/compile.test.old 2016-12-01 09:17:04.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config.tests/unix/compile.test 2017-05-14 14:05:41.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,6 +31,21 @@ while [ "$#" -gt 0 ]; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LFLAGS="$LFLAGS -framework \"$2\""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- shift
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -Wl,-framework,*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LFLAGS="$LFLAGS -framework \"${PARAM#-Wl,-framework,}\""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -Wl,-framework)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # -Wl,-framework,... cought above
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case $2 in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -Wl,*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LFLAGS="$LFLAGS -framework \"${2#-Wl,}\""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ shift
</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;'>-+ exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -arch)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MAC_ARCH_CFLAGS="$MAC_ARCH_CFLAGS -arch $2"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MAC_ARCH_CXXFLAGS="$MAC_ARCH_CXXFLAGS -arch $2"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-firstObject.diff b/aqua/qt5/files/patch-firstObject.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b059ce0..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-firstObject.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/plugins/avfoundation/camera/avfcamerautility.mm.orig 2016-09-12 03:58:51.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/plugins/avfoundation/camera/avfcamerautility.mm 2016-12-28 09:44:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -48,6 +48,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <algorithm>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <limits>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// see https://trac.macports.org/ticket/52922
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// see https://trac.macports.org/ticket/53949
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// from the 10.9 SDK
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@interface NSArray (MacPortsCompatibilityFirstObject)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+- (id)firstObject NS_AVAILABLE(10_6, 4_0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QT_BEGIN_NAMESPACE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AVFPSRange qt_connection_framerates(AVCaptureConnection *videoConnection)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-freetype.diff b/aqua/qt5/files/patch-freetype.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 03621f1..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-freetype.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/platformsupport/fontdatabases/mac/coretext.pri.orig 2016-09-15 22:49:42.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/platformsupport/fontdatabases/mac/coretext.pri 2017-07-07 07:53:26.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HEADERS += $$PWD/qcoretextfontdatabase_p.h $$PWD/qfontengine_coretext_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OBJECTIVE_SOURCES += $$PWD/qfontengine_coretext.mm $$PWD/qcoretextfontdatabase.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--contains(QT_CONFIG, freetype) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+contains(QT_CONFIG, freetype)|contains(QT_CONFIG, system-freetype) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include($$QT_SOURCE_TREE/src/3rdparty/freetype_dependency.pri)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HEADERS += $$QT_SOURCE_TREE/src/gui/text/qfontengine_ft_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SOURCES += $$QT_SOURCE_TREE/src/gui/text/qfontengine_ft.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/3rdparty/freetype_dependency.pri.orig 2016-12-01 01:17:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/3rdparty/freetype_dependency.pri 2017-07-07 09:06:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,6 +2,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INCLUDEPATH += $$PWD/freetype/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS_PRIVATE += -L$$QT_BUILD_TREE/lib -lqtfreetype$$qtPlatformTargetSuffix()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else:contains(QT_CONFIG, system-freetype) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # pull in the proper freetype2 include directory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ INCLUDEPATH += __MACPORTS_PREFIX__/include/freetype2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LIBS_PRIVATE += -L__MACPORTS_PREFIX__/lib -lfreetype
</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-icu.diff b/aqua/qt5/files/patch-icu.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 322cae5..5aeb3ab 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-icu.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-icu.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> @@ -14,6 +14,7 @@
LIBS += -licuin -licuuc -licudt
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else:!contains(QT_CONFIG,no-pkg-config):packagesExist("icu-i18n") {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else:qtConfig(pkg-config):packagesExist("icu-i18n") {
</span> + CONFIG += link_pkgconfig
PKGCONFIG += icu-i18n
} else {
<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 35258b4..6696d4c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-mkspecs.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-mkspecs.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,10 @@
</span> --- mkspecs/macx-clang/qmake.conf.orig 2016-09-15 22:49:42.000000000 -0700
+++ mkspecs/macx-clang/qmake.conf 2016-12-24 08:54:33.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11,6 +11,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7,6 +7,10 @@
</span> include(../common/clang.conf)
include(../common/clang-mac.conf)
<span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
</span> +QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
+
+QMAKE_CFLAGS += -arch x86_64
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,11 +14,11 @@
</span> load(qt_config)
--- mkspecs/macx-clang-32/qmake.conf.orig 2016-10-31 19:11:03.000000000 -0700
+++ mkspecs/macx-clang-32/qmake.conf 2016-10-31 19:13:21.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11,7 +11,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7,7 +7,7 @@
</span> include(../common/clang.conf)
include(../common/clang-mac.conf)
<span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
</span> +QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
QMAKE_CFLAGS += -arch i386
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +29,7 @@
</span> include(../common/gcc-base-mac.conf)
include(../common/g++-macx.conf)
<span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
</span> +QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
+
+QMAKE_CFLAGS += -arch x86_64
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,7 +43,7 @@
</span> include(../common/gcc-base-mac.conf)
include(../common/g++-macx.conf)
<span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
</span> +QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
QMAKE_CFLAGS += -arch i386
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,7 +54,7 @@
</span> include(../common/gcc-base-mac.conf)
include(../common/g++-macx.conf)
<span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
</span> +QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
QMAKE_CC = gcc-4.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,7 +65,7 @@
</span> include(../common/gcc-base-mac.conf)
include(../common/g++-macx.conf)
<span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
</span> +QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
QMAKE_CC = gcc-4.2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,14 +87,14 @@
</span> include(../common/gcc-base-mac.conf)
include(../common/llvm.conf)
<span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
</span> +QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
QMAKE_XCODE_GCC_VERSION = com.apple.compilers.llvmgcc42
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/common/clang-mac.conf.orig 2016-10-31 19:35:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/common/clang-mac.conf 2016-10-31 19:35:36.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:#e0ffe0;'>+--- mkspecs/common/clang-mac.conf.orig 2017-05-06 08:49:54.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/common/clang-mac.conf 2017-05-06 08:51:06.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6,6 +6,6 @@
</span>
QMAKE_XCODE_GCC_VERSION = com.apple.compilers.llvm.clang.1_0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -102,3 +102,4 @@
</span> -QMAKE_LFLAGS += -stdlib=libc++
+QMAKE_CXXFLAGS += -stdlib=__MACPORTS__CXX_STDLIB__
+QMAKE_LFLAGS += -stdlib=__MACPORTS__CXX_STDLIB__
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_AR_LTCG = libtool -static -o
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-opengl.diff b/aqua/qt5/files/patch-opengl.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b6afb15..e4a5259 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-opengl.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-opengl.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2015-10-12 21:35:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2015-10-18 12:19:26.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4264,7 +4264,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- local incdir_raw incdir_mod cflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- local libdir_raw libdir_mod libs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists $pkg_name 2>/dev/null; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if [ -n "$PKG_CONFIG" ] && [ "$qmake_postfix" != "OPENGL" ] && $PKG_CONFIG --exists $pkg_name 2>/dev/null; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- incdir_raw=`$PKG_CONFIG --cflags-only-I $pkg_name 2>/dev/null`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cflags=`$PKG_CONFIG --cflags-only-other $pkg_name 2>/dev/null`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libdir_raw=`$PKG_CONFIG --libs-only-L $pkg_name 2>/dev/null`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/gui/configure.json.orig 2017-01-18 07:20:58.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/gui/configure.json 2017-06-11 06:11:53.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -182,8 +182,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "label": "Desktop OpenGL",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "test": "unix/opengldesktop",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "sources": [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { "type": "pkgConfig", "args": "gl" },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { "type": "makeSpec", "spec": "OPENGL" }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { "type": "makeSpec", "spec": "OPENGL" },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { "type": "pkgConfig", "args": "gl" }
</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;'>+ "opengl_es2": {
</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 e61d7b5..11492c9 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;'>-@@ -245,7 +245,7 @@ load(qt_installs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -249,7 +249,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-qcocoahelpers.diff b/aqua/qt5/files/patch-qcocoahelpers.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..6a72973
</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-qcocoahelpers.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,33 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/plugins/platforms/cocoa/qcocoahelpers.h.orig 2017-01-18 07:20:58.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/plugins/platforms/cocoa/qcocoahelpers.h 2017-05-29 06:54:43.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -168,6 +168,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @interface QT_MANGLE_NAMESPACE(QNSPanelContentsWrapper) : NSView
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++NSButton *_okButton;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++NSButton *_cancelButton;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++NSView *_panelContents;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++NSEdgeInsets _panelContentsMargins;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</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;'>+ @property (nonatomic, readonly) NSButton *okButton;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @property (nonatomic, readonly) NSButton *cancelButton;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/plugins/platforms/cocoa/qcocoahelpers.mm.orig 2017-01-18 07:20:58.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/plugins/platforms/cocoa/qcocoahelpers.mm 2017-05-14 12:37:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -312,6 +312,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @implementation QNSPanelContentsWrapper
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@synthesize okButton = _okButton;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@synthesize cancelButton = _cancelButton;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@synthesize panelContents = _panelContents;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@synthesize panelContentsMargins = _panelContentsMargins;
</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;'>+ - (instancetype)initWithPanelDelegate:(id<QT_MANGLE_NAMESPACE(QNSPanelDelegate)>)panelDelegate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((self = [super initWithFrame:NSZeroRect])) {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qt_module.prf.diff b/aqua/qt5/files/patch-qt_module.prf.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..73b5dce
</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-qt_module.prf.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/features/qt_module.prf.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/features/qt_module.prf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -68,9 +68,9 @@ load(qt_build_paths)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ header_module {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TEMPLATE = aux
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CONFIG += \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- force_qt \ # Needed for the headers_clean tests.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- qt_no_install_library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONFIG += force_qt # Needed for the headers_clean tests.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ !lib_bundle: \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONFIG += qt_no_install_library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TEMPLATE = lib
</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-qtgamepad_i386.diff b/aqua/qt5/files/patch-qtgamepad_i386.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..5f5c454
</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-qtgamepad_i386.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/plugins/gamepads/gamepads.pro.orig 2016-11-29 05:16:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/plugins/gamepads/gamepads.pro 2017-06-20 22:40:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,5 +3,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtConfig(sdl2): SUBDIRS += sdl2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !android: qtConfig(evdev): SUBDIRS += evdev
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ win32: !wince*: SUBDIRS += xinput
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-darwin: !watchos: SUBDIRS += darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++darwin: !watchos: !equals(QT_ARCH, i386): SUBDIRS += darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ android: SUBDIRS += android
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtvirtualkeyboard_noxcb.diff b/aqua/qt5/files/patch-qtvirtualkeyboard_noxcb.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..9413c11
</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-qtvirtualkeyboard_noxcb.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/virtualkeyboard/virtualkeyboard.pro.orig 2016-11-28 02:45:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/virtualkeyboard/virtualkeyboard.pro 2017-06-20 07:13:44.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -207,10 +207,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SOURCES += desktopinputpanel.cpp inputview.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HEADERS += desktopinputpanel.h inputview.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEFINES += QT_VIRTUALKEYBOARD_DESKTOP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- !no-pkg-config:packagesExist(xcb) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PKGCONFIG += xcb xcb-xfixes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DEFINES += QT_VIRTUALKEYBOARD_HAVE_XCB
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #!no-pkg-config:packagesExist(xcb) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # PKGCONFIG += xcb xcb-xfixes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # DEFINES += QT_VIRTUALKEYBOARD_HAVE_XCB
</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;'>+ SOURCES += appinputpanel.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HEADERS += appinputpanel.h
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtwebengine_deployment_target.diff b/aqua/qt5/files/patch-qtwebengine_deployment_target.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..5427f90
</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-qtwebengine_deployment_target.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tools/qmake/mkspecs/features/default_pre.prf.orig 2017-01-03 03:35:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tools/qmake/mkspecs/features/default_pre.prf 2017-06-17 11:38:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # We depend on libc++ to build chromium so our macosx-version-min has to be 10.7
</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 = 10.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QTWEBENGINEPROCESS_NAME_RELEASE = QtWebEngineProcess
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ debug_and_release {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtwebengine_external.diff b/aqua/qt5/files/patch-qtwebengine_external.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..6657bc2
</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-qtwebengine_external.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tools/qmake/config.tests/libvpx/libvpx.pro.orig 2017-01-03 03:35:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tools/qmake/config.tests/libvpx/libvpx.pro 2017-06-19 11:03:15.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,3 +1,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-SOURCES += libvpx.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++linux:SOURCES += libvpx.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKGCONFIG += libvpx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONFIG -= qt
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-sql_plugins.diff b/aqua/qt5/files/patch-sql_plugins.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..b8ca2cc
</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-sql_plugins.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/plugins/sqldrivers/sqlite/sqlite.pro.orig 2017-01-18 07:20:58.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/plugins/sqldrivers/sqlite/sqlite.pro 2017-06-22 04:52:40.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,11 +5,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HEADERS += $$PWD/qsql_sqlite_p.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SOURCES += $$PWD/qsql_sqlite.cpp $$PWD/smain.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-qtConfig(system-sqlite) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#qtConfig(system-sqlite) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_USE += sqlite
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- include($$PWD/../../../3rdparty/sqlite.pri)
</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;'>++# include($$PWD/../../../3rdparty/sqlite.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;'>+ OTHER_FILES += sqlite.json
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>