diff --git a/qt-everywhere-opensource-src-4.8.7-qmake_LFLAGS.patch b/qt-everywhere-opensource-src-4.8.7-qmake_LFLAGS.patch new file mode 100644 index 0000000..f1a5a12 --- /dev/null +++ b/qt-everywhere-opensource-src-4.8.7-qmake_LFLAGS.patch @@ -0,0 +1,12 @@ +diff -up qt-everywhere-opensource-src-4.8.7/qmake/Makefile.unix.qmake_LFLAGS qt-everywhere-opensource-src-4.8.7/qmake/Makefile.unix +--- qt-everywhere-opensource-src-4.8.7/qmake/Makefile.unix.qmake_LFLAGS 2015-05-07 09:14:42.000000000 -0500 ++++ qt-everywhere-opensource-src-4.8.7/qmake/Makefile.unix 2018-02-15 08:25:13.168838577 -0600 +@@ -3,7 +3,7 @@ BUILD_PATH = @BUILD_PATH@ + QTOBJS = @QMAKE_QTOBJS@ + QTSRCS = @QMAKE_QTSRCS@ + QMAKESPEC = @QMAKESPEC@ +-LFLAGS = @QMAKE_LFLAGS@ ++LFLAGS = @QMAKE_LFLAGS@ $(QMAKE_LFLAGS_RELEASE) + + #qmake code + OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o \ diff --git a/qt.spec b/qt.spec index 2ff532e..151c6fe 100644 --- a/qt.spec +++ b/qt.spec @@ -40,7 +40,7 @@ Summary: Qt toolkit Name: qt Epoch: 1 Version: 4.8.7 -Release: 35%{?dist} +Release: 36%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT @@ -121,6 +121,9 @@ Patch55: qt-everywhere-opensource-src-4.6.2-cups.patch # backport https://codereview.qt-project.org/#/c/205874/ Patch56: qt-everywhere-opensource-src-4.8.7-mariadb.patch +# use QMAKE_LFLAGS_RELEASE when building qmake +Patch57: qt-everywhere-opensource-src-4.8.7-qmake_LFLAGS.patch + # Fails to create debug build of Qt projects on mingw (rhbz#653674) Patch64: qt-everywhere-opensource-src-4.8.5-QTBUG-14467.patch @@ -593,6 +596,7 @@ and invoke methods on those objects. %patch54 -p1 -b .mysql_config %patch55 -p1 -b .cups-1 %patch56 -p1 -b .mariadb +%patch57 -p1 -b .qmake_LFLAGS %patch64 -p1 -b .QTBUG-14467 %patch65 -p1 -b .qtreeview-kpackagekit-crash %patch67 -p1 -b .s390 @@ -1400,6 +1404,9 @@ fi %changelog +* Thu Feb 15 2018 Rex Dieter - 1:4.8.7-36 +- qt: Fedora build flags only partially applied (#1543887) + * Fri Feb 09 2018 Igor Gnatenko - 1:4.8.7-35 - Escape macros in %%changelog