[SCM] qtdeclarative packaging branch, master, updated. debian/5.6.1-5-4-gb6b6662

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtdeclarative.git;a=commitdiff;h=763b9b1

The following commit has been merged in the master branch:
commit 763b9b1442f54ff4b186bdfb4cb642ecdb0cbc3c
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Aug 29 21:24:46 2016 +0300

    Backport upstream change to fix crashes when compiled with GCC 6.
    
    See https://bugreports.qt.io/browse/QTBUG-55482.
---
 debian/changelog                    |  3 +++
 debian/patches/no_lifetime_dse.diff | 15 +++++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 19 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7460abe..ccf90ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qtdeclarative-opensource-src (5.6.1-6) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Backport upstream change to fix crashes when compiled with GCC 6
+    (no_lifetime_dse.diff; see QTBUG-55482).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 29 Aug 2016 21:22:36 +0300
 
diff --git a/debian/patches/no_lifetime_dse.diff b/debian/patches/no_lifetime_dse.diff
new file mode 100644
index 0000000..f980eee
--- /dev/null
+++ b/debian/patches/no_lifetime_dse.diff
@@ -0,0 +1,15 @@
+Description: workaround crashes in QtQml code related to dead-store elimination
+Origin: upstream, https://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=fcc2c95421710f98
+Last-Update: 2016-08-29
+
+--- a/src/qml/qml.pro
++++ b/src/qml/qml.pro
+@@ -18,7 +18,7 @@
+ 
+ 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
diff --git a/debian/patches/series b/debian/patches/series
index cf2f326..777b790 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 # Backported patches
 qml_only_release_types_if_they_arent_referenced_anymore.patch
+no_lifetime_dse.diff
 
 # Debian patches
 check_system_double-conversion.patch

-- 
qtdeclarative packaging