diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-03-29 08:55:19 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-03-31 12:48:15 +0000 |
| commit | 338f9c3a63171c1895aaeea8748122eec886004a (patch) | |
| tree | 86726e81234cecc0159eb3f3c864e285c317858c | |
| parent | 599c283fa5a1c29ab632f7f6a987f3b6f53b001b (diff) | |
| download | aports-338f9c3a63171c1895aaeea8748122eec886004a.tar.bz2 aports-338f9c3a63171c1895aaeea8748122eec886004a.tar.xz | |
main/qt5-qtbase: upgrade to 5.6.0
| -rw-r--r-- | main/qt5-qtbase/APKBUILD | 18 | ||||
| -rw-r--r-- | main/qt5-qtbase/qt-musl-socklen.patch | 14 | ||||
| -rw-r--r-- | main/qt5-qtbase/xcb-193.patch | 13 |
3 files changed, 7 insertions, 38 deletions
diff --git a/main/qt5-qtbase/APKBUILD b/main/qt5-qtbase/APKBUILD index c1c85065ff..5b4a5c617d 100644 --- a/main/qt5-qtbase/APKBUILD +++ b/main/qt5-qtbase/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=qt5-qtbase -pkgver=5.5.1 +pkgver=5.6.0 _ver=${pkgver/_/-} _ver=${_ver/beta0/beta} _ver=${_ver/rc0/rc} @@ -51,7 +51,6 @@ case $pkgver in esac source="http://download.qt-project.org/$_rel/qt/${pkgver%.*}/$_ver/submodules/qtbase-opensource-src-$_V.tar.xz qt-musl-iconv-no-bom.patch - qt-musl-socklen.patch " _qt5_prefix=/usr/lib/qt5 @@ -201,12 +200,9 @@ x11() { return 0 } -md5sums="687e2b122fa2c3390b5e20a166d38038 qtbase-opensource-src-5.5.1.tar.xz -077e31e0cb0d25637a3b3638fffbef3c qt-musl-iconv-no-bom.patch -bc83dc99f866423b4803453a0e2949d2 qt-musl-socklen.patch" -sha256sums="dfa4e8a4d7e4c6b69285e7e8833eeecd819987e1bdbe5baa6b6facd4420de916 qtbase-opensource-src-5.5.1.tar.xz -40b337c16bbb1d259f315fe5a1b110f9917223aee53b82809934efa4fa5e62a3 qt-musl-iconv-no-bom.patch -e70bdddf67c358c02099bebee460e3c5456666562bff9ef9ebaacf9f4ea7a6df qt-musl-socklen.patch" -sha512sums="4d31de136870025dfb7544f255798884af1ad4f3060b0c00a0467c98af1f7de368eb298d4c52ba6d1ad27e36060b30c0314ce7ba0744b15642420ec89587a575 qtbase-opensource-src-5.5.1.tar.xz -a185ea5e984d2636e3f9f6c4ed8fad66a17575da0679724da60a3dc519468ab45aa9369f43ce5c64f07cb730910e36623164aefafca3aabe0359c62becca870e qt-musl-iconv-no-bom.patch -fb621e9e5a60bb5bd4ad86fa41772fd8db7e8ad3a6e8d36a3d720d493d462db618e4bf3187e3eb66d123fceca64bbbd2df2afba506cc4c79bafa456cd67e82aa qt-musl-socklen.patch" +md5sums="d6b6cfd333c22829c6c85fc52ceed019 qtbase-opensource-src-5.6.0.tar.xz +077e31e0cb0d25637a3b3638fffbef3c qt-musl-iconv-no-bom.patch" +sha256sums="6efa8a5c559e92b2e526d48034e858023d5fd3c39115ac1bfd3bb65834dbd67a qtbase-opensource-src-5.6.0.tar.xz +40b337c16bbb1d259f315fe5a1b110f9917223aee53b82809934efa4fa5e62a3 qt-musl-iconv-no-bom.patch" +sha512sums="5b2a5842346475be0944fc44bc09ff5b5d5da167246310de132f034e17ebbcbbf103b6f085dbf8b566389694bd095227aa1ed569b93e0f9a8f02da51d8fe076e qtbase-opensource-src-5.6.0.tar.xz +a185ea5e984d2636e3f9f6c4ed8fad66a17575da0679724da60a3dc519468ab45aa9369f43ce5c64f07cb730910e36623164aefafca3aabe0359c62becca870e qt-musl-iconv-no-bom.patch" diff --git a/main/qt5-qtbase/qt-musl-socklen.patch b/main/qt5-qtbase/qt-musl-socklen.patch deleted file mode 100644 index 90b9ccda08..0000000000 --- a/main/qt5-qtbase/qt-musl-socklen.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- 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 diff --git a/main/qt5-qtbase/xcb-193.patch b/main/qt5-qtbase/xcb-193.patch deleted file mode 100644 index 5ad3623cba..0000000000 --- a/main/qt5-qtbase/xcb-193.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp -index cc8c42f..d03ea6f 100644 ---- a/src/plugins/platforms/xcb/qxcbconnection.cpp -+++ b/src/plugins/platforms/xcb/qxcbconnection.cpp -@@ -1752,7 +1752,7 @@ bool QXcbConnection::xi2GetValuatorValueIfSet(void *event, int valuatorNum, doub - bool QXcbConnection::xi2PrepareXIGenericDeviceEvent(xcb_ge_event_t *event, int opCode) - { - // xGenericEvent has "extension" on the second byte, xcb_ge_event_t has "pad0". -- if (event->pad0 == opCode) { -+ if (event->extension == opCode) { - // xcb event structs contain stuff that wasn't on the wire, the full_sequence field - // adds an extra 4 bytes and generic events cookie data is on the wire right after the standard 32 bytes. - // Move this data back to have the same layout in memory as it was on the wire |