[99093] trunk/dports/kde/kdevplatform

[nicos at macports.org]

Revision: 99093
          http://trac.macports.org//changeset/99093
Author:   nicos at macports.org
Date:     2012-10-25 19:51:38 -0700 (Thu, 25 Oct 2012)
Log Message:
-----------
kdevplatform: update to 1.4.0

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

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

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

Modified: trunk/dports/kde/kdevplatform/Portfile
===================================================================
--- trunk/dports/kde/kdevplatform/Portfile	2012-10-26 01:23:44 UTC (rev 99092)
+++ trunk/dports/kde/kdevplatform/Portfile	2012-10-26 02:51:38 UTC (rev 99093)
@@ -5,8 +5,7 @@
 PortGroup           kde4 1.1
 
 name                kdevplatform
-version             1.3.1
-revision            3
+version             1.4.0
 categories          kde kde4
 platforms           darwin
 license             GPL-2+
@@ -19,14 +18,14 @@
                     is planned to be used by programs like: KDevelop, \
                     Quanta, Kile, KTechLab ... etc.
 
-set kdevelopversion 4.3.1
+set kdevelopversion 4.4.0
 
 homepage            http://www.kdevelop.org/
 master_sites        kde:stable/kdevelop/${kdevelopversion}/src/
 distname            ${name}-${version}
 
-checksums           sha1    bba0cefdac6de83c8d3354534a94e8500dccda37 \
-                    rmd160  18cb71493a043fdc1937c6a18f93b3de33565e08
+checksums           rmd160  e15b8a5733500efcba9f48232201153c9ed4f2bb \
+                    sha256  fd00aff21af14c07eca6e0dfbc0d4dd1edcc4ec3c50e6a5dd7e962214922c08e
 
 use_bzip2           yes
 
@@ -46,11 +45,12 @@
 if {${configure.compiler} == "clang"} {
     if {${os.major} >= 11} {
         #Case of Lion and higher (ticket #34545)
-        configure.args-append   -DCMAKE_CXX_FLAGS="-Wno-reserved-user-defined-literal -stdlib=libc++"
+        configure.args-append   -DCMAKE_CXX_FLAGS="-Wno-reserved-user-defined-literal -stdlib=libc++" \
+                                -DHAVE_UNORDERED_MAP=1
     } else {
         #Patching code for clang on SL where libc++ is not available (ticket #34859)
         configure.args-append   -DCMAKE_CXX_FLAGS="-Wno-reserved-user-defined-literal"
-        patchfiles-append       patch-modificationrevision.diff
+        patchfiles-append       patch-uicontroller.cpp.diff
     }
 }
 

Deleted: trunk/dports/kde/kdevplatform/files/patch-modificationrevision.diff
===================================================================
--- trunk/dports/kde/kdevplatform/files/patch-modificationrevision.diff	2012-10-26 01:23:44 UTC (rev 99092)
+++ trunk/dports/kde/kdevplatform/files/patch-modificationrevision.diff	2012-10-26 02:51:38 UTC (rev 99093)
@@ -1,31 +0,0 @@
---- language/editor/modificationrevision.cpp.orig	2012-04-14 04:49:31.000000000 +0900
-+++ language/editor/modificationrevision.cpp	2012-06-08 10:40:54.000000000 +0900
-@@ -26,19 +26,20 @@
- #if defined(Q_CC_MSVC)
- #include <hash_map>
- using namespace stdext;
--#elif defined GXX_LT_4_3
-+//#elif defined GXX_LT_4_3
-+#else
- #include <ext/hash_map>
- using namespace __gnu_cxx;
--#else // C++0X
-+//#else // C++0X
- // TODO: Replace hash_map with unordered map when support for G++ < 4.3 has 
- //       ended. This class was added as a temporary workaround, to get rid of
- //       hash_map related warnings for g++ >= 4.3.
--#include <unordered_map>
--template<class _Key, class _Tp,
--       class _Hash = std::hash<_Key>,
--       class _Pred = std::equal_to<_Key>,
--       class _Alloc = std::allocator<std::pair<const _Key, _Tp> > >
--class  hash_map : public std::unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc> { };
-+//#include <unordered_map>
-+//template<class _Key, class _Tp,
-+//       class _Hash = std::hash<_Key>,
-+//       class _Pred = std::equal_to<_Key>,
-+//       class _Alloc = std::allocator<std::pair<const _Key, _Tp> > >
-+//class  hash_map : public std::unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc> { };
- #endif
- 
- 

Added: trunk/dports/kde/kdevplatform/files/patch-uicontroller.cpp.diff
===================================================================
--- trunk/dports/kde/kdevplatform/files/patch-uicontroller.cpp.diff	                        (rev 0)
+++ trunk/dports/kde/kdevplatform/files/patch-uicontroller.cpp.diff	2012-10-26 02:51:38 UTC (rev 99093)
@@ -0,0 +1,11 @@
+--- 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/20121025/c57586b6/attachment.html>