[126959] trunk/dports/kde/kdevplatform
nicos at macports.org
nicos at macports.org
Sat Oct 18 00:31:37 PDT 2014
Revision: 126959
https://trac.macports.org/changeset/126959
Author: nicos at macports.org
Date: 2014-10-18 00:31:37 -0700 (Sat, 18 Oct 2014)
Log Message:
-----------
kdevplatform: update to 1.7.0,
simplify Portfile
Modified Paths:
--------------
trunk/dports/kde/kdevplatform/Portfile
Added Paths:
-----------
trunk/dports/kde/kdevplatform/files/patch-outputwidget.diff
Removed Paths:
-------------
trunk/dports/kde/kdevplatform/files/patch-hash.diff
trunk/dports/kde/kdevplatform/files/patch-plugins_appwizard_appwizardplugin.cpp.diff
Modified: trunk/dports/kde/kdevplatform/Portfile
===================================================================
--- 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)
@@ -7,8 +7,7 @@
PortGroup compiler_blacklist_versions 1.0
name kdevplatform
-version 1.6.0
-revision 1
+version 1.7.0
categories kde kde4
platforms darwin
license GPL-2+
@@ -21,14 +20,14 @@
is planned to be used by programs like: KDevelop, \
Quanta, Kile, KTechLab ... etc.
-set kdevelopversion 4.6.0
+set kdevelopversion 4.7.0
homepage http://www.kdevelop.org/
master_sites kde:stable/kdevelop/${kdevelopversion}/src/
distname ${name}-${version}
-checksums rmd160 6c212795effdd3ec0077795e37884edead916f06 \
- sha256 cdf7c88ca8860258f46e41d2107c826a307212fd041345bee54fbd70c9794f80
+checksums rmd160 bfa2899a954f3aa1529c3250f56c92a7057d7c42 \
+ sha256 bfd765019511c5c9abc19bc412c75d7abd468f1a077ce4bc471cd6704b9f53f7
use_xz yes
@@ -44,24 +43,10 @@
#Binaries do not link to openssl, nor use the ssl backend of kdelibs4
license_noconflict openssl
-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=/
-}
-
#1. Deactivating subversion detection at configure to avoid hidden \
-# use of system one (ticket #35185) \
-#2. Keep backwards compatibility: replace "dest" variable (BUG 329392) \
-# [commit 33b660dfefe02ecd4391a284f6fd6de9439b2b45]
+# use of system one (ticket #35185)
patchfiles-append patch-pluginsCMakeLists.diff \
- patch-hash.diff \
- patch-plugins_appwizard_appwizardplugin.cpp.diff
+ patch-outputwidget.diff
variant subversion description {Add subversion support for kdevelop} {
depends_lib-append port:subversion
Deleted: trunk/dports/kde/kdevplatform/files/patch-hash.diff
===================================================================
--- 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)
@@ -1,24 +0,0 @@
-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 {
-
Added: trunk/dports/kde/kdevplatform/files/patch-outputwidget.diff
===================================================================
--- 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)
@@ -0,0 +1,11 @@
+--- 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);
+ }
+
Deleted: trunk/dports/kde/kdevplatform/files/patch-plugins_appwizard_appwizardplugin.cpp.diff
===================================================================
--- 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)
@@ -1,12 +0,0 @@
-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;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141018/aebab35b/attachment-0001.html>
More information about the macports-changes
mailing list