diff options
Diffstat (limited to 'x11/qt4-libs/patches/patch-ao')
| -rw-r--r-- | x11/qt4-libs/patches/patch-ao | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/x11/qt4-libs/patches/patch-ao b/x11/qt4-libs/patches/patch-ao index 46bfa02b787..a05cffc04d9 100644 --- a/x11/qt4-libs/patches/patch-ao +++ b/x11/qt4-libs/patches/patch-ao @@ -1,6 +1,6 @@ -$NetBSD: patch-ao,v 1.7 2010/01/29 18:19:09 adam Exp $ +$NetBSD: patch-ao,v 1.8 2010/07/04 06:00:14 adam Exp $ ---- src/corelib/codecs/qiconvcodec.cpp.orig 2010-01-15 17:01:36.000000000 +0000 +--- src/corelib/codecs/qiconvcodec.cpp.orig 2010-06-02 02:03:17.000000000 +0000 +++ src/corelib/codecs/qiconvcodec.cpp @@ -50,9 +50,14 @@ #include <stdio.h> @@ -37,7 +37,16 @@ $NetBSD: patch-ao,v 1.7 2010/01/29 18:19:09 adam Exp $ // GNU doesn't disagree with POSIX :/ const char *inBytes = chars; #else -@@ -305,7 +313,7 @@ QByteArray QIconvCodec::convertFromUnico +@@ -311,7 +319,7 @@ static bool setByteOrder(iconv_t cd) + size_t outBytesLeft = sizeof buf; + size_t inBytesLeft = sizeof bom; + +-#if defined(GNU_LIBICONV) ++#if defined(GNU_LIBICONV) || defined(__NetBSD__) + const char **inBytesPtr = const_cast<const char **>(&inBytes); + #else + char **inBytesPtr = &inBytes; +@@ -331,7 +339,7 @@ QByteArray QIconvCodec::convertFromUnico char *outBytes; size_t inBytesLeft; @@ -46,7 +55,7 @@ $NetBSD: patch-ao,v 1.7 2010/01/29 18:19:09 adam Exp $ const char **inBytesPtr = const_cast<const char **>(&inBytes); #else char **inBytesPtr = &inBytes; -@@ -451,11 +459,13 @@ iconv_t QIconvCodec::createIconv_t(const +@@ -468,11 +476,13 @@ iconv_t QIconvCodec::createIconv_t(const static const char empty_codeset[] = ""; const char *codeset = empty_codeset; cd = iconv_open(to ? to : codeset, from ? from : codeset); |