Fix building with the latest Clang

3 files changed, 28 insertions, 3 deletions

diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo
index 00ff88344c0..a9fac27168c 100644
--- a/x11/qt4-libs/distinfo
+++ b/x11/qt4-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.55 2011/05/13 16:36:38 drochner Exp $
+$NetBSD: distinfo,v 1.56 2011/08/12 13:24:07 adam Exp $
 
 SHA1 (qt-everywhere-opensource-src-4.7.3.tar.gz) = 765eb70d9779f93fefddddda5e6ddb33f4c0b71e
 RMD160 (qt-everywhere-opensource-src-4.7.3.tar.gz) = ab9c11c85898430fa74e5e07894f8da5e5936645
@@ -41,4 +41,5 @@ SHA1 (patch-ce) = 91b8f49008783e25e9e2252f92d9481bba2d318d
 SHA1 (patch-cf) = 8b18fce7f564e8cd688f09fd5de6340771f428e8
 SHA1 (patch-cg) = c5948cea47fb4134c626415b0b2c36660beea64a
 SHA1 (patch-ch) = 8efaa05e564022710ff978b59581c017bbece979
-SHA1 (patch-ci) = 2fecb3ea7796fcf5c0db421a9d10b31a35225c6d
+SHA1 (patch-ci) = a2ac5703503afcdb2a87f80a8ba373c8ff7a2697
+SHA1 (patch-cj) = 49fd8ae10c5fc026101355596b91fcf3e1701b9d
diff --git a/x11/qt4-libs/patches/patch-ci b/x11/qt4-libs/patches/patch-ci
index 10dd255ff41..41c0a9439ee 100644
--- a/x11/qt4-libs/patches/patch-ci
+++ b/x11/qt4-libs/patches/patch-ci
@@ -1,9 +1,18 @@
-$NetBSD: patch-ci,v 1.1 2011/03/03 05:50:04 adam Exp $
+$NetBSD: patch-ci,v 1.2 2011/08/12 13:24:07 adam Exp $
 
 Rename argument 'id'; 'id' is a key-word in Objective-C.
 
 --- src/plugins/bearer/corewlan/qcorewlanengine.mm.orig	2011-03-02 13:32:05.000000000 +0000
 +++ src/plugins/bearer/corewlan/qcorewlanengine.mm
+@@ -73,7 +73,7 @@ inline QString qt_NSStringToQString(cons
+ { return QCFString::toQString(reinterpret_cast<const CFStringRef>(nsstr)); }
+ 
+ inline NSString *qt_QStringToNSString(const QString &qstr)
+-{ return [reinterpret_cast<const NSString *>(QCFString::toCFStringRef(qstr)) autorelease]; }
++{ return (NSString *)[reinterpret_cast<const NSString *>(QCFString::toCFStringRef(qstr)) autorelease]; }
+ 
+ 
+ @interface QT_MANGLE_NAMESPACE(QNSListener) : NSObject
 @@ -864,7 +864,7 @@ quint64 QCoreWlanEngine::bytesReceived(c
      return getBytes(interfaceStr,true);
  }
diff --git a/x11/qt4-libs/patches/patch-cj b/x11/qt4-libs/patches/patch-cj
new file mode 100644
index 00000000000..982e48e286e
--- /dev/null
+++ b/x11/qt4-libs/patches/patch-cj
@@ -0,0 +1,15 @@
+$NetBSD: patch-cj,v 1.1 2011/08/12 13:24:07 adam Exp $
+
+Avoid error when compiling with Clang.
+
+--- src/gui/kernel/qt_cocoa_helpers_mac_p.h.orig	2011-08-11 11:42:47.000000000 +0000
++++ src/gui/kernel/qt_cocoa_helpers_mac_p.h
+@@ -195,7 +195,7 @@ inline QString qt_mac_NSStringToQString(
+ { return QCFString::toQString(reinterpret_cast<const CFStringRef>(nsstr)); }
+ 
+ inline NSString *qt_mac_QStringToNSString(const QString &qstr)
+-{ return [reinterpret_cast<const NSString *>(QCFString::toCFStringRef(qstr)) autorelease]; }
++{ return (NSString *)[reinterpret_cast<const NSString *>(QCFString::toCFStringRef(qstr)) autorelease]; }
+ 
+ #ifdef QT_MAC_USE_COCOA
+ class QCocoaPostMessageArgs {