Commit 105c23ce authored by Julien CORJON's avatar Julien CORJON Committed by Thomas Petazzoni
Browse files

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: default avatarJulien Corjon <corjon.j@ecagroup.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent aa24cb8b

package/qt5/qt5.mk

+2 −2
Original line number Diff line number Diff line 
QT5_VERSION_MAJOR = 5.4

QT5_VERSION = $(QT5_VERSION_MAJOR).1

QT5_VERSION_MAJOR = 5.5

QT5_VERSION = $(QT5_VERSION_MAJOR).0

QT5_SITE = http://download.qt.io/official_releases/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules

include $(sort $(wildcard package/qt5/*/*.mk))

package/qt5/qt5base/0002-logging-Check-if-uClibc-has-backtrace-support.patch

deleted100644 → 0
+0 −48
Original line number Diff line number Diff line 
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

package/qt5/qt5base/0004-xcb-egl-fixes.patch

+5 −4
Original line number Diff line number Diff line
@@ -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

package/qt5/qt5base/0005-no-gold-linker-for-host-build.patch

+27 −13
Original line number Diff line number Diff line 
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

package/qt5/qt5base/0006-configure-fix-gold-linker-support-detection.patch

deleted100644 → 0
+0 −36
Original line number Diff line number Diff line 
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