libc++ has swap for pairs already. Add missing include. Don't mess with

the ctype macros again, it breaks libc++ headers.

4 files changed, 48 insertions, 1 deletions

diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index 339dd3b8c27..a0c4d53ed4b 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.33 2013/04/03 10:51:44 markd Exp $
+$NetBSD: distinfo,v 1.34 2013/05/06 15:03:19 joerg Exp $
 
 SHA1 (kdelibs-4.10.2.tar.xz) = 2f1f455c39fa33cc133db7ec6b3d2dbbabe03c85
 RMD160 (kdelibs-4.10.2.tar.xz) = b1cb62464e146c2f65cf4bb2487be7001ee4fc7b
@@ -20,4 +20,7 @@ SHA1 (patch-kdecore_localization_klocale_kde.cpp) = b8a513a0c51e65d7e604a88c1d0e
 SHA1 (patch-kdecore_network_ConfigureChecks.cmake) = 0ad9352974911ef78ec565f7b2a97c45ead2cf72
 SHA1 (patch-kdecore_util_kshareddatacache_p.h) = 6d064fe75fbecd489b0343960333864c717c0805
 SHA1 (patch-kjs_JSImmediate.h) = ecc761c7c82f711f41cf47d706c1c22d22c2980a
+SHA1 (patch-kjs_interpreter.cpp) = 9d400daf7d96674b8d66e1cde46dcb3615635241
+SHA1 (patch-kjs_wtf_DisallowCType.h) = 6305dd274f1478ba0fe0a6f1717451ab8e3e50d2
+SHA1 (patch-kjs_wtf_HashTable.h) = ec37861cacbe5cf16d40e9895f9245796b7d437b
 SHA1 (patch-kpty_kpty.cpp) = e8fd2e7c88b8926cf5bf12deea9e6af08e0739d8
diff --git a/x11/kdelibs4/patches/patch-kjs_interpreter.cpp b/x11/kdelibs4/patches/patch-kjs_interpreter.cpp
new file mode 100644
index 00000000000..1a3fea50856
--- /dev/null
+++ b/x11/kdelibs4/patches/patch-kjs_interpreter.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-kjs_interpreter.cpp,v 1.1 2013/05/06 15:03:19 joerg Exp $
+
+--- kjs/interpreter.cpp.orig	2013-05-03 23:52:06.000000000 +0000
++++ kjs/interpreter.cpp
+@@ -63,6 +63,7 @@
+ #include <math.h>
+ #include <signal.h>
+ #include <stdio.h>
++#include <cstdlib>
+ #if defined(HAVE_UNISTD_H)
+ #include <unistd.h>
+ #endif
diff --git a/x11/kdelibs4/patches/patch-kjs_wtf_DisallowCType.h b/x11/kdelibs4/patches/patch-kjs_wtf_DisallowCType.h
new file mode 100644
index 00000000000..c1cd0b0800d
--- /dev/null
+++ b/x11/kdelibs4/patches/patch-kjs_wtf_DisallowCType.h
@@ -0,0 +1,19 @@
+$NetBSD: patch-kjs_wtf_DisallowCType.h,v 1.1 2013/05/06 15:03:19 joerg Exp $
+
+--- kjs/wtf/DisallowCType.h.orig	2013-05-03 23:51:02.000000000 +0000
++++ kjs/wtf/DisallowCType.h
+@@ -54,6 +54,7 @@
+ #undef tolower
+ #undef toupper
+ 
++#ifndef _LIBCPP_VERSION
+ #define isalnum WTF_Please_use_ASCIICType_instead_of_ctype_see_comment_in_ASCIICType_h
+ #define isalpha WTF_Please_use_ASCIICType_instead_of_ctype_see_comment_in_ASCIICType_h
+ #define isascii WTF_Please_use_ASCIICType_instead_of_ctype_see_comment_in_ASCIICType_h
+@@ -70,5 +71,6 @@
+ #define toascii WTF_Please_use_ASCIICType_instead_of_ctype_see_comment_in_ASCIICType_h
+ #define tolower WTF_Please_use_ASCIICType_instead_of_ctype_see_comment_in_ASCIICType_h
+ #define toupper WTF_Please_use_ASCIICType_instead_of_ctype_see_comment_in_ASCIICType_h
++#endif
+ 
+ #endif
diff --git a/x11/kdelibs4/patches/patch-kjs_wtf_HashTable.h b/x11/kdelibs4/patches/patch-kjs_wtf_HashTable.h
new file mode 100644
index 00000000000..35b603e96d3
--- /dev/null
+++ b/x11/kdelibs4/patches/patch-kjs_wtf_HashTable.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-kjs_wtf_HashTable.h,v 1.1 2013/05/06 15:03:19 joerg Exp $
+
+--- kjs/wtf/HashTable.h.orig	2013-05-03 23:46:27.000000000 +0000
++++ kjs/wtf/HashTable.h
+@@ -245,7 +245,7 @@ namespace WTF {
+ 
+     using std::swap;
+ 
+-#if !COMPILER(MSVC)
++#if !COMPILER(MSVC) && !defined(_LIBCPP_VERSION)
+     // Visual C++ has a swap for pairs defined.
+ 
+     // swap pairs by component, in case of pair members that specialize swap