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/0005-forkd-disable-eventfd-for-uclibc.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/0005-forkd-disable-eventfd-for-uclibc.patch')
-rw-r--r-- | package/qt5/qt5base/0005-forkd-disable-eventfd-for-uclibc.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/package/qt5/qt5base/0005-forkd-disable-eventfd-for-uclibc.patch b/package/qt5/qt5base/0005-forkd-disable-eventfd-for-uclibc.patch deleted file mode 100644 index 04d49dd3b9..0000000000 --- a/package/qt5/qt5base/0005-forkd-disable-eventfd-for-uclibc.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 62ef0d97cfa2ed0142fc69c6e6395a570bea9215 Mon Sep 17 00:00:00 2001 -From: Julien Corjon <corjon.j@ecagroup.com> -Date: Tue, 21 Jul 2015 11:59:57 +0200 -Subject: [PATCH] forkd - disable eventfd for uClibc <= 0.9.33 - -eventfd is not implemented in uClibc <= 0.9.33 - -Upstream-Status : https://bugreports.qt.io/browse/QTBUG-47337 - -Signed-off-by: Julien Corjon <corjon.j@ecagroup.com> ---- - src/3rdparty/forkfd/forkfd.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/3rdparty/forkfd/forkfd.c b/src/3rdparty/forkfd/forkfd.c -index 8d08f40..fa47cdf 100644 ---- a/src/3rdparty/forkfd/forkfd.c -+++ b/src/3rdparty/forkfd/forkfd.c -@@ -48,6 +48,10 @@ - # if (defined(__GLIBC__) && (__GLIBC__ << 16) + __GLIBC_MINOR__ >= 0x209) || defined(__BIONIC__) - # define HAVE_PIPE2 1 - # endif -+# if (defined(__UCLIBC__) && (__UCLIBC_MAJOR__ == 0) && (__UCLIBC_MINOR__ < 9 || (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 33))) -+# undef HAVE_EVENTFD -+# undef HAVE_PIPE2 -+# endif - #endif - - #if _POSIX_VERSION-0 >= 200809L || _XOPEN_VERSION-0 >= 500 --- -2.1.0 - |