Tweek on mkspecs fix

Add mkspecs to build on RHEL8 (Kevin Kofler)
Merge branch f30 into epel8
2019-11-06 23:08:48 +00:00 · 2019-11-06 23:08:34 +00:00 · 2019-08-01 08:06:45 -07:00 · 2019-07-31 10:40:47 -05:00
23 changed files with 292 additions and 303 deletions
--- a/.gitignore
+++ b/.gitignore
@ -5,9 +5,3 @@
 /qtwebengine-everywhere-src-5.12.2-clean.tar.xz
 /qtwebengine-everywhere-src-5.12.3-clean.tar.xz
 /qtwebengine-everywhere-src-5.12.4-clean.tar.xz
-/pulseaudio-12.2-headers.tar.gz
-/qtwebengine-everywhere-src-5.12.5-clean.tar.xz
-/qtwebengine-everywhere-src-5.12.6-clean.tar.xz
-/qtwebengine-everywhere-src-5.13.2-clean.tar.xz
-/qtwebengine-everywhere-src-5.14.1-clean.tar.xz
-/qtwebengine-everywhere-src-5.14.2-clean.tar.xz
--- a/0001-Fix-changing-should_override_user_agent_in_new_tabs_.patch
+++ b/0001-Fix-changing-should_override_user_agent_in_new_tabs_.patch
@ -0,0 +1,34 @@
+From e8eec84aac0dc626770a483d503f7b16ab0dbe70 Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen@qt.io>
+Date: Fri, 7 Jun 2019 14:18:23 +0200
+Subject: [PATCH 1/3] Fix changing should_override_user_agent_in_new_tabs_
+
+It wouldn't be updated if the custom user-agent didn't change.
+
+Change-Id: Ic31ef485e2cb84903f9b48cb9ad5f9f1a723eb92
+Reviewed-by: Michal Klocek <michal.klocek@qt.io>
+---
+ chromium/content/browser/web_contents/web_contents_impl.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/chromium/content/browser/web_contents/web_contents_impl.cc b/chromium/content/browser/web_contents/web_contents_impl.cc
+index a2659263737..4c127f835d6 100644
+--- a/chromium/content/browser/web_contents/web_contents_impl.cc
+++ b/chromium/content/browser/web_contents/web_contents_impl.cc
+@@ -1230,11 +1230,11 @@ WebUI* WebContentsImpl::GetCommittedWebUI() const {
+ 
+ void WebContentsImpl::SetUserAgentOverride(const std::string& override,
+                                            bool override_in_new_tabs) {
+  should_override_user_agent_in_new_tabs_ = override_in_new_tabs;
+
+   if (GetUserAgentOverride() == override)
+     return;
+ 
+-  should_override_user_agent_in_new_tabs_ = override_in_new_tabs;
+-
+   renderer_preferences_.user_agent_override = override;
+ 
+   // Send the new override string to the renderer.
+-- 
+2.21.0
+
--- a/0002-Bump-V8-patch-level.patch
+++ b/0002-Bump-V8-patch-level.patch
@ -0,0 +1,30 @@
+From 6f3c15d2319ca11c2e31076292f5733baf64d991 Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen@qt.io>
+Date: Tue, 18 Jun 2019 10:29:48 +0200
+Subject: [PATCH 2/3] Bump V8 patch level
+
+Otherwise it might use outdated script caches.
+
+Change-Id: I839c6a11c3e1991f232972ad2d87fe6318256307
+Fixes: QTBUG-72532
+Reviewed-by: Michal Klocek <michal.klocek@qt.io>
+---
+ chromium/v8/include/v8-version.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chromium/v8/include/v8-version.h b/chromium/v8/include/v8-version.h
+index 3e703039517..8dacc30c340 100644
+--- a/chromium/v8/include/v8-version.h
+++ b/chromium/v8/include/v8-version.h
+@@ -11,7 +11,7 @@
+ #define V8_MAJOR_VERSION 6
+ #define V8_MINOR_VERSION 9
+ #define V8_BUILD_NUMBER 427
+-#define V8_PATCH_LEVEL 31
+#define V8_PATCH_LEVEL 32
+ 
+ // Use 1 for candidates and 0 otherwise.
+ // (Boolean macro values are not supported by all preprocessors.)
+-- 
+2.21.0
+
--- a/0003-Fix-segfaults-with-arm-32bit-on-metrics.patch
+++ b/0003-Fix-segfaults-with-arm-32bit-on-metrics.patch
@ -0,0 +1,31 @@
+From 2323dc924a3b107647f9e5f0bdbcfc44b9713195 Mon Sep 17 00:00:00 2001
+From: Michal Klocek <michal.klocek@qt.io>
+Date: Thu, 20 Jun 2019 09:09:53 +0200
+Subject: [PATCH 3/3] Fix segfaults with arm 32bit on metrics
+
+Gcc 6 seems to misscompile pair's template constructor
+in std::map emplace, use converting move constructor instead.
+
+Fixes: QTBUG-75097
+Change-Id: Ia50dc9eadb58f713432c0228a4a5aed73b275f32
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+---
+ chromium/services/metrics/public/cpp/ukm_entry_builder_base.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chromium/services/metrics/public/cpp/ukm_entry_builder_base.cc b/chromium/services/metrics/public/cpp/ukm_entry_builder_base.cc
+index 6685a5816db..5c5380e007e 100644
+--- a/chromium/services/metrics/public/cpp/ukm_entry_builder_base.cc
+++ b/chromium/services/metrics/public/cpp/ukm_entry_builder_base.cc
+@@ -23,7 +23,7 @@ UkmEntryBuilderBase::~UkmEntryBuilderBase() = default;
+ 
+ void UkmEntryBuilderBase::SetMetricInternal(uint64_t metric_hash,
+                                             int64_t value) {
+-  entry_->metrics.emplace(metric_hash, value);
+  entry_->metrics.emplace(std::make_pair(metric_hash, value));
+ }
+ 
+ void UkmEntryBuilderBase::Record(UkmRecorder* recorder) {
+-- 
+2.21.0
+
--- a/0027-Fix-compilation-of-simplebrowser-example.patch
+++ b/0027-Fix-compilation-of-simplebrowser-example.patch
@ -0,0 +1,35 @@
+From c041711febbee334ce5369f25cfae3f560819855 Mon Sep 17 00:00:00 2001
+From: Kai Koehne <kai.koehne@qt.io>
+Date: Tue, 16 Jan 2018 14:09:50 +0100
+Subject: [PATCH 027/230] Fix compilation of simplebrowser example
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Previously qstyle.h was included indirectly through the uic
+generated code, but this got changed in qtbase
+commit 058474884c2505a8a0.
+
+Task-number: QTBUG-65793
+Change-Id: I56a1cd045d53b268999d728f6907ee8d952ba6e9
+Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
+Reviewed-by: Michal Klocek <michal.klocek@qt.io>
+---
+ examples/webenginewidgets/simplebrowser/webpage.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/examples/webenginewidgets/simplebrowser/webpage.cpp b/examples/webenginewidgets/simplebrowser/webpage.cpp
+index 3b78b861..90395641 100644
+--- a/examples/webenginewidgets/simplebrowser/webpage.cpp
+++ b/examples/webenginewidgets/simplebrowser/webpage.cpp
+@@ -56,6 +56,7 @@
+ #include "webview.h"
+ #include <QAuthenticator>
+ #include <QMessageBox>
+#include <QStyle>
+ 
+ WebPage::WebPage(QWebEngineProfile *profile, QObject *parent)
+     : QWebEnginePage(profile, parent)
+-- 
+2.17.0
+
--- a/clean_ffmpeg.sh
+++ b/clean_ffmpeg.sh
@ -46,12 +46,6 @@ header_files="  libavutil/x86/asm.h \
                libavutil/arm/intmath.h \
                libavutil/arm/intreadwrite.h \
                libavutil/arm/timer.h \
-                libavutil/ppc/cpu.h \
-                libavutil/ppc/float_dsp_altivec.h \
-                libavutil/ppc/float_dsp_vsx.h \
-                libavutil/ppc/intreadwrite.h \
-                libavutil/ppc/timer.h \
-                libavutil/ppc/util_altivec.h \
                libavutil/aes_internal.h \
                libavutil/atomic.h \
                libavutil/atomic_gcc.h \
@ -91,8 +85,6 @@ header_files="  libavutil/x86/asm.h \
                libavutil/time_internal.h \
                libavutil/version.h \
                libavutil/x86_cpu.h
-		libavcodec/aarch64/neon.S \
-		libavcodec/aarch64/vp8dsp.h \
                libavcodec/x86/constants.h \
                libavcodec/x86/dsputil_x86.h \
                libavcodec/x86/fft.h \
@ -107,9 +99,6 @@ header_files="  libavutil/x86/asm.h \
                libavcodec/arm/vp56_arith.h \
                libavcodec/arm/vp8.h \
                libavcodec/arm/vp8dsp.h \
-                libavcodec/ppc/fft_vsx.h \
-                libavcodec/ppc/hpeldsp_altivec.h \
-                libavcodec/ppc/mathops.h \
 		libavcodec/aac_ac3_parser.h \
 		libavcodec/ac3_parser_internal.h \
 		libavcodec/ac3.h \
@ -157,14 +146,12 @@ header_files="  libavutil/x86/asm.h \
                libavcodec/old_codec_ids.h \
                libavcodec/options_table.h \
 		libavcodec/opus_celt.h \
-		libavcodec/opusdsp.h \
 		libavcodec/opus_pvq.h \
                libavcodec/opus_rc.h \
                libavcodec/pcm_tablegen.h \
                libavcodec/pel_template.c \
                libavcodec/pixblockdsp.h \
                libavcodec/pixels.h \
-		libavcodec/png.h \
                libavcodec/pthread_internal.h \
                libavcodec/put_bits.h \
                libavcodec/qpeldsp.h \
@ -182,7 +169,6 @@ header_files="  libavutil/x86/asm.h \
                libavcodec/vorbisdsp.h \
                libavcodec/vp3data.h \
                libavcodec/vp3dsp.h \
-		libavcodec/vp4data.h \
                libavcodec/vp56.h \
                libavcodec/vp56dsp.h \
                libavcodec/vp8data.h \
@ -281,24 +267,9 @@ manual_files="  libavutil/x86/x86inc.asm \
                libavcodec/aarch64/h264pred_neon.S \
                libavcodec/aarch64/mdct_neon.S \
                libavcodec/aarch64/vorbisdsp_neon.S \
-		libavcodec/aarch64/vp8dsp_neon.S \
                libavcodec/arm/vorbisdsp_neon.S \
                libavcodec/arm/mdct_neon.S \
                libavcodec/arm/fft_neon.S \
-		libavcodec/arm/vp8dsp_neon.S \
-                libavutil/ppc/cpu.c \
-                libavutil/ppc/float_dsp_altivec.c \
-                libavutil/ppc/float_dsp_init.c \
-                libavutil/ppc/float_dsp_vsx.c \
-                libavcodec/ppc/fft_altivec.S \
-                libavcodec/ppc/fft_init.c \
-                libavcodec/ppc/fft_vsx.c \
-                libavcodec/ppc/hpeldsp_altivec.c \
-                libavcodec/ppc/mpegaudiodsp_altivec.c \
-                libavcodec/ppc/videodsp.c \
-                libavcodec/ppc/vorbisdsp_altivec.c \
-                libavcodec/ppc/vp3dsp_altivec.c \
-                libavcodec/ppc/vp8dsp_altivec.c \
                chromium/ffmpeg_stub_headers.fragment \
                chromium/ffmpegsumo.sigs"

--- a/clean_qtwebengine.sh
+++ b/clean_qtwebengine.sh
@ -21,7 +21,7 @@

 if [ -z "$1" ] ; then
  echo "usage: ./clean_qtwebengine.sh VERSION"
-  echo "e.g.: ./clean_qtwebengine.sh 5.14.1"
+  echo "e.g.: ./clean_qtwebengine.sh 5.11.1"
  exit 1
 fi

@ -32,7 +32,7 @@ rm -rf "$DIRNAME" || exit $?

 if [ -f "$DIRNAME.tar.xz" ] ; then
  echo "unpacking $DIRNAME.tar.xz"
-  XZ_OPT="-T 4" tar xJf "$DIRNAME.tar.xz" || exit $?
+  tar xJf "$DIRNAME.tar.xz" || exit $?
 elif [ -f "$DIRNAME.tar.bz2" ] ; then
  echo "unpacking $DIRNAME.tar.bz2"
  tar xjf "$DIRNAME.tar.bz2" || exit $?
@ -61,7 +61,7 @@ echo "ripping out openh264 sources"
 rm -rf "$DIRNAME/src/3rdparty/chromium/third_party/openh264/src" || exit $?

 echo "repacking as $DIRNAME-clean.tar.xz"
-XZ_OPT="-9 -T 4" tar cJf "$DIRNAME-clean.tar.xz" "$DIRNAME" || exit $?
+XZ_OPT="-9 -f" tar cJf "$DIRNAME-clean.tar.xz" "$DIRNAME" || exit $?

 echo "removing $DIRNAME"
 rm -rf "$DIRNAME" || exit $?
--- a/get_free_ffmpeg_source_files.py
+++ b/get_free_ffmpeg_source_files.py
@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python
 # Copyright 2015 Tomas Popela <tpopela@redhat.com>
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
--- a/package.cfg
+++ b/package.cfg
@ -0,0 +1,2 @@
+[koji]
+targets = epel8 epel8-playground
--- a/qt5-qtbase-5.11.1-mkspecs.patch
+++ b/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
+
--- a/qt5-qtwebengine.spec
+++ b/qt5-qtwebengine.spec
@ -6,18 +6,13 @@
 # where qt5-qttools (qt5-doctools) builds are not yet available
 %global docs 1

-%if 0%{?fedora}
+%if 0%{?fedora} > 29
 # need libvpx >= 1.8.0 (need commit 297dfd869609d7c3c5cd5faa3ebc7b43a394434e)
 %global use_system_libvpx 1
 %endif
 # need libwebp >= 0.6.0
 %global use_system_libwebp 1

-%if 0%{?fedora} > 31
-# need libicu >= 64, only currently available on f32+
-%global use_system_libicu 1
-%endif
-
 # NEON support on ARM (detected at runtime) - disable this if you are hitting
 # FTBFS due to e.g. GCC bug https://bugzilla.redhat.com/show_bug.cgi?id=1282495
 #global arm_neon 1
@ -41,24 +36,27 @@

 %global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)

-# exclude plugins
-%global __provides_exclude ^lib.*plugin\\.so.*$
+# exclude plugins (all architectures) and libv8.so (i686, it's static everywhere
+# else)
+%global __provides_exclude ^lib.*plugin\\.so.*|libv8\\.so$
+# exclude libv8.so (i686, it's static everywhere else)
+%global __requires_exclude ^libv8\\.so$
 # and designer plugins
 %global __provides_exclude_from ^%{_qt5_plugindir}/.*\\.so$

 Summary: Qt5 - QtWebEngine components
 Name:    qt5-qtwebengine
-Version: 5.14.2
-Release: 2%{?dist}
+Version: 5.12.4
+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
 # The other licenses are from Chromium and the code it bundles
 License: (LGPLv2 with exceptions or GPLv3 with exceptions) and BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
 URL:     http://www.qt.io
-# leaned tarball with patent-encumbered codecs removed from the bundled FFmpeg
-# wget http://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/qtwebengine-everywhere-src-5.14.2.tar.xz
-# ./clean_qtwebengine.sh 5.14.2
+# cleaned tarball with patent-encumbered codecs removed from the bundled FFmpeg
+# wget http://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtwebengine-everywhere-src-5.12.3.tar.xz
+# ./clean_qtwebengine.sh 5.12.2
 Source0: qtwebengine-everywhere-src-%{version}-clean.tar.xz
 # cleanup scripts used above
 Source1: clean_qtwebengine.sh
@ -67,9 +65,6 @@ Source3: get_free_ffmpeg_source_files.py
 # macros
 Source10: macros.qt5-qtwebengine

-# pulseaudio headers
-Source20: pulseaudio-12.2-headers.tar.gz
-
 # some tweaks to linux.pri (system yasm, link libpci, run unbundling script)
 Patch0:  qtwebengine-everywhere-src-5.10.0-linux-pri.patch
 # quick hack to avoid checking for the nonexistent icudtl.dat and silence the
@ -85,23 +80,21 @@ Patch2:  qtwebengine-opensource-src-5.12.4-fix-extractcflag.patch
 Patch3:  qtwebengine-opensource-src-5.9.0-no-neon.patch
 # workaround FTBFS against kernel-headers-5.2.0+
 Patch4:  qtwebengine-SIOCGSTAMP.patch
-#  fix build when using qt < 5.14
-Patch5:  qtwebengine-5.14-1-QT_DEPRECATED_VERSION.patch
 # remove Android dependencies from openmax_dl ARM NEON detection (detect.c)
 Patch10: qtwebengine-opensource-src-5.9.0-openmax-dl-neon.patch
 # Force verbose output from the GN bootstrap process
 Patch21: qtwebengine-everywhere-src-5.12.0-gn-bootstrap-verbose.patch
 # Fix/workaround FTBFS on aarch64 with newer glibc
 Patch24: qtwebengine-everywhere-src-5.11.3-aarch64-new-stat.patch
-# Use Python2
-Patch26: qtwebengine-everywhere-5.13.2-use-python2.patch
-# Fix missing include in chromium
-Patch27: qtwebengine-everywhere-5.13.2-fix-chromium-headers.patch
-# Fix gcc10 FTBFS
-Patch29: qtwebengine-everywhere-5.14.1-gcc10.patch

 ## Upstream patches:
 # qtwebengine-chromium
+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}
@ -128,9 +121,7 @@ BuildRequires: libstdc++-static
 BuildRequires: git-core
 BuildRequires: gperf
 BuildRequires: krb5-devel
-%if 0%{?use_system_libicu}
-BuildRequires: libicu-devel >= 64
-%endif
+BuildRequires: libicu-devel
 BuildRequires: libjpeg-devel
 BuildRequires: re2-devel
 BuildRequires: snappy-devel
@ -182,15 +173,7 @@ BuildRequires: pkgconfig(lcms2)
 ## https://bugreports.qt.io/browse/QTBUG-59094
 #BuildRequires: pkgconfig(libxslt) pkgconfig(libxml-2.0)
 BuildRequires: perl-interpreter
-# fesco exception to allow python2 use: https://pagure.io/fesco/issue/2208
-# per https://fedoraproject.org/wiki/Changes/RetirePython2#FESCo_exceptions
-# Only the interpreter is needed
-%if 0%{?fedora} > 29 || 0%{?rhel} > 8
-BuildRequires: %{__python2}
-%else
-BuildRequires: python2
-BuildRequires: python2-rpm-macros
-%endif
+BuildRequires: python2-devel
 %if 0%{?use_system_libvpx}
 BuildRequires: pkgconfig(vpx) >= 1.7.0
 %endif
@ -364,33 +347,28 @@ BuildArch: noarch


 %prep
-%setup -q -n %{qt_module}-everywhere-src-%{version}%{?prerelease:-%{prerelease}} -a20
-
-mv pulse src/3rdparty/chromium/
+%setup -q -n %{qt_module}-everywhere-src-%{version}%{?prerelease:-%{prerelease}}

 pushd src/3rdparty/chromium
+%patch101 -p2 -b .0001
+%patch102 -p2 -b .0002
+%patch103 -p2 -b .0003
 popd

 %patch0 -p1 -b .linux-pri
-%if 0%{?use_system_libicu}
 %patch1 -p1 -b .no-icudtl-dat
-%endif
 %patch2 -p1 -b .fix-extractcflag
 %if !0%{?arm_neon}
 %patch3 -p1 -b .no-neon
 %endif
 %patch4 -p1 -b .SIOCGSTAMP
-%patch5 -p1 -b .QT_DEPRECATED_VERSION

 ## upstream patches

-#patch10 -p1 -b .openmax-dl-neon
+%patch10 -p1 -b .openmax-dl-neon
 ## NEEDSWORK
 #patch21 -p1 -b .gn-bootstrap-verbose
 %patch24 -p1 -b .aarch64-new-stat
-%patch26 -p1 -b .use-python2
-%patch27 -p1 -b .fix-chromium
-%patch29 -p1 -b .gcc10

 # the xkbcommon config/feature was renamed in 5.12, so need to adjust QT_CONFIG references
 # when building on older Qt releases
@ -440,14 +418,20 @@ 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}

 %{qmake_qt5} \
-  %{?debug_config:CONFIG+="%{debug_config}}" \
-  CONFIG+="link_pulseaudio" \
-  %{?use_system_libicu:QMAKE_EXTRA_ARGS+="-system-webengine-icu"} \
+  CONFIG+="%{debug_config}" \
+  QMAKE_EXTRA_ARGS+="-system-webengine-icu" \
  QMAKE_EXTRA_ARGS+="-webengine-kerberos" \
  .

@ -493,8 +477,6 @@ for prl_file in libQt5*.prl ; do
    sed -i -e "/^QMAKE_PRL_LIBS/d" ${prl_file}
  fi
 done
-# explicitly omit, at least until there's a real library installed associated with it -- rex
-rm -fv Qt5WebEngineCore.la
 popd

 mkdir -p %{buildroot}%{_qtwebengine_dictionaries_dir}
@ -525,11 +507,13 @@ done
 %{_qt5_bindir}/qwebengine_convert_dict
 %{_qt5_libdir}/qt5/qml/*
 %{_qt5_libdir}/qt5/libexec/QtWebEngineProcess
+#ifarch %{ix86}
+%if 0%{?sse2}
+# shared V8 library and its SSE2 version
+%{_qt5_libdir}/qtwebengine/
+%endif
 %{_qt5_plugindir}/designer/libqwebengineview.so
 %dir %{_qt5_datadir}/resources/
-%if ! 0%{?use_system_libicu}
-%{_qt5_datadir}/resources/icudtl.dat
-%endif
 %{_qt5_datadir}/resources/qtwebengine_resources_100p.pak
 %{_qt5_datadir}/resources/qtwebengine_resources_200p.pak
 %{_qt5_datadir}/resources/qtwebengine_resources.pak
@ -594,7 +578,6 @@ done
 %{_qt5_headerdir}/Qt*/
 %{_qt5_libdir}/libQt5*.so
 %{_qt5_libdir}/libQt5*.prl
-#{_qt5_libdir}/Qt5WebEngineCore.la
 %{_qt5_libdir}/cmake/Qt5*/
 %{_qt5_libdir}/pkgconfig/Qt5*.pc
 %{_qt5_archdatadir}/mkspecs/modules/*.pri
@ -612,53 +595,8 @@ done


 %changelog
-* Sat Apr 04 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.14.2-2
- rebuild (qt5)
-
-* Wed Apr 01 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.14.2-1
- 5.14.2
-
-* Wed Mar 25 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.14.1-1
- 5.14.1
- use_system_icu on f32+
- drop upstreamed patches
-
-* Wed Mar 25 2020 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 5.13.2-4
- Add patch to allow clock_nanosleep in Linux sandbox (Chromium)
-
-* Fri Feb 21 2020 Troy Dawson <tdawson@redhat.com> - 5.13.2-3
- Patch 3rd party chromium, fix FTBFS (#1799084)
-
-* Wed Jan 08 2020 Than Ngo <than@redhat.com> - 5.13.2-2
- merged Pull-Request, keep ppc files in ffmpeg
-
-* Mon Dec 09 2019 Jan Grulich <jgrulich@redhat.com> - 5.13.2-1
- 5.13.2
-
-* Mon Dec 02 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.12.6-1
- 5.12.6
-
-* Wed Oct 02 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.12.5-2
- explicitly omit QtWebEngineCore.la from packaging
-
-* Thu Sep 26 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.12.5-1
- 5.12.5
-
-* Tue Sep 24 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.4-10
- rebuild (qt5)
-
-* Wed Aug 14 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.12.4-9
- rebuild (re2)
-
-* Mon Aug 12 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.12.4-8
- CONFIG+=link_pulseaudio
-
-* Wed Aug 07 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.12.4-7
- rebuild (re2, #1672014#c10)
- build using bundled pulse headers, workaround FTBFS bug #1729806
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.12.4-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+* Fri Aug 02 2019 Troy Dawson <tdawson@redhat.com> - 5.12.4-5.1
+- Add mkspecs to build on RHEL8 (Kevin Kofler)

 * Wed Jun 26 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.12.4-5
 - pull in some upstream fixes
--- a/qtwebengine-5.14-1-QT_DEPRECATED_VERSION.patch
+++ b/qtwebengine-5.14-1-QT_DEPRECATED_VERSION.patch
@ -1,17 +0,0 @@
-diff -up qtwebengine-everywhere-src-5.14.1.orig/src/webenginewidgets/api/qwebenginedownloaditem.h.QT_DEPRECATED qtwebengine-everywhere-src-5.14.1.orig/src/webenginewidgets/api/qwebenginedownloaditem.h
--- qtwebengine-everywhere-src-5.14.1.orig/src/webenginewidgets/api/qwebenginedownloaditem.h.QT_DEPRECATED	2020-01-20 05:17:16.000000000 -0600
-+++ qtwebengine-everywhere-src-5.14.1.orig/src/webenginewidgets/api/qwebenginedownloaditem.h	2020-03-24 15:42:03.558394148 -0500
-@@ -119,9 +119,13 @@ public:
-     QUrl url() const;
-     QString mimeType() const;
- #if QT_DEPRECATED_SINCE(5, 14)
-+#if QT_VERSION >= QT_VERSION_CHECK(5,14,0)
-     QT_DEPRECATED_VERSION_X(5, 14, "Use downloadDirectory() and downloadFileName() instead")
-+#endif
-     QString path() const;
-+#if QT_VERSION >= QT_VERSION_CHECK(5,14,0)
-     QT_DEPRECATED_VERSION_X(5, 14, "Use setDownloadDirectory() and setDownloadFileName() instead")
-+#endif
-     void setPath(QString path);
- #endif
-     bool isFinished() const;
--- a/qtwebengine-SIOCGSTAMP.patch
+++ b/qtwebengine-SIOCGSTAMP.patch
@ -1,11 +1,11 @@
-diff --git a/src/3rdparty/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc b/src/3rdparty/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc
-index c38d7fdfa..0a8b0fd8b 100644
--- a/src/3rdparty/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc
-+++ b/src/3rdparty/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc
-@@ -72,6 +72,11 @@ typedef void* SockOptArg;
- 
+diff --git a/src/3rdparty/chromium/third_party/webrtc/rtc_base/physicalsocketserver.cc b/src/3rdparty/chromium/third_party/webrtc/rtc_base/physicalsocketserver.cc
+index ca7849917..31c5f7697 100644
+--- a/src/3rdparty/chromium/third_party/webrtc/rtc_base/physicalsocketserver.cc
+++ b/src/3rdparty/chromium/third_party/webrtc/rtc_base/physicalsocketserver.cc
+@@ -69,6 +69,11 @@ typedef void* SockOptArg;
+
 #if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(__native_client__)
- 
+
 +// Seems that kernel 5.2.0 renames this define to SIOCGSTAMP_OLD
 +#ifndef SIOCGSTAMP
 +#define SIOCGSTAMP        0x8906          /* Get stamp (timeval) */
--- a/qtwebengine-everywhere-5.13.2-fix-chromium-headers.patch
+++ b/qtwebengine-everywhere-5.13.2-fix-chromium-headers.patch
@ -1,39 +0,0 @@
-From 033c7aa2da1bc78347765d60c15843ece02ef4d8 Mon Sep 17 00:00:00 2001
-From: Troy Dawson <tdawson@redhat.com>
-Date: Tue, 11 Feb 2020 15:43:30 -0800
-Subject: [PATCH] fix chromium headers
-
---
- .../chromium/cc/base/list_container_helper.cc | 250 -----------------
- .../chromium/cc/base/list_container_helper.h  | 254 ++++++++++++++++++
- .../aec3/clockdrift_detector.h                |   1 +
- .../modules/video_coding/decoding_state.h     |   1 +
- 4 files changed, 256 insertions(+), 250 deletions(-)
-
-diff --git a/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h b/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
-index 22528c948..69e624e8b 100644
--- a/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
-+++ b/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
-@@ -12,6 +12,7 @@
- #define MODULES_AUDIO_PROCESSING_AEC3_CLOCKDRIFT_DETECTOR_H_
- 
- #include <array>
-+#include <cstddef>
- 
- namespace webrtc {
- 
-diff --git a/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/decoding_state.h b/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/decoding_state.h
-index b87fb2d03..ec972949d 100644
--- a/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/decoding_state.h
-+++ b/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/decoding_state.h
-@@ -11,6 +11,7 @@
- #ifndef MODULES_VIDEO_CODING_DECODING_STATE_H_
- #define MODULES_VIDEO_CODING_DECODING_STATE_H_
- 
-+#include <cstdint>
- #include <map>
- #include <set>
- #include <vector>
-- 
-2.24.1
-
--- a/qtwebengine-everywhere-5.13.2-use-python2.patch
+++ b/qtwebengine-everywhere-5.13.2-use-python2.patch
@ -1,13 +0,0 @@
-diff --git a/src/webengine/module.pro b/src/webengine/module.pro
-index 49a1086b2..afc89d49e 100644
--- a/src/webengine/module.pro
-+++ b/src/webengine/module.pro
-@@ -76,7 +76,7 @@ qtConfig(webengine-testsupport) {
-     python = $$pythonPathForShell()
-     chromium_attributions.commands = \
-         cd $$shell_quote($$shell_path($$PWD/../3rdparty)) && \
-        $$python chromium/tools/licenses.py \
-+        python2 chromium/tools/licenses.py \
-         --file-template ../../tools/about_credits.tmpl \
-         --entry-template ../../tools/about_credits_entry.tmpl credits \
-         $$shell_quote($$shell_path($$OUT_PWD/chromium_attributions.qdoc))
--- a/qtwebengine-everywhere-5.14.1-gcc10.patch
+++ b/qtwebengine-everywhere-5.14.1-gcc10.patch
@ -1,35 +0,0 @@
-diff -up qtwebengine-everywhere-src-5.14.1.orig/src/3rdparty/chromium/media/cdm/supported_cdm_versions.cc.gcc10 qtwebengine-everywhere-src-5.14.1.orig/src/3rdparty/chromium/media/cdm/supported_cdm_versions.cc
-diff -up qtwebengine-everywhere-src-5.14.1.orig/src/3rdparty/chromium/media/cdm/supported_cdm_versions.h.gcc10 qtwebengine-everywhere-src-5.14.1.orig/src/3rdparty/chromium/media/cdm/supported_cdm_versions.h
--- qtwebengine-everywhere-src-5.14.1.orig/src/3rdparty/chromium/media/cdm/supported_cdm_versions.h.gcc10	2020-01-20 04:37:42.000000000 -0600
-+++ qtwebengine-everywhere-src-5.14.1.orig/src/3rdparty/chromium/media/cdm/supported_cdm_versions.h	2020-03-25 08:19:35.628534572 -0500
-@@ -6,6 +6,7 @@
- #define MEDIA_CDM_SUPPORTED_CDM_VERSIONS_H_
- 
- #include <array>
-+#include <cstdlib>
- 
- #include "media/base/media_export.h"
- #include "media/cdm/api/content_decryption_module.h"
-diff -up qtwebengine-everywhere-src-5.14.1.orig/src/3rdparty/chromium/third_party/perfetto/include/perfetto/base/task_runner.h.gcc10 qtwebengine-everywhere-src-5.14.1.orig/src/3rdparty/chromium/third_party/perfetto/include/perfetto/base/task_runner.h
--- qtwebengine-everywhere-src-5.14.1.orig/src/3rdparty/chromium/third_party/perfetto/include/perfetto/base/task_runner.h.gcc10	2020-01-20 04:37:42.000000000 -0600
-+++ qtwebengine-everywhere-src-5.14.1.orig/src/3rdparty/chromium/third_party/perfetto/include/perfetto/base/task_runner.h	2020-03-17 16:59:11.432193734 -0500
-@@ -18,6 +18,7 @@
- #define INCLUDE_PERFETTO_BASE_TASK_RUNNER_H_
- 
- #include <functional>
-+#include <cstdint>
- 
- #include "perfetto/base/export.h"
- 
-diff -up qtwebengine-everywhere-src-5.14.1.orig/src/3rdparty/chromium/third_party/webrtc/call/rtx_receive_stream.h.gcc10 qtwebengine-everywhere-src-5.14.1.orig/src/3rdparty/chromium/third_party/webrtc/call/rtx_receive_stream.h
--- qtwebengine-everywhere-src-5.14.1.orig/src/3rdparty/chromium/third_party/webrtc/call/rtx_receive_stream.h.gcc10	2020-01-20 04:37:42.000000000 -0600
-+++ qtwebengine-everywhere-src-5.14.1.orig/src/3rdparty/chromium/third_party/webrtc/call/rtx_receive_stream.h	2020-03-25 09:37:13.373280961 -0500
-@@ -11,6 +11,8 @@
- #ifndef CALL_RTX_RECEIVE_STREAM_H_
- #define CALL_RTX_RECEIVE_STREAM_H_
- 
-+#include <cstdlib>
-+#include <cstdint>
- #include <map>
- 
- #include "call/rtp_packet_sink_interface.h"
--- a/qtwebengine-everywhere-src-5.10.0-linux-pri.patch
+++ b/qtwebengine-everywhere-src-5.10.0-linux-pri.patch
@ -1,6 +1,6 @@
-diff -ur qtwebengine-everywhere-src-5.10.0/src/buildtools/config/linux.pri qtwebengine-everywhere-src-5.10.0-linux-pri/src/buildtools/config/linux.pri
--- qtwebengine-everywhere-src-5.10.0/src/buildtools/config/linux.pri	2017-11-29 09:42:29.000000000 +0100
-+++ qtwebengine-everywhere-src-5.10.0-linux-pri/src/buildtools/config/linux.pri	2017-12-25 12:07:40.262411459 +0100
+diff -ur qtwebengine-everywhere-src-5.10.0/src/core/config/linux.pri qtwebengine-everywhere-src-5.10.0-linux-pri/src/core/config/linux.pri
+--- qtwebengine-everywhere-src-5.10.0/src/core/config/linux.pri	2017-11-29 09:42:29.000000000 +0100
+++ qtwebengine-everywhere-src-5.10.0-linux-pri/src/core/config/linux.pri	2017-12-25 12:07:40.262411459 +0100
@@ -157,3 +157,19 @@
     #qtConfig(webengine-system-jsoncpp): gn_args += use_system_jsoncpp=true
     #qtConfig(webengine-system-libsrtp: gn_args += use_system_libsrtp=true
--- a/qtwebengine-everywhere-src-5.11.0-no-icudtl-dat.patch
+++ b/qtwebengine-everywhere-src-5.11.0-no-icudtl-dat.patch
@ -1,10 +1,9 @@
-diff --git a/src/core/web_engine_library_info.cpp b/src/core/web_engine_library_info.cpp
-index 1c8316430..a1c27d28f 100644
--- a/src/core/web_engine_library_info.cpp
-+++ b/src/core/web_engine_library_info.cpp
-@@ -259,29 +259,12 @@ QString dictionariesPath()
+diff -up qtwebengine-everywhere-src-5.11.0/src/core/web_engine_library_info.cpp.no-icudtl-dat qtwebengine-everywhere-src-5.11.0/src/core/web_engine_library_info.cpp
+--- qtwebengine-everywhere-src-5.11.0/src/core/web_engine_library_info.cpp.no-icudtl-dat	2018-06-14 09:23:48.931195271 -0500
+++ qtwebengine-everywhere-src-5.11.0/src/core/web_engine_library_info.cpp	2018-06-14 09:27:26.248014325 -0500
+@@ -258,28 +258,12 @@ QString dictionariesPath()
 
- QString resourcesDataPath()
+ QString icuDataPath()
 {
 -    static bool initialized = false;
     static QString potentialResourcesPath =
@ -15,20 +14,19 @@ index 1c8316430..a1c27d28f 100644
 #endif
 -    if (!initialized) {
 -        initialized = true;
-        if (!QFileInfo::exists(potentialResourcesPath % QLatin1String("/qtwebengine_resources.pak"))) {
-            qWarning("Qt WebEngine resources not found at %s. Trying parent directory...", qPrintable(potentialResourcesPath));
+-        if (!QFileInfo::exists(potentialResourcesPath % QLatin1String("/icudtl.dat"))) {
+-            qWarning("Qt WebEngine ICU data not found at %s. Trying parent directory...", qPrintable(potentialResourcesPath));
 -            potentialResourcesPath = QLibraryInfo::location(QLibraryInfo::DataPath);
 -        }
-        if (!QFileInfo::exists(potentialResourcesPath % QLatin1String("/qtwebengine_resources.pak"))) {
-            qWarning("Qt WebEngine resources not found at %s. Trying application directory...", qPrintable(potentialResourcesPath));
+-        if (!QFileInfo::exists(potentialResourcesPath % QLatin1String("/icudtl.dat"))) {
+-            qWarning("Qt WebEngine ICU data not found at %s. Trying application directory...", qPrintable(potentialResourcesPath));
 -            potentialResourcesPath = QCoreApplication::applicationDirPath();
 -        }
-        if (!QFileInfo::exists(potentialResourcesPath % QLatin1String("/qtwebengine_resources.pak"))) {
-            qWarning("Qt WebEngine resources not found at %s. Trying fallback directory... The application MAY NOT work.", qPrintable(potentialResourcesPath));
+-        if (!QFileInfo::exists(potentialResourcesPath % QLatin1String("/icudtl.dat"))) {
+-            qWarning("Qt WebEngine ICU data not found at %s. Trying fallback directory... The application MAY NOT work.", qPrintable(potentialResourcesPath));
 -            potentialResourcesPath = fallbackDir();
 -        }
 -    }
-
+ 
     return potentialResourcesPath;
 }
- } // namespace
--- a/qtwebengine-everywhere-src-5.12.0-gn-bootstrap-verbose.patch
+++ b/qtwebengine-everywhere-src-5.12.0-gn-bootstrap-verbose.patch
@ -1,13 +1,12 @@
-diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro
-index b6bf9cfc4..30f92e6ac 100644
--- a/src/buildtools/gn.pro
-+++ b/src/buildtools/gn.pro
+diff -up qtwebengine-everywhere-src-5.12.0/src/buildtools/gn.pro.gn-bootstrap-verbose qtwebengine-everywhere-src-5.12.0/src/buildtools/gn.pro
+--- qtwebengine-everywhere-src-5.12.0/src/buildtools/gn.pro.gn-bootstrap-verbose	2018-12-07 09:53:18.262171677 -0600
+++ qtwebengine-everywhere-src-5.12.0/src/buildtools/gn.pro	2018-12-07 09:57:53.246646133 -0600
@@ -18,7 +18,7 @@ build_pass|!debug_and_release {
             src_3rd_party_dir = $$absolute_path("$${getChromiumSrcDir()}/../", "$$QTWEBENGINE_ROOT")
             gn_bootstrap = $$system_path($$absolute_path(gn/build/gen.py, $$src_3rd_party_dir))
 
-            gn_gen_args = --no-last-commit-position --out-path $$out_path \
-+            gn_gen_args = --no-last-commit-position --verbose --out-path $$out_path \
-                           --cc \"$$which($$QMAKE_CC)\" --cxx \"$$which($$QMAKE_CXX)\" \
-                           --ld \"$$which($$QMAKE_LINK)\"
- 
+-            gn_configure = $$system_quote($$gn_bootstrap) --no-last-commit-position --out-path $$out_path
+            gn_configure = $$system_quote($$gn_bootstrap) --verbose --no-last-commit-position --out-path $$out_path
+             !system("$$pythonPathForSystem() $$gn_configure") {
+                 error("GN generation error!")
+             }
--- a/qtwebengine-opensource-src-5.12.4-fix-extractcflag.patch
+++ b/qtwebengine-opensource-src-5.12.4-fix-extractcflag.patch
@ -1,7 +1,7 @@
-diff --git a/src/buildtools/config/functions.pri b/src/buildtools/config/functions.pri
+diff --git a/src/core/config/functions.pri b/src/core/config/functions.pri
 index 8c11faa16..191d3d623 100644
--- a/src/buildtools/config/functions.pri
-+++ b/src/buildrools/config/functions.pri
+--- a/src/core/config/functions.pri
+++ b/src/core/config/functions.pri
@@ -1,5 +1,5 @@
 defineReplace(qtwebengine_extractCFlag) {
 -    CFLAGS = $$QMAKE_CC $$QMAKE_CFLAGS
--- a/qtwebengine-opensource-src-5.9.0-no-neon.patch
+++ b/qtwebengine-opensource-src-5.9.0-no-neon.patch
@ -1,8 +1,7 @@
-diff --git a/src/buildtools/config/linux.pri b/src/buildtools/config/linux.pri
-index f45c418fe..f6c7b714e 100644
--- a/src/buildtools/config/linux.pri
-+++ b/src/buildtools/config/linux.pri
-@@ -87,7 +87,9 @@ contains(QT_ARCH, "arm") {
+diff -ur qtwebengine-opensource-src-5.9.0/src/core/config/linux.pri qtwebengine-opensource-src-5.9.0-no-neon/src/core/config/linux.pri
+--- qtwebengine-opensource-src-5.9.0/src/core/config/linux.pri	2017-05-19 06:22:04.000000000 +0200
+++ qtwebengine-opensource-src-5.9.0-no-neon/src/core/config/linux.pri	2017-06-08 00:55:22.257781563 +0200
+@@ -70,7 +70,9 @@
             gn_args += arm_use_neon=false
             # If the toolchain does not explicitly specify to use NEON instructions
             # we use arm_neon_optional for ARMv7
--- a/qtwebengine-opensource-src-5.9.0-openmax-dl-neon.patch
+++ b/qtwebengine-opensource-src-5.9.0-openmax-dl-neon.patch
@ -1,24 +1,19 @@
-diff --git a/src/3rdparty/chromium/third_party/openmax_dl/dl/BUILD.gn b/src/3rdparty/chromium/third_party/openmax_dl/dl/BUILD.gn
-index 96a59c7c7..d5470f284 100644
--- a/src/3rdparty/chromium/third_party/openmax_dl/dl/BUILD.gn
-+++ b/src/3rdparty/chromium/third_party/openmax_dl/dl/BUILD.gn
-@@ -208,12 +208,6 @@ if (current_cpu == "arm") {
+diff -ur qtwebengine-opensource-src-5.9.0/src/3rdparty/chromium/third_party/openmax_dl/dl/BUILD.gn qtwebengine-opensource-src-5.9.0-openmax-dl-neon/src/3rdparty/chromium/third_party/openmax_dl/dl/BUILD.gn
+--- qtwebengine-opensource-src-5.9.0/src/3rdparty/chromium/third_party/openmax_dl/dl/BUILD.gn	2017-05-18 16:51:44.000000000 +0200
+++ qtwebengine-opensource-src-5.9.0-openmax-dl-neon/src/3rdparty/chromium/third_party/openmax_dl/dl/BUILD.gn	2017-06-10 02:41:10.317340598 +0200
+@@ -196,9 +196,6 @@
     ]
     if (arm_optionally_use_neon) {
       # Run-time NEON detection.
-      deps = [
-        "//third_party/android_tools:cpu_features",
-      ]
-
+-      deps = [ "//third_party/android_tools:cpu_features" ]
 -      # To get the __android_log_print routine
 -      libs = [ "log" ]
- 
       # Detection routine
       sources += [ "sp/src/arm/detect.c" ]
-diff --git a/src/3rdparty/chromium/third_party/openmax_dl/dl/sp/src/arm/detect.c b/src/3rdparty/chromium/third_party/openmax_dl/dl/sp/src/arm/detect.c
-index 57bfe4089..94a3f7ddc 100644
--- a/src/3rdparty/chromium/third_party/openmax_dl/dl/sp/src/arm/detect.c
-+++ b/src/3rdparty/chromium/third_party/openmax_dl/dl/sp/src/arm/detect.c
+     }
+diff -ur qtwebengine-opensource-src-5.9.0/src/3rdparty/chromium/third_party/openmax_dl/dl/sp/src/arm/detect.c qtwebengine-opensource-src-5.9.0-openmax-dl-neon/src/3rdparty/chromium/third_party/openmax_dl/dl/sp/src/arm/detect.c
+--- qtwebengine-opensource-src-5.9.0/src/3rdparty/chromium/third_party/openmax_dl/dl/sp/src/arm/detect.c	2017-05-18 16:51:44.000000000 +0200
+++ qtwebengine-opensource-src-5.9.0-openmax-dl-neon/src/3rdparty/chromium/third_party/openmax_dl/dl/sp/src/arm/detect.c	2017-06-10 02:38:30.593809570 +0200
@@ -9,13 +9,57 @@
  *
  */
@ -81,7 +76,7 @@ index 57bfe4089..94a3f7ddc 100644
 }
 
 static void SetFFTRoutines() {
-@@ -24,13 +68,9 @@ static void SetFFTRoutines() {
+@@ -24,13 +68,9 @@
    * forward and inverse FFTs
    */
   if (omxSP_HasArmNeon()) {
--- a/3
+++ b/3
@ -1,2 +1 @@
-SHA512 (pulseaudio-12.2-headers.tar.gz) = a5a9bcbb16030b3bc83cc0cc8f5e7f90e0723d3e83258a5c77eacb32eaa267118a73fa7814fbcc99a24e4907916a2b371ebb6dedc4f45541c3acf6c834fd35be
-SHA512 (qtwebengine-everywhere-src-5.14.2-clean.tar.xz) = 1b946115ac7fba2db6f2807bca5b8911147c164ed19aa13e46bd030a3317f484b2241150cad59ab071da5fd000fc003a81ccc93a68ef3f34a997ff8c4a7d113a
+SHA512 (qtwebengine-everywhere-src-5.12.4-clean.tar.xz) = 6ac76ef0fde00763a407363e1ce79d883d827020580c0ec712ae1b2f1262d9daf2a1039c44f271ac4b498acaa9af1c1dcdb7367bcf3a6b97acdc9d8973b3cd18
Author	SHA1	Message	Date
Troy Dawson	908c51a8b7	Tweek on mkspecs fix	2019-11-06 23:08:48 +00:00
Troy Dawson	df5295b731	Add mkspecs to build on RHEL8 (Kevin Kofler)	2019-11-06 23:08:34 +00:00
Troy Dawson	c7a84d3268	Merge branch f30 into epel8	2019-08-01 08:06:45 -07:00
Gwyn Ciesla	55b15bbb4a	"Adding package.cfg file"	2019-07-31 10:40:47 -05:00