diff options
| -rw-r--r-- | x11/qt4-libs/distinfo | 4 | ||||
| -rw-r--r-- | x11/qt4-libs/patches/patch-ao | 39 |
2 files changed, 30 insertions, 13 deletions
diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo index 8fae3a57cb4..e5cc7036a96 100644 --- a/x11/qt4-libs/distinfo +++ b/x11/qt4-libs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.21 2008/02/11 23:06:01 hubertf Exp $ +$NetBSD: distinfo,v 1.22 2008/05/13 18:35:19 drochner Exp $ SHA1 (qt-x11-opensource-src-4.3.3.tar.gz) = 77d00e2438efa793f6c16c54b64c8ba440ee3228 RMD160 (qt-x11-opensource-src-4.3.3.tar.gz) = 410daca03b6802ba5cc6662219c2ba7a190bd292 @@ -17,7 +17,7 @@ SHA1 (patch-ak) = bd5d0f766a6ddcd801b94b4387d19b62edc8e4e1 SHA1 (patch-al) = 606610ee684836d14e5893d295c0b131beeb9605 SHA1 (patch-am) = 0d4a4f2767cad5414c8bfe4dc8485064a9be4381 SHA1 (patch-an) = 6c9044134516d089e97b47a2750beab0e4c4952f -SHA1 (patch-ao) = 04361d820325b1b8a0bc66ecaf47bab5f92e7825 +SHA1 (patch-ao) = 44d5b5830b237d6e71fc83444029461bace15081 SHA1 (patch-ap) = 99402ac9ef527e7fa9b1825c8e1b8a299bc4ffe7 SHA1 (patch-aq) = afdc1fcacc6f2f421a209d96d2c80141f1aa6dc3 SHA1 (patch-ar) = 7ed6f3e8db11e15c907eeeb11f691612633f1c34 diff --git a/x11/qt4-libs/patches/patch-ao b/x11/qt4-libs/patches/patch-ao index 111135086ef..7eebb7fd8ff 100644 --- a/x11/qt4-libs/patches/patch-ao +++ b/x11/qt4-libs/patches/patch-ao @@ -1,17 +1,34 @@ -$NetBSD: patch-ao,v 1.2 2007/11/22 18:51:25 drochner Exp $ +$NetBSD: patch-ao,v 1.3 2008/05/13 18:35:19 drochner Exp $ ---- ./src/corelib/codecs/qiconvcodec.cpp.orig 2007-10-01 15:06:02.000000000 +0200 -+++ ./src/corelib/codecs/qiconvcodec.cpp -@@ -44,7 +44,7 @@ +--- src/corelib/codecs/qiconvcodec.cpp.orig 2007-12-04 18:42:55 +0200 ++++ src/corelib/codecs/qiconvcodec.cpp 2008-05-13 09:47:40 +0300 +@@ -43,9 +43,14 @@ + #include <stdio.h> + #include <dlfcn.h> ++// for __DragonFly_version ++#if defined(__DragonFly__) ++#include <sys/param.h> ++#endif ++ // unistd.h is needed for the _XOPEN_UNIX macro #include <unistd.h> -#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX6) && !defined(Q_OS_OSF) -+#if (defined(_XOPEN_UNIX) && !defined(Q_OS_QNX6) && !defined(Q_OS_OSF)) || defined(Q_OS_NETBSD) ++#if (defined(_XOPEN_UNIX) && !defined(Q_OS_QNX6) && !defined(Q_OS_OSF)) || defined(Q_OS_NETBSD) || defined(__DragonFly__) # include <langinfo.h> #endif -@@ -95,7 +95,7 @@ QString QIconvCodec::convertToUnicode(co +@@ -55,6 +60,9 @@ + #elif defined(Q_OS_AIX) + # define NO_BOM + # define UTF16 "UCS-2" ++#elif defined(__DragonFly__) && __DragonFly_version < 197700 ++# define NO_BOM ++# define UTF16 "UTF-16" + #else + # define UTF16 "UTF-16" + #endif +@@ -129,7 +137,7 @@ QString QIconvCodec::convertToUnicode(co QByteArray ba; size_t outBytesLeft = len * 2 + 2; ba.resize(outBytesLeft); @@ -20,7 +37,7 @@ $NetBSD: patch-ao,v 1.2 2007/11/22 18:51:25 drochner Exp $ // GNU doesn't disagree with POSIX :/ const char *inBytes = chars; #else -@@ -155,7 +155,7 @@ QByteArray QIconvCodec::convertFromUnico +@@ -189,7 +197,7 @@ QByteArray QIconvCodec::convertFromUnico ba.resize(outBytesLeft); char *outBytes = ba.data(); @@ -29,7 +46,7 @@ $NetBSD: patch-ao,v 1.2 2007/11/22 18:51:25 drochner Exp $ const char *inBytes; #else char *inBytes; -@@ -165,7 +165,7 @@ QByteArray QIconvCodec::convertFromUnico +@@ -199,7 +207,7 @@ QByteArray QIconvCodec::convertFromUnico #if !defined(NO_BOM) // give iconv() a BOM QChar bom[] = { QChar(QChar::ByteOrderMark) }; @@ -38,7 +55,7 @@ $NetBSD: patch-ao,v 1.2 2007/11/22 18:51:25 drochner Exp $ // GNU doesn't disagree with POSIX :/ inBytes = reinterpret_cast<const char *>(bom); #else -@@ -179,7 +179,7 @@ QByteArray QIconvCodec::convertFromUnico +@@ -213,7 +221,7 @@ QByteArray QIconvCodec::convertFromUnico #endif // NO_BOM // now feed iconv() the real data @@ -47,12 +64,12 @@ $NetBSD: patch-ao,v 1.2 2007/11/22 18:51:25 drochner Exp $ // GNU doesn't disagree with POSIX :/ inBytes = reinterpret_cast<const char *>(uc); #else -@@ -244,7 +244,7 @@ iconv_t QIconvCodec::createIconv_t(const +@@ -278,7 +286,7 @@ iconv_t QIconvCodec::createIconv_t(const char *codeset = 0; #endif -#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX6) && !defined(Q_OS_OSF) -+#if (defined(_XOPEN_UNIX) && !defined(Q_OS_QNX6) && !defined(Q_OS_OSF)) || defined(Q_OS_NETBSD) ++#if (defined(_XOPEN_UNIX) && !defined(Q_OS_QNX6) && !defined(Q_OS_OSF)) || defined(Q_OS_NETBSD) || defined(__DragonFly__) if (cd == (iconv_t) -1) { codeset = nl_langinfo(CODESET); if (codeset) |