From 8ac9392911c4446720ac18f40b061a149e927e055294dee5836881f2b6e15cfd Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 21 Jun 2016 13:32:33 +0000 Subject: [PATCH] Accepting request 403815 from home:luca_b:branches:openSUSE:Factory - Add qtdeclarative-opensource-src-5.6.0-qml_no-lifetime-dse.patch - Fix crashes with i686 and QML loader (boo#985768) OBS-URL: https://build.opensuse.org/request/show/403815 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtdeclarative?expand=0&rev=31 --- libqt5-qtdeclarative.changes | 6 ++++++ libqt5-qtdeclarative.spec | 3 +++ ...ve-opensource-src-5.6.0-qml_no-lifetime-dse.patch | 12 ++++++++++++ 3 files changed, 21 insertions(+) create mode 100644 qtdeclarative-opensource-src-5.6.0-qml_no-lifetime-dse.patch diff --git a/libqt5-qtdeclarative.changes b/libqt5-qtdeclarative.changes index e60e2d9..a6eeec5 100644 --- a/libqt5-qtdeclarative.changes +++ b/libqt5-qtdeclarative.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 21 09:53:21 UTC 2016 - lbeltrame@kde.org + +- Add qtdeclarative-opensource-src-5.6.0-qml_no-lifetime-dse.patch + - Fix crashes with i686 and QML loader (boo#985768) + ------------------------------------------------------------------- Thu May 26 15:49:35 UTC 2016 - hrvoje.senjan@gmail.com diff --git a/libqt5-qtdeclarative.spec b/libqt5-qtdeclarative.spec index 4b96176..6df5151 100644 --- a/libqt5-qtdeclarative.spec +++ b/libqt5-qtdeclarative.spec @@ -37,6 +37,8 @@ Source1: baselibs.conf Patch0: overflow.patch # PATCH-FIX-UPSTREAM Workaround-for-crashes-in-QtQml-code-relating-to-null-this-pointers.patch Patch1: Workaround-for-crashes-in-QtQml-code-relating-to-null-this-pointers.patch +# PATCH-FIX-OPENSUSE: qtdeclarative-opensource-src-5.6.0-qml_no-lifetime-dse.patch - fix crashes with i586 and Plasma (boo #985768) +Patch2: qtdeclarative-opensource-src-5.6.0-qml_no-lifetime-dse.patch BuildRequires: fdupes BuildRequires: libQt5Core-private-headers-devel >= %{version} BuildRequires: libQt5Gui-private-headers-devel >= %{version} @@ -75,6 +77,7 @@ handling. %setup -q -n qtdeclarative-opensource-src-%{real_version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 %package -n %libname Summary: Qt 5 Declarative Library diff --git a/qtdeclarative-opensource-src-5.6.0-qml_no-lifetime-dse.patch b/qtdeclarative-opensource-src-5.6.0-qml_no-lifetime-dse.patch new file mode 100644 index 0000000..5c9bef5 --- /dev/null +++ b/qtdeclarative-opensource-src-5.6.0-qml_no-lifetime-dse.patch @@ -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