<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[148395] trunk/dports/devel/qt5-creator</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/148395">148395</a></dd>
<dt>Author</dt> <dd>mcalhoun@macports.org</dd>
<dt>Date</dt> <dd>2016-05-06 21:43:19 -0700 (Fri, 06 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>qt5-creator, qt5-creator-docs: update version 3.5.1->3.6.1</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelqt5creatorPortfile">trunk/dports/devel/qt5-creator/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/devel/qt5-creator/files/</li>
<li><a href="#trunkdportsdevelqt5creatorfilespatchno_qtwebkitdiff">trunk/dports/devel/qt5-creator/files/patch-no_qtwebkit.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelqt5creatorPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/qt5-creator/Portfile (148394 => 148395)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -12,32 +12,40 @@
</span><span class="cx"> }
</span><span class="cx"> PortGroup qmake5 1.0
</span><span class="cx">
</span><del>-version 3.5.1
-revision 1
</del><ins>+version 3.6.1
+#revision 0
</ins><span class="cx"> categories devel aqua
</span><span class="cx"> platforms darwin
</span><del>-license LGPL-2.1
</del><ins>+license {LGPL-2.1 LGPL-3 GPL-3}
</ins><span class="cx"> maintainers mcalhoun openmaintainer
</span><span class="cx"> description Cross-platform integrated development environment (IDE) tailored to the needs of Qt developers.
</span><span class="cx"> long_description Qt Creator is a cross-platform integrated development environment (IDE) tailored to the needs of Qt developers.
</span><span class="cx">
</span><span class="cx"> homepage http://qt-project.org/wiki/Category:Tools::QtCreator
</span><span class="cx"> distname qt-creator-opensource-src-${version}
</span><del>-master_sites https://download.qt-project.org/official_releases/qtcreator/[join [lrange [split ${version} .] 0 1] .]/${version}/
</del><ins>+master_sites https://download.qt.io/official_releases/qtcreator/[join [lrange [split ${version} .] 0 1] .]/${version}/
</ins><span class="cx">
</span><del>-checksums rmd160 3892cb1d1334feebc686ef56c33c70a31badbdb7 \
- sha256 5925ac818a08be919094e0f28fb4c5d8896765e0975d54d353e4c50f13d63e65
</del><ins>+checksums rmd160 ee20bc80e538e3e8f564b3dd731f85d3c909a858 \
+ sha256 e53611f80332cd1d171a9b91f8467b6182186cbec6b4a9301f32367368f15de2
</ins><span class="cx">
</span><span class="cx"> if { ${subport} eq ${name} } {
</span><span class="cx"> depends_lib-append \
</span><span class="cx"> port:qt5-qtscript \
</span><span class="cx"> port:qt5-qtdeclarative \
</span><span class="cx"> port:qt5-qttools \
</span><del>- port:qt5-qtmacextras
</del><ins>+ port:qt5-qtmacextras \
+ port:qt5-qtsvg
</ins><span class="cx">
</span><span class="cx"> depends_lib-append port:botan
</span><span class="cx"> configure.args-append "USE_SYSTEM_BOTAN=1"
</span><span class="cx">
</span><ins>+ 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
+ }
+
</ins><span class="cx"> if { ![variant_isset universal] } {
</span><span class="cx"> destroot {
</span><span class="cx"> # make install attempts to install command line tools into /bin, etc.
</span><span class="lines">@@ -68,7 +76,7 @@
</span><span class="cx"> # 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
</span><span class="cx"> # modify for our purposes
</span><span class="cx"> #
</span><del>- # for unknownd reason, using system instead of exec results in "QWidget: Cannot create a QWidget without QApplication"
</del><ins>+ # for unknown reason, using system instead of exec results in "QWidget: Cannot create a QWidget without QApplication"
</ins><span class="cx"> set sdktool ${destroot}${qt_apps_dir}/Qt\ Creator.app/Contents/Resources/sdktool
</span><span class="cx">
</span><span class="cx"> exec \
</span></span></pre></div>
<a id="trunkdportsdevelqt5creatorfilespatchno_qtwebkitdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/qt5-creator/files/patch-no_qtwebkit.diff (0 => 148395)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+--- 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;
+ }
+
</ins></span></pre>
</div>
</div>
</body>
</html>