<!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>[126959] trunk/dports/kde/kdevplatform</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/126959">126959</a></dd>
<dt>Author</dt> <dd>nicos@macports.org</dd>
<dt>Date</dt> <dd>2014-10-18 00:31:37 -0700 (Sat, 18 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>kdevplatform: update to 1.7.0,
simplify Portfile</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportskdekdevplatformPortfile">trunk/dports/kde/kdevplatform/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportskdekdevplatformfilespatchoutputwidgetdiff">trunk/dports/kde/kdevplatform/files/patch-outputwidget.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportskdekdevplatformfilespatchhashdiff">trunk/dports/kde/kdevplatform/files/patch-hash.diff</a></li>
<li><a href="#trunkdportskdekdevplatformfilespatchplugins_appwizard_appwizardplugincppdiff">trunk/dports/kde/kdevplatform/files/patch-plugins_appwizard_appwizardplugin.cpp.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportskdekdevplatformPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/kde/kdevplatform/Portfile (126958 => 126959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/kde/kdevplatform/Portfile 2014-10-18 07:29:18 UTC (rev 126958)
+++ trunk/dports/kde/kdevplatform/Portfile 2014-10-18 07:31:37 UTC (rev 126959)
</span><span class="lines">@@ -7,8 +7,7 @@
</span><span class="cx"> PortGroup compiler_blacklist_versions 1.0
</span><span class="cx">
</span><span class="cx"> name kdevplatform
</span><del>-version 1.6.0
-revision 1
</del><ins>+version 1.7.0
</ins><span class="cx"> categories kde kde4
</span><span class="cx"> platforms darwin
</span><span class="cx"> license GPL-2+
</span><span class="lines">@@ -21,14 +20,14 @@
</span><span class="cx"> is planned to be used by programs like: KDevelop, \
</span><span class="cx"> Quanta, Kile, KTechLab ... etc.
</span><span class="cx">
</span><del>-set kdevelopversion 4.6.0
</del><ins>+set kdevelopversion 4.7.0
</ins><span class="cx">
</span><span class="cx"> homepage http://www.kdevelop.org/
</span><span class="cx"> master_sites kde:stable/kdevelop/${kdevelopversion}/src/
</span><span class="cx"> distname ${name}-${version}
</span><span class="cx">
</span><del>-checksums rmd160 6c212795effdd3ec0077795e37884edead916f06 \
- sha256 cdf7c88ca8860258f46e41d2107c826a307212fd041345bee54fbd70c9794f80
</del><ins>+checksums rmd160 bfa2899a954f3aa1529c3250f56c92a7057d7c42 \
+ sha256 bfd765019511c5c9abc19bc412c75d7abd468f1a077ce4bc471cd6704b9f53f7
</ins><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><span class="lines">@@ -44,24 +43,10 @@
</span><span class="cx"> #Binaries do not link to openssl, nor use the ssl backend of kdelibs4
</span><span class="cx"> license_noconflict openssl
</span><span class="cx">
</span><del>-post-extract {
- file delete -force ${worksrcpath}/util/google
-}
-
-pre-configure {
- #Suppress these arguments from cmake portgroup
- #which break compilation for kdevplatform
- configure.args-delete -DCMAKE_OSX_DEPLOYMENT_TARGET="" \
- -DCMAKE_OSX_SYSROOT=/
-}
-
</del><span class="cx"> #1. Deactivating subversion detection at configure to avoid hidden \
</span><del>-# use of system one (ticket #35185) \
-#2. Keep backwards compatibility: replace "dest" variable (BUG 329392) \
-# [commit 33b660dfefe02ecd4391a284f6fd6de9439b2b45]
</del><ins>+# use of system one (ticket #35185)
</ins><span class="cx"> patchfiles-append patch-pluginsCMakeLists.diff \
</span><del>- patch-hash.diff \
- patch-plugins_appwizard_appwizardplugin.cpp.diff
</del><ins>+ patch-outputwidget.diff
</ins><span class="cx">
</span><span class="cx"> variant subversion description {Add subversion support for kdevelop} {
</span><span class="cx"> depends_lib-append port:subversion
</span></span></pre></div>
<a id="trunkdportskdekdevplatformfilespatchhashdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/kde/kdevplatform/files/patch-hash.diff (126958 => 126959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/kde/kdevplatform/files/patch-hash.diff 2014-10-18 07:29:18 UTC (rev 126958)
+++ trunk/dports/kde/kdevplatform/files/patch-hash.diff 2014-10-18 07:31:37 UTC (rev 126959)
</span><span class="lines">@@ -1,24 +0,0 @@
</span><del>-diff -ur ../kdevplatform-1.6.0-orig/language/duchain/duchain.cpp ./language/duchain/duchain.cpp
---- ../kdevplatform-1.6.0-orig/language/duchain/duchain.cpp 2013-12-08 03:45:38.000000000 +0900
-+++ ./language/duchain/duchain.cpp 2013-12-11 11:54:50.000000000 +0900
-@@ -42,7 +42,7 @@
- #include <interfaces/foregroundlock.h>
- #include <interfaces/isession.h>
-
--#include <util/google/dense_hash_map>
-+#include <google/dense_hash_map>
-
- #include "../interfaces/ilanguagesupport.h"
- #include "../interfaces/icodehighlighting.h"
-diff -ur ../kdevplatform-1.6.0-orig/language/duchain/ducontextdynamicdata.h ./language/duchain/ducontextdynamicdata.h
---- ../kdevplatform-1.6.0-orig/language/duchain/ducontextdynamicdata.h 2013-12-08 03:45:38.000000000 +0900
-+++ ./language/duchain/ducontextdynamicdata.h 2013-12-11 11:51:39.000000000 +0900
-@@ -23,7 +23,7 @@
- #define DUCONTEXTDYNAMICDATA_H
-
- #include "ducontextdata.h"
--#include <util/google/dense_hash_map>
-+#include <google/dense_hash_map>
-
- namespace KDevelop {
-
</del></span></pre></div>
<a id="trunkdportskdekdevplatformfilespatchoutputwidgetdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/kde/kdevplatform/files/patch-outputwidget.diff (0 => 126959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/kde/kdevplatform/files/patch-outputwidget.diff (rev 0)
+++ trunk/dports/kde/kdevplatform/files/patch-outputwidget.diff 2014-10-18 07:31:37 UTC (rev 126959)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- plugins/standardoutputview/outputwidget.cpp.orig 2014-10-17 22:25:08.000000000 +0900
++++ plugins/standardoutputview/outputwidget.cpp 2014-10-17 22:25:12.000000000 +0900
+@@ -422,7 +422,7 @@
+ ? iface->previousHighlightIndex( index )
+ : iface->nextHighlightIndex( index );
+
+- kDebug() << "selecting item" << select << index << newIndex;
++// kDebug() << "selecting item" << select << index << newIndex;
+ activateIndex(newIndex, view, iface);
+ }
+
</ins></span></pre></div>
<a id="trunkdportskdekdevplatformfilespatchplugins_appwizard_appwizardplugincppdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/kde/kdevplatform/files/patch-plugins_appwizard_appwizardplugin.cpp.diff (126958 => 126959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/kde/kdevplatform/files/patch-plugins_appwizard_appwizardplugin.cpp.diff 2014-10-18 07:29:18 UTC (rev 126958)
+++ trunk/dports/kde/kdevplatform/files/patch-plugins_appwizard_appwizardplugin.cpp.diff 2014-10-18 07:31:37 UTC (rev 126959)
</span><span class="lines">@@ -1,12 +0,0 @@
</span><del>-diff --git plugins/appwizard/appwizardplugin.cpp plugins/appwizard/appwizardplugin.cpp
-index 3e22183..7948e47 100644
---- plugins/appwizard/appwizardplugin.cpp
-+++ plugins/appwizard/appwizardplugin.cpp
-@@ -238,6 +238,8 @@ QString AppWizardPlugin::createProject(const ApplicationInfo& info)
- m_variables["APPNAMELC"] = info.name.toLower();
- m_variables["APPNAMEID"] = generateIdentifier(info.name);
- m_variables["PROJECTDIR"] = dest.toLocalFile();
-+ // backwards compatibility
-+ m_variables["dest"] = m_variables["PROJECTDIR"];
- m_variables["PROJECTDIRNAME"] = dest.fileName();
- m_variables["VERSIONCONTROLPLUGIN"] = info.vcsPluginName;
</del></span></pre>
</div>
</div>
</body>
</html>