qt5: bump version to 5.4.1
PATCH v2 1/1 qt5: bump version to 5.4.1
From: Will Wagner <[email protected]>
Also remove all patches that have been applied to 5.4.1 branch
--- package/qt5/qt5.mk | 2 +- ...lify-use-of-__has_include-in-qlogging.cpp.patch | 54 ---- ...ersions.cpp-Fix-build-on-big-endian-syste.patch | 51 ---- ...cpp-Fix-build-on-mips-without-dsp-support.patch | 47 ---- .../0001-Make-it-compile-with-no-opengl.patch | 53 ---- .../0002-Fix-build-failure-with-python3.patch | 31 --- .../qt5webkit/0003-Fix-build-without-OpenGL.patch | 291 --------------------- 7 files changed, 1 insertion(+), 528 deletions(-) delete mode 100644 package/qt5/qt5base/0001-Simplify-use-of-__has_include-in-qlogging.cpp.patch delete mode 100644 package/qt5/qt5base/0004-qimage_conversions.cpp-Fix-build-on-big-endian-syste.patch delete mode 100644 package/qt5/qt5base/0005-qdrawhelper.cpp-Fix-build-on-mips-without-dsp-support.patch delete mode 100644 package/qt5/qt5multimedia/0001-Make-it-compile-with-no-opengl.patch delete mode 100644 package/qt5/qt5webkit/0002-Fix-build-failure-with-python3.patch delete mode 100644 package/qt5/qt5webkit/0003-Fix-build-without-OpenGL.patch
package/qt5/qt5.mk +1 -1
@@ -1,5 +1,5 @@ QT5_VERSION_MAJOR = 5.4 -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/qt5base/0001-Simplify-use-of-__has_include-in-qlogging.cpp.patch deleted +0 -54
54 lines not on this page · raw message
package/qt5/qt5base/0004-qimage_conversions.cpp-Fix-build-on-big-endian-syste.patch deleted +0 -51
51 lines not on this page · raw message
package/qt5/qt5base/0005-qdrawhelper.cpp-Fix-build-on-mips-without-dsp-support.patch deleted +0 -47
47 lines not on this page · raw message
package/qt5/qt5multimedia/0001-Make-it-compile-with-no-opengl.patch deleted +0 -53
53 lines not on this page · raw message
package/qt5/qt5webkit/0002-Fix-build-failure-with-python3.patch deleted +0 -31
@@ -1,31 +0,0 @@ -Fetched from: https://codereview.qt-project.org/#/c/99784/ - -From e9d00f6279f9cfefc5a3144d5953bb7934aed418 Mon Sep 17 00:00:00 2001 -From: Samuel Martin <[email protected]> -Date: Thu, 13 Nov 2014 15:29:38 +0100 -Subject: [PATCH] Fix build failure with python3 - -Task-number: QTBUG-33692 -Change-Id: I7a3bc6217110ce3a0bf5fee4b3b675dee39d8ac5 - -Signed-off-by: Samuel Martin <[email protected]> ---- - Source/JavaScriptCore/disassembler/udis86/itab.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Source/JavaScriptCore/disassembler/udis86/itab.py b/Source/JavaScriptCore/disassembler/udis86/itab.py -index 3d50ad0..90bd3e0 100644 ---- a/Source/JavaScriptCore/disassembler/udis86/itab.py -+++ b/Source/JavaScriptCore/disassembler/udis86/itab.py -@@ -314,7 +314,7 @@ class UdItabGenerator( ud_opcode.UdOpcodeTables ): - self.ItabH.write( "\n" ) - - self.ItabH.write("\n/* itab entry operand definitions */\n"); -- operands = self.OperandDict.keys() -+ operands = list( self.OperandDict.keys() ) - operands.sort() - for o in operands: - self.ItabH.write("#define O_%-7s { %-12s %-8s }\n" % --- -2.1.3 -
package/qt5/qt5webkit/0003-Fix-build-without-OpenGL.patch deleted +0 -291
291 lines not on this page · raw message
Signature · 1 line
2.1.4
Thomas Petazzoni
AppliedPATCH v2 1/1 qt5: bump version to 5.4.1
Will,
Quoted 5 lines · will_wagner at carallon.com
From: Will Wagner <[email protected]>
Also remove all patches that have been applied to 5.4.1 branch
Signed-off-by Will Wagner <[email protected]>
Applied, thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v2 1/1 qt5: bump version to 5.4.1
In reply to will_wagner at carallon.comWill, All,
On 2015-03-04 14:01 +0000, will_wagner at carallon.com spake thusly:
Quoted 3 lines
From: Will Wagner <[email protected]>
Also remove all patches that have been applied to 5.4.1 branch
You forgot to update the hashes.
Care to send a patch to add them, please?
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH v2 1/1 qt5: bump version to 5.4.1
Quoted 9 lines · Yann E. MORIN
Will, All,
On 2015-03-04 14:01 +0000,
will_wagnerat carallon.com spake thusly:Quoted 3 lines
From: Will Wagner <[email protected]>
Also remove all patches that have been applied to 5.4.1 branch
You forgot to update the hashes.
Care to send a patch to add them, please?
Sorry about that, not had to deal with hashes before. I'll submit a patch shortly.
Will
Signature · 5 lines
------------------------------------------------------------------------ Will Wagner will_wagner at carallon.com Development Manager Office Tel: +44 (0)20 7371 2032 Carallon Ltd, Studio G20, Shepherds Building, Rockley Rd, London W14 0DA ------------------------------------------------------------------------
PATCH v2 1/1 qt5: bump version to 5.4.1
Will, All,
On 2015-04-01 10:55 +0100, Will Wagner spake thusly:
Quoted 12 lines · Yann E. MORIN
Quoted 9 lines
Will, All,
On 2015-03-04 14:01 +0000,
will_wagnerat carallon.com spake thusly:Quoted 3 lines
From: Will Wagner <[email protected]>
Also remove all patches that have been applied to 5.4.1 branch
You forgot to update the hashes.
Care to send a patch to add them, please?
Sorry about that, not had to deal with hashes before.
No problem. I'm starting to pay extra attention to hashes, because we're in the process of making them mandatory. So a branch I have locally breaks (but upstream is still OK, hence the reason you missed them!).
Quoted 1 line
I'll submit a patch shortly.
Thank you! :-)
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'