SHA256
1
0
forked from pool/libqt5-qt3d

Accepting request 714857 from home:Vogtinator:qt5.13

- Add patch to fix build with LTO enabled:
  * lto-workaround.patch

OBS-URL: https://build.opensuse.org/request/show/714857
OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.13/libqt5-qt3d?expand=0&rev=7
This commit is contained in:
Luca Beltrame 2019-07-12 12:09:08 +00:00 committed by Git OBS Bridge
parent 5eb5f8e4b0
commit 46d69aa091
3 changed files with 39 additions and 1 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jul 12 11:42:02 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
- Add patch to fix build with LTO enabled:
* lto-workaround.patch
-------------------------------------------------------------------
Wed Jun 19 11:18:55 UTC 2019 - fabian@ritter-vogt.de

View File

@ -33,6 +33,8 @@ 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}
@ -56,7 +58,7 @@ Qt 3D provides functionality for near-realtime simulation
systems with support for 2D and 3D rendering in both Qt C++ and Qt Quick applications.
%prep
%setup -q -n %{tar_version}
%autosetup -p1 -n %{tar_version}
%package -n %libname
Summary: Qt 5 3D Addon

30
lto-workaround.patch Normal file
View File

@ -0,0 +1,30 @@
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