From 65c9f227b2cda7a607efb28e4930d86e60520fb1 Mon Sep 17 00:00:00 2001
From: Jan Grulich <jgrulich@redhat.com>
Date: Tue, 18 Jun 2019 08:36:05 +0200
Subject: [PATCH] Rebase extractcflag patch

Not sure if it's needed, it seems to build anyway
---
 qt5-qtwebengine.spec                                 |  5 ++---
 ...gine-opensource-src-5.12.1-fix-extractcflag.patch | 12 ------------
 ...gine-opensource-src-5.12.4-fix-extractcflag.patch | 11 +++++++++++
 3 files changed, 13 insertions(+), 15 deletions(-)
 delete mode 100644 qtwebengine-opensource-src-5.12.1-fix-extractcflag.patch
 create mode 100644 qtwebengine-opensource-src-5.12.4-fix-extractcflag.patch

diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec
index 7f7316d..684d029 100644
--- a/qt5-qtwebengine.spec
+++ b/qt5-qtwebengine.spec
@@ -73,7 +73,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
@@ -341,8 +341,7 @@ BuildArch: noarch
 %setup -q -n %{qt_module}-everywhere-src-%{version}%{?prerelease:-%{prerelease}}
 %patch0 -p1 -b .linux-pri
 %patch1 -p1 -b .no-icudtl-dat
-## FIXME?  no longer applies, relevant code very different now, hopefuly no longer needed -- rex
-#patch2 -p1 -b .fix-extractcflag
+%patch2 -p1 -b .fix-extractcflag
 %if !0%{?arm_neon}
 %patch3 -p1 -b .no-neon
 %endif
diff --git a/qtwebengine-opensource-src-5.12.1-fix-extractcflag.patch b/qtwebengine-opensource-src-5.12.1-fix-extractcflag.patch
deleted file mode 100644
index 3f047c2..0000000
--- a/qtwebengine-opensource-src-5.12.1-fix-extractcflag.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up qtwebengine-everywhere-src-5.12.1/mkspecs/features/functions.prf.fix-extractcflag qtwebengine-everywhere-src-5.12.1/mkspecs/features/functions.prf
---- qtwebengine-everywhere-src-5.12.1/mkspecs/features/functions.prf.fix-extractcflag	2019-02-01 09:25:44.950965875 -0600
-+++ qtwebengine-everywhere-src-5.12.1/mkspecs/features/functions.prf	2019-02-01 09:28:39.290041131 -0600
-@@ -11,7 +11,7 @@ defineReplace(getChromiumSrcDir) {
- }
- 
- defineReplace(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/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)