Fix build failure on NetBSD/arm.

patch-ad:
 src/tools/qglobal.h mentionss about Q_NO_PACKED_REFERENCE:
---
/* ARM gcc pads structs to 32 bits, even when they contain a single
   char, or short.  We tell gcc to pack QChars to 16 bits, to avoid
   QString bloat. However, gcc 3.4 doesn't allow us to create references to
   members of a packed struct. (Pointers are OK, because then you
   supposedly know what you are doing.) */
#  if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP)
#    define Q_PACKED __attribute__ ((packed))
#    if __GNUC__ == 3 && __GNUC_MINOR__ >= 4
#      define Q_NO_PACKED_REFERENCE
---
 but it seems we also have to define it on gcc4.

patch-ch:
 Furthermore, it looks gcc4 also rejects implicit pointer casts, so
 add an explicit cast where the above Q_NO_PACKED_REFERENCE is referred.

3 files changed, 32 insertions, 9 deletions

diff --git a/x11/qt3-libs/distinfo b/x11/qt3-libs/distinfo
index ef822cfa610..690942faf4d 100644
--- a/x11/qt3-libs/distinfo
+++ b/x11/qt3-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.52 2010/06/13 22:45:50 wiz Exp $
+$NetBSD: distinfo,v 1.53 2010/08/09 13:21:07 tsutsui Exp $
 
 SHA1 (qt-x11-free-3.3.8.tar.bz2) = 91b192cb8e80679607d24ae35d6e20ed68d149d7
 RMD160 (qt-x11-free-3.3.8.tar.bz2) = 7b8e4e35f49014eac4fcfe91b7ec0a45c5569cf4
@@ -6,7 +6,7 @@ Size (qt-x11-free-3.3.8.tar.bz2) = 14360483 bytes
 SHA1 (patch-aa) = 0247c3694db7bf29556e00809b5d7f26817f3055
 SHA1 (patch-ab) = 4dfee5c06bc322646465f43fe850126873d7bb75
 SHA1 (patch-ac) = aca8761d8adb87624340d7d75df22e91bef8182b
-SHA1 (patch-ad) = 366c411ad5cb8227d5e40165d877c627dbf9c670
+SHA1 (patch-ad) = 9780ceeb4eadd48735803fc789dcdf0da974c23d
 SHA1 (patch-ae) = 2ec0b408edd78daa03c02c654e0ce515933f36e7
 SHA1 (patch-af) = 7ac1629afd6de928d35d0a410795ca45451d5b18
 SHA1 (patch-ag) = a413055f8df258b0bb91e46d6f611e9ec511b913
@@ -32,5 +32,6 @@ SHA1 (patch-cd) = bb03346ccd04374c3baa33bc1922fe4a3bb99ada
 SHA1 (patch-ce) = 6dbf1d619782be1c4522ec019df3936a2538ea39
 SHA1 (patch-cf) = 4a38cf1a82ef03a85ecb5787e5954f0c8a0afbda
 SHA1 (patch-cg) = 4ae34d2556314e6bf35160c018987a453055a0eb
+SHA1 (patch-ch) = 91c5404967d5e154280c9bb18046f3f724981b00
 SHA1 (patch-ia) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112
 SHA1 (patch-ib) = b15936b85b2b1946e8c9a92bf393c3d3a1fc6950
diff --git a/x11/qt3-libs/patches/patch-ad b/x11/qt3-libs/patches/patch-ad
index 0769256b0cf..e1f06e89783 100644
--- a/x11/qt3-libs/patches/patch-ad
+++ b/x11/qt3-libs/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.8 2005/04/13 21:58:05 bouyer Exp $
+$NetBSD: patch-ad,v 1.9 2010/08/09 13:21:07 tsutsui Exp $
 
---- src/tools/qglobal.h.orig	Fri Jan 21 18:16:04 2005
-+++ src/tools/qglobal.h	Fri Apr  8 21:19:49 2005
+--- src/tools/qglobal.h.orig	2007-02-02 14:01:04.000000000 +0000
++++ src/tools/qglobal.h
 @@ -63,6 +63,7 @@
       NETBSD	- NetBSD
       OPENBSD	- OpenBSD
@@ -22,13 +22,22 @@ $NetBSD: patch-ad,v 1.8 2005/04/13 21:58:05 bouyer Exp $
  #elif defined(macintosh)
  #  define Q_OS_MAC9
  #elif defined(__CYGWIN__)
-@@ -119,6 +120,9 @@
- #  define Q_OS_BSD4
+@@ -120,6 +121,9 @@
  #elif defined(__NetBSD__)
  #  define Q_OS_NETBSD
-+#  define Q_OS_BSD4
+ #  define Q_OS_BSD4
 +#elif defined(__INTERIX)
 +#  define Q_OS_INTERIX
- #  define Q_OS_BSD4
++#  define Q_OS_BSD4
  #elif defined(__OpenBSD__)
  #  define Q_OS_OPENBSD
+ #  define Q_OS_BSD4
+@@ -317,7 +321,7 @@
+    supposedly know what you are doing.) */
+ #  if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP)
+ #    define Q_PACKED __attribute__ ((packed))
+-#    if __GNUC__ == 3 && __GNUC_MINOR__ >= 4
++#    if (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || __GNUC__ >= 4
+ #      define Q_NO_PACKED_REFERENCE
+ #    endif
+ #  endif
diff --git a/x11/qt3-libs/patches/patch-ch b/x11/qt3-libs/patches/patch-ch
new file mode 100644
index 00000000000..5883cc66f16
--- /dev/null
+++ b/x11/qt3-libs/patches/patch-ch
@@ -0,0 +1,13 @@
+$NetBSD: patch-ch,v 1.1 2010/08/09 13:21:07 tsutsui Exp $
+
+--- src/tools/qstring.h.orig	2007-02-02 14:01:05.000000000 +0000
++++ src/tools/qstring.h
+@@ -194,7 +194,7 @@
+     char latin1() const { return ucs > 0xff ? 0 : (char) ucs; }
+     ushort unicode() const { return ucs; }
+ #ifdef Q_NO_PACKED_REFERENCE
+-    ushort &unicode() { return *(&ucs); }
++    ushort &unicode() { return *(ushort *)(&ucs); }
+ #else
+     ushort &unicode() { return ucs; }
+ #endif