diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2014-03-03 14:26:38 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2014-03-03 14:27:39 +0000 |
| commit | dc043a0252c0eb8041b032d88b6f28c9c74a1a7a (patch) | |
| tree | 4b2cba000a4976a865eacfaf000bac700f8eb87c /testing/qt5-qtbase | |
| parent | 74532119b8110896689d2eeb270c620a89b01f59 (diff) | |
| download | aports-dc043a0252c0eb8041b032d88b6f28c9c74a1a7a.tar.bz2 aports-dc043a0252c0eb8041b032d88b6f28c9c74a1a7a.tar.xz | |
testing/qt5-*: upgrade to 5.2.1, fix musl build
Diffstat (limited to 'testing/qt5-qtbase')
| -rw-r--r-- | testing/qt5-qtbase/APKBUILD | 19 | ||||
| -rw-r--r-- | testing/qt5-qtbase/qt-musl-iconv-no-bom.patch | 11 | ||||
| -rw-r--r-- | testing/qt5-qtbase/qt-musl-socklen.patch | 14 |
3 files changed, 39 insertions, 5 deletions
diff --git a/testing/qt5-qtbase/APKBUILD b/testing/qt5-qtbase/APKBUILD index 694f8f1ec..2f4e33c8d 100644 --- a/testing/qt5-qtbase/APKBUILD +++ b/testing/qt5-qtbase/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=qt5-qtbase -pkgver=5.1.1 -pkgrel=3 +pkgver=5.2.1 +pkgrel=0 pkgdesc="Qt5 - QtBase components" url="http://qt-project.org/" arch="all" @@ -42,7 +42,10 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-sqlite $pkgname-odbc $pkgname-postgresql $pkgname-mysql $pkgname-tds $pkgname-x11" source="http://download.qt-project.org/official_releases/qt/${pkgver%.*}/$pkgver/submodules/qtbase-opensource-src-$pkgver.tar.xz + qt-musl-iconv-no-bom.patch + qt-musl-socklen.patch " + _builddir="$srcdir"/qtbase-opensource-src-$pkgver prepare() { cd "$_builddir" @@ -176,6 +179,12 @@ x11() { return 0 } -md5sums="955d1e4da875f3872ef3208f21a757dd qtbase-opensource-src-5.1.1.tar.xz" -sha256sums="d4620e0b1aff6d2b6f4d8066e6f8258e012a8b5507af7c03b661029a1ffa75c9 qtbase-opensource-src-5.1.1.tar.xz" -sha512sums="db7e25a520584b10370d898747f2cfb84ebbce3a8b9027f373cac7ab713fe199da5465df2453d04107406101ad4eff8cd82871efab40377ff44d789a424667c3 qtbase-opensource-src-5.1.1.tar.xz" +md5sums="fa005301a2000b92b61b63edc042567b qtbase-opensource-src-5.2.1.tar.xz +077e31e0cb0d25637a3b3638fffbef3c qt-musl-iconv-no-bom.patch +bc83dc99f866423b4803453a0e2949d2 qt-musl-socklen.patch" +sha256sums="acdfd1aa2548ebea1d922e8e24e5c59f5fc3b2beae7c8003ba47d773bfcc94c0 qtbase-opensource-src-5.2.1.tar.xz +40b337c16bbb1d259f315fe5a1b110f9917223aee53b82809934efa4fa5e62a3 qt-musl-iconv-no-bom.patch +e70bdddf67c358c02099bebee460e3c5456666562bff9ef9ebaacf9f4ea7a6df qt-musl-socklen.patch" +sha512sums="72ef00e9828bf19b2a3daca1c0fa6b0f458c4847da79d4066c818526b8dac504fa4c54496b5d6c67dbea4e786bd811ee8f87614146e684a117d9b86df580e07d qtbase-opensource-src-5.2.1.tar.xz +a185ea5e984d2636e3f9f6c4ed8fad66a17575da0679724da60a3dc519468ab45aa9369f43ce5c64f07cb730910e36623164aefafca3aabe0359c62becca870e qt-musl-iconv-no-bom.patch +fb621e9e5a60bb5bd4ad86fa41772fd8db7e8ad3a6e8d36a3d720d493d462db618e4bf3187e3eb66d123fceca64bbbd2df2afba506cc4c79bafa456cd67e82aa qt-musl-socklen.patch" diff --git a/testing/qt5-qtbase/qt-musl-iconv-no-bom.patch b/testing/qt5-qtbase/qt-musl-iconv-no-bom.patch new file mode 100644 index 000000000..35380ad67 --- /dev/null +++ b/testing/qt5-qtbase/qt-musl-iconv-no-bom.patch @@ -0,0 +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 @@ + #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/testing/qt5-qtbase/qt-musl-socklen.patch b/testing/qt5-qtbase/qt-musl-socklen.patch new file mode 100644 index 000000000..90b9ccda0 --- /dev/null +++ b/testing/qt5-qtbase/qt-musl-socklen.patch @@ -0,0 +1,14 @@ +--- qt-everywhere-opensource-src-4.8.5/mkspecs/linux-g++/qplatformdefs.h.orig ++++ qt-everywhere-opensource-src-4.8.5/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 |