<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/2b8aaeb9c4745261501b06770f7b8e05a09559cd">https://github.com/macports/macports-ports/commit/2b8aaeb9c4745261501b06770f7b8e05a09559cd</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 2b8aaeb qt5-qtcreator: update version 4.2.1->4.3.1
</span>2b8aaeb is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2b8aaeb9c4745261501b06770f7b8e05a09559cd
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Tue Jul 11 20:22:12 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5-qtcreator: update version 4.2.1->4.3.1
</span>---
devel/qt5-qtcreator/Portfile | 39 ++++++++++++++++++++++++---------------
1 file changed, 24 insertions(+), 15 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qt5-qtcreator/Portfile b/devel/qt5-qtcreator/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 30a4001..096d31e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/qt5-qtcreator/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/qt5-qtcreator/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@ if { ${subport} eq ${name} } {
</span> }
PortGroup qmake5 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.2.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.3.1
</span> #revision 0
categories devel aqua
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,20 +24,26 @@ homepage http://qt-project.org/wiki/Category:Tools::QtCreator
</span> distname qt-creator-opensource-src-${version}
master_sites https://download.qt.io/official_releases/qtcreator/[join [lrange [split ${version} .] 0 1] .]/${version}/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 174ccebd65904a31674cbfdddabc1c14dd4bf16c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2537c2fcd127136241d0bf3bf9e1f03cf35be1a24414479d5502a7539ca25a38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 200b302418f4e0387df1713326ff78be099668f2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 db43c796adf11f02fd22d01820678cd118fc5bd9a7bb5d2d76ed0f86e0dd8a69
</span>
# qtcreator does not depend directly on openssl
# qtcreator links against QtNetwork.framework, and any OpenSSL functionality
# used is through QtNetwork
license_noconflict openssl
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# avoid make[4]: write error
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_parallel_build no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if { ${subport} eq ${name} } {
qt5.depends_component qtscript qtdeclarative qttools qtmacextras qtquickcontrols qtsvg
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #depends_lib-append port:botan
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #configure.args-append "USE_SYSTEM_BOTAN=1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:botan
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append "USE_SYSTEM_BOTAN=1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:qbs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append "QBS_INSTALL_DIR=${prefix}"
</span>
# do not opportunistically use QtWebengine
patchfiles-append patch-no_qtwebengine.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,10 +79,10 @@ if { ${subport} eq ${name} } {
</span> # "${qt_apps_dir}/Qt Creator.app/Contents/Resources/QtProject/qtcreator/qtversion.xml"
# "${qt_apps_dir}/Qt Creator.app/Contents/Resources/QtProject/qtcreator/profiles.xml"
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # from the installer.dat file, it seems the following are run by the binary installer of Qt Creator version 5.7.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see http://code.qt.io/cgit/qtsdk/qtsdk.git/tree/packaging-tools/configurations/pkg_templates/pkg_57/qt.57.clang_64/meta/installscript.qs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # sdktool addQt --id qt.57.clang_64 --name "Qt %{Qt:Version} clang 64bit" --type Qt4ProjectManager.QtVersion.Desktop --qmake qmakeBinary
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # sdktool addKit --id qt.57.clang_64_kit --name "Desktop Qt %{Qt:Version} clang 64bit" --toolchain x86-macos-generic-mach_o-64bit --qt qt.57.clang_64 --debuggerengine 256 --devicetype Desktop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # from the installer.dat file, it seems the following are run by the binary installer of Qt Creator version 5.9.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see http://code.qt.io/cgit/qtsdk/qtsdk.git/tree/packaging-tools/configurations/pkg_templates/pkg_59/qt.59.clang_64/meta/installscript.qs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # sdktool addQt --id qt.59.clang_64 --name "Qt %{Qt:Version} clang 64bit" --type Qt4ProjectManager.QtVersion.Desktop --qmake qmakeBinary
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # sdktool addKit --id qt.59.clang_64_kit --name "Desktop Qt %{Qt:Version} clang 64bit" --Ctoolchain x86-macos-generic-mach_o-64bit --Cxxtoolchain x86-macos-generic-mach_o-64bit --qt qt.59.clang_64 --debuggerengine 256 --devicetype Desktop
</span> #
# modify for our purposes
#
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -117,7 +123,8 @@ if { ${subport} eq ${name} } {
</span> addKit \
--id qt.5.macports_${arch}_kit \
--name "Desktop Qt %{Qt:Version} from MacPorts ${arch}" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --toolchain x86-macos-generic-mach_o-${toolchain_bit}bit \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --Ctoolchain x86-macos-generic-mach_o-${toolchain_bit}bit \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --Cxxtoolchain x86-macos-generic-mach_o-${toolchain_bit}bit \
</span> --qt qt.5.macports \
--debuggerengine 256 \
--devicetype Desktop \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -142,7 +149,8 @@ if { ${subport} eq ${name} } {
</span> addKit \
--id qt.5.macports_${build_arch}_kit \
--name "Desktop Qt %{Qt:Version} from MacPorts ${build_arch}" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --toolchain x86-macos-generic-mach_o-${toolchain_bit}bit \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --Ctoolchain x86-macos-generic-mach_o-${toolchain_bit}bit \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --Cxxtoolchain x86-macos-generic-mach_o-${toolchain_bit}bit \
</span> --qt qt.5.macports \
--debuggerengine 256 \
--devicetype Desktop \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -171,11 +179,12 @@ subport ${name}-docs {
</span> build.target docs
destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${qt_apps_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy "${worksrcpath}/bin/Qt Creator.app" "${destroot}${qt_apps_dir}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> xinstall -m 755 -d ${destroot}${qt_docs_dir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/doc/html ${worksrcpath}/doc/html-dev ${destroot}${qt_docs_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach dir "qtcreator qtcreator-dev" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 "${worksrcpath}/bin/Qt Creator.app/Contents/Resources/doc/${dir}.qch" ${destroot}${qt_docs_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/doc/${dir} ${destroot}${qt_docs_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
</pre><pre style='margin:0'>
</pre>