[94304] trunk/dports/kde/kdevplatform

[nicos at macports.org]

Revision: 94304
          https://trac.macports.org/changeset/94304
Author:   nicos at macports.org
Date:     2012-06-14 09:09:56 -0700 (Thu, 14 Jun 2012)
Log Message:
-----------
kdevplatform: enabling clang also on 10.6 (ticket #34859)

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

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

Modified: trunk/dports/kde/kdevplatform/Portfile
===================================================================
--- trunk/dports/kde/kdevplatform/Portfile	2012-06-14 15:50:03 UTC (rev 94303)
+++ trunk/dports/kde/kdevplatform/Portfile	2012-06-14 16:09:56 UTC (rev 94304)
@@ -33,8 +33,17 @@
 depends_lib-append  port:kdelibs4 \
                     port:boost
 
+platform darwin 10 {
+    #Adjusting flags for clang on SL and 
+    #patching <unordered_map> (ticket #34859)
+    if {${configure.compiler} == "clang"} {
+        patchfiles-append       patch-modificationrevision.diff
+        configure.args-append   -DCMAKE_CXX_FLAGS="-Wno-reserved-user-defined-literal"
+    }
+}
+
 #Adjusting configure flags for Clang on Lion (ticket #34545)
-if {${configure.compiler} == "clang"} {
+platform darwin 11 {
     configure.args-append   -DCMAKE_CXX_FLAGS="-Wno-reserved-user-defined-literal -stdlib=libc++"
 }
 

Added: trunk/dports/kde/kdevplatform/files/patch-modificationrevision.diff
===================================================================
--- trunk/dports/kde/kdevplatform/files/patch-modificationrevision.diff	                        (rev 0)
+++ trunk/dports/kde/kdevplatform/files/patch-modificationrevision.diff	2012-06-14 16:09:56 UTC (rev 94304)
@@ -0,0 +1,31 @@
+--- 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
+ 
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120614/f310f2d3/attachment-0001.html>