diff options
Diffstat (limited to 'main/qt5-qtbase/qt-musl-iconv-no-bom.patch')
| -rw-r--r-- | main/qt5-qtbase/qt-musl-iconv-no-bom.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/main/qt5-qtbase/qt-musl-iconv-no-bom.patch b/main/qt5-qtbase/qt-musl-iconv-no-bom.patch index 35380ad671..8bf35ec1ec 100644 --- a/main/qt5-qtbase/qt-musl-iconv-no-bom.patch +++ b/main/qt5-qtbase/qt-musl-iconv-no-bom.patch @@ -1,11 +1,11 @@ ---- qt-everywhere-opensource-src-4.8.5/src/corelib/codecs/qiconvcodec.cpp.orig -+++ qt-everywhere-opensource-src-4.8.5/src/corelib/codecs/qiconvcodec.cpp -@@ -62,7 +62,7 @@ +--- qtbase/src/corelib/codecs/qiconvcodec.cpp 2017-01-18 15:20:58.000000000 +0100 ++++ qtbase/src/corelib/codecs/qiconvcodec.cpp 2017-02-21 14:33:32.423808603 +0100 +@@ -64,7 +64,7 @@ #elif defined(Q_OS_AIX) # define NO_BOM # define UTF16 "UCS-2" --#elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC) -+#elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC) || (defined(Q_OS_LINUX) && !defined(__GLIBC__)) +-#elif defined(Q_OS_FREEBSD) ++#elif defined(Q_OS_FREEBSD) || (defined(Q_OS_LINUX) && !defined(__GLIBC__)) # define NO_BOM # if Q_BYTE_ORDER == Q_BIG_ENDIAN # define UTF16 "UTF-16BE" |