[qt5-qtwebengine-freeworld] rebase fix-extractcflag.patch

commit 9f3afea994bba265d685eb843a01a6f95ef845ce Author: Rex Dieter <rdieter(a)gmail.com&gt; Date: Tue Jun 18 08:50:43 2019 -0500 rebase fix-extractcflag.patch .gitignore | 1 + qt5-qtwebengine-freeworld.spec | 5 +++-- qtwebengine-opensource-src-5.12.1-fix-extractcflag.patch | 12 ------------ qtwebengine-opensource-src-5.12.4-fix-extractcflag.patch | 11 +++++++++++ sources | 2 +- 5 files changed, 16 insertions(+), 15 deletions(-) --- diff --git a/.gitignore b/.gitignore index ca9465e..e7f6fb1 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /qtwebengine-everywhere-src-5.11.3.tar.xz /qtwebengine-everywhere-src-5.12.2.tar.xz /qtwebengine-everywhere-src-5.12.3.tar.xz +/qtwebengine-everywhere-src-5.12.4.tar.xz diff --git a/qt5-qtwebengine-freeworld.spec b/qt5-qtwebengine-freeworld.spec index cf7dcaf..e83ec60 100644 --- a/qt5-qtwebengine-freeworld.spec +++ b/qt5-qtwebengine-freeworld.spec @@ -43,7 +43,7 @@ Summary: Qt5 - QtWebEngine components (freeworld version) Name: qt5-qtwebengine-freeworld -Version: 5.12.3 +Version: 5.12.4 Release: 1%{?dist} %global major_minor %(echo %{version} | cut -d. -f-2) @@ -64,7 +64,7 @@ Patch0: qtwebengine-everywhere-src-5.10.0-linux-pri.patch Patch1: qtwebengine-everywhere-src-5.11.0-no-icudtl-dat.patch # fix extractCFlag to also look in QMAKE_CFLAGS_RELEASE, needed to detect the # ARM flags with our %%qmake_qt5 macro, including for the next patch -Patch2: qtwebengine-opensource-src-5.12.1-fix-extractcflag.patch +Patch2: qtwebengine-opensource-src-5.12.4-fix-extractcflag.patch # disable NEON vector instructions on ARM where the NEON code FTBFS due to # GCC bug https://bugzilla.redhat.com/show_bug.cgi?id=1282495 Patch3: qtwebengine-opensource-src-5.9.0-no-neon.patch @@ -410,6 +410,7 @@ echo "%{_libdir}/%{name}" \ %changelog * Mon Apr 22 2019 Rex Dieter <rdieter(a)fedoraproject.org&gt; - 5.12.3-1 - 5.12.3 +- rebase fix-extractcflag.patch * Thu Apr 18 2019 Vasiliy N. Glazov <vascom2(a)gmail.com&gt; - 5.12.2-2 - Bump release for rebuild diff --git a/qtwebengine-opensource-src-5.12.4-fix-extractcflag.patch b/qtwebengine-opensource-src-5.12.4-fix-extractcflag.patch new file mode 100644 index 0000000..fbbf6fc --- /dev/null +++ b/qtwebengine-opensource-src-5.12.4-fix-extractcflag.patch @@ -0,0 +1,11 @@ +diff --git a/src/core/config/functions.pri b/src/core/config/functions.pri +index 8c11faa16..191d3d623 100644 +--- a/src/core/config/functions.pri ++++ b/src/core/config/functions.pri +@@ -1,5 +1,5 @@ + defineReplace(qtwebengine_extractCFlag) { +- CFLAGS = $$QMAKE_CC $$QMAKE_CFLAGS ++ CFLAGS = $$QMAKE_CC $$QMAKE_CFLAGS $$QMAKE_CFLAGS_RELEASE + OPTION = $$find(CFLAGS, $$1) + OPTION = $$split(OPTION, =) + PARAM = $$member(OPTION, 1) diff --git a/sources b/sources index a9a97ba..a47e86a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9841599435095b16f12870bd48ef5342 qtwebengine-everywhere-src-5.12.3.tar.xz +9f1f20537eba9b166cd0e59191e49f29 qtwebengine-everywhere-src-5.12.4.tar.xz