From 1563fad8d516d11b88aa1a99e2d25a034da6dbb9 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 11 May 2015 10:48:38 +0200 Subject: [PATCH] qt5: portability patches from Alpine. Close #1470 --- srcpkgs/qt5/patches/qt-musl-iconv-no-bom.patch | 11 +++++++++++ srcpkgs/qt5/patches/qt-musl-socklen.patch | 14 ++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 srcpkgs/qt5/patches/qt-musl-iconv-no-bom.patch create mode 100644 srcpkgs/qt5/patches/qt-musl-socklen.patch diff --git a/srcpkgs/qt5/patches/qt-musl-iconv-no-bom.patch b/srcpkgs/qt5/patches/qt-musl-iconv-no-bom.patch new file mode 100644 index 00000000000..2d15df22e3c --- /dev/null +++ b/srcpkgs/qt5/patches/qt-musl-iconv-no-bom.patch @@ -0,0 +1,11 @@ +--- src/corelib/codecs/qiconvcodec.cpp.orig ++++ src/corelib/codecs/qiconvcodec.cpp +@@ -62,7 +62,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__)) + # define NO_BOM + # if Q_BYTE_ORDER == Q_BIG_ENDIAN + # define UTF16 "UTF-16BE" diff --git a/srcpkgs/qt5/patches/qt-musl-socklen.patch b/srcpkgs/qt5/patches/qt-musl-socklen.patch new file mode 100644 index 00000000000..ae76061340c --- /dev/null +++ b/srcpkgs/qt5/patches/qt-musl-socklen.patch @@ -0,0 +1,14 @@ +--- mkspecs/linux-g++/qplatformdefs.h.orig ++++ mkspecs/linux-g++/qplatformdefs.h +@@ -86,11 +86,7 @@ + + #undef QT_SOCKLEN_T + +-#if defined(__GLIBC__) && (__GLIBC__ >= 2) + #define QT_SOCKLEN_T socklen_t +-#else +-#define QT_SOCKLEN_T int +-#endif + + #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) + #define QT_SNPRINTF ::snprintf