diff options
| author | wiz <wiz> | 2009-05-20 01:00:40 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2009-05-20 01:00:40 +0000 |
| commit | e9d3ec1d09f7dd203f8b50d497a8cf33d7d52169 (patch) | |
| tree | b76802b26de496ff81a7cda2df2152774b091a03 /x11/qt3-libs | |
| parent | bce310e12c34dd199b2fb13ec720a93538f33642 (diff) | |
| download | pkgsrc-e9d3ec1d09f7dd203f8b50d497a8cf33d7d52169.tar.gz | |
Apply patch reported by Gary Duzan in PR 37347 to fix finance/kmymoney2
after ld.elf_so fix from December 2007.
Bump PKGREVISION.
Diffstat (limited to 'x11/qt3-libs')
| -rw-r--r-- | x11/qt3-libs/Makefile | 4 | ||||
| -rw-r--r-- | x11/qt3-libs/distinfo | 4 | ||||
| -rw-r--r-- | x11/qt3-libs/patches/patch-ar | 19 |
3 files changed, 18 insertions, 9 deletions
diff --git a/x11/qt3-libs/Makefile b/x11/qt3-libs/Makefile index a2aae63e88b..72b93e6d92c 100644 --- a/x11/qt3-libs/Makefile +++ b/x11/qt3-libs/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.70 2008/01/18 05:10:06 tnn Exp $ +# $NetBSD: Makefile,v 1.71 2009/05/20 01:00:40 wiz Exp $ PKGNAME= qt3-libs-${QTVERSION} -PKGREVISION= 8 +PKGREVISION= 9 MAINTAINER= adam@NetBSD.org COMMENT= C++ X GUI toolkit diff --git a/x11/qt3-libs/distinfo b/x11/qt3-libs/distinfo index 926be2119f6..cfa08df80a4 100644 --- a/x11/qt3-libs/distinfo +++ b/x11/qt3-libs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.49 2009/04/07 10:59:48 hasso Exp $ +$NetBSD: distinfo,v 1.50 2009/05/20 01:00:40 wiz Exp $ SHA1 (qt-x11-free-3.3.8.tar.bz2) = 91b192cb8e80679607d24ae35d6e20ed68d149d7 RMD160 (qt-x11-free-3.3.8.tar.bz2) = 7b8e4e35f49014eac4fcfe91b7ec0a45c5569cf4 @@ -20,7 +20,7 @@ SHA1 (patch-an) = 2981ca827b6486a59654d902291685aa57fe9d26 SHA1 (patch-ao) = 3aacba05b27314cadab7dceba3c21d65bab608d3 SHA1 (patch-ap) = 5040628324d271abfc662c5a6eeb4f1ecf0d4758 SHA1 (patch-aq) = c17ff8b42901ae9a3cc51c33cffe4cffa64b4e4d -SHA1 (patch-ar) = 736703bd8831a4fa5562690b9159d937b233fccf +SHA1 (patch-ar) = 84c0d7153feabcab6558ba84fbaa723f1c238e40 SHA1 (patch-bb) = b6a15a4b2b7b83b89bd3610cf2e48c242dbce2e5 SHA1 (patch-bc) = d8a84e1b66bf1953b53df57ae81d2c98cce69c41 SHA1 (patch-bd) = a116ecf305ee5b5338bf84cb908d695f3baea830 diff --git a/x11/qt3-libs/patches/patch-ar b/x11/qt3-libs/patches/patch-ar index 24ba3c43901..4c95f9d0e15 100644 --- a/x11/qt3-libs/patches/patch-ar +++ b/x11/qt3-libs/patches/patch-ar @@ -1,8 +1,17 @@ -$NetBSD: patch-ar,v 1.1 2007/04/06 12:44:38 markd Exp $ +$NetBSD: patch-ar,v 1.2 2009/05/20 01:00:40 wiz Exp $ ---- src/tools/qstring.cpp +--- src/tools/qstring.cpp.orig 2007-02-02 14:01:05.000000000 +0000 +++ src/tools/qstring.cpp -@@ -5805,6 +5805,7 @@ +@@ -1362,7 +1362,7 @@ QT_STATIC_CONST_IMPL QChar QChar::nbsp(( + QStringData* QString::makeSharedNull() + { + QString::shared_null = new QStringData; +-#if defined( Q_OS_MAC ) || defined(Q_OS_SOLARIS) || defined(Q_OS_HPUX) || defined(Q_OS_AIX) ++#if defined( Q_OS_MAC ) || defined(Q_OS_SOLARIS) || defined(Q_OS_HPUX) || defined(Q_OS_AIX) || defined(Q_OS_NETBSD) + QString *that = const_cast<QString *>(&QString::null); + that->d = QString::shared_null; + #endif +@@ -5805,6 +5805,7 @@ QString QString::fromUtf8( const char* u result.setLength( len ); // worst case QChar *qch = (QChar *)result.unicode(); uint uc = 0; @@ -10,7 +19,7 @@ $NetBSD: patch-ar,v 1.1 2007/04/06 12:44:38 markd Exp $ int need = 0; int error = -1; uchar ch; -@@ -5822,6 +5823,12 @@ +@@ -5822,6 +5823,12 @@ QString QString::fromUtf8( const char* u unsigned short low = uc%0x400 + 0xdc00; *qch++ = QChar(high); *qch++ = QChar(low); @@ -23,7 +32,7 @@ $NetBSD: patch-ar,v 1.1 2007/04/06 12:44:38 markd Exp $ } else { *qch++ = uc; } -@@ -5844,14 +5851,17 @@ +@@ -5844,14 +5851,17 @@ QString QString::fromUtf8( const char* u uc = ch & 0x1f; need = 1; error = i; |