[arch-commits] Commit in qt5-declarative/trunk (PKGBUILD qt5-declarative-gcc6.patch)

[Antonio Rojas]

    Date: Monday, June 20, 2016 @ 21:05:14
  Author: arojas
Revision: 270405

Fix i686 segfaults with GCC 6 (FS#49723)

Added:
  qt5-declarative/trunk/qt5-declarative-gcc6.patch
Modified:
  qt5-declarative/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |   11 ++++++++---
 qt5-declarative-gcc6.patch |   12 ++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-06-20 21:03:31 UTC (rev 270404)
+++ PKGBUILD	2016-06-20 21:05:14 UTC (rev 270405)
@@ -5,7 +5,7 @@
 pkgname=qt5-declarative
 _qtver=5.7.0
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -14,8 +14,9 @@
 makedepends=('python2' 'cmake')
 groups=('qt' 'qt5')
 _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-md5sums=('0d9e461aa54dba4793253fa2eb501f9b')
+source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz" qt5-declarative-gcc6.patch)
+md5sums=('0d9e461aa54dba4793253fa2eb501f9b'
+         'fb2a2a118b356a0a4635111f2e0b0ee6')
 
 prepare() {
   mkdir -p build
@@ -22,6 +23,10 @@
 
   # Use python2 for Python 2.x
   find -name '*.pro' -o -name '*.pri' | xargs sed -i -e 's|python -c|python2 -c|g' -e 's|python \$|python2 \$|g'
+
+  # Fix i686 segfaults with GCC 6 https://bugreports.qt.io/browse/QTBUG-52057 (Fedora patch)
+  cd ${_pkgfqn}
+  patch -p1 -i ../qt5-declarative-gcc6.patch
 }
 
 build() {

Added: qt5-declarative-gcc6.patch
===================================================================
--- qt5-declarative-gcc6.patch	                        (rev 0)
+++ qt5-declarative-gcc6.patch	2016-06-20 21:05:14 UTC (rev 270405)
@@ -0,0 +1,12 @@
+diff -up qtdeclarative-opensource-src-5.6.0/src/qml/qml.pro.1135 qtdeclarative-opensource-src-5.6.0/src/qml/qml.pro
+--- qtdeclarative-opensource-src-5.6.0/src/qml/qml.pro.1135	2016-06-02 08:43:24.509068141 -0500
++++ qtdeclarative-opensource-src-5.6.0/src/qml/qml.pro	2016-06-02 10:25:28.813766581 -0500
+@@ -21,7 +21,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