[148357] trunk/dports/aqua/qt5
mcalhoun at macports.org
mcalhoun at macports.org
Thu May 5 05:34:05 PDT 2016
Revision: 148357
https://trac.macports.org/changeset/148357
Author: mcalhoun at macports.org
Date: 2016-05-05 05:34:05 -0700 (Thu, 05 May 2016)
Log Message:
-----------
qt5 and subports: update version 5.5.1->5.6.0 (fixes #51008)
Modified Paths:
--------------
trunk/dports/aqua/qt5/Portfile
trunk/dports/aqua/qt5/files/patch-add_sdk.diff
trunk/dports/aqua/qt5/files/patch-configure.diff
trunk/dports/aqua/qt5/files/patch-mkspecs.diff
Added Paths:
-----------
trunk/dports/aqua/qt5/files/patch-example_install.diff
trunk/dports/aqua/qt5/files/patch-fontfind.diff
trunk/dports/aqua/qt5/files/patch-icu.diff
trunk/dports/aqua/qt5/files/patch-no_qtwebkit.diff
trunk/dports/aqua/qt5/files/patch-objc.diff
trunk/dports/aqua/qt5/files/patch-pc_files.diff
Removed Paths:
-------------
trunk/dports/aqua/qt5/files/patch-fix_sdk.diff
trunk/dports/aqua/qt5/files/patch-icu.pro.diff
trunk/dports/aqua/qt5/files/patch-midifix.diff
trunk/dports/aqua/qt5/files/patch-pcfiles.diff
trunk/dports/aqua/qt5/files/patch-qtwebengine32.diff
trunk/dports/aqua/qt5/files/patch-rpath.diff
trunk/dports/aqua/qt5/files/patch-stdloc.diff
Modified: trunk/dports/aqua/qt5/Portfile
===================================================================
--- trunk/dports/aqua/qt5/Portfile 2016-05-05 11:14:22 UTC (rev 148356)
+++ trunk/dports/aqua/qt5/Portfile 2016-05-05 12:34:05 UTC (rev 148357)
@@ -4,9 +4,21 @@
PortSystem 1.0
name qt5
-version 5.5.1
-revision 1
+# sepcial case
+if { ${subport} eq "qt5-qtwebkit" } {
+ version 5.5.1
+ revision 4
+} elseif { ${subport} eq "qt5-qtquick1" } {
+ version 5.5.1
+ revision 3
+} elseif { ${subport} eq "qt5-qtwebkit-examples" } {
+ version 5.5.1
+ revision 3
+} else {
+ version 5.6.0
+}
+
# get Qt's version numbers
set branch [join [lrange [split ${version} .] 0 1] .]
set qt_major [lindex [split ${version} .] 0]
@@ -14,26 +26,10 @@
categories aqua
platforms macosx
maintainers mcalhoun openmaintainer
-license {LGPL-2.1 GPL-3}
+license {LGPL-2.1 LGPL-3 GPL-3}
homepage http://qt.io
-if { ${version} eq "5.5.1" && ${subport} eq "qt5-qtimageformats" } {
- incr revision 2
-}
-
-if { ${version} eq "5.5.1" && ${subport} eq "qt5-qtwebengine" } {
- incr revision 1
-}
-
-if { ${version} eq "5.5.1" && ${subport} eq "qt5-qtwebkit" } {
- incr revision 1
-}
-
-if { ${version} eq "5.5.1" && ${subport} eq "qt5-qtbase" } {
- incr revision 2
-}
-
# generate documentation from complete code base
# generate modules from separate downloads
if { ${subport} ne "${name}-docs" } {
@@ -76,14 +72,19 @@
#
# qtconnectivity checks for bluetooth libraries
# bluez and bluez_le (Linux Only)
-# btapi10_2_1 libbb2 (Blackberry Only)
#
# qtconnectivity depends on
# qtandroidextras (Android Only)
#
+# qtserialport depends on
+# ntddmodm (Windows Only)
+#
# qttools depends on
-# qtactiveqt (Windows Only)
+# qtactiveqt (Windows Only)
#
+# qtquick1 depends on
+# qtactiveqt (Windows Only)
+#
# qtwebkit has tests for libraries in:
# Tools/qmake/mkspecs/features/configure.prf
# Tools/qmake/config.tests/
@@ -93,7 +94,6 @@
############################################################################### TODO
#
# TODO: possible to trim dependencies of qtbase?
-# TODO: force qttools to not depend on (deprecated) qtwebkit?
# TODO: support older versions of OS X via different versions of Qt 5
#
###############################################################################
@@ -116,28 +116,28 @@
###############################################################################
array set modules {
qt3d {
- 181929ce80c7e88e4230239c260242749771f8ad
- e380906e2bcbd825dab45043bf063dd88b793c0d5fb050ee915bf4e2b58b1bf7
+ 3f1ba4b025e271f3cf5f07a695d7897bab1831c4
+ b961789daecebed030ad36568301d1fe6c1ad97e9a2726fad5bd96ad603f439d
""
"port:assimp"
"qtbase qtxmlpatterns qtdeclarative qtimageformats"
- {"Qt3D Core" "Qt3D Renderer" "Qt3D Quick" "Qt3D Quick Renderer" "Qt3D Input"}
- "technology preview module"
+ {"Qt3D Core" "Qt3D Input" "Qt3D Logic" "Qt3D Renderer"}
+ "technology preview modules"
"variant overrides: "
}
qtbase {
- ce4bccd0703aaf8d904fbecd1f334ef13d698a44
- dfa4e8a4d7e4c6b69285e7e8833eeecd819987e1bdbe5baa6b6facd4420de916
+ 93d2fad2d45baff8ff6268a2f28321dd78985092
+ 6efa8a5c559e92b2e526d48034e858023d5fd3c39115ac1bfd3bb65834dbd67a
""
- "port:zlib port:libpng port:jpeg port:freetype path:bin/dbus-daemon:dbus path:lib/libssl.dylib:openssl port:tiff port:libmng path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre port:libiconv port:harfbuzz"
+ "port:zlib port:libpng port:jpeg port:fontconfig port:freetype path:bin/dbus-daemon:dbus path:lib/libssl.dylib:openssl port:tiff port:libmng path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre port:libiconv port:harfbuzz"
""
{"Qt Gui" "Qt Widgets" "Qt Print Support" "Qt OpenGL" "Qt Core" "Qt XML" "Qt SQL" "Qt Network" "Qt Test" "Qt D-Bus" "Qt Concurrent" "Qt Platform Headers"}
""
"variant overrides: "
}
qtcanvas3d {
- ed68d3c61b0c67818626595a7bba14a627f5120b
- 759b171030d7110751943643885c1484c7900fed7737424d202e36bdeba0b080
+ 5b94a6984199bbf06d3ece5819a72961b64809b2
+ 66add59e826a0161f4a4dc3ec0b44c17fad1451390b4f7c67af23ee7429d9ecf
""
""
"qtbase qtdeclarative"
@@ -146,8 +146,8 @@
"variant overrides: "
}
qtconnectivity {
- ff138deaf87850b047c1e472188a2455b2e0ff54
- 3637e6def8582fc0fb3684179b93650720ba2da1311a560d358296153f245023
+ 819cb4003d0e2db2b0005b0b9efc851522271acf
+ 0c5cb0c100006759b6954a36e7dc66f8f1ac2b61b3f639152cf6ecb8d48a40eb
""
""
"qtbase qtdeclarative qtxmlpatterns"
@@ -156,8 +156,8 @@
"variant overrides: "
}
qtdeclarative {
- 1d8939c42f4b510443365479ffe8bc525e0faac6
- 5fd14eefb83fff36fb17681693a70868f6aaf6138603d799c16466a094b26791
+ 6997601e480d7ef350922c1f6a5f37482a027bb6
+ 8c55f053f0e348577b56da541af74d02d0f2b61c9a6c15152b03dad03dfde04c
"port:python27"
""
"qtbase qtxmlpatterns"
@@ -166,8 +166,8 @@
"variant overrides: "
}
qtenginio {
- 5b23212c3da401b9c74f33a6486ba18166f129f6
- a79936bd5b6a35aba28dd282291b28c8fa869b8d86652c62efe5e268d94defe2
+ c67e5bfafc774c19f62db8d1fd1be297de3776c5
+ 627ddcfbbfc3ec1a83c9dbb5f24287b5cd6cb5d3b9d09af4d1c444c6ac147f0c
""
""
"qtbase qtdeclarative qtxmlpatterns"
@@ -176,8 +176,8 @@
"variant overrides: "
}
qtgraphicaleffects {
- 43f6a91f75863f8333fc6b70456f1b0d175b55e4
- 9bca0f8db3a4289eceebfa9504915440fe3fa6301d90b65705e4ece528c12d47
+ f9d47a38f39328641044de93b446a0d410fd233d
+ 01e911fdcf85a13b927cba341d15a0baeead3eba85c4532b1b45bb5c334416e8
""
""
"qtbase qtdeclarative qtxmlpatterns"
@@ -186,8 +186,8 @@
"variant overrides: "
}
qtimageformats {
- 75000000ddfbb83b960b73c07d2083b85dcd81fa
- c97fee00c602f9f089fea480546d6e9d61a2b2297c2f163bfd9f8aba92b754a5
+ 4a2c2f83bfb5cbb714a34ea5cb99a5e0925b6405
+ 2c854275a689a513ba24f4266cc6017d76875336671c2c8801b4b7289081bada
""
"port:jasper port:libmng port:tiff port:webp"
"qtbase"
@@ -196,18 +196,18 @@
"variant overrides: "
}
qtlocation {
- 3792eedc159db6bf15eef706ee218f3cc5759a51
- 1fe948cb87649f4450be921cf3cdefc311595a80ef6a7a7b7484901baa0d6316
+ a409f44805869bd0043a54e30f64d9d7b56d7a4b
+ 360e1519d0fcafe4f86923d224e76d56dd785dfb0e1a19fd2e2b0016799653c9
""
""
- "qtbase qtxmlpatterns qtdeclarative qtquickcontrols"
+ "qtbase qtxmlpatterns qtdeclarative qtquickcontrols qtserialport"
{"Qt Location" "Qt Positioning"}
""
"variant overrides: "
}
qtmacextras {
- e31be686e79c1cf4a70357921f0caad4cd496c79
- 025350fdcc936118539ee3703115549b4547def329d3d959b9db5bd853ec9058
+ 692dff2950b62e7af9b6d0ed94fb63d347118779
+ 12d2422d1d98bdbd33b45a0fb124b1cc29063b952b373e436ed5efabeee575ca
""
""
"qtbase"
@@ -216,8 +216,8 @@
"variant overrides: "
}
qtmultimedia {
- 68049da5e203e484de766c17d683a34a888e0603
- 7cc7ca99f41587c188303670499e5c75101f9a8cb6178e8f29cc941e637d957f
+ 9760bee92b3260df88f1a47f48addebac357364f
+ 103f99d6cd266f5c4485546a75ef0c6ee7e88dc901a0be21447cf89159370686
""
""
"qtbase qtxmlpatterns qtdeclarative"
@@ -236,18 +236,28 @@
"variant overrides: "
}
qtquickcontrols {
- 3975fbb34a74d55f88f47b436b6fca6ce3f7c078
- 1b7a8389d656066c629bd2cb520b39a7eb041d184b567dd1b9639b88d841fcf0
+ ac3ebe977dbc4e98e4340759c2747eb1fc408466
+ ec0896792f2a08d109ab3791aa4e47747aab22ebfad281005c4bf8f26f9f788b
""
""
- "qtbase qtdeclarative qtxmlpatterns"
+ "qtbase qtdeclarative qtxmlpatterns qtgraphicaleffects"
{"Qt Quick Controls" "Qt Quick Dialogs" "Qt Quick Layouts" "Qt Quick Extras"}
""
"variant overrides: "
}
+ qtquickcontrols2 {
+ 4a8baf8c83c4c4779ee1ceabff9e5a7b8f399a76
+ 59ec6ea2282931bc0d0748b3979a52e1a322e7ef8d1e5490b8a34931e8b9fee0
+ ""
+ ""
+ "qtbase qtxmlpatterns qtdeclarative qtquickcontrols qtgraphicaleffects"
+ {"Qt Labs Controls"}
+ "technology preview module"
+ "variant overrides: "
+ }
qtscript {
- 7d8ff8c4462b21b83212dd780030a01bd00b8ca9
- cd46dddd998f22bcb06447e0407fef81f7052f25bc770b1c27625654cee828fd
+ b7158a2573c6d10f16e9a5a6cd054b72ba162c74
+ ac7475197d9a0f3c7284f002390e2427fef84ec90dc590630431a848099c5042
""
""
"qtbase"
@@ -256,8 +266,8 @@
"variant overrides: "
}
qtsensors {
- 9a3eaad761efaefc0a56258c0bd64e01d0889cba
- 5d264fc0729a5d7679bd4eb8d7a0a9b142ed38d09fa68fc7dfe57f64afc8eeea
+ 31447c16b0b7d88a5a66a106f777838e8d7494fd
+ 518f392fec5e01aaa7f95e9141678cc99b02ed067ebbd24c38c1420067c59c2e
""
""
"qtbase qtxmlpatterns qtdeclarative"
@@ -265,9 +275,19 @@
""
"variant overrides: "
}
+ qtserialbus {
+ ec67e98bd59969be6ae31e2aabf0665a5aa0de2e
+ 8cca530ee53f19672f57ffee6f2f28866d5c84b8cb3dbbd67c05d27893ac0b8e
+ ""
+ ""
+ "qtbase qtserialport"
+ {"Qt Serial Bus"}
+ "technology preview module"
+ "variant overrides: "
+ }
qtserialport {
- 00c53b307fd6ad509aedc6ed0b3a464ac3d8e809
- a034dbfb023db1b9b9de54390f7e76a48c1d1eb12533b0ffd574505c99968f7a
+ 4d326e73606d543fd1fdafeb47cfc3879a506326
+ 16ee7fb66bb997df674a12a7a5a1450e2a2b860c8d34d237f3631d9f60853c1f
""
""
"qtbase"
@@ -276,8 +296,8 @@
"variant overrides: "
}
qtsvg {
- db1dd37355a1e4b40a37decc1df60d574ab14088
- f7f588be48befd9ccab5a6086832551b8899e8bed9e603ddea979581e05a91c7
+ d19366a29671ade1b1a24f581bda45ae884bfa01
+ 798799319138bb40b6187f4ecc1099956a0d62148f78512e9cb085d1fa5f641f
""
""
"qtbase"
@@ -286,18 +306,18 @@
"variant overrides: "
}
qttools {
- 279aacc94f7fa583a59d3fe005ecb3e598e92b32
- 4361f6ce49717058160908297841a18b94645cec593d1b48fb126c9d06c87bfd
+ 03c7b7cccfc26aac6b0db39d608ecc8b40bbd6b5
+ 0d244c61bbe5505cb94310e980b06ef13dd573511e80ccbdc060f71d5462219d
""
""
- "qtbase qtxmlpatterns qtdeclarative qtwebkit"
+ "qtbase qtxmlpatterns qtdeclarative"
{"Qt Help" "Qt UI Tools" "Qt Designer" }
""
"variant overrides: "
}
qttranslations {
- f9c956935768cea5c935a10493963f7e411dc255
- 41f800710f0bc6ca263f1e54f1fa22be7043962999304e73ce9887ebefc7a4c6
+ 3ddf4d09dfce47076b988dbd5ae56f87cc552efe
+ 9809351f0922b2d91aeb5d8e5756665eea0b2cbcaab74a570f6e5bf08574cd49
""
""
"qtbase qttools"
@@ -306,8 +326,8 @@
"variant overrides: ~examples ~tests ~debug noarch"
}
qtwebchannel {
- fca861f785f9d718aa17853bf7a3c072efcd53b7
- 7f4295ee57cd4ecba3cb263452d2a08d501b45c9a2b8b7794b6a97d7652f15d0
+ c7c1a1f20585183dfa94f09a9a048d50cb4d9deb
+ c25424935e866e77f31e5ebc50fc97eaedd4d77f6e967bfc59ce7fa6a7b4c14f
""
""
"qtbase qtwebsockets qtdeclarative"
@@ -316,18 +336,18 @@
"variant overrides: "
}
qtwebengine {
- 0c24bb89cc72a18c06e2fd613db1eb879ada2a2a
- 7c4d328dd305991aaf0c3450615f4a8e5d80152194bee6f5925bd8d3477e2b90
+ b1feb200f3c18a4b54f8df6f109facdf2aba64dc
+ 8aa2b5ad6c9f98a781aa99303eab3a40bbe74d26a543eea6b4145f5f47c76a03
"port:python27 port:py27-ply"
""
- "qtbase qtdeclarative qtxmlpatterns qtquickcontrols qtwebchannel qtlocation"
+ "qtbase qtdeclarative qtxmlpatterns qtquickcontrols qtwebchannel"
{"Qt WebEngine" "Qt WebEngine Widgets"}
- "very large and relatively new; requires newer version of XCode"
- "variant overrides: "
+ "very large and relatively new; requires newer version of OS X"
+ "variant overrides: ~universal"
}
qtwebsockets {
- 83dcc5d07dca6c1cccfaed13cd16fde940ad0b94
- cf4e834a867b90337188be504ef20184c52666370f721e704952988f8cb12deb
+ 82301dc779436dffcb5f6e887398a2720babd645
+ 268ab869fe3d0d22abd9668851155db79aff2f386bc448051b6ef477841d719f
""
""
"qtbase qtdeclarative"
@@ -335,6 +355,16 @@
""
"variant overrides: "
}
+ qtwebview {
+ dc9b1c83d534df1e302b1cb56d2256e590076a89
+ a48fa53e9e012102774c3faa6c99113918442f891952cd97ef67e05544800b57
+ ""
+ ""
+ "qtbase qtdeclarative qtwebengine"
+ {"Qt WebView"}
+ "new in 5.6.0; requires qtwebengine"
+ "variant overrides: ~universal"
+ }
qtwebkit {
0594ec1150f7899d72f57d8ff2f108f3f75faaf9
77583f9dbd3e6ad874386df71b165dc3ce88efdabbc6e5d97a959ee2187d6d69
@@ -356,8 +386,8 @@
"variant overrides: ++examples"
}
qtxmlpatterns {
- 403a3b2377728629b6a3f1073b24af3f3360adf7
- b537eb0252988e3805a32a16c65038973371d647baf246fdf703bde725d0e8ec
+ 324b5a3b3ff416bd937694de4728ce27114791f7
+ baed1b3bd3f010b8c4a96b4ca7a595b665d43d2e5758b55a364dbc9f2ac819d4
""
""
"qtbase"
@@ -425,7 +455,12 @@
foreach {module module_info} [array get modules] {
subport ${name}-${module} {
- distname ${module}-opensource-src-${version}
+ # sepcial case
+ if { ${module} eq "qtenginio" } {
+ distname ${module}-opensource-src-1.6.0
+ } else {
+ distname ${module}-opensource-src-${version}
+ }
# see https://bugreports.qt.io/browse/QTBUG-35514
build.target
@@ -465,8 +500,8 @@
distname qt-everywhere-opensource-src-${version}
checksums \
- rmd160 42bf7768dafb868f2cdef857fd3e444520f2a706 \
- sha256 6f028e63d4992be2b4a5526f2ef3bfa2fe28c5c757554b11d9e8d86189652518
+ rmd160 bea243ed30c720fc5f92028b82b14fb3a49b6b5f \
+ sha256 76a95cf6c1503290f75a641aa25079cd0c5a8fcd7cff07ddebff80a955b07de7
description Documentation for Qt Tool Kit ${qt_major}
long_description Documentation for Qt Tool Kit ${qt_major}
@@ -586,15 +621,69 @@
} elseif { ${subport} ne "${name}-qtbase" && ${subport} ne "${name}-docs" } {
# these subports use qmake
+ # detremint which variants are to be turned off
+ set request_examples true
+ set request_tests true
+ set def_var ""
+
+ set current_module [string range ${subport} [string length "${name}-"] end]
+ # is subport a module or an SQL plugin?
+ if { [info exists modules(${current_module})] } {
+ # subport is a module
+
+ set module_info $modules(${current_module})
+
+ if { [lsearch -exact [lindex ${module_info} 7] "~universal"] != -1 } {
+ universal_variant no
+ }
+
+ if { [lsearch -exact [lindex ${module_info} 7] "noarch"] != -1 } {
+ supported_archs noarch
+ universal_variant no
+ }
+
+ if { [lsearch -exact [lindex ${module_info} 7] "~debug"] != -1 } {
+ set qt5_qmake_request_no_debug true
+ }
+
+ if { [lsearch -exact [lindex ${module_info} 7] "~examples"] != -1 } {
+ set request_examples false
+ }
+
+ if { [lsearch -exact [lindex ${module_info} 7] "~tests"] != -1 } {
+ set request_tests false
+ }
+
+ if { [lsearch -exact [lindex ${module_info} 7] "++examples"] != -1 } {
+ set request_examples true
+ lappend def_var "+examples"
+ }
+ } else {
+ # subport is an SQL plugin
+ }
+
+ if { ${request_examples} } {
+ variant examples description {Build examples} {}
+ }
+
+ if { ${request_tests} } {
+ variant tests description {Enable tests} {}
+ }
+
+ if { ${def_var} ne "" } {
+ default_variants-append ${def_var}
+ }
+
+ PortGroup qmake5 1.0
+
# special case
if { ${subport} eq "${name}-qtlocation" } {
# qtlocation uses
- # GeoClue (https://www.freedesktop.org/wiki/Software/GeoClue/) and
# Gypsy (https://gypsy.freedesktop.org/wiki/)
# if they can be found
# Ensure that test fails even if software is installed
post-patch {
- foreach test { geoclue geoclue-satellite gypsy } {
+ foreach test { gypsy } {
reinplace "s|return 0;|return 0;\\\n#error turn off test|g" ${worksrcpath}/config.tests/${test}/main.cpp
}
}
@@ -602,15 +691,31 @@
# special case
if { ${subport} eq "${name}-qtwebkit" } {
+ # use MacPorts icu
+ #
# qmake uses pkgconfig to look for icu
- # This feature does not work without "CONFIG += link_pkgconfig"
- patchfiles-append patch-icu.pro.diff
+ # this feature does not work without "CONFIG += link_pkgconfig"
+ patchfiles-append patch-icu.diff
#https://codereview.qt-project.org/#/c/139967/
#https://codereview.qt-project.org/#/c/139968/
#https://codereview.qt-project.org/#/c/139970/
patchfiles-append patch-ssl.diff
+ # Prevent:
+ # In file included from llint/LLIntOffsetsExtractor.cpp:26:
+ # In file included from ./config.h:30:
+ # In file included from ../WTF/wtf/Platform.h:1087:
+ # /opt/local/libexec/qt5/lib/QtCore.framework/Headers/qglobal.h:54:10: fatal error: 'QtCore/qconfig.h' file not found
+ # #include <QtCore/qconfig.h>
+ # ^
+ # 1 error generated.
+ configure.args-append QMAKE_CXXFLAGS+=-F${qt_libs_dir}
+
+ # Prevent conflicting definitions of Objective-C classes in C++ code
+ # from ${qt_libs_dir}/QtCore.framework/Headers/qglobal.h
+ patchfiles-append patch-objc.diff
+
# qtwebkit uses
# glx
# libXcomposite
@@ -625,26 +730,39 @@
}
# special case
+ if { ${subport} eq "${name}-qttools" } {
+ # prevent qttools from opportunistically using qtwebkit if it can be found
+ patchfiles-append patch-no_qtwebkit.diff
+
+ variant qtwebkit description {build with QtWebkit support} {
+ patchfiles-delete patch-no_qtwebkit.diff
+ depends_lib-append port:${name}-qtwebkit
+ }
+ }
+
+ # special case
if { ${subport} eq "${name}-qtwebengine" } {
# see https://wiki.qt.io/QtWebEngine
PortGroup xcodeversion 1.0
- minimum_xcodeversions {12 5.1}
+ minimum_xcodeversions {13 5.1}
- # see https://codereview.qt-project.org/#/c/125968/
- patchfiles-append patch-qtwebengine32.diff
+ # see http://lists.qt-project.org/pipermail/interest/2016-February/thread.html#20946
+ # see http://googleappsupdates.blogspot.co.uk/2014/09/google-chrome-64-bit-for-mac-and-windows.html
+ supported_archs x86_64
- # at some point prior to OS X 10.11, MIDI types were unified
- patchfiles-append patch-midifix.diff
-
- # see https://codereview.qt-project.org/#/c/127759/
- patchfiles-append patch-fix_sdk.diff
-
# UsingTheRightCompiler (https://trac.macports.org/wiki/UsingTheRightCompiler)
build.env-append CXX=${configure.cxx}
+ build.env-append CC=${configure.cc}
configure.args-append QMAKE_LINK=${configure.cxx}
}
# special case
+ if { ${subport} eq "${name}-qtsvg" } {
+ # install file in the correct location
+ patchfiles-append patch-example_install.diff
+ }
+
+ # special case
if { ${subport} eq "${name}-qtwebengine" || ${subport} eq "${name}-qtdeclarative" || ${subport} eq "${name}-qtwebkit" } {
# version 5.5.1 (at least) of qtwebengine must find a python version in the interval [2.7, 3)
# (see tools/qmake/mkspecs/features/functions.prf)
@@ -661,59 +779,6 @@
build.env-append PATH=${python_framework}/bin:$env(PATH)
}
- # detremint which variants are to be turned off
- set request_examples true
- set request_tests true
- set def_var ""
-
- set current_module [string range ${subport} [string length "${name}-"] end]
- # is subport a module or an SQL plugin?
- if { [info exists modules(${current_module})] } {
- # subport is a module
-
- set module_info $modules(${current_module})
-
- if { [lsearch -exact [lindex ${module_info} 7] "~universal"] != -1 } {
- universal_variant no
- }
-
- if { [lsearch -exact [lindex ${module_info} 7] "noarch"] != -1 } {
- supported_archs noarch
- universal_variant no
- }
-
- if { [lsearch -exact [lindex ${module_info} 7] "~debug"] != -1 } {
- set qt5_qmake_request_no_debug true
- }
-
- if { [lsearch -exact [lindex ${module_info} 7] "~examples"] != -1 } {
- set request_examples false
- }
-
- if { [lsearch -exact [lindex ${module_info} 7] "~tests"] != -1 } {
- set request_tests false
- }
-
- if { [lsearch -exact [lindex ${module_info} 7] "++examples"] != -1 } {
- set request_examples true
- lappend def_var "+examples"
- }
- } else {
- # subport is an SQL plugin
- }
-
- if { ${request_examples} } {
- variant examples description {Build examples} {}
- }
-
- if { ${request_tests} } {
- variant tests description {Enable tests} {}
- }
-
- if { ${def_var} ne "" } {
- default_variants-append ${def_var}
- }
-
# special case
if { ${subport} eq "${name}-qtwebkit-examples" && ![variant_isset examples] } {
# create a dummy file so the port can be successfully activated
@@ -744,11 +809,6 @@
}
}
- if { ${version} eq "5.5.1" } {
- incr revision 1
- }
- PortGroup qmake5 1.0
-
# special case
if { ${subport} eq "${name}-qtwebkit" } {
PortGroup cxx11 1.0
@@ -766,6 +826,11 @@
QMAKE_LFLAGS_CXX11-=-stdlib=libc++
}
+ # special case
+ if { ${subport} eq "${name}-qtserialbus" } {
+ PortGroup cxx11 1.0
+ }
+
# accommodating variant request varies depending on how qtbase was built
pre-configure {
@@ -821,9 +886,10 @@
# does not include certain parts
set building_qt5 1
PortGroup qt5 1.0
- PortGroup xcodeversion 1.0
- PortGroup cxx11 1.0
+ # In Qt 4.7, c++-11 support will be required
+ #PortGroup cxx11 1.0
+
if { ${os.platform} ne "darwin" } {
pre-fetch {
ui_warn "${subport} is untested on \"${os.platform}\"."
@@ -831,7 +897,7 @@
} elseif { ${os.major} < ${qt5_min_tested_version} } {
pre-fetch {
ui_error "OS X prior to 10.8 (Mountain Lion) is not a Reference Configuration for Qt."
- ui_error "OS X prior to 10.7 (Lion) is not even tested."
+ ui_error "OS X prior to 10.8 (Mountain Lion) is not even tested."
ui_error "See http://doc.qt.io/qt-5/supported-platforms.html#reference-configurations"
return -code error "unsupported OS"
}
@@ -859,14 +925,15 @@
conflicts qt3 qt3-mac
- minimum_xcodeversions {11 4.3}
-
# special case
- if { ${subport} ne "${name}-docs" } {
+ if { ${subport} eq "${name}-qtbase" } {
# https://codereview.qt-project.org/#/c/141654/
patchfiles-append patch-add_sdk.diff
+ # https://codereview.qt-project.org/#/c/124643/
+ patchfiles-append patch-fontfind.diff
+
# the build system automatically uses OpenGL frameworks (-framework OpenGL -framework AGL)
# the build system also uses pkgconfig to look for an OpenGL installation (gl.pc)
# if mesa is installed, the build system will try to use both OpenGL systems
@@ -874,15 +941,12 @@
# Undefined symbols: "_CGLGetCurrentContext"
patchfiles-append patch-configure.diff
- # see https://codereview.qt-project.org/#/c/126584/
- patchfiles-append patch-pcfiles.diff
- #https://codereview.qt-project.org/#/c/140876/
- patchfiles-append patch-stdloc.diff
+ # undo part of https://codereview.qt-project.org/#/c/140954/
+ # .pc files still needed by some port
+ # see https://github.com/Homebrew/legacy-homebrew/blob/master/Library/Formula/qt5.rb
+ patchfiles-append patch-pc_files.diff
- #https://codereview.qt-project.org/#/c/138349
- patchfiles-append patch-rpath.diff
-
#-----------------------------------------------------------------------------
# qtbase is used for:
# 1) building qtbase
@@ -943,12 +1007,6 @@
}
if { [variant_isset tests] } {
- # header file QtCore/private/qmachparser_p.h is included only if "defined(QT_BUILD_INTERNAL) && defined(Q_OF_MACH_O)"
- # code from header is used only "ifdef Q_OF_MACH_O"
- # the two must be consistent
- # assume the header include code is correct
- patchfiles-append patch-tst_qpluginloader.diff
-
if { ${configure.build_arch} eq "i386" || [variant_isset universal] } {
# see http://stackoverflow.com/questions/14506151/invalid-symbol-redefinition-in-inline-asm-on-llvm
# only runs test code on 32-bit systems
@@ -1018,11 +1076,14 @@
-no-gcov \
-force-pkg-config
+ # turn off CFG_CLOEXEC if gnulib is installed
+
# Third Party Libraries:
configure.args-append \
-system-zlib \
-no-mtdev \
-no-journald \
+ -no-syslog \
-system-libpng \
-system-libjpeg \
-system-freetype \
@@ -1040,6 +1101,9 @@
-no-alsa \
-no-gtkstyle
+ # from the configure script:
+ # NOTE: -optimized-tools is not useful in -release mode.
+
# Additional options:
configure.args-append \
{-make libs} \
@@ -1050,7 +1114,6 @@
-widgets \
-no-rpath \
-verbose \
- -optimized-qmake \
-nis \
-cups \
-iconv \
@@ -1060,14 +1123,17 @@
-fontconfig \
-strip \
-no-pch \
+ -no-ltcg \
-dbus-linked \
-no-use-gold-linker \
-no-separate-debug-info \
-no-xcb \
-no-eglfs \
+ -no-gbm \
-no-directfb \
-no-linuxfb \
-no-kms \
+ -no-mirclient \
-no-libinput \
-no-gstreamer \
-no-system-proxies
@@ -1169,24 +1235,24 @@
# special case
if { ${subport} eq "${name}-docs" } {
+ depends_build-append \
+ port:python27
+
+ set python_framework ${frameworks_dir}/Python.framework/Versions/2.7
+ configure.env-append PATH=${python_framework}/bin:$env(PATH)
+ build.env-append PATH=${python_framework}/bin:$env(PATH)
+
depends_lib-append \
path:${qt_bins_dir}/qdoc:${name}-qtbase \
path:${qt_plugins_dir}/sqldrivers/libqsqlite.dylib:${name}-sqlite-plugin \
path:${qt_bins_dir}/qhelpgenerator:${name}-qttools
post-extract {
- # For the most part, generated makefiles use ${prefix}/bin/qdoc.
- ln -s ${qt_bins_dir}/qdoc ${worksrcpath}/qtbase/bin/
-
- # Similarly, location of qhelpgenerator is expected in ${worksrcpath}
- xinstall -d -m 0755 ${worksrcpath}/qttools/bin/
+ # generated makefiles assume full Qt was built locally
+ xinstall -d -m 0755 ${worksrcpath}/qttools/bin/
+ ln -s ${qt_bins_dir}/qdoc ${worksrcpath}/qttools/bin/
ln -s ${qt_bins_dir}/qhelpgenerator ${worksrcpath}/qttools/bin/
-
- # Without this file, the makefile ${worksrcpath}/qtwebkit/Source/WebCore/Makefile.WebCore.Target
- # keeps generating itself over and over again.
- # This file is only created when the library is being built, however.
- xinstall -d -m 0755 ${worksrcpath}/qtwebkit/Source/WebCore/generated
- touch ${worksrcpath}/qtwebkit/Source/WebCore/generated/InspectorBackendCommands.qrc
+ ln -s ${qt_bins_dir}/rcc ${worksrcpath}/qtbase/bin/
}
}
Modified: trunk/dports/aqua/qt5/files/patch-add_sdk.diff
===================================================================
--- trunk/dports/aqua/qt5/files/patch-add_sdk.diff 2016-05-05 11:14:22 UTC (rev 148356)
+++ trunk/dports/aqua/qt5/files/patch-add_sdk.diff 2016-05-05 12:34:05 UTC (rev 148357)
@@ -19,7 +19,7 @@
index e238f8e..624366a 100644
--- mkspecs/features/mac/sdk.prf
+++ mkspecs/features/mac/sdk.prf
-@@ -43,7 +43,7 @@ QMAKE_INCDIR_OPENGL = $$sysrootified
+@@ -42,7 +42,7 @@ QMAKE_INCDIR_OPENGL = $$sysrootified
QMAKESPEC_NAME = $$basename(QMAKESPEC)
# Resolve SDK version of various tools
Modified: trunk/dports/aqua/qt5/files/patch-configure.diff
===================================================================
--- trunk/dports/aqua/qt5/files/patch-configure.diff 2016-05-05 11:14:22 UTC (rev 148356)
+++ trunk/dports/aqua/qt5/files/patch-configure.diff 2016-05-05 12:34:05 UTC (rev 148357)
@@ -1,6 +1,6 @@
--- configure.orig 2015-10-12 21:35:07.000000000 -0700
+++ configure 2015-10-18 12:19:26.000000000 -0700
-@@ -4230,7 +4230,7 @@
+@@ -4294,7 +4294,7 @@
local incdir_raw incdir_mod cflags
local libdir_raw libdir_mod libs
Added: trunk/dports/aqua/qt5/files/patch-example_install.diff
===================================================================
--- trunk/dports/aqua/qt5/files/patch-example_install.diff (rev 0)
+++ trunk/dports/aqua/qt5/files/patch-example_install.diff 2016-05-05 12:34:05 UTC (rev 148357)
@@ -0,0 +1,9 @@
+--- examples/svg/richtext/textobject/textobject.pro.orig 2016-01-19 01:50:20.000000000 -0700
++++ examples/svg/richtext/textobject/textobject.pro 2016-05-02 20:55:45.000000000 -0700
+@@ -13,5 +13,5 @@
+ INSTALLS += target
+
+ filesToDeploy.files = files/*.svg
+-filesToDeploy.path = files
++filesToDeploy.path = $$[QT_INSTALL_EXAMPLES]/svg/richtext/textobject/files
+ DEPLOYMENT += filesToDeploy
Deleted: trunk/dports/aqua/qt5/files/patch-fix_sdk.diff
===================================================================
--- trunk/dports/aqua/qt5/files/patch-fix_sdk.diff 2016-05-05 11:14:22 UTC (rev 148356)
+++ trunk/dports/aqua/qt5/files/patch-fix_sdk.diff 2016-05-05 12:34:05 UTC (rev 148357)
@@ -1,60 +0,0 @@
-From 146ebe26dce3289eb440bed7d5d0a7988ff5f5c9 Mon Sep 17 00:00:00 2001
-From: Sylvain Defresne <sdefresne at chromium.org>
-Date: Fri, 18 Sep 2015 22:18:57 +0200
-Subject: [PATCH] <tools/gyp> [Backport] Fallback to '.tbd' for system missing
- '.dylib'.
-
-With Xcode 7 the '.dylib' for system libraries are no longer present
-but instead only '.tbd' are shipped maybe in an effort to reduce the
-size of the SDK download.
-
-Change XcodeSettings._AdjustLibrary() to look for a '.tbd' file for
-system libraries (those whose path starts by "$(SDKROOT)"). Only do
-the substitution if the '.dylib' cannot be found and a '.tbd' file
-with the same path exists.
-
-BUG=517914
-R=justincohen at chromium.org, mark at chromium.org
-
-Review URL: https://codereview.chromium.org/1275133004 .
-
-Patch from Sylvain Defresne <sdefresne at chromium.org>.
-
-Change-Id: I8e81340b1258501a2e5f4952c606ae7204b0d74f
-Reviewed-by: Kai Koehne <kai.koehne at theqtcompany.com>
----
- chromium/tools/gyp/pylib/gyp/xcode_emulation.py | 18 +++++++++++++++++-
- 1 file changed, 17 insertions(+), 1 deletion(-)
-
-diff --git a/chromium/tools/gyp/pylib/gyp/xcode_emulation.py b/chromium/tools/gyp/pylib/gyp/xcode_emulation.py
-index ac5ffea..14bd7a9 100644
---- src/3rdparty/chromium/tools/gyp/pylib/gyp/xcode_emulation.py
-+++ src/3rdparty/chromium/tools/gyp/pylib/gyp/xcode_emulation.py
-@@ -1006,7 +1006,23 @@ class XcodeSettings(object):
- sdk_root = self._SdkPath(config_name)
- if not sdk_root:
- sdk_root = ''
-- return l.replace('$(SDKROOT)', sdk_root)
-+ # Xcode 7 started shipping with ".tbd" (text based stubs) files instead of
-+ # ".dylib" without providing a real support for them. What it does, for
-+ # "/usr/lib" libraries, is do "-L/usr/lib -lname" which is dependent on the
-+ # library order and cause collision when building Chrome.
-+ #
-+ # Instead substitude ".tbd" to ".dylib" in the generated project when the
-+ # following conditions are both true:
-+ # - library is referenced in the gyp file as "$(SDKROOT)/**/*.dylib",
-+ # - the ".dylib" file does not exists but a ".tbd" file do.
-+ library = l.replace('$(SDKROOT)', sdk_root)
-+ if l.startswith('$(SDKROOT)'):
-+ basename, ext = os.path.splitext(library)
-+ if ext == '.dylib' and not os.path.exists(library):
-+ tbd_library = basename + '.tbd'
-+ if os.path.exists(tbd_library):
-+ library = tbd_library
-+ return library
-
- def AdjustLibraries(self, libraries, config_name=None):
- """Transforms entries like 'Cocoa.framework' in libraries into entries like
---
-2.4.9 (Apple Git-60)
-
Added: trunk/dports/aqua/qt5/files/patch-fontfind.diff
===================================================================
--- trunk/dports/aqua/qt5/files/patch-fontfind.diff (rev 0)
+++ trunk/dports/aqua/qt5/files/patch-fontfind.diff 2016-05-05 12:34:05 UTC (rev 148357)
@@ -0,0 +1,66 @@
+From: Thiago Macieira <thiago.macieira at intel.com>
+Date: Sat, 29 Aug 2015 00:25:28 +0000 (-0700)
+Subject: OS X: Fix build when system-freetype is detected
+X-Git-Url: https://codereview.qt-project.org/gitweb?p=qt%2Fqtbase.git;a=commitdiff_plain;h=a9599be2d86dd534f37b46ab38a970ad88619c08;hp=2baeeb4026e55955a329480b2550a4353291f8ca
+
+OS X: Fix build when system-freetype is detected
+
+We need to pass the correct include paths that configure detected.
+
+Change-Id: I9832b93d3f2a07776f793c92355d764603d48c0d
+---
+
+diff --git a/config.tests/unix/freetype/freetype.pri b/config.tests/unix/freetype/freetype.pri
+index 05299ed..93d09e3 100644
+--- config.tests/unix/freetype/freetype.pri
++++ config.tests/unix/freetype/freetype.pri
+@@ -1,4 +1,4 @@
+-!cross_compile {
++!cross_compile:isEmpty(QMAKE_CFLAGS_FONTCONFIG) {
+ TRY_INCLUDEPATHS = /include /usr/include $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
+ # LSB doesn't allow using headers from /include or /usr/include
+ linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
+@@ -10,6 +10,15 @@
+ } else {
+ # If we are cross-compiling, then there is still a remote possibility that
+ # configure detected font-config & freetype, stored in these variables.
+- QMAKE_CFLAGS += $$QMAKE_CFLAGS_FONTCONFIG
+- QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_FONTCONFIG
++ for(i, QMAKE_CFLAGS_FONTCONFIG) {
++ contains(i, "-I.*") {
++ i ~= s/^-I//
++ INCLUDEPATH += $$i
++ } else {
++ QMAKE_CFLAGS += $$i
++ QMAKE_CXXFLAGS += $$i
++ }
++ }
+ }
++
++LIBS += $$QMAKE_LIBS_FONTCONFIG
+\ No newline at end of file
+diff --git a/src/platformsupport/fontdatabases/mac/coretext.pri b/src/platformsupport/fontdatabases/mac/coretext.pri
+index ebb64d1..3e64f94 100644
+--- src/platformsupport/fontdatabases/mac/coretext.pri
++++ src/platformsupport/fontdatabases/mac/coretext.pri
+@@ -1,7 +1,7 @@
+ HEADERS += $$PWD/qcoretextfontdatabase_p.h $$PWD/qfontengine_coretext_p.h
+ OBJECTIVE_SOURCES += $$PWD/qfontengine_coretext.mm $$PWD/qcoretextfontdatabase.mm
+
+-contains(QT_CONFIG, freetype) {
++contains(QT_CONFIG, freetype)|contains(QT_CONFIG, system-freetype) {
+ include($$QT_SOURCE_TREE/src/3rdparty/freetype_dependency.pri)
+ HEADERS += $$QT_SOURCE_TREE/src/gui/text/qfontengine_ft_p.h
+ SOURCES += $$QT_SOURCE_TREE/src/gui/text/qfontengine_ft.cpp
+diff --git a/src/plugins/platforms/cocoa/cocoa.pro b/src/plugins/platforms/cocoa/cocoa.pro
+index ba0e6b0..f6c2bdb 100644
+--- src/plugins/platforms/cocoa/cocoa.pro
++++ src/plugins/platforms/cocoa/cocoa.pro
+@@ -85,6 +85,7 @@ contains(QT_CONFIG, opengl.*) {
+ RESOURCES += qcocoaresources.qrc
+
+ LIBS += -framework Cocoa -framework Carbon -framework IOKit -lcups
++CONFIG += qpa/basicunixfontdatabase
+
+ QT += core-private gui-private platformsupport-private
+
Copied: trunk/dports/aqua/qt5/files/patch-icu.diff (from rev 148025, trunk/dports/aqua/qt5/files/patch-icu.pro.diff)
===================================================================
--- trunk/dports/aqua/qt5/files/patch-icu.diff (rev 0)
+++ trunk/dports/aqua/qt5/files/patch-icu.diff 2016-05-05 12:34:05 UTC (rev 148357)
@@ -0,0 +1,38 @@
+--- Tools/qmake/config.tests/icu/icu.pro.orig 2015-07-16 11:45:20.000000000 -0700
++++ Tools/qmake/config.tests/icu/icu.pro 2015-07-16 11:46:05.000000000 -0700
+@@ -14,6 +14,7 @@
+ LIBS += -licuin -licuuc -licudt
+ }
+ } else:!contains(QT_CONFIG,no-pkg-config):packagesExist("icu-i18n") {
++ CONFIG += link_pkgconfig
+ PKGCONFIG += icu-i18n
+ } else {
+ LIBS += -licui18n -licuuc -licudata
+--- Source/WTF/WTF.pri.orig 2015-10-12 21:37:08.000000000 -0700
++++ Source/WTF/WTF.pri 2016-05-04 04:22:48.000000000 -0700
+@@ -9,10 +9,8 @@
+ INCLUDEPATH += $$PWD
+
+ mac {
+- # Mac OS does ship libicu but not the associated header files.
+- # Therefore WebKit provides adequate header files.
+- INCLUDEPATH = $${ROOT_WEBKIT_DIR}/Source/WTF/icu $$INCLUDEPATH
+- LIBS += -licucore
++ CONFIG += link_pkgconfig
++ PKGCONFIG *= icu-i18n
+ } else:!use?(wchar_unicode): {
+ win32 {
+ CONFIG(static, static|shared) {
+--- Source/WebCore/Target.pri.orig 2015-10-12 21:37:22.000000000 -0700
++++ Source/WebCore/Target.pri 2016-05-04 09:47:10.000000000 -0700
+@@ -2986,9 +2986,7 @@
+ }
+
+ mac {
+- # For Mac we use the same SmartReplace implementation as the Apple port.
+- SOURCES += editing/SmartReplaceCF.cpp
+- INCLUDEPATH += $$PWD/icu
++ SOURCES += editing/SmartReplaceICU.cpp
+ } else {
+ SOURCES += editing/SmartReplaceICU.cpp
+ }
Deleted: trunk/dports/aqua/qt5/files/patch-icu.pro.diff
===================================================================
--- trunk/dports/aqua/qt5/files/patch-icu.pro.diff 2016-05-05 11:14:22 UTC (rev 148356)
+++ trunk/dports/aqua/qt5/files/patch-icu.pro.diff 2016-05-05 12:34:05 UTC (rev 148357)
@@ -1,10 +0,0 @@
---- Tools/qmake/config.tests/icu/icu.pro.orig 2015-07-16 11:45:20.000000000 -0700
-+++ Tools/qmake/config.tests/icu/icu.pro 2015-07-16 11:46:05.000000000 -0700
-@@ -14,6 +14,7 @@
- LIBS += -licuin -licuuc -licudt
- }
- } else:!contains(QT_CONFIG,no-pkg-config):packagesExist("icu-i18n") {
-+ CONFIG += link_pkgconfig
- PKGCONFIG += icu-i18n
- } else {
- LIBS += -licui18n -licuuc -licudata
Deleted: trunk/dports/aqua/qt5/files/patch-midifix.diff
===================================================================
--- trunk/dports/aqua/qt5/files/patch-midifix.diff 2016-05-05 11:14:22 UTC (rev 148356)
+++ trunk/dports/aqua/qt5/files/patch-midifix.diff 2016-05-05 12:34:05 UTC (rev 148357)
@@ -1,25 +0,0 @@
---- .//src/3rdparty/chromium/media/midi/midi_manager_mac.cc.orig 2015-10-12 21:36:43.000000000 -0700
-+++ .//src/3rdparty/chromium/media/midi/midi_manager_mac.cc 2015-11-11 09:31:28.000000000 -0700
-@@ -17,10 +17,6 @@
- using base::SysCFStringRefToUTF8;
- using std::string;
-
--// NB: System MIDI types are pointer types in 32-bit and integer types in
--// 64-bit. Therefore, the initialization is the simplest one that satisfies both
--// (if possible).
--
- namespace media {
-
- namespace {
-@@ -206,11 +202,7 @@
- // This method is called on a separate high-priority thread owned by CoreMIDI.
-
- MidiManagerMac* manager = static_cast<MidiManagerMac*>(read_proc_refcon);
--#if __LP64__
- MIDIEndpointRef source = reinterpret_cast<uintptr_t>(src_conn_refcon);
--#else
-- MIDIEndpointRef source = static_cast<MIDIEndpointRef>(src_conn_refcon);
--#endif
-
- // Dispatch to class method.
- manager->ReadMidi(source, packet_list);
Modified: trunk/dports/aqua/qt5/files/patch-mkspecs.diff
===================================================================
--- trunk/dports/aqua/qt5/files/patch-mkspecs.diff 2016-05-05 11:14:22 UTC (rev 148356)
+++ trunk/dports/aqua/qt5/files/patch-mkspecs.diff 2016-05-05 12:34:05 UTC (rev 148357)
@@ -1,13 +1,11 @@
---- .//mkspecs/common/clang-mac.conf.orig 2016-01-08 05:58:40.000000000 -0700
-+++ .//mkspecs/common/clang-mac.conf 2016-01-08 06:01:16.000000000 -0700
-@@ -6,5 +6,7 @@
+--- mkspecs/common/clang-mac.conf.orig 2016-01-08 05:58:40.000000000 -0700
++++ mkspecs/common/clang-mac.conf 2016-01-08 06:01:16.000000000 -0700
+@@ -6,5 +6,5 @@
QMAKE_XCODE_GCC_VERSION = com.apple.compilers.llvm.clang.1_0
--QMAKE_CXXFLAGS_CXX11 += -stdlib=libc++
--QMAKE_LFLAGS_CXX11 += -stdlib=libc++
-+QMAKE_CXXFLAGS_CXX11 += -stdlib=__MACPORTS__CXX_STDLIB__
-+QMAKE_LFLAGS_CXX11 += -stdlib=__MACPORTS__CXX_STDLIB__
+-QMAKE_CXXFLAGS += -stdlib=libc++
+-QMAKE_LFLAGS += -stdlib=libc++
+QMAKE_CXXFLAGS += -stdlib=__MACPORTS__CXX_STDLIB__
+QMAKE_LFLAGS += -stdlib=__MACPORTS__CXX_STDLIB__
--- mkspecs/macx-clang/qmake.conf.orig 2016-01-08 05:56:17.000000000 -0700
@@ -20,8 +18,8 @@
+QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
load(qt_config)
---- .//mkspecs/macx-clang-32/qmake.conf.orig 2016-01-08 05:56:36.000000000 -0700
-+++ .//mkspecs/macx-clang-32/qmake.conf 2016-01-08 06:02:20.000000000 -0700
+--- mkspecs/macx-clang-32/qmake.conf.orig 2016-01-08 05:56:36.000000000 -0700
++++ mkspecs/macx-clang-32/qmake.conf 2016-01-08 06:02:20.000000000 -0700
@@ -11,7 +11,7 @@
include(../common/clang.conf)
include(../common/clang-mac.conf)
@@ -30,4 +28,4 @@
+QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
QMAKE_CFLAGS += -arch i386
- QMAKE_OBJECTIVE_CFLAGS += -arch i386
+ QMAKE_CXXFLAGS += -arch i386
Added: trunk/dports/aqua/qt5/files/patch-no_qtwebkit.diff
===================================================================
--- trunk/dports/aqua/qt5/files/patch-no_qtwebkit.diff (rev 0)
+++ trunk/dports/aqua/qt5/files/patch-no_qtwebkit.diff 2016-05-05 12:34:05 UTC (rev 148357)
@@ -0,0 +1,20 @@
+--- src/assistant/assistant/assistant.pro.orig 2016-02-26 03:07:22.000000000 -0700
++++ src/assistant/assistant/assistant.pro 2016-05-04 16:32:44.000000000 -0700
+@@ -1,8 +1,4 @@
+-qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) {
+- BROWSER = qtwebkit
+-} else {
+ BROWSER = qtextbrowser
+-}
+
+ QT += widgets network help sql help
+ qtHaveModule(printsupport): QT += printsupport
+--- src/designer/src/plugins/plugins.pro.orig 2016-02-26 03:07:22.000000000 -0700
++++ src/designer/src/plugins/plugins.pro 2016-05-04 16:32:21.000000000 -0700
+@@ -1,6 +1,5 @@
+ TEMPLATE = subdirs
+
+ # qtHaveModule(opengl): SUBDIRS += tools/view3d
+-qtHaveModule(webkitwidgets): SUBDIRS += qwebview
+ win32: qtHaveModule(axcontainer): SUBDIRS += activeqt
+ qtHaveModule(quickwidgets): SUBDIRS += qquickwidget
Added: trunk/dports/aqua/qt5/files/patch-objc.diff
===================================================================
--- trunk/dports/aqua/qt5/files/patch-objc.diff (rev 0)
+++ trunk/dports/aqua/qt5/files/patch-objc.diff 2016-05-05 12:34:05 UTC (rev 148357)
@@ -0,0 +1,11 @@
+--- Source/WTF/wtf/Compiler.h.orig 2015-10-12 21:37:08.000000000 -0700
++++ Source/WTF/wtf/Compiler.h 2016-05-02 17:07:10.000000000 -0700
+@@ -315,7 +315,7 @@
+ #ifdef __OBJC__
+ #define OBJC_CLASS @class
+ #else
+-#define OBJC_CLASS class
++#define OBJC_CLASS typedef struct objc_object
+ #endif
+ #endif
+
Added: trunk/dports/aqua/qt5/files/patch-pc_files.diff
===================================================================
--- trunk/dports/aqua/qt5/files/patch-pc_files.diff (rev 0)
+++ trunk/dports/aqua/qt5/files/patch-pc_files.diff 2016-05-05 12:34:05 UTC (rev 148357)
@@ -0,0 +1,15 @@
+Partially reverts <https://codereview.qt-project.org/#/c/140954/>.
+
+diff --git i/qtbase/mkspecs/features/qt_module.prf w/qtbase/mkspecs/features/qt_module.prf
+index bb28af97..36bb6483 100644
+--- mkspecs/features/qt_module.prf
++++ mkspecs/features/qt_module.prf
+@@ -245,7 +245,7 @@ load(qt_installs)
+ load(qt_targets)
+
+ # this builds on top of qt_common
+-!internal_module:!lib_bundle:if(unix|mingw) {
++!internal_module:if(unix|mingw) {
+ CONFIG += create_pc
+ QMAKE_PKGCONFIG_DESTDIR = pkgconfig
+ host_build: \
Deleted: trunk/dports/aqua/qt5/files/patch-pcfiles.diff
===================================================================
--- trunk/dports/aqua/qt5/files/patch-pcfiles.diff 2016-05-05 11:14:22 UTC (rev 148356)
+++ trunk/dports/aqua/qt5/files/patch-pcfiles.diff 2016-05-05 12:34:05 UTC (rev 148357)
@@ -1,38 +0,0 @@
-From 3964b683f849baade1576ea2f50aab631970df58 Mon Sep 17 00:00:00 2001
-From: Martin Afanasjew <martin at afanasjew.de>
-Date: Sun, 27 Sep 2015 14:39:06 +0200
-Subject: [PATCH] qmake: Fix 'Libs:' line in .pc files on OS X
-
-On OS X with a framework-based build of Qt, the 'Libs:' line of the
-.pc files generated by `qmake` references the framework. This requires
-two separate arguments to the linker: The fixed string '-framework' and
-the name of the framework (e.g. 'QtCore'). Only the latter might need
-quoting. Prior to this fix, they were treated as a single argument (e.g.
-'-framework QtCore'), thus always quoted because of the contained space,
-and later lead to errors when trying to link a Qt framework discovered
-via `pkg-config`.
-
-Change-Id: I5c11ee651048832007e2ee4ebcbcf2e3212c8f48
-Task-number: QTBUG-47162
-Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen at theqtcompany.com>
----
- qmake/generators/makefile.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index 4a03faf..7d4026c 100644
---- qmake/generators/makefile.cpp
-+++ qmake/generators/makefile.cpp
-@@ -3253,7 +3253,8 @@ MakefileGenerator::writePkgConfigFile()
- int suffix = bundle.lastIndexOf(".framework");
- if (suffix != -1)
- bundle = bundle.left(suffix);
-- pkgConfiglibName = "-framework " + bundle + " ";
-+ t << "-framework ";
-+ pkgConfiglibName = bundle.toQString();
- } else {
- if (!project->values("QMAKE_DEFAULT_LIBDIRS").contains(libDir))
- t << "-L${libdir} ";
---
-2.4.9 (Apple Git-60)
-
Deleted: trunk/dports/aqua/qt5/files/patch-qtwebengine32.diff
===================================================================
--- trunk/dports/aqua/qt5/files/patch-qtwebengine32.diff 2016-05-05 11:14:22 UTC (rev 148356)
+++ trunk/dports/aqua/qt5/files/patch-qtwebengine32.diff 2016-05-05 12:34:05 UTC (rev 148357)
@@ -1,28 +0,0 @@
-From 1e4a0d70224cf48ae9834858848a5d68fd0a96c5 Mon Sep 17 00:00:00 2001
-From: Joerg Bornemann <joerg.bornemann at theqtcompany.com>
-Date: Thu, 17 Sep 2015 17:09:50 +0200
-Subject: [PATCH] enable OS X 32 bit build
-
-Task-number: QTBUG-48228
-Change-Id: Ic8ee640316b95b2e7e2de9115330821dfae0e905
-Reviewed-by: Kai Koehne <kai.koehne at theqtcompany.com>
----
- tools/qmake/mkspecs/features/functions.prf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
-index ef0320d..69d3fd3 100644
---- tools/qmake/mkspecs/features/functions.prf
-+++ tools/qmake/mkspecs/features/functions.prf
-@@ -14,7 +14,7 @@ defineTest(isPlatformSupported) {
-
- linux-g++*:!isGCCVersionSupported(): return(false)
- !isPythonVersionSupported(): return(false)
-- linux-g++*|win32-msvc2013|macx-clang: return(true)
-+ linux-g++*|win32-msvc2013|macx-clang*: return(true)
- boot2qt: return(true)
-
- skipBuild("Qt WebEngine can currently only be built for Linux (GCC), Windows (MSVC 2013), OS X (XCode 5.1+) or Qt for Device Creation.")
---
-2.4.9 (Apple Git-60)
-
Deleted: trunk/dports/aqua/qt5/files/patch-rpath.diff
===================================================================
--- trunk/dports/aqua/qt5/files/patch-rpath.diff 2016-05-05 11:14:22 UTC (rev 148356)
+++ trunk/dports/aqua/qt5/files/patch-rpath.diff 2016-05-05 12:34:05 UTC (rev 148357)
@@ -1,64 +0,0 @@
-From 6c222297ab19e1bc6b74c4290446c1cb61f6fda8 Mon Sep 17 00:00:00 2001
-From: Martin Afanasjew <martin at afanasjew.de>
-Date: Mon, 19 Oct 2015 23:52:10 +0200
-Subject: [PATCH] Make -no-rpath build more useful on Apple platforms
-
-[ChangeLog][Platform Specific Changes][OS X] Configure with -no-rpath
-will now yield Qt dynamic libraries and frameworks with an absolute
-install name (based in -libdir).
-
-OS X package managers like Homebrew install Qt in a fixed location. This
-change simplifies deployment for such package managers and is consistent
-with the default expectation on Apple platforms for libraries with a
-fixed location to also have absolute install names.
-
-While a relocatable installation (the default) also works in this
-scenario, it requires all software that depends on Qt to be aware of
-this and to embed a suitable RPATH into application binaries (which is
-not automatic for non-qmake builds). This might not be true for some
-select fallback search locations, but as package managers on OS X tend
-not to use those, embedding an RPATH becomes practically mandatory. In a
-default Homebrew installation, Qt is configured such that the frameworks
-end up in /usr/local/Cellar/qt5/<version>/lib and that will be later
-symlinked to /usr/local/opt/qt5/lib, both of which are not searched by
-the dynamic linker by default.
-
-Task-number: QTBUG-48958
-Change-Id: I4395df98771e06a2ce8a293d11dc755bdc50757f
-Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen at theqtcompany.com>
----
- configure | 4 +++-
- mkspecs/features/qt_module.prf | 2 ++
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/configure b/configure
-index cea62fb..c29c113 100755
---- configure
-+++ configure
-@@ -2557,7 +2557,9 @@ Additional options:
- -l <string> ........ Add an explicit library.
-
- -no-rpath .......... Do not use the library install path as a runtime
-- library path.
-+ library path. On Apple platforms, this implies using
-+ absolute install names (based in -libdir) for dynamic
-+ libraries and frameworks.
- + -rpath ............. Link Qt libraries and executables using the library
- install path as a runtime library path. Equivalent
- to -R install_libpath
-diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
-index c89b6d2..f187b85 100644
---- mkspecs/features/qt_module.prf
-+++ mkspecs/features/qt_module.prf
-@@ -135,6 +135,8 @@ mac {
-
- contains(QT_CONFIG, rpath): \
- QMAKE_SONAME_PREFIX = @rpath
-+ else: \
-+ CONFIG += absolute_library_soname
- }
-
- DEFINES += QT_BUILDING_QT
---
-2.6.2.2.g1b5ffa3
-
Deleted: trunk/dports/aqua/qt5/files/patch-stdloc.diff
===================================================================
--- trunk/dports/aqua/qt5/files/patch-stdloc.diff 2016-05-05 11:14:22 UTC (rev 148356)
+++ trunk/dports/aqua/qt5/files/patch-stdloc.diff 2016-05-05 12:34:05 UTC (rev 148357)
@@ -1,29 +0,0 @@
-From bc7d0da741d1bc2ab2d36227d40d255c692a6fa5 Mon Sep 17 00:00:00 2001
-From: Andrew McCann <amccann at gmail.com>
-Date: Sun, 15 Nov 2015 16:29:47 -0800
-Subject: [PATCH] OS X: Fix QStandardPaths::standardLocations()
-
-Task-number: QTBUG-49443
-Change-Id: I0699dfd3cb4c710ab96c324219444c6294c9d732
-Reviewed-by: Jake Petroules <jake.petroules at theqtcompany.com>
-Reviewed-by: Milian Wolff <milian.wolff at kdab.com>
----
- src/corelib/io/qstandardpaths_mac.mm | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/corelib/io/qstandardpaths_mac.mm b/src/corelib/io/qstandardpaths_mac.mm
-index d6126ce..7b97a03 100644
---- src/corelib/io/qstandardpaths_mac.mm
-+++ src/corelib/io/qstandardpaths_mac.mm
-@@ -204,7 +204,7 @@ QStringList QStandardPaths::standardLocations(StandardLocation type)
- CFRelease(bundleUrl);
-
- CFURLRef resourcesUrl = CFBundleCopyResourcesDirectoryURL(mainBundle);
-- CFStringRef cfResourcesPath = CFURLCopyPath(bundleUrl);
-+ CFStringRef cfResourcesPath = CFURLCopyPath(resourcesUrl);
- QString resourcesPath = QCFString::toQString(cfResourcesPath);
- CFRelease(cfResourcesPath);
- CFRelease(resourcesUrl);
---
-2.6.2.2.g1b5ffa3
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160505/99bc2b72/attachment-0001.html>
More information about the macports-changes
mailing list