diff options
| author | Julien CORJON <corjon.j@ecagroup.com> | 2016-03-17 10:42:28 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-03-20 23:23:37 +0100 |
| commit | 59ef95fdaecd0506b99a4144c7a2ae1194ada729 (patch) | |
| tree | bcbd0beff66951746ba13fc625ff23501f61ae7d /package/qt5/qt5base/0014-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch | |
| parent | 940bfe2f4336a3fea1ec6805db1f90ce83bd4a78 (diff) | |
| download | buildroot-59ef95fdaecd0506b99a4144c7a2ae1194ada729.tar.gz buildroot-59ef95fdaecd0506b99a4144c7a2ae1194ada729.zip | |
qt5: bump version to 5.6.0
Remove upstream committed patches (qt5base):
- 0001-Force_egl_visual_ID_33.patch (see [1], [2])
- 0003-xcb-egl-fixes.patch (see [3])
- 0005-forkd-disable-eventfd-for-uclibc.patch (see [4], [5])
- 0009-fix-eglfs-for-sunxi-mali.patch (see [6])
- 0014-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch (see [7])
Remove MX6_WORKAROUND from qt5base.mk since we do not need to tweak
EGL visual ID to 33.
Remove upstream committed patch (qt5webchannel):
- 0001-Fix-builds-without-qml-module.patch (see [8], [9])
Fix Qt5Enginio to 1.6.0 version (see [10])
[1] https://bugreports.qt.io/browse/QTBUG-44290
[2] https://codereview.qt-project.org/#/c/108849/
[3] https://codereview.qt-project.org/#/c/115438/
[4] https://bugreports.qt.io/browse/QTBUG-47337
[5] https://codereview.qt-project.org/#/c/121988/
[6] https://codereview.qt-project.org/#/c/125837/
[7] https://codereview.qt-project.org/#/c/126725/
[8] https://bugreports.qt.io/browse/QTBUG-47360
[9] https://codereview.qt-project.org/#/c/122086/
[10] https://bugreports.qt.io/browse/QTBUG-50111
Signed-off-by: Julien Corjon <corjon.j@ecagroup.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/qt5/qt5base/0014-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch')
| -rw-r--r-- | package/qt5/qt5base/0014-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/package/qt5/qt5base/0014-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch b/package/qt5/qt5base/0014-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch deleted file mode 100644 index 97be739d0b..0000000000 --- a/package/qt5/qt5base/0014-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 8f09897de948cea8861ca95e182f442cf15a339e Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 8 Jun 2015 13:59:25 -0700 -Subject: [PATCH] linux-oe-g++: Invert conditional for defining QT_SOCKLEN_T - -This helps to make sure that QT_SOCKLEN_T is defined to be 'int' -only when its glibc < 2 and not also for the libraries which may define -it as per standards but are not glibc, e.g. musl - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -[Bernd: Downloaded from -https://github.com/meta-qt5/meta-qt5/blob/d9d1d04760430cd0e5edd1764d832860715e7b83/recipes-qt/qt5/qtbase/0014-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch -and adjusted path.] - -Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> ---- - mkspecs/linux-oe-g++/qplatformdefs.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h -index dd12003..8623651 100644 ---- a/mkspecs/linux-g++/qplatformdefs.h -+++ b/mkspecs/linux-g++/qplatformdefs.h -@@ -86,10 +86,10 @@ - - #undef QT_SOCKLEN_T - --#if defined(__GLIBC__) && (__GLIBC__ >= 2) --#define QT_SOCKLEN_T socklen_t --#else -+#if defined(__GLIBC__) && (__GLIBC__ < 2) - #define QT_SOCKLEN_T int -+#else -+#define QT_SOCKLEN_T socklen_t - #endif - - #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) --- -2.1.4 - |
