From 105c23cedb54f34e80a303c6af02c4398f72f029 Mon Sep 17 00:00:00 2001 From: Julien CORJON Date: Tue, 21 Jul 2015 13:30:14 +0200 Subject: qt5: bump version to 5.5.0 QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES is no longer useful since eglfs does not depend on the device makespecs anymore. Instead, backends are autodetected by configure [1]. We still need specifics include path for rpi eglfs support. 0008-forkd-disable-eventfd-for-uclibc.patch disable missing eventfd in new Qt 3rd party forkd for uClibc toolchains. Remove patches commited in Qt mainline and update pending one [1] https://codereview.qt-project.org/#/c/107548/ Passed test : - Full compilation on ARM/uClibc - Partialy compiled and tested on i.MX6/linaro with OpenGL backend - Partialy compiled but not executed for Raspberry Pi (rpi-userland) Signed-off-by: Julien Corjon Signed-off-by: Thomas Petazzoni --- ...ing-Check-if-uClibc-has-backtrace-support.patch | 48 ---------------------- 1 file changed, 48 deletions(-) delete mode 100644 package/qt5/qt5base/0002-logging-Check-if-uClibc-has-backtrace-support.patch (limited to 'package/qt5/qt5base/0002-logging-Check-if-uClibc-has-backtrace-support.patch') diff --git a/package/qt5/qt5base/0002-logging-Check-if-uClibc-has-backtrace-support.patch b/package/qt5/qt5base/0002-logging-Check-if-uClibc-has-backtrace-support.patch deleted file mode 100644 index 7d884adc74..0000000000 --- a/package/qt5/qt5base/0002-logging-Check-if-uClibc-has-backtrace-support.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 9f03adc74fa06e9559e8bb85f1cfd942397328b5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= -Date: Wed, 24 Dec 2014 17:29:11 +0200 -Subject: [PATCH] logging: Check if uClibc has backtrace support - -execinfo.h is optional in uClibc. We need to check -__UCLIBC_HAS_BACKTRACE__ if uClibc is used. - -Change-Id: Ie28be85b0b70472df1fc4a208581bb66ad34229e -Sent-Upstream: https://codereview.qt-project.org/#/c/102628/ -Signed-off-by: Fatih Aşıcı ---- - src/corelib/global/qlogging.cpp | 15 +++++++++++---- - 1 file changed, 11 insertions(+), 4 deletions(-) - -diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp -index 50d35a6..fa897d6 100644 ---- a/src/corelib/global/qlogging.cpp -+++ b/src/corelib/global/qlogging.cpp -@@ -77,14 +77,21 @@ - #endif - - #if !defined QT_NO_REGULAREXPRESSION && !defined(QT_BOOTSTRAPPED) --# if (defined(__GLIBC__) && defined(__GLIBCXX__)) || (__has_include() && __has_include()) -+# ifdef __UCLIBC__ -+# if __UCLIBC_HAS_BACKTRACE__ -+# define QLOGGING_HAVE_BACKTRACE -+# endif -+# elif (defined(__GLIBC__) && defined(__GLIBCXX__)) || (__has_include() && __has_include()) - # define QLOGGING_HAVE_BACKTRACE --# include --# include --# include - # endif - #endif - -+#ifdef QLOGGING_HAVE_BACKTRACE -+# include -+# include -+# include -+#endif -+ - #include - - QT_BEGIN_NAMESPACE --- -1.9.1 - -- cgit v1.2.3