Mon May 6 15:03:19 2013 UTC ()
libc++ has swap for pairs already. Add missing include. Don't mess with
the ctype macros again, it breaks libc++ headers.


(joerg)
diff -r1.33 -r1.34 pkgsrc/x11/kdelibs4/distinfo
diff -r0 -r1.1 pkgsrc/x11/kdelibs4/patches/patch-kjs_interpreter.cpp
diff -r0 -r1.1 pkgsrc/x11/kdelibs4/patches/patch-kjs_wtf_DisallowCType.h
diff -r0 -r1.1 pkgsrc/x11/kdelibs4/patches/patch-kjs_wtf_HashTable.h
cvs diff -r1.33 -r1.34 pkgsrc/x11/kdelibs4/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/kdelibs4/distinfo 2013/04/03 10:51:44 1.33
+++ pkgsrc/x11/kdelibs4/distinfo 2013/05/06 15:03:19 1.34
@@ -1,23 +1,26 @@ @@ -1,23 +1,26 @@
1$NetBSD: distinfo,v 1.33 2013/04/03 10:51:44 markd Exp $ 1$NetBSD: distinfo,v 1.34 2013/05/06 15:03:19 joerg Exp $
2 2
3SHA1 (kdelibs-4.10.2.tar.xz) = 2f1f455c39fa33cc133db7ec6b3d2dbbabe03c85 3SHA1 (kdelibs-4.10.2.tar.xz) = 2f1f455c39fa33cc133db7ec6b3d2dbbabe03c85
4RMD160 (kdelibs-4.10.2.tar.xz) = b1cb62464e146c2f65cf4bb2487be7001ee4fc7b 4RMD160 (kdelibs-4.10.2.tar.xz) = b1cb62464e146c2f65cf4bb2487be7001ee4fc7b
5Size (kdelibs-4.10.2.tar.xz) = 11979652 bytes 5Size (kdelibs-4.10.2.tar.xz) = 11979652 bytes
6SHA1 (patch-ConfigureChecks.cmake) = b03b38108d68d940782fbbb876affd011a39acf4 6SHA1 (patch-ConfigureChecks.cmake) = b03b38108d68d940782fbbb876affd011a39acf4
7SHA1 (patch-aa) = c3044205a964797a7718b7a7bd03bb99dd3ca37d 7SHA1 (patch-aa) = c3044205a964797a7718b7a7bd03bb99dd3ca37d
8SHA1 (patch-ab) = 3f89ddfa9a6101a016128d82dbbd0e985e396cae 8SHA1 (patch-ab) = 3f89ddfa9a6101a016128d82dbbd0e985e396cae
9SHA1 (patch-ac) = 200391c0cf0a89ef43f0cb57e39d56eee51da505 9SHA1 (patch-ac) = 200391c0cf0a89ef43f0cb57e39d56eee51da505
10SHA1 (patch-ad) = 08467b484f3df864d343d9151b13bedc4f001976 10SHA1 (patch-ad) = 08467b484f3df864d343d9151b13bedc4f001976
11SHA1 (patch-ag) = 67561007567ba10f20d8e8572dd0a33c8139b7cd 11SHA1 (patch-ag) = 67561007567ba10f20d8e8572dd0a33c8139b7cd
12SHA1 (patch-ah) = 368f4f641ce55257409137185357e796666ae42f 12SHA1 (patch-ah) = 368f4f641ce55257409137185357e796666ae42f
13SHA1 (patch-aj) = 501e34c8fdf242c3718ecb26577ac5940d37fae5 13SHA1 (patch-aj) = 501e34c8fdf242c3718ecb26577ac5940d37fae5
14SHA1 (patch-ak) = 73cc1bb149039d2fe3c05ee631426a8773f951c6 14SHA1 (patch-ak) = 73cc1bb149039d2fe3c05ee631426a8773f951c6
15SHA1 (patch-al) = 5efa7d504fe75bec53837bfa062a4b3f910fd71f 15SHA1 (patch-al) = 5efa7d504fe75bec53837bfa062a4b3f910fd71f
16SHA1 (patch-am) = b6c315d152d2c3d3c66ad85050549d0b39b263e5 16SHA1 (patch-am) = b6c315d152d2c3d3c66ad85050549d0b39b263e5
17SHA1 (patch-cmake_modules_FindKDE4Internal.cmake) = 4b1e7a68fe6f3766deca6d557e80ceafb37a3ee3 17SHA1 (patch-cmake_modules_FindKDE4Internal.cmake) = 4b1e7a68fe6f3766deca6d557e80ceafb37a3ee3
18SHA1 (patch-cmake_modules_FindTaglib.cmake) = be38479966da542343dd962c57f7e9d1be3e9ff4 18SHA1 (patch-cmake_modules_FindTaglib.cmake) = be38479966da542343dd962c57f7e9d1be3e9ff4
19SHA1 (patch-kdecore_localization_klocale_kde.cpp) = b8a513a0c51e65d7e604a88c1d0e3325be6ad688 19SHA1 (patch-kdecore_localization_klocale_kde.cpp) = b8a513a0c51e65d7e604a88c1d0e3325be6ad688
20SHA1 (patch-kdecore_network_ConfigureChecks.cmake) = 0ad9352974911ef78ec565f7b2a97c45ead2cf72 20SHA1 (patch-kdecore_network_ConfigureChecks.cmake) = 0ad9352974911ef78ec565f7b2a97c45ead2cf72
21SHA1 (patch-kdecore_util_kshareddatacache_p.h) = 6d064fe75fbecd489b0343960333864c717c0805 21SHA1 (patch-kdecore_util_kshareddatacache_p.h) = 6d064fe75fbecd489b0343960333864c717c0805
22SHA1 (patch-kjs_JSImmediate.h) = ecc761c7c82f711f41cf47d706c1c22d22c2980a 22SHA1 (patch-kjs_JSImmediate.h) = ecc761c7c82f711f41cf47d706c1c22d22c2980a
 23SHA1 (patch-kjs_interpreter.cpp) = 9d400daf7d96674b8d66e1cde46dcb3615635241
 24SHA1 (patch-kjs_wtf_DisallowCType.h) = 6305dd274f1478ba0fe0a6f1717451ab8e3e50d2
 25SHA1 (patch-kjs_wtf_HashTable.h) = ec37861cacbe5cf16d40e9895f9245796b7d437b
23SHA1 (patch-kpty_kpty.cpp) = e8fd2e7c88b8926cf5bf12deea9e6af08e0739d8 26SHA1 (patch-kpty_kpty.cpp) = e8fd2e7c88b8926cf5bf12deea9e6af08e0739d8
File Added: pkgsrc/x11/kdelibs4/patches/patch-kjs_interpreter.cpp
$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
File Added: pkgsrc/x11/kdelibs4/patches/patch-kjs_wtf_DisallowCType.h
$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
File Added: pkgsrc/x11/kdelibs4/patches/Attic/patch-kjs_wtf_HashTable.h
$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