diff options
| author | drochner <drochner@pkgsrc.org> | 2008-05-13 18:35:19 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2008-05-13 18:35:19 +0000 |
| commit | 4d4d648001e6f9414afc57869c64ea74e3355a0c (patch) | |
| tree | b4dac0b2877ca20e287cbf82536adb36aee3f751 /x11/qt4-libs/patches | |
| parent | fc9965ca883e5fd8dda965d0fc60327eeb28b323 (diff) | |
| download | pkgsrc-4d4d648001e6f9414afc57869c64ea74e3355a0c.tar.gz | |
The citrix i18n code in DragonFly had some issues wrt BOM handling which
are fixed now. Enable BOM handling for newer versions only.
From Hasso Tepper per PM.
Diffstat (limited to 'x11/qt4-libs/patches')
| -rw-r--r-- | x11/qt4-libs/patches/patch-ao | 39 |
1 files changed, 28 insertions, 11 deletions
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) |