<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/7b1be9c4aa611ed7790a89a1be41c1f7baba853f">https://github.com/macports/macports-ports/commit/7b1be9c4aa611ed7790a89a1be41c1f7baba853f</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 7b1be9c qt5-qtcreator: update version 4.1.0->4.2.1
</span>7b1be9c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7b1be9c4aa611ed7790a89a1be41c1f7baba853f
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Fri Mar 17 19:53:21 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5-qtcreator: update version 4.1.0->4.2.1
</span>---
devel/qt5-qtcreator/Portfile | 31 ++++++++----------
.../qt5-qtcreator/files/patch-no_qtwebengine.diff | 8 ++---
devel/qt5-qtcreator/files/patch-no_qtwebkit.diff | 38 ----------------------
3 files changed, 18 insertions(+), 59 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 745e2a2..30a4001 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;'>@@ -5,11 +5,11 @@ PortSystem 1.0
</span> name qt5-qtcreator
if { ${subport} eq ${name} } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup muniversal 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup muniversal 1.0
</span> }
PortGroup qmake5 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.2.1
</span> #revision 0
categories devel aqua
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,31 +24,28 @@ 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 aad5f1096cf038b23969c6677cb4094515eaaa48 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 412c0223dbfd86983b39e10e2c7cb42b530995cfe2f3aa3529ea3f1b00ffb403
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 174ccebd65904a31674cbfdddabc1c14dd4bf16c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2537c2fcd127136241d0bf3bf9e1f03cf35be1a24414479d5502a7539ca25a38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# qtcreator does not depend directly on openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# qtcreator links against QtNetwork.framework, and any OpenSSL functionality
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# used is through QtNetwork
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license_noconflict openssl
</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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # do not opportunistically use QtWebkit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-no_qtwebkit.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #depends_lib-append port:botan
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #configure.args-append "USE_SYSTEM_BOTAN=1"
</span>
# do not opportunistically use QtWebengine
patchfiles-append patch-no_qtwebengine.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant qtwebkit description {build with QtWebkit support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-delete patch-no_qtwebkit.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qt5.depends_component qtwebkit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # qtwebengine does not have a universal build
variant qtwebengine conflicts universal description {build with QtWebengine support} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-delete patch-no_qtwebkit.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qt5.depends_component qtwebengine
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-delete patch-no_qtwebengine.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5.depends_component qtwebengine qtwebchannel
</span> }
if { ![variant_isset universal] } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,7 +73,7 @@ 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.0
</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.7.1
</span> # see http://code.qt.io/cgit/qtsdk/qtsdk.git/tree/packaging-tools/configurations/pkg_templates/pkg_57/qt.57.clang_64/meta/installscript.qs
# sdktool addQt --id qt.57.clang_64 --name "Qt %{Qt:Version} clang 64bit" --type Qt4ProjectManager.QtVersion.Desktop --qmake qmakeBinary
# 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 style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qt5-qtcreator/files/patch-no_qtwebengine.diff b/devel/qt5-qtcreator/files/patch-no_qtwebengine.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d634f48..170699a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/qt5-qtcreator/files/patch-no_qtwebengine.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/qt5-qtcreator/files/patch-no_qtwebengine.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/plugins/help/help.pro.orig 2016-06-06 06:26:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/plugins/help/help.pro 2016-06-14 17:50:01.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -61,13 +61,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/plugins/help/help.pro.orig 2016-12-09 02:55:44.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/plugins/help/help.pro 2016-12-27 21:26:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -58,13 +58,6 @@
</span> generalsettingspage.ui \
remotehelpfilter.ui
<span style='display:block; white-space:pre;background:#ffe0e0;'>--!isEmpty(QT.webenginewidgets.name):minQtVersion(5, 6, 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-!isEmpty(QT.webenginewidgets.name) {
</span> - QT += webenginewidgets
- HEADERS += webenginehelpviewer.h
- SOURCES += webenginehelpviewer.cpp
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qt5-qtcreator/files/patch-no_qtwebkit.diff b/devel/qt5-qtcreator/files/patch-no_qtwebkit.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5722ec0..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/qt5-qtcreator/files/patch-no_qtwebkit.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,38 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/plugins/help/help.pro.orig 2016-03-08 04:30:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/plugins/help/help.pro 2016-05-06 16:50:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,7 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QT += help network printsupport sql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--!isEmpty(QT.htmlviewwidgets.name): QT += htmlviewwidgets htmlview
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--else:!isEmpty(QT.webkitwidgets.name): QT += webkitwidgets webkit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--else: DEFINES += QT_NO_WEBKIT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+DEFINES += QT_NO_WEBKIT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INCLUDEPATH += $$PWD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/plugins/help/help.qbs.orig 2016-03-08 04:30:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/plugins/help/help.qbs 2016-05-06 16:49:33.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5,14 +5,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Depends { name: "Qt"; submodules: ["help", "network", "sql"]; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Depends { name: "Qt.printsupport" }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Depends {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- name: "Qt.webkit"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- required: false
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Depends {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- name: "Qt.webkitwidgets"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- condition: Qt.webkit.present
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Depends { name: "Aggregation" }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Depends { name: "Utils" }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,8 +16,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cpp.defines: {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- var defines = base.concat(["QT_CLUCENE_SUPPORT"]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (!Qt.webkit.present)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- defines.push("QT_NO_WEBKIT");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ defines.push("QT_NO_WEBKIT");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return defines;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>