diff options
Diffstat (limited to 'package/qt5/qt5base')
9 files changed, 114 insertions, 173 deletions
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?= <fatih.asici@gmail.com> -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ı <fatih.asici@gmail.com> ---- - 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(<cxxabi.h>) && __has_include(<execinfo.h>)) -+# ifdef __UCLIBC__ -+# if __UCLIBC_HAS_BACKTRACE__ -+# define QLOGGING_HAVE_BACKTRACE -+# endif -+# elif (defined(__GLIBC__) && defined(__GLIBCXX__)) || (__has_include(<cxxabi.h>) && __has_include(<execinfo.h>)) - # define QLOGGING_HAVE_BACKTRACE --# include <qregularexpression.h> --# include <cxxabi.h> --# include <execinfo.h> - # endif - #endif - -+#ifdef QLOGGING_HAVE_BACKTRACE -+# include <qregularexpression.h> -+# include <cxxabi.h> -+# include <execinfo.h> -+#endif -+ - #include <stdio.h> - - QT_BEGIN_NAMESPACE --- -1.9.1 - diff --git a/package/qt5/qt5base/0004-xcb-egl-fixes.patch b/package/qt5/qt5base/0004-xcb-egl-fixes.patch index 2bbd84927a..53f8453461 100644 --- a/package/qt5/qt5base/0004-xcb-egl-fixes.patch +++ b/package/qt5/qt5base/0004-xcb-egl-fixes.patch @@ -49,15 +49,16 @@ diff -Nuar a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/pl #include <qpa/qplatformcursor.h> #include <qpa/qplatformscreen.h> ---- a/src/platformsupport/eglconvenience/qeglplatformcursor.cpp 2014-08-07 16:53:50.038277168 -0400 -+++ b/src/platformsupport/eglconvenience/qeglplatformcursor.cpp 2014-08-07 17:00:36.806286766 -0400 -@@ -49,8 +49,8 @@ +--- qt5base-5.5.0.orig/src/platformsupport/eglconvenience/qeglplatformcursor.cpp ++++ qt5base-5.5.0/src/platformsupport/eglconvenience/qeglplatformcursor.cpp +@@ -41,8 +41,8 @@ - #include <QtPlatformSupport/private/qdevicediscovery_p.h> + #include <QtGui/private/qguiapplication_p.h> -#include "qeglplatformcursor_p.h" #include "qeglplatformintegration_p.h" +#include "qeglplatformcursor_p.h" + #include "qeglplatformscreen_p.h" QT_BEGIN_NAMESPACE diff --git a/package/qt5/qt5base/0005-no-gold-linker-for-host-build.patch b/package/qt5/qt5base/0005-no-gold-linker-for-host-build.patch index 99d5928ab6..3dc9a6d50d 100644 --- a/package/qt5/qt5base/0005-no-gold-linker-for-host-build.patch +++ b/package/qt5/qt5base/0005-no-gold-linker-for-host-build.patch @@ -1,27 +1,41 @@ -Use the gold linker only for target builds +From 2cb4b7e947f64580592afaf221d4b261d980bb45 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer <ps.report@gmx.net> +Date: Tue, 19 May 2015 21:30:21 +0200 +Subject: [PATCH] Disable gold linker/new dtags support for host builds -Availability of the gold linker is only tested with the -cross-compiler, not the host compiler, so Qt shouldn't assume it's -available when doing host builds. +There is no test for gold linker and new dtags support for the host build +(only for the target compiler/build) which leads to trouble in some cross +compiling environments (see [1] for details). -This fixes build failures occuring when cross-compiling Qt5 with a -gold capable cross-compiler, on a host that has a too old compiler to -support gold. +So disable gold linker/new dtags support unconditionally for host builds. -Bug reported upstream at https://bugreports.qt.io/browse/QTBUG-46125. +[1] http://lists.busybox.net/pipermail/buildroot/2015-May/128303.html -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +Task-number: QTBUG-46125 +Change-Id: Ic62828704dcce461487d63860705158cce3e4af8 +Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> +--- + mkspecs/features/default_post.prf | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) -Index: b/mkspecs/features/default_post.prf -=================================================================== +diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf +index 8e68b95..bcaddc8 100644 --- a/mkspecs/features/default_post.prf +++ b/mkspecs/features/default_post.prf -@@ -62,7 +62,7 @@ +@@ -62,8 +62,11 @@ debug { QMAKE_LIBFLAGS += $$QMAKE_LIBFLAGS_RELEASE } -use_gold_linker: QMAKE_LFLAGS += $$QMAKE_LFLAGS_USE_GOLD -+!host_build: use_gold_linker: QMAKE_LFLAGS += $$QMAKE_LFLAGS_USE_GOLD +-enable_new_dtags: QMAKE_LFLAGS += $$QMAKE_LFLAGS_NEW_DTAGS ++# disable special linker flags for host builds (no proper test for host support yet) ++!host_build { ++ use_gold_linker: QMAKE_LFLAGS += $$QMAKE_LFLAGS_USE_GOLD ++ enable_new_dtags: QMAKE_LFLAGS += $$QMAKE_LFLAGS_NEW_DTAGS ++} dll:win32: QMAKE_LFLAGS += $$QMAKE_LFLAGS_DLL static:mac: QMAKE_LFLAGS += $$QMAKE_LFLAGS_STATIC_LIB +-- +2.1.0 + diff --git a/package/qt5/qt5base/0006-configure-fix-gold-linker-support-detection.patch b/package/qt5/qt5base/0006-configure-fix-gold-linker-support-detection.patch deleted file mode 100644 index 053d4296e7..0000000000 --- a/package/qt5/qt5base/0006-configure-fix-gold-linker-support-detection.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 6e750053cd6d183173a4c39f2b1080b3c9814d76 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard <peter@korsgaard.com> -Date: Sun, 15 Feb 2015 22:58:07 +0100 -Subject: [PATCH] configure: fix gold linker support detection - -Submitted upstream: https://bugreports.qt.io/browse/QTBUG-44487 - -While the -fuse-ld=gold flag is related to linking, it is an argument to the -compiler driver to tell it what linker to execute, NOT an option to tell the -linker to behave differently. - -So it shouldn't get prefixed with -Wl when passed though the compiler driver. - -Fixes http://autobuild.buildroot.net/results/92c/92c3fb4ddb934115b228652bb8c972bb7459bb40/ - -Signed-off-by: Peter Korsgaard <peter@korsgaard.com> ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure b/configure -index 043d9fc..987d7f0 100755 ---- a/configure -+++ b/configure -@@ -3263,7 +3263,7 @@ fi - - # auto-detect -fuse-ld=gold support - if [ "$CFG_USE_GOLD_LINKER" != "no" ]; then -- if linkerSupportsFlag $TEST_COMPILER -fuse-ld=gold; then -+ if compilerSupportsFlag $TEST_COMPILER -fuse-ld=gold; then - CFG_USE_GOLD_LINKER=yes - else - if [ "$CFG_USE_GOLD_LINKER" = "yes" ]; then --- -2.1.3 - diff --git a/package/qt5/qt5base/0006-eglfs-rasp-pi-header-inclusion.patch b/package/qt5/qt5base/0006-eglfs-rasp-pi-header-inclusion.patch new file mode 100644 index 0000000000..f1f6d9b0b7 --- /dev/null +++ b/package/qt5/qt5base/0006-eglfs-rasp-pi-header-inclusion.patch @@ -0,0 +1,45 @@ +From 91c3b111e45dd476aba057836b1b618eacf90f3f Mon Sep 17 00:00:00 2001 +From: Julien Corjon <corjon.j@ecagroup.com> +Date: Tue, 21 Jul 2015 09:58:14 +0200 +Subject: [PATCH] eglfs - fix rasp-pi header inclusion + +eglplateform.h include headers for low level instruction and fail on brcm +headers inclusion + For the brcm presence test we use egl pkg-config file + For the eglfs-plugin compilation we use the egl configuration + +Upstream-Status: https://bugreports.qt.io/browse/QTBUG-47339 +Signed-off-by: Julien Corjon <corjon.j@ecagroup.com> +--- + config.tests/qpa/eglfs-brcm/eglfs-brcm.pro | 2 ++ + src/plugins/platforms/eglfs/eglfs-plugin.pro | 1 + + 2 files changed, 3 insertions(+) + +diff --git a/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro b/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro +index ce16a3a..192a8ad 100644 +--- a/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro ++++ b/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro +@@ -1,6 +1,8 @@ + SOURCES = eglfs-brcm.cpp + + CONFIG -= qt ++CONFIG += link_pkgconfig ++PKGCONFIG += egl + + INCLUDEPATH += $$QMAKE_INCDIR_EGL + +diff --git a/src/plugins/platforms/eglfs/eglfs-plugin.pro b/src/plugins/platforms/eglfs/eglfs-plugin.pro +index 0f493fd..8479496 100644 +--- a/src/plugins/platforms/eglfs/eglfs-plugin.pro ++++ b/src/plugins/platforms/eglfs/eglfs-plugin.pro +@@ -6,6 +6,7 @@ PLUGIN_CLASS_NAME = QEglFSIntegrationPlugin + load(qt_plugin) + + QT += platformsupport-private eglfs_device_lib-private ++CONFIG += egl + + SOURCES += $$PWD/qeglfsmain.cpp + +-- +2.1.0 + diff --git a/package/qt5/qt5base/0007-configure-add-psql_config-option.patch b/package/qt5/qt5base/0007-configure-add-psql_config-option.patch deleted file mode 100644 index 8075fe4579..0000000000 --- a/package/qt5/qt5base/0007-configure-add-psql_config-option.patch +++ /dev/null @@ -1,61 +0,0 @@ -From f23a18de3c398c908c92b8cf8f20edc12435b9d1 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer <ps.report@gmx.net> -Date: Thu, 19 Feb 2015 22:41:02 +0100 -Subject: [PATCH] configure: add '-psql_config' option - -Allow setting of pg_config path for cross compilation (do -the same as for mysql_config). - -Signed-off-by: Peter Seiderer <ps.report@gmx.net> ---- - configure | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/configure b/configure -index 0c66ecf..491486a 100755 ---- a/configure -+++ b/configure -@@ -578,6 +578,7 @@ CFG_WIDGETS=yes - CFG_QCONFIG=full - CFG_DEBUG=auto - CFG_MYSQL_CONFIG= -+CFG_PSQL_CONFIG= - CFG_DEBUG_RELEASE=no - CFG_FORCEDEBUGINFO=no - CFG_SHARED=yes -@@ -885,6 +886,7 @@ while [ "$#" -gt 0 ]; do - -arch| \ - -host-arch| \ - -mysql_config| \ -+ -psql_config| \ - -qpa| \ - -qconfig| \ - -qreal| \ -@@ -1066,6 +1068,9 @@ while [ "$#" -gt 0 ]; do - mysql_config) - CFG_MYSQL_CONFIG="$VAL" - ;; -+ psql_config) -+ CFG_PSQL_CONFIG="$VAL" -+ ;; - prefix) - QT_INSTALL_PREFIX="$VAL" - ;; -@@ -4369,10 +4374,11 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do - ;; - psql) - if [ "$CFG_SQL_psql" != "no" ]; then -+ [ -z "$CFG_PSQL_CONFIG" ] && CFG_PSQL_CONFIG=`"$WHICH" pg_config` - # Be careful not to use native pg_config when cross building. -- if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then -- QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null | filterIncludePath` -- QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null | filterLibraryPath` -+ if [ "$XPLATFORM_MINGW" != "yes" ] && [ -x "$CFG_PSQL_CONFIG" ]; then -+ QT_CFLAGS_PSQL=`$CFG_PSQL_CONFIG --includedir 2>/dev/null | filterIncludePath` -+ QT_LFLAGS_PSQL=`$CFG_PSQL_CONFIG --libdir 2>/dev/null | filterLibraryPath` - fi - [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL" - [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL" --- -2.1.4 - diff --git a/package/qt5/qt5base/0008-forkd-disable-eventfd-for-uclibc.patch b/package/qt5/qt5base/0008-forkd-disable-eventfd-for-uclibc.patch new file mode 100644 index 0000000000..04d49dd3b9 --- /dev/null +++ b/package/qt5/qt5base/0008-forkd-disable-eventfd-for-uclibc.patch @@ -0,0 +1,32 @@ +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 + diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index 7dcf28dced..07f6cafc82 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtbase-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 8574a593830959c0f7e5430fe77a43832ea7f5299e14a397a74576b3df7fb1b7 qtbase-opensource-src-5.4.1.tar.xz -sha1 134ec03371722cc31e2041a82c255cec708ca848 qtbase-opensource-src-5.4.1.tar.xz -md5 9507825e558c980fed602de1f16ec7ae qtbase-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtbase-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 893f0691739c00d13ff85bf8d3fd14e1c7a62fbbbcffa44b0491da4d5e570965 qtbase-opensource-src-5.5.0.tar.xz +sha1 3d6734bc6d00e1017c1db40d68309997bdf7bf6f qtbase-opensource-src-5.5.0.tar.xz +md5 252613b5a180c94d7196d10467a4f08b qtbase-opensource-src-5.5.0.tar.xz diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 31247dde7f..6f0f5267a7 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -123,12 +123,6 @@ QT5BASE_CONFIGURE_OPTS += -eglfs QT5BASE_DEPENDENCIES += libegl ifeq ($(BR2_PACKAGE_IMX_GPU_VIV),y) QT5BASE_EXTRA_CFLAGS = -DENABLE_MX6_WORKAROUND -QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES = \ - $(@D)/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp -endif -ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) -QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES = \ - $(@D)/mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp endif else QT5BASE_CONFIGURE_OPTS += -no-eglfs @@ -167,6 +161,7 @@ QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_SQL) += Qt5Sql QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_TEST) += Qt5Test QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XML) += Qt5Xml QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_OPENGL_LIB) += Qt5OpenGL +QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglDeviceIntegration QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_GUI) += Qt5Gui QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_WIDGETS) += Qt5Widgets @@ -202,7 +197,6 @@ define QT5BASE_CONFIGURE_CMDS -device-option BR_CCACHE="$(CCACHE)" \ -device-option BR_COMPILER_CFLAGS="$(TARGET_CFLAGS) $(QT5BASE_EXTRA_CFLAGS)" \ -device-option BR_COMPILER_CXXFLAGS="$(TARGET_CXXFLAGS) $(QT5BASE_EXTRA_CFLAGS)" \ - -device-option EGLFS_PLATFORM_HOOKS_SOURCES="$(QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES)" \ $(QT5BASE_CONFIGURE_OPTS) \ ) endef |
