rpm/libqt5-qtdeclarative
SHA256
1
0
Fork 0
forked from pool/libqt5-qtdeclarative
Code Pull Requests Activity

Accepting request 403815 from home:luca_b:branches:openSUSE:Factory

Browse Source 
- 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
This commit is contained in:
Dominique Leuenberger 2016-06-21 13:32:33 +00:00 committed by Git OBS Bridge
parent 19016ae735
commit 8ac9392911
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libqt5-qtdeclarative.changes
View File

@ -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 Thu May 26 15:49:35 UTC 2016 - hrvoje.senjan@gmail.com

3
libqt5-qtdeclarative.spec
View File

@ -37,6 +37,8 @@ Source1: baselibs.conf
Patch0: overflow.patch Patch0: overflow.patch
# PATCH-FIX-UPSTREAM Workaround-for-crashes-in-QtQml-code-relating-to-null-this-pointers.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 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: fdupes
BuildRequires: libQt5Core-private-headers-devel >= %{version} BuildRequires: libQt5Core-private-headers-devel >= %{version}
BuildRequires: libQt5Gui-private-headers-devel >= %{version} BuildRequires: libQt5Gui-private-headers-devel >= %{version}
@ -75,6 +77,7 @@ handling.
%setup -q -n qtdeclarative-opensource-src-%{real_version} %setup -q -n qtdeclarative-opensource-src-%{real_version}
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1
%package -n %libname %package -n %libname
Summary: Qt 5 Declarative Library Summary: Qt 5 Declarative Library

12
qtdeclarative-opensource-src-5.6.0-qml_no-lifetime-dse.patch Normal file
View File

@ -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