From d3ce9a6ce6a74bd31e06fe18c5da6fecc4edd165 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Sun, 11 Nov 2012 22:28:28 +0000
Subject: Fix clang patch with outdated patchsum to actually fix the issue. It
 is simply not correct to pass references to variadic functions.

---
 misc/kdepimlibs4/Makefile                    |  4 +--
 misc/kdepimlibs4/distinfo                    |  4 ++-
 misc/kdepimlibs4/patches/patch-kldap_ber.cpp | 44 +++++++++++++++++++---------
 3 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/misc/kdepimlibs4/Makefile b/misc/kdepimlibs4/Makefile
index 64c92581a5a..f0336d802d6 100644
--- a/misc/kdepimlibs4/Makefile
+++ b/misc/kdepimlibs4/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2012/10/08 23:01:05 adam Exp $
+# $NetBSD: Makefile,v 1.41 2012/11/11 22:28:28 joerg Exp $
 
 DISTNAME=	kdepimlibs-${_KDE_VERSION}
 PKGNAME=	${DISTNAME:S/-4/4-4/}
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	misc
 COMMENT=	Support libraries for PIM for the KDE integrated X11 desktop
 
diff --git a/misc/kdepimlibs4/distinfo b/misc/kdepimlibs4/distinfo
index 91d33a244ab..966699920d8 100644
--- a/misc/kdepimlibs4/distinfo
+++ b/misc/kdepimlibs4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2012/06/16 04:45:32 markd Exp $
+$NetBSD: distinfo,v 1.22 2012/11/11 22:28:28 joerg Exp $
 
 SHA1 (kdepimlibs-4.8.4.tar.xz) = 34f693ac71896d0d8653fc2a81323d1e91531bb2
 RMD160 (kdepimlibs-4.8.4.tar.xz) = f9804ea6e6d016d879a16f1077e49aeef429ba13
@@ -8,6 +8,8 @@ SHA1 (patch-kalarmcal_CMakeLists.txt) = 8237552f350f214c3380bf0fc54d19d36765c9b9
 SHA1 (patch-kblog_CMakeLists.txt) = 183d17f2de6f5f4f2f6bd29666b2a35d22c055aa
 SHA1 (patch-kcalutils_CMakeLists.txt) = 5c212ab23d0b1006a43c765bc1d860be85da284a
 SHA1 (patch-kimap_loginjob.cpp) = efcc4ee6915215013cbc8b349741d747cb061a94
+SHA1 (patch-kldap_ber.cpp) = 3656e006278db8fd4014f6e4a902f60703955871
+SHA1 (patch-kldap_ber.h) = c4edcaedb7169e261892b973627b3265f1efd3df
 SHA1 (patch-kmbox_CMakeLists.txt) = 924bd70a84c8af1c7d37501d4f718343a0aa7121
 SHA1 (patch-kpimutils_CMakeLists.txt) = 0a9f7283e2b70b38e0c545240251bc9ecb615eab
 SHA1 (patch-qgpgme_CMakeLists.txt) = 0860963f371a008f1d006dad58ea40329c358cfd
diff --git a/misc/kdepimlibs4/patches/patch-kldap_ber.cpp b/misc/kdepimlibs4/patches/patch-kldap_ber.cpp
index 42b95ff9557..bbb14cfe149 100644
--- a/misc/kdepimlibs4/patches/patch-kldap_ber.cpp
+++ b/misc/kdepimlibs4/patches/patch-kldap_ber.cpp
@@ -1,30 +1,46 @@
-$NetBSD: patch-kldap_ber.cpp,v 1.1 2012/09/30 13:15:04 adam Exp $
+$NetBSD: patch-kldap_ber.cpp,v 1.2 2012/11/11 22:28:29 joerg Exp $
 
 Fix building with Clang.
 
---- kldap/ber.cpp.orig	2012-09-30 12:13:44.000000000 +0000
+--- kldap/ber.cpp.orig	2012-11-08 10:20:25.000000000 +0000
 +++ kldap/ber.cpp
-@@ -128,7 +128,11 @@ int Ber::printf( const QString &format, 
+@@ -124,7 +124,7 @@ QByteArray Ber::flatten() const
+   return ret;
+ }
+ 
+-int Ber::printf( const QString &format, ... )
++int Ber::printf( const char *format, ... )
  {
    char fmt[2];
    va_list args;
-+#ifdef __clang__
-+  va_start ( args, format.unicode() );
-+#else
-   va_start ( args, format );
-+#endif
+@@ -132,8 +132,8 @@ int Ber::printf( const QString &format, 
    fmt[1] = '\0';
  
    int i = 0, ret = 0;
-@@ -233,7 +237,11 @@ int Ber::scanf( const QString &format, .
+-  while ( i < format.length() ) {
+-    fmt[0] = format[i].toLatin1();
++  while ( format[i] ) {
++    fmt[0] = format[i];
+     i++;
+     switch ( fmt[0] ) {
+       case 'b':
+@@ -229,7 +229,7 @@ int Ber::printf( const QString &format, 
+   return ret;
+ }
+ 
+-int Ber::scanf( const QString &format, ... )
++int Ber::scanf( const char *format, ... )
  {
    char fmt[2];
    va_list args;
-+#ifdef __clang__
-+  va_start ( args, format.unicode() );
-+#else
-   va_start ( args, format );
-+#endif
+@@ -237,8 +237,8 @@ int Ber::scanf( const QString &format, .
    fmt[1] = '\0';
  
    int i = 0, ret = 0;
+-  while ( i < format.length() ) {
+-    fmt[0] = format[i].toLatin1();
++  while ( format[i] ) {
++    fmt[0] = format[i];
+     i++;
+     switch ( fmt[0] ) {
+       case 'l':
-- 
cgit v1.2.3