Accepting request 715703 from home:Vogtinator:qt5.13

- Drop lto-workaround.patch in favor of just disabling LTO

OBS-URL: https://build.opensuse.org/request/show/715703
OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.13/libqt5-qt3d?expand=0&rev=8

libqt5-qt3d.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jul 12 13:21:22 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Drop lto-workaround.patch in favor of just disabling LTO
+
 -------------------------------------------------------------------
 Fri Jul 12 11:42:02 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
 

libqt5-qt3d.spec

@@ -33,8 +33,6 @@ Url:            https://www.qt.io
 %define tar_version qt3d-everywhere-src-5.13.0
 Source:         https://download.qt.io/official_releases/qt/5.13/%{real_version}/submodules/%{tar_version}.tar.xz
 Source1:        baselibs.conf
-# PATCH-FIX-OPENSUSE (until upstream solution available)
-Patch1:         lto-workaround.patch
 BuildRequires:  fdupes
 BuildRequires:  libQt5Bootstrap-devel-static >= %{version}
 BuildRequires:  libQt5Concurrent-devel >= %{version}
@@ -415,6 +413,8 @@ the exact Qt version.
 %postun -n libQt53DQuickExtras5 -p /sbin/ldconfig
 
 %build
+# -flto breaks CONFIG += resources_big (QTBUG-73834), but resources_big is needed to prevent excessive memory use
+%define _lto_cflags %{nil}
 %if %qt5_snapshot
 #force the configure script to generate the forwarding headers (it checks whether .git directory exists)
 mkdir .git

lto-workaround.patch

@@ -1,30 +0,0 @@
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Subject: resources_big is incompatible with -flto in CXXFLAGS
-
-See https://bugreports.qt.io/browse/QTBUG-73834
-
-Index: qt3d-everywhere-src-5.13.0/examples/qt3d/examples.pri
-===================================================================
---- qt3d-everywhere-src-5.13.0.orig/examples/qt3d/examples.pri
-+++ qt3d-everywhere-src-5.13.0/examples/qt3d/examples.pri
-@@ -1,7 +1,6 @@
- TEMPLATE = app
- 
- QT += 3dextras
--CONFIG += resources_big
- 
- target.path = $$[QT_INSTALL_EXAMPLES]/qt3d/$$TARGET
- INSTALLS += target
-Index: qt3d-everywhere-src-5.13.0/examples/qt3d/planets-qml/planets-qml.pro
-===================================================================
---- qt3d-everywhere-src-5.13.0.orig/examples/qt3d/planets-qml/planets-qml.pro
-+++ qt3d-everywhere-src-5.13.0/examples/qt3d/planets-qml/planets-qml.pro
-@@ -8,7 +8,7 @@ QT += qml quick \
-     3dquick 3dquickrender 3dquickinput 3dquickextras \
-     network
- 
--CONFIG += resources_big c++11
-+CONFIG += c++11
- 
- HEADERS += \
-     networkcontroller.h