[112337] trunk/dports/kde/kdevplatform

[nicos at macports.org]

Revision: 112337
          https://trac.macports.org/changeset/112337
Author:   nicos at macports.org
Date:     2013-10-19 00:03:04 -0700 (Sat, 19 Oct 2013)
Log Message:
-----------
kdevplatform: update to 1.5.1, solve license conflict with openssl

Modified Paths:
--------------
    trunk/dports/kde/kdevplatform/Portfile

Removed Paths:
-------------
    trunk/dports/kde/kdevplatform/files/patch-uicontroller.cpp.diff

Modified: trunk/dports/kde/kdevplatform/Portfile
===================================================================
--- trunk/dports/kde/kdevplatform/Portfile	2013-10-19 06:16:02 UTC (rev 112336)
+++ trunk/dports/kde/kdevplatform/Portfile	2013-10-19 07:03:04 UTC (rev 112337)
@@ -6,7 +6,7 @@
 PortGroup           muniversal 1.0
 
 name                kdevplatform
-version             1.4.1
+version             1.5.1
 categories          kde kde4
 platforms           darwin
 license             GPL-2+
@@ -19,25 +19,34 @@
                     is planned to be used by programs like: KDevelop, \
                     Quanta, Kile, KTechLab ... etc.
 
-set kdevelopversion 4.4.1
+set kdevelopversion 4.5.1
 
 homepage            http://www.kdevelop.org/
 master_sites        kde:stable/kdevelop/${kdevelopversion}/src/
 distname            ${name}-${version}
 
-checksums           rmd160  2726503031278ee0da8357cfa3796edb4625c398 \
-                    sha256  d48dba12cc61e006d1ed63c664a1cfa0d6c86a241b633565cda034cd42a78033
+checksums           rmd160  ebe3221e57d5e42483efc35a3b3162c3c61a4776 \
+                    sha256  37bc8985ca855673dce085722ae3cfd3703b9155eb5d0b31e60b975c976a410f
 
 use_bzip2           yes
 
 depends_lib-append  port:kdelibs4 \
-                    port:boost
+                    port:boost \
+                    port:grantlee
 
+#Binaries do not link to openssl, nor use the ssl backend of kdelibs4
+license_noconflict  openssl
+
+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. Suppress ambiguous use of Sublime::Position class
-patchfiles-append   patch-pluginsCMakeLists.diff \
-                    patch-uicontroller.cpp.diff
+patchfiles-append   patch-pluginsCMakeLists.diff
 
 variant subversion description {Add subversion support for kdevelop} {
     depends_lib-append  port:subversion  

Deleted: trunk/dports/kde/kdevplatform/files/patch-uicontroller.cpp.diff
===================================================================
--- trunk/dports/kde/kdevplatform/files/patch-uicontroller.cpp.diff	2013-10-19 06:16:02 UTC (rev 112336)
+++ trunk/dports/kde/kdevplatform/files/patch-uicontroller.cpp.diff	2013-10-19 07:03:04 UTC (rev 112337)
@@ -1,11 +0,0 @@
---- shell/uicontroller.cpp.orig	2012-10-16 06:35:28.000000000 +0900
-+++ shell/uicontroller.cpp	2012-10-20 18:50:15.000000000 +0900
-@@ -635,7 +635,7 @@
-     Sublime::View* view = doc->createView();
-     area->addToolView(
-         view,
--        p == Sublime::Position::AllPositions ? Sublime::dockAreaToPosition(factory->defaultPosition()) : p);
-+        p == Sublime::AllPositions ? Sublime::dockAreaToPosition(factory->defaultPosition()) : p);
- 
-     connect(view, SIGNAL(raise(Sublime::View*)),
-             SLOT(raiseToolView(Sublime::View*)));
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131019/55ac902c/attachment.html>