qt5: Update to 5.6.2
This commit is contained in:
Alexey Pavlov
@@ -1,9 +1,9 @@
|
||||
--- x86_64/qtbase/mkspecs/features/configure.prf.orig 2014-04-20 21:21:48.808906400 +0100
|
||||
+++ x86_64/qtbase/mkspecs/features/configure.prf 2014-04-20 21:20:41.677381800 +0100
|
||||
@@ -1,10 +1,10 @@
|
||||
equals(MAKEFILE_GENERATOR, UNIX) {
|
||||
QMAKE_MAKE = make
|
||||
} else:equals(MAKEFILE_GENERATOR, MINGW) {
|
||||
!isEmpty(QMAKE_MAKE) {
|
||||
# We were called recursively. Use the same make.
|
||||
} else:if(equals(MAKEFILE_GENERATOR, UNIX)|equals(MAKEFILE_GENERATOR, MINGW)) {
|
||||
- !equals(QMAKE_HOST.os, Windows): \
|
||||
- QMAKE_MAKE = make
|
||||
- else: \
|
||||
|
||||
@@ -1,44 +0,0 @@
|
||||
From fcc2c95421710f98c7b2dec73e2c8b0d9164bc9b Mon Sep 17 00:00:00 2001
|
||||
From: Jonathan Liu <net147@gmail.com>
|
||||
Date: Wed, 24 Aug 2016 11:18:37 +1000
|
||||
Subject: [PATCH] Workaround crashes in QtQml code related to dead-store
|
||||
elimination
|
||||
|
||||
When compiled in release mode with GCC 6, QtQml may crash.
|
||||
This is because the C++ compiler is more aggressive about dead-store
|
||||
elimination in situations where a memory store to a location precedes
|
||||
the construction of an object at that memory location.
|
||||
|
||||
The QV4::MemoryManager::allocate{Managed,Object} functions allocate
|
||||
memory and write to it before the caller does a placement new to
|
||||
construct an object in the same memory. The compiler considers these
|
||||
writes before the constructor as "dead stores" and eliminates them.
|
||||
|
||||
The -fno-lifetime-dse compiler flag is added to disable this more
|
||||
aggressive dead-store eliminiation optimization.
|
||||
|
||||
This is a temporary workaround until a proper solution is found.
|
||||
|
||||
Task-number: QTBUG-55482
|
||||
Change-Id: I7dbae6e9e613e53ce5fb25957c449bc6657803b5
|
||||
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
||||
---
|
||||
src/qml/qml.pro | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/qml/qml.pro b/src/qml/qml.pro
|
||||
index f4862a1..651afa6 100644
|
||||
--- a/src/qml/qml.pro
|
||||
+++ b/src/qml/qml.pro
|
||||
@@ -18,7 +18,7 @@ exists("qqml_enable_gcov") {
|
||||
|
||||
greaterThan(QT_GCC_MAJOR_VERSION, 5) {
|
||||
# Our code is bad. Temporary workaround.
|
||||
- QMAKE_CXXFLAGS += -fno-delete-null-pointer-checks
|
||||
+ QMAKE_CXXFLAGS += -fno-delete-null-pointer-checks -fno-lifetime-dse
|
||||
}
|
||||
|
||||
QMAKE_DOCS = $$PWD/doc/qtqml.qdocconf
|
||||
--
|
||||
2.9.1
|
||||
|
||||
@@ -89,9 +89,9 @@ _opengl_for_configure="${_opengl}"
|
||||
_realname=qt5${_namesuff}
|
||||
pkgbase="mingw-w64-${_realname}"
|
||||
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
|
||||
_ver_base=5.6.1
|
||||
_ver_base=5.6.2
|
||||
# use 5.6.1-1 hot fix : only the archive name was changed from *-5.6.1.tar.xz to *-5.6.1-1.tar.xz
|
||||
_hotfix=-1
|
||||
_hotfix=
|
||||
|
||||
# qt5-static must be kept in its own prefix hierarchy
|
||||
# as otherwise it will conflict with qt5 itself
|
||||
@@ -227,8 +227,7 @@ source=(#https://download.qt.io/development_releases/qt/${pkgver%.*}/${_ver_base
|
||||
0052-qt5-qtwebkit-mfence-mingw.patch
|
||||
0121-qt5-qtwebkit-dont-depend-on-icu.patch
|
||||
0122-revert-qt4-unicode-removal.patch
|
||||
0124-qt5-qtwebkit-disambiguate-append.patch
|
||||
0126-qt5-Workaround-crashes-in-QtQml-code-related-to-dead-store.patch)
|
||||
0124-qt5-qtwebkit-disambiguate-append.patch)
|
||||
|
||||
# Translates using cygpath according to the ${_make} being used
|
||||
# (so either mingw32-make or MSYS2 make can be used)
|
||||
@@ -371,10 +370,6 @@ prepare() {
|
||||
patch -p1 -i ${srcdir}/0051-qt5-qtwebkit-workaround-build-breakage-after-svn-commit-136242.patch
|
||||
patch -p1 -i ${srcdir}/0052-qt5-qtwebkit-mfence-mingw.patch
|
||||
|
||||
pushd qtdeclarative > /dev/null
|
||||
patch -p1 -i ${srcdir}/0126-qt5-Workaround-crashes-in-QtQml-code-related-to-dead-store.patch
|
||||
popd
|
||||
|
||||
# Skip using ICU, we should be sharing the exact same
|
||||
# sources between the different variants if possible.
|
||||
# if [ "$_use_icu" == "no" ]; then
|
||||
@@ -689,8 +684,8 @@ package() {
|
||||
# export PKG_CONFIG_PATH=/mingw32/lib/pkgconfig
|
||||
# E:/m2/repo/mingw-w64-qt5/src/i686/qtbase/bin/qmake.exe -o Makefile qml.pro
|
||||
|
||||
sha256sums=('ce08a7eb54661705f55fb283d895a089b267c688fabe017062bd71b9231736db'
|
||||
'f5cfbfa5fad2b65a9be907d426f99694b86a04c3bb5a8814b21bd0ade4c672aa'
|
||||
sha256sums=('83e61bfc78bba230770704e828fa4d23fe3bbfdcfa4a8f5db37ce149731d89b3'
|
||||
'528a6b8b1c5095367b26e8ce4f3a46bb739e2e9913ff4dfc6ef58a04fcd73966'
|
||||
'7363ae7695af2f5278e9d91f6e52b3533dea4139ef252284bb82abfd025630d9'
|
||||
'609ab74b93ef11f24ef4d7c1bd0a2e81c4280b07fa455dfcf003a2364ab72745'
|
||||
'1b3aace0abc6c1ab1d077a57f7b2b0b7772e63c5b61519b633e955bbbc6d5485'
|
||||
@@ -716,7 +711,7 @@ sha256sums=('ce08a7eb54661705f55fb283d895a089b267c688fabe017062bd71b9231736db'
|
||||
'1d55b9c7af068c736b424eb0acb22080a74939152381db12c76a3e5350a3c853'
|
||||
'd0dbe4b5f8a9291a02f9e9c6e59a0ff038e5dc521f79eb2da7a5fcaa681479bb'
|
||||
'2c949e5fd0339892e5ea1253f233231c2e594783af517ae924b9b3c6799521da'
|
||||
'c5345d8f7f2661e123cbbded1f70030bde7e121a291a179cd285af86d0b754bc'
|
||||
'5e5c4ca66f8926de975414628e9fbfa2f1875c00bd88258d8571ce488744f00b'
|
||||
'c7246a8fb3255b4ec37318ad8dbe26eca0ca14f8aff1bf7fbeb697a5ab462ef7'
|
||||
'bf006bf325961e69c09df60b9d04d9d1b43dc64fb56723c2681d5e6adc6899db'
|
||||
'70cee7bee73c8f52a1d13bafacb85d4e61be7cbfcef2a1d91557763a7e163211'
|
||||
@@ -747,5 +742,4 @@ sha256sums=('ce08a7eb54661705f55fb283d895a089b267c688fabe017062bd71b9231736db'
|
||||
'f7fe9ce6d2832b4e220d209ba08a1fbfb1adeb5abea1531240a1d5a96d2540e5'
|
||||
'e412e0715597331d69d2672f072b4578ed4c0d7a3b8f959bce216f6998c74922'
|
||||
'd9e3928ded3adf98bc6c57f0c40126be29679d767701bdb5d161cc5d85ce81ee'
|
||||
'9f95d0549b4bd416d760e715d0211932585ecfe8132d29e52cbe8025cee9e900'
|
||||
'49922a70662f06daee35a2d8ea9474bf4181561ba7f0181d5e2a936f5a178dd5')
|
||||
'9f95d0549b4bd416d760e715d0211932585ecfe8132d29e52cbe8025cee9e900')
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
--- x86_64/qtbase/mkspecs/features/configure.prf.orig 2014-04-20 21:21:48.808906400 +0100
|
||||
+++ x86_64/qtbase/mkspecs/features/configure.prf 2014-04-20 21:20:41.677381800 +0100
|
||||
@@ -1,10 +1,10 @@
|
||||
equals(MAKEFILE_GENERATOR, UNIX) {
|
||||
QMAKE_MAKE = make
|
||||
} else:equals(MAKEFILE_GENERATOR, MINGW) {
|
||||
!isEmpty(QMAKE_MAKE) {
|
||||
# We were called recursively. Use the same make.
|
||||
} else:if(equals(MAKEFILE_GENERATOR, UNIX)|equals(MAKEFILE_GENERATOR, MINGW)) {
|
||||
- !equals(QMAKE_HOST.os, Windows): \
|
||||
- QMAKE_MAKE = make
|
||||
- else: \
|
||||
|
||||
@@ -1,44 +0,0 @@
|
||||
From fcc2c95421710f98c7b2dec73e2c8b0d9164bc9b Mon Sep 17 00:00:00 2001
|
||||
From: Jonathan Liu <net147@gmail.com>
|
||||
Date: Wed, 24 Aug 2016 11:18:37 +1000
|
||||
Subject: [PATCH] Workaround crashes in QtQml code related to dead-store
|
||||
elimination
|
||||
|
||||
When compiled in release mode with GCC 6, QtQml may crash.
|
||||
This is because the C++ compiler is more aggressive about dead-store
|
||||
elimination in situations where a memory store to a location precedes
|
||||
the construction of an object at that memory location.
|
||||
|
||||
The QV4::MemoryManager::allocate{Managed,Object} functions allocate
|
||||
memory and write to it before the caller does a placement new to
|
||||
construct an object in the same memory. The compiler considers these
|
||||
writes before the constructor as "dead stores" and eliminates them.
|
||||
|
||||
The -fno-lifetime-dse compiler flag is added to disable this more
|
||||
aggressive dead-store eliminiation optimization.
|
||||
|
||||
This is a temporary workaround until a proper solution is found.
|
||||
|
||||
Task-number: QTBUG-55482
|
||||
Change-Id: I7dbae6e9e613e53ce5fb25957c449bc6657803b5
|
||||
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
||||
---
|
||||
src/qml/qml.pro | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/qml/qml.pro b/src/qml/qml.pro
|
||||
index f4862a1..651afa6 100644
|
||||
--- a/src/qml/qml.pro
|
||||
+++ b/src/qml/qml.pro
|
||||
@@ -18,7 +18,7 @@ exists("qqml_enable_gcov") {
|
||||
|
||||
greaterThan(QT_GCC_MAJOR_VERSION, 5) {
|
||||
# Our code is bad. Temporary workaround.
|
||||
- QMAKE_CXXFLAGS += -fno-delete-null-pointer-checks
|
||||
+ QMAKE_CXXFLAGS += -fno-delete-null-pointer-checks -fno-lifetime-dse
|
||||
}
|
||||
|
||||
QMAKE_DOCS = $$PWD/doc/qtqml.qdocconf
|
||||
--
|
||||
2.9.1
|
||||
|
||||
@@ -89,9 +89,9 @@ _opengl_for_configure="${_opengl}"
|
||||
_realname=qt5${_namesuff}
|
||||
pkgbase="mingw-w64-${_realname}"
|
||||
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
|
||||
_ver_base=5.6.1
|
||||
_ver_base=5.6.2
|
||||
# use 5.6.1-1 hot fix : only the archive name was changed from *-5.6.1.tar.xz to *-5.6.1-1.tar.xz
|
||||
_hotfix=-1
|
||||
_hotfix=
|
||||
|
||||
# qt5-static must be kept in its own prefix hierarchy
|
||||
# as otherwise it will conflict with qt5 itself
|
||||
@@ -228,8 +228,7 @@ source=(#https://download.qt.io/development_releases/qt/${pkgver%.*}/${_ver_base
|
||||
0121-qt5-qtwebkit-dont-depend-on-icu.patch
|
||||
0122-revert-qt4-unicode-removal.patch
|
||||
0124-qt5-qtwebkit-disambiguate-append.patch
|
||||
0125-qt5-windeployqt-fixes.patch
|
||||
0126-qt5-Workaround-crashes-in-QtQml-code-related-to-dead-store.patch)
|
||||
0125-qt5-windeployqt-fixes.patch)
|
||||
|
||||
# Translates using cygpath according to the ${_make} being used
|
||||
# (so either mingw32-make or MSYS2 make can be used)
|
||||
@@ -386,10 +385,6 @@ prepare() {
|
||||
patch -p1 -i ${srcdir}/0125-qt5-windeployqt-fixes.patch
|
||||
popd
|
||||
|
||||
pushd qtdeclarative > /dev/null
|
||||
patch -p1 -i ${srcdir}/0126-qt5-Workaround-crashes-in-QtQml-code-related-to-dead-store.patch
|
||||
popd
|
||||
|
||||
# See: https://bugreports.qt-project.org/browse/QTBUG-37902
|
||||
# _ver_num=${_ver_base%%-*}
|
||||
# sed -i "s/^MODULE_VERSION = .*$/MODULE_VERSION = ${_ver_num}/g" qtenginio/.qmake.conf
|
||||
@@ -694,8 +689,8 @@ package() {
|
||||
# export PKG_CONFIG_PATH=/mingw32/lib/pkgconfig
|
||||
# E:/m2/repo/mingw-w64-qt5/src/i686/qtbase/bin/qmake.exe -o Makefile qml.pro
|
||||
|
||||
sha256sums=('ce08a7eb54661705f55fb283d895a089b267c688fabe017062bd71b9231736db'
|
||||
'f5cfbfa5fad2b65a9be907d426f99694b86a04c3bb5a8814b21bd0ade4c672aa'
|
||||
sha256sums=('83e61bfc78bba230770704e828fa4d23fe3bbfdcfa4a8f5db37ce149731d89b3'
|
||||
'528a6b8b1c5095367b26e8ce4f3a46bb739e2e9913ff4dfc6ef58a04fcd73966'
|
||||
'7363ae7695af2f5278e9d91f6e52b3533dea4139ef252284bb82abfd025630d9'
|
||||
'609ab74b93ef11f24ef4d7c1bd0a2e81c4280b07fa455dfcf003a2364ab72745'
|
||||
'1b3aace0abc6c1ab1d077a57f7b2b0b7772e63c5b61519b633e955bbbc6d5485'
|
||||
@@ -721,7 +716,7 @@ sha256sums=('ce08a7eb54661705f55fb283d895a089b267c688fabe017062bd71b9231736db'
|
||||
'1d55b9c7af068c736b424eb0acb22080a74939152381db12c76a3e5350a3c853'
|
||||
'd0dbe4b5f8a9291a02f9e9c6e59a0ff038e5dc521f79eb2da7a5fcaa681479bb'
|
||||
'2c949e5fd0339892e5ea1253f233231c2e594783af517ae924b9b3c6799521da'
|
||||
'c5345d8f7f2661e123cbbded1f70030bde7e121a291a179cd285af86d0b754bc'
|
||||
'5e5c4ca66f8926de975414628e9fbfa2f1875c00bd88258d8571ce488744f00b'
|
||||
'c7246a8fb3255b4ec37318ad8dbe26eca0ca14f8aff1bf7fbeb697a5ab462ef7'
|
||||
'bf006bf325961e69c09df60b9d04d9d1b43dc64fb56723c2681d5e6adc6899db'
|
||||
'70cee7bee73c8f52a1d13bafacb85d4e61be7cbfcef2a1d91557763a7e163211'
|
||||
@@ -753,5 +748,4 @@ sha256sums=('ce08a7eb54661705f55fb283d895a089b267c688fabe017062bd71b9231736db'
|
||||
'e412e0715597331d69d2672f072b4578ed4c0d7a3b8f959bce216f6998c74922'
|
||||
'd9e3928ded3adf98bc6c57f0c40126be29679d767701bdb5d161cc5d85ce81ee'
|
||||
'9f95d0549b4bd416d760e715d0211932585ecfe8132d29e52cbe8025cee9e900'
|
||||
'e868da7e8716fd3f09d448d003796feda77e59b38d194cab7c8a99fabbdb78af'
|
||||
'49922a70662f06daee35a2d8ea9474bf4181561ba7f0181d5e2a936f5a178dd5')
|
||||
'e868da7e8716fd3f09d448d003796feda77e59b38d194cab7c8a99fabbdb78af')
|
||||
|
||||
Reference in New Issue
Block a user