? qt3-libs/patches/patch-ch Index: qt3-libs/distinfo =================================================================== RCS file: /cvsroot/pkgsrc/x11/qt3-libs/distinfo,v retrieving revision 1.52 diff -u -r1.52 distinfo --- qt3-libs/distinfo 13 Jun 2010 22:45:50 -0000 1.52 +++ qt3-libs/distinfo 7 Aug 2010 22:12:53 -0000 @@ -6,7 +6,7 @@ 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-ce) = 6dbf1d619782be1c4522ec019df3936a2538ea39 SHA1 (patch-cf) = 4a38cf1a82ef03a85ecb5787e5954f0c8a0afbda SHA1 (patch-cg) = 4ae34d2556314e6bf35160c018987a453055a0eb +SHA1 (patch-ch) = 91c5404967d5e154280c9bb18046f3f724981b00 SHA1 (patch-ia) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112 SHA1 (patch-ib) = b15936b85b2b1946e8c9a92bf393c3d3a1fc6950 Index: qt3-libs/patches/patch-ad =================================================================== RCS file: /cvsroot/pkgsrc/x11/qt3-libs/patches/patch-ad,v retrieving revision 1.8 diff -u -r1.8 patch-ad --- qt3-libs/patches/patch-ad 13 Apr 2005 21:58:05 -0000 1.8 +++ qt3-libs/patches/patch-ad 7 Aug 2010 22:12:53 -0000 @@ -1,7 +1,7 @@ $NetBSD: patch-ad,v 1.8 2005/04/13 21:58:05 bouyer 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 @@ #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 --- /dev/null 2010-08-08 06:59:37.000000000 +0900 +++ qt3-libs/patches/patch-ch 2010-06-14 15:32:52.000000000 +0900 @@ -0,0 +1,13 @@ +$NetBSD$ + +--- 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