Tweek on mkspecs fix

qt5-qtbase-5.11.1-mkspecs.patch

@@ -0,0 +1,68 @@
+From 133fb029a6b9c3ee06792887b61c8ed52315f58b Mon Sep 17 00:00:00 2001
+From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
+Date: Wed, 2 May 2018 18:07:05 +0200
+Subject: make it possible to override the basename of module config files
+
+using qt$$MODULE isn't enough if the module is composed of submodules
+which need the final module's headers, because that would require two
+modules having the same module .pri file.
+
+the first thought to fix this was to just use $$lower($$TARGET), but
+that breaks for testlib (QtTest). while the config file name isn't
+public api, it's included by a public header, so changing it is risky.
+
+so instead stay with the original pattern, but make it explicitly
+overrideable.
+
+the cherry-pick is needed to support QtWebEngine 5.12 with Qt 5.11,
+a requirement that was raised too late.
+
+Change-Id: I758c46ed403620620d577ae16866ce751271b63e
+Reviewed-by: Michal Klocek <michal.klocek@qt.io>
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+(cherry picked from commit 95b0e4c956181e535d635b108adc732d8c91a803)
+Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
+---
+ mkspecs/features/qt_module.prf         | 5 +++--
+ mkspecs/features/qt_module_headers.prf | 7 ++++---
+ 2 files changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
+index f8729de947..8c7adc45eb 100644
+--- a/mkspecs/features/qt_module.prf
++++ b/mkspecs/features/qt_module.prf
+@@ -13,8 +13,9 @@ isEmpty(MODULE):MODULE = $$section($$list($$basename(_PRO_FILE_)), ., 0, 0)
+ isEmpty(VERSION): VERSION = $$MODULE_VERSION
+ isEmpty(VERSION): error("Module does not define version.")
+ 
+-exists($$OUT_PWD/qt$${MODULE}-config.pri) {
+-    include($$OUT_PWD/qt$${MODULE}-config.pri)
++isEmpty(MODULE_CFG_FILE): MODULE_CFG_FILE = qt$${MODULE}-config
++exists($$OUT_PWD/$${MODULE_CFG_FILE}.pri) {
++    include($$OUT_PWD/$${MODULE_CFG_FILE}.pri)
+     CONFIG += generated_privates
+ }
+ 
+diff --git a/mkspecs/features/qt_module_headers.prf b/mkspecs/features/qt_module_headers.prf
+index e45ac94966..bbded56b42 100644
+--- a/mkspecs/features/qt_module_headers.prf
++++ b/mkspecs/features/qt_module_headers.prf
+@@ -121,11 +121,12 @@ alien_syncqt: return()
+ 
+ MODULE_INC_OUTDIR = $$MODULE_BASE_OUTDIR/include/$$MODULE_INCNAME
+ 
+-exists($$OUT_PWD/qt$${MODULE}-config.h) {
++isEmpty(MODULE_CFG_FILE): MODULE_CFG_FILE = qt$${MODULE}-config
++exists($$OUT_PWD/$${MODULE_CFG_FILE}.h) {
+     fwd_rel = $$relative_path($$OUT_PWD, $$MODULE_INC_OUTDIR)
+     SYNCQT.INJECTIONS += \
+-        $$fwd_rel/qt$${MODULE}-config.h:qt$${MODULE}-config.h \
+-        $$fwd_rel/qt$${MODULE}-config_p.h:$$MODULE_VERSION/$$MODULE_INCNAME/private/qt$${MODULE}-config_p.h
++        $$fwd_rel/$${MODULE_CFG_FILE}.h:$${MODULE_CFG_FILE}.h \
++        $$fwd_rel/$${MODULE_CFG_FILE}_p.h:$$MODULE_VERSION/$$MODULE_INCNAME/private/$${MODULE_CFG_FILE}_p.h
+ }
+ 
+ for (injection, SYNCQT.INJECTIONS) {
+-- 
+cgit v1.2.1
+

qt5-qtwebengine.spec

@@ -4,7 +4,7 @@
 
 # define to build docs, need to undef this for bootstrapping
 # where qt5-qttools (qt5-doctools) builds are not yet available
-%global docs 1
+%global docs 0
 
 %if 0%{?fedora} > 29
 # need libvpx >= 1.8.0 (need commit 297dfd869609d7c3c5cd5faa3ebc7b43a394434e)
@@ -47,7 +47,7 @@
 Summary: Qt5 - QtWebEngine components
 Name:    qt5-qtwebengine
 Version: 5.12.4
-Release: 5%{?dist}
+Release: 5%{?dist}.1
 
 # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
 # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html
@@ -93,6 +93,9 @@ Patch101: 0001-Fix-changing-should_override_user_agent_in_new_tabs_.patch
 Patch102: 0002-Bump-V8-patch-level.patch
 Patch103: 0003-Fix-segfaults-with-arm-32bit-on-metrics.patch
 
+## RHEL8 only patch
+Patch500: qt5-qtbase-5.11.1-mkspecs.patch
+
 # handled by qt5-srpm-macros, which defines %%qt5_qtwebengine_arches
 ExclusiveArch: %{qt5_qtwebengine_arches}
 
@@ -415,6 +418,13 @@ cp -p src/3rdparty/chromium/LICENSE LICENSE.Chromium
 
 
 %build
+mkdir patched-mkspecs-features
+cp -a /usr/lib64/qt5/mkspecs/features/qt_module{,_headers}.prf \
+  patched-mkspecs-features/
+patch -p3 -d patched-mkspecs-features <%{PATCH500}
+sed -i "s|\$\${PWD}|/usr/lib64/qt5/mkspecs/features|" patched-mkspecs-features/qt_module.prf
+export QMAKEFEATURES=`pwd`/patched-mkspecs-features
+
 export STRIP=strip
 export NINJAFLAGS="%{__ninja_common_opts}"
 export NINJA_PATH=%{__ninja}
@@ -585,6 +595,10 @@ done
 
 
 %changelog
+* Fri Aug 02 2019 Troy Dawson <tdawson@redhat.com> - 5.12.4-5.1
+- Add mkspecs to build on RHEL8 (Kevin Kofler)
+- Do not build docs for initial EPEL8 build.
+
 * Wed Jun 26 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.12.4-5
 - pull in some upstream fixes