Commit c2174c1a authored by Peter Seiderer's avatar Peter Seiderer Committed by Thomas Petazzoni
Browse files

qt5: bump version to 5.5.1 

Reduce hash lists to strongest only (sha256).

Remove upstream committed patches (qt5base):
 - 0004-no-gold-linker-for-host-build.patch (see [1], [2])
 - 0007-big_endian-fix_destformat.patch (see [3])
 - 0008-QtGui-force-image-dir-in-include_path.patch (see [4], [5])

[1] https://bugreports.qt.io/browse/QTBUG-46125
[2] https://codereview.qt-project.org/#/c/113563/
[3] https://codereview.qt-project.org/#/c/120654/
[4] https://bugreports.qt.io/browse/QTBUG-47400
[5] https://codereview.qt-project.org/#/c/122145/



Signed-off-by: default avatarPeter Seiderer <ps.report@gmx.net>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 7eafaa6f

package/qt5/qt5.mk

+1 −1
Original line number Diff line number Diff line 
QT5_VERSION_MAJOR = 5.5

QT5_VERSION = $(QT5_VERSION_MAJOR).0

QT5_VERSION = $(QT5_VERSION_MAJOR).1

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

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

package/qt5/qt53d/qt53d.hash

+2 −2
Original line number Diff line number Diff line 
# Hash from http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qt3d-opensource-src-5.5.0.tar.xz.mirrorlist

sha256 bf6c54fbb6f279e9bd6fd67f7faa8e61ac4273baa06a56f8946346adc8c3568e qt3d-opensource-src-5.5.0.tar.xz
 
# Hash from http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qt3d-opensource-src-5.5.1.tar.xz.mirrorlist

sha256 e380906e2bcbd825dab45043bf063dd88b793c0d5fb050ee915bf4e2b58b1bf7 qt3d-opensource-src-5.5.1.tar.xz

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

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



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).



So disable gold linker/new dtags support unconditionally for host builds.



[1] http://lists.busybox.net/pipermail/buildroot/2015-May/128303.html



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(-)



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,8 +62,11 @@ debug {

     QMAKE_LIBFLAGS += $$QMAKE_LIBFLAGS_RELEASE

 }

 

-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/0007-big_endian-fix_destformat.patch

deleted100644 → 0
+0 −34
Original line number Diff line number Diff line 
From 02ab210ea9bc5ee53fa4f1db2f068ce24272a6cd Mon Sep 17 00:00:00 2001

From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>

Date: Fri, 3 Jul 2015 14:19:02 +0200

Subject: [PATCH] Fix compile error on big endian



DestFormat is not defined here but should be Format_RGBX8888



Change-Id: Ie33989a6fc31650434281a6b7b0f4806524268af

Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>

Reviewed-by: Timo Jyrinki <timo.jyrinki@canonical.com>

Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>



Upstream-Status: https://codereview.qt-project.org/#/c/120654/

Signed-off-by: Julien Corjon <corjon.j@ecagroup.com>

---

 src/gui/image/qimage_conversions.cpp | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/src/gui/image/qimage_conversions.cpp b/src/gui/image/qimage_conversions.cpp

index e0ca2c5..02f32aa 100644

--- a/src/gui/image/qimage_conversions.cpp

+++ b/src/gui/image/qimage_conversions.cpp

@@ -1103,7 +1103,7 @@ static bool mask_alpha_converter_rgbx_inplace(QImageData *data, Qt::ImageConvers

         }

         rgb_data += pad;

     }

-    data->format = DestFormat;

+    data->format = QImage::Format_RGBX8888;

     return true;

 #endif

 }

-- 

2.1.0

package/qt5/qt5base/0008-QtGui-force-image-dir-in-include_path.patch

deleted100644 → 0
+0 −89
Original line number Diff line number Diff line 
From 7f282aa9f718389199b95b7f53ecd6401172fcc6 Mon Sep 17 00:00:00 2001

From: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

Date: Fri, 24 Jul 2015 13:18:29 +0200

Subject: [PATCH 1/1] fix build with no built-in image handlers



the handlers' .pri files added $$PWD to INCLUDEPATH to make the files

self-contained when used externally, but this polluted the include path

of the gui module itself, thus hiding incorrect use of QPA includes.



Task-number: QTBUG-47400

Change-Id: I576469a71e8ded0b409d62687999c0fa884613f9

Signed-off-by: Julien Corjon <corjon.j@ecagroup.com>

---

 src/gui/image/qgifhandler.pri          | 1 -

 src/gui/image/qjpeghandler.pri         | 1 -

 src/gui/image/qpnghandler.pri          | 1 -

 src/gui/painting/qbrush.cpp            | 2 +-

 src/plugins/imageformats/gif/gif.pro   | 1 +

 src/plugins/imageformats/jpeg/jpeg.pro | 1 +

 6 files changed, 3 insertions(+), 4 deletions(-)



diff --git a/src/gui/image/qgifhandler.pri b/src/gui/image/qgifhandler.pri

index 6eb0751..ec33101 100644

--- a/src/gui/image/qgifhandler.pri

+++ b/src/gui/image/qgifhandler.pri

@@ -1,4 +1,3 @@

 # common to plugin and built-in forms

-INCLUDEPATH *= $$PWD

 HEADERS += $$PWD/qgifhandler_p.h

 SOURCES += $$PWD/qgifhandler.cpp

diff --git a/src/gui/image/qjpeghandler.pri b/src/gui/image/qjpeghandler.pri

index c8de33d..de40c67 100644

--- a/src/gui/image/qjpeghandler.pri

+++ b/src/gui/image/qjpeghandler.pri

@@ -1,5 +1,4 @@

 # common to plugin and built-in forms

-INCLUDEPATH *= $$PWD

 HEADERS += $$PWD/qjpeghandler_p.h

 SOURCES += $$PWD/qjpeghandler.cpp

 contains(QT_CONFIG, system-jpeg) {

diff --git a/src/gui/image/qpnghandler.pri b/src/gui/image/qpnghandler.pri

index aca7e2c..9ab175d 100644

--- a/src/gui/image/qpnghandler.pri

+++ b/src/gui/image/qpnghandler.pri

@@ -1,4 +1,3 @@

-INCLUDEPATH *= $$PWD

 HEADERS += $$PWD/qpnghandler_p.h

 SOURCES += $$PWD/qpnghandler.cpp

 contains(QT_CONFIG, system-png) {

diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp

index 670717c..c3a0f5c 100644

--- a/src/gui/painting/qbrush.cpp

+++ b/src/gui/painting/qbrush.cpp

@@ -35,7 +35,7 @@

 #include "qpixmap.h"

 #include "qbitmap.h"

 #include "qpixmapcache.h"

-#include "qplatformpixmap.h"

+#include <qpa/qplatformpixmap.h>

 #include "qdatastream.h"

 #include "qvariant.h"

 #include "qline.h"

diff --git a/src/plugins/imageformats/gif/gif.pro b/src/plugins/imageformats/gif/gif.pro

index 898f06e..2a5048b 100644

--- a/src/plugins/imageformats/gif/gif.pro

+++ b/src/plugins/imageformats/gif/gif.pro

@@ -5,6 +5,7 @@ PLUGIN_CLASS_NAME = QGifPlugin

 load(qt_plugin)

 

 include(../../../gui/image/qgifhandler.pri)

+INCLUDEPATH += ../../../gui/image

 SOURCES += $$PWD/main.cpp

 HEADERS += $$PWD/main.h

 OTHER_FILES += gif.json

diff --git a/src/plugins/imageformats/jpeg/jpeg.pro b/src/plugins/imageformats/jpeg/jpeg.pro

index 45bf7bb..e33fde1 100644

--- a/src/plugins/imageformats/jpeg/jpeg.pro

+++ b/src/plugins/imageformats/jpeg/jpeg.pro

@@ -9,6 +9,7 @@ QT += core-private

 QTDIR_build:REQUIRES = "!contains(QT_CONFIG, no-jpeg)"

 

 include(../../../gui/image/qjpeghandler.pri)

+INCLUDEPATH += ../../../gui/image

 SOURCES += main.cpp

 HEADERS += main.h

 OTHER_FILES += jpeg.json

-- 

2.1.0