[148395] trunk/dports/devel/qt5-creator

[mcalhoun at macports.org]

Revision: 148395
          https://trac.macports.org/changeset/148395
Author:   mcalhoun at macports.org
Date:     2016-05-06 21:43:19 -0700 (Fri, 06 May 2016)
Log Message:
-----------
qt5-creator, qt5-creator-docs: update version 3.5.1->3.6.1

Modified Paths:
--------------
    trunk/dports/devel/qt5-creator/Portfile

Added Paths:
-----------
    trunk/dports/devel/qt5-creator/files/
    trunk/dports/devel/qt5-creator/files/patch-no_qtwebkit.diff

Modified: trunk/dports/devel/qt5-creator/Portfile
===================================================================
--- trunk/dports/devel/qt5-creator/Portfile	2016-05-07 00:56:38 UTC (rev 148394)
+++ trunk/dports/devel/qt5-creator/Portfile	2016-05-07 04:43:19 UTC (rev 148395)
@@ -12,32 +12,40 @@
 }
 PortGroup           qmake5 1.0
 
-version             3.5.1
-revision            1
+version             3.6.1
+#revision            0
 categories          devel aqua
 platforms           darwin
-license             LGPL-2.1
+license             {LGPL-2.1 LGPL-3 GPL-3}
 maintainers         mcalhoun openmaintainer
 description         Cross-platform integrated development environment (IDE) tailored to the needs of Qt developers.
 long_description    Qt Creator is a cross-platform integrated development environment (IDE) tailored to the needs of Qt developers.
 
 homepage            http://qt-project.org/wiki/Category:Tools::QtCreator
 distname            qt-creator-opensource-src-${version}
-master_sites        https://download.qt-project.org/official_releases/qtcreator/[join [lrange [split ${version} .] 0 1] .]/${version}/
+master_sites        https://download.qt.io/official_releases/qtcreator/[join [lrange [split ${version} .] 0 1] .]/${version}/
 
-checksums           rmd160  3892cb1d1334feebc686ef56c33c70a31badbdb7 \
-                    sha256  5925ac818a08be919094e0f28fb4c5d8896765e0975d54d353e4c50f13d63e65
+checksums           rmd160  ee20bc80e538e3e8f564b3dd731f85d3c909a858 \
+                    sha256  e53611f80332cd1d171a9b91f8467b6182186cbec6b4a9301f32367368f15de2
 
 if { ${subport} eq ${name}  } {
     depends_lib-append          \
         port:qt5-qtscript       \
         port:qt5-qtdeclarative  \
         port:qt5-qttools        \
-        port:qt5-qtmacextras
+        port:qt5-qtmacextras    \
+        port:qt5-qtsvg
 
     depends_lib-append     port:botan
     configure.args-append  "USE_SYSTEM_BOTAN=1"
 
+    patchfiles-append      patch-no_qtwebkit.diff
+
+    variant qtwebkit description {build with QtWebkit support} {
+        patchfiles-delete  patch-no_qtwebkit.diff
+        depends_lib-append port:qt5-qtwebkit
+    }
+
     if { ![variant_isset universal] } {
         destroot {
             # make install attempts to install command line tools into /bin, etc.
@@ -68,7 +76,7 @@
         #    sdktool addKit --id qt.55.clang_64_kit --name "Desktop Qt %{Qt:Version} clang 64bit" --devicetype Desktop --qt qt.55.clang_64 --toolchain x86-macos-generic-mach_o-64bit
         # modify for our purposes
         #
-        # for unknownd reason, using system instead of exec results in "QWidget: Cannot create a QWidget without QApplication"
+        # for unknown reason, using system instead of exec results in "QWidget: Cannot create a QWidget without QApplication"
         set sdktool ${destroot}${qt_apps_dir}/Qt\ Creator.app/Contents/Resources/sdktool
 
         exec                                             \

Added: trunk/dports/devel/qt5-creator/files/patch-no_qtwebkit.diff
===================================================================
--- trunk/dports/devel/qt5-creator/files/patch-no_qtwebkit.diff	                        (rev 0)
+++ trunk/dports/devel/qt5-creator/files/patch-no_qtwebkit.diff	2016-05-07 04:43:19 UTC (rev 148395)
@@ -0,0 +1,38 @@
+--- src/plugins/help/help.pro.orig	2016-03-08 04:30:19.000000000 -0700
++++ src/plugins/help/help.pro	2016-05-06 16:50:13.000000000 -0700
+@@ -1,7 +1,5 @@
+ QT += help network printsupport sql
+-!isEmpty(QT.htmlviewwidgets.name): QT += htmlviewwidgets htmlview
+-else:!isEmpty(QT.webkitwidgets.name): QT += webkitwidgets webkit
+-else: DEFINES += QT_NO_WEBKIT
++DEFINES += QT_NO_WEBKIT
+ 
+ INCLUDEPATH += $$PWD
+ 
+--- src/plugins/help/help.qbs.orig	2016-03-08 04:30:19.000000000 -0700
++++ src/plugins/help/help.qbs	2016-05-06 16:49:33.000000000 -0700
+@@ -5,14 +5,6 @@
+ 
+     Depends { name: "Qt"; submodules: ["help", "network", "sql"]; }
+     Depends { name: "Qt.printsupport" }
+-    Depends {
+-        name: "Qt.webkit"
+-        required: false
+-    }
+-    Depends {
+-        name: "Qt.webkitwidgets"
+-        condition: Qt.webkit.present
+-    }
+ 
+     Depends { name: "Aggregation" }
+     Depends { name: "Utils" }
+@@ -24,8 +16,7 @@
+ 
+     cpp.defines: {
+         var defines = base.concat(["QT_CLUCENE_SUPPORT"]);
+-        if (!Qt.webkit.present)
+-            defines.push("QT_NO_WEBKIT");
++        defines.push("QT_NO_WEBKIT");
+         return defines;
+     }
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160506/4733f171/attachment.html>