$ git diff --patch-with-stat --summary 2223540ea78a4865701aeb613257e69a976821be..9a0aa890e8677773d025b81ab605581d82216dc5
.abf.yml | 3 +-
....27947d92157b0987ceef9ae31fe0d3e7f8b653df.patch | 158 +++++++++++++++++++++
qt5-qtwebengine.spec | 65 +++++----
qtwebengine-everywhere-src-5.10.0-linux-pri.patch | 6 +-
...ne-opensource-src-5.12.1-fix-extractcflag.patch | 12 --
qtwebengine-opensource-src-5.9.0-no-neon.patch | 6 +-
...gine-opensource-src-5.9.0-openmax-dl-neon.patch | 14 +-
7 files changed, 213 insertions(+), 51 deletions(-)
create mode 100644 34662922afe684e6561224cb217e220536bc8bcc..27947d92157b0987ceef9ae31fe0d3e7f8b653df.patch
delete mode 100644 qtwebengine-opensource-src-5.12.1-fix-extractcflag.patch
diff --git a/.abf.yml b/.abf.yml
index 03d6245..83f6d89 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,3 @@
sources:
- qtwebengine-everywhere-src-5.13.0.tar.xz: 378c7b4879779919a9cb0b42ccffa57020f675e5
+ qtwebengine-chromium-77-20191020.tar.xz: 437ac08074eafbbcfc8e16a710812d4b3a9aa8ab
+ qtwebengine-everywhere-src-5.15.0-20191020.tar.xz: 5e9763386dbb3f53b368829677586cf411a82214
diff --git a/34662922afe684e6561224cb217e220536bc8bcc..27947d92157b0987ceef9ae31fe0d3e7f8b653df.patch b/34662922afe684e6561224cb217e220536bc8bcc..27947d92157b0987ceef9ae31fe0d3e7f8b653df.patch
new file mode 100644
index 0000000..e724ce6
--- /dev/null
+++ b/34662922afe684e6561224cb217e220536bc8bcc..27947d92157b0987ceef9ae31fe0d3e7f8b653df.patch
@@ -0,0 +1,158 @@
+From 27947d92157b0987ceef9ae31fe0d3e7f8b653df Mon Sep 17 00:00:00 2001
+From: Kirill Burtsev <kirill.burtsev@qt.io>
+Date: Fri, 23 Aug 2019 15:09:25 +0200
+Subject: Fix compilation with system ICU
+
+1. system_icu_config is missing default type for UCHAR_TYPE, that causes
+a mismatch of types all over Chromium. uint16_t is defined as a base type
+under linux in chromium/build/linux/unbundle/icu.gn.
+Necessary constructions were lost during recent refactorings,
+and seems to be restored in later chromium > 77.
+
+2. Update shim headers
+
+3. ICU upstream now requires that ICU4C API macros are used with a
+trailing semicolon.
+
+- https://unicode-org.atlassian.net/browse/ICU-20601
+- https://github.com/unicode-org/icu/pull/759
+
+Change-Id: Ie05c005ebcded9a228386db5d9abe9863787ec2b
+Fixes: QTBUG-78911
+Reviewed-by: Jimi Huotari <chiitoo@gentoo.org>
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+---
+ .../blink/renderer/core/dom/document.cc | 2 +-
+ chromium/third_party/icu/BUILD.gn | 28 +++++++++++++++-------
+ 2 files changed, 21 insertions(+), 9 deletions(-)
+
+diff --git qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc
+index 920dab7c48d..43fd422393c 100644
+--- qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc
++++ qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc
+@@ -6065,7 +6065,7 @@ static ParseQualifiedNameResult ParseQualifiedNameInternal(
+
+ for (unsigned i = 0; i < length;) {
+ UChar32 c;
+- U16_NEXT(characters, i, length, c)
++ U16_NEXT(characters, i, length, c);
+ if (c == ':') {
+ if (saw_colon)
+ return ParseQualifiedNameResult(kQNMultipleColons);
+diff --git qtwebengine/src/3rdparty/chromium/third_party/icu/BUILD.gn qtwebengine/src/3rdparty/chromium/third_party/icu/BUILD.gn
+index 8809dcfbcd4..489a87e6080 100644
+--- qtwebengine/src/3rdparty/chromium/third_party/icu/BUILD.gn
++++ qtwebengine/src/3rdparty/chromium/third_party/icu/BUILD.gn
+@@ -1176,6 +1176,12 @@ config("system_icu_config") {
+ "USING_SYSTEM_ICU=1",
+ "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC",
+ ]
++
++ if (is_win) {
++ defines += [ "UCHAR_TYPE=wchar_t" ]
++ } else {
++ defines += [ "UCHAR_TYPE=uint16_t" ]
++ }
+ }
+
+ if (use_system_icu) {
+@@ -1193,9 +1199,7 @@ shim_headers("icui18n_shim") {
+ prefix = "unicode/"
+ headers = [
+ # This list can easily be updated using the command below:
+- # find third_party/icu/source/i18n/unicode \
+- # -iname '*.h' -printf '"%p",\n' | \
+- # sed -e 's|third_party/icu/source/i18n/unicode/||' | sort -u
++ # find third_party/icu/source/i18n/unicode -iname '*.h' -printf '%f\n' | sort -Vu | sed -e 's/.*/"&",/'
+ "alphaindex.h",
+ "basictz.h",
+ "calendar.h",
+@@ -1217,15 +1221,18 @@ shim_headers("icui18n_shim") {
+ "fieldpos.h",
+ "fmtable.h",
+ "format.h",
++ "formattedvalue.h",
+ "fpositer.h",
+ "gender.h",
+ "gregocal.h",
++ "listformatter.h",
+ "measfmt.h",
+ "measunit.h",
+ "measure.h",
+ "msgfmt.h",
+ "nounit.h",
+ "numberformatter.h",
++ "numberrangeformatter.h",
+ "numfmt.h",
+ "numsys.h",
+ "plurfmt.h",
+@@ -1261,11 +1268,14 @@ shim_headers("icui18n_shim") {
+ "udatpg.h",
+ "ufieldpositer.h",
+ "uformattable.h",
++ "uformattedvalue.h",
+ "ugender.h",
++ "ulistformatter.h",
+ "ulocdata.h",
+ "umsg.h",
+ "unirepl.h",
+ "unum.h",
++ "unumberformatter.h",
+ "unumsys.h",
+ "upluralrules.h",
+ "uregex.h",
+@@ -1284,9 +1294,7 @@ shim_headers("icuuc_shim") {
+ prefix = "unicode/"
+ headers = [
+ # This list can easily be updated using the command below:
+- # find third_party/icu/source/common/unicode \
+- # -iname '*.h' -printf '"%p",\n' | \
+- # sed -e 's|third_party/icu/source/common/unicode/||' | sort -u
++ # find third_party/icu/source/common/unicode -iname '*.h' -printf '%f\n' | sort -Vu | sed -e 's/.*/"&",/'
+ "appendable.h",
+ "brkiter.h",
+ "bytestream.h",
+@@ -1306,6 +1314,7 @@ shim_headers("icuuc_shim") {
+ "icudataver.h",
+ "icuplug.h",
+ "idna.h",
++ "localebuilder.h",
+ "localpointer.h",
+ "locdspnm.h",
+ "locid.h",
+@@ -1339,10 +1348,12 @@ shim_headers("icuuc_shim") {
+ "uchriter.h",
+ "uclean.h",
+ "ucnv.h",
++ "ucnvsel.h",
+ "ucnv_cb.h",
+ "ucnv_err.h",
+- "ucnvsel.h",
+ "uconfig.h",
++ "ucpmap.h",
++ "ucptrie.h",
+ "ucurr.h",
+ "udata.h",
+ "udisplaycontext.h",
+@@ -1353,6 +1364,7 @@ shim_headers("icuuc_shim") {
+ "uloc.h",
+ "umachine.h",
+ "umisc.h",
++ "umutablecptrie.h",
+ "unifilt.h",
+ "unifunct.h",
+ "unimatch.h",
+@@ -1373,9 +1385,9 @@ shim_headers("icuuc_shim") {
+ "ustringtrie.h",
+ "utext.h",
+ "utf.h",
++ "utf8.h",
+ "utf16.h",
+ "utf32.h",
+- "utf8.h",
+ "utf_old.h",
+ "utrace.h",
+ "utypes.h",
+--
+cgit v1.2.1
+
diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec
index 45cc387..3d1e7af 100644
--- a/qt5-qtwebengine.spec
+++ b/qt5-qtwebengine.spec
@@ -1,6 +1,6 @@
%define _disable_ld_no_undefined 1
-%define beta %{nil}
-%define debug_package %nil
+%define beta 20191020
+%define debug_package %nil
# FIXME build failure w/ 5.11.0beta4, clang 6.0, binutils 2.30
#define _disable_lto 1
@@ -14,20 +14,26 @@
# Build with gcc instead of clang
%bcond_with gcc
+
%ifarch %{ix86}
-%global optflags %{optflags} -Wl,-z,notext
+%global optflags %{optflags} -O2 -Wl,-z,notext
%global ldflags %{ldflags} -Wl,-z,notext
+%else
+%global optflags %{optflags} -O2
%endif
Summary: Qt WebEngine
Name: qt5-qtwebengine
-Version: 5.13.0
+Version: 5.15.0
%if "%{beta}" != ""
Release: 0.%{beta}.1
%define qttarballdir qtwebengine-everywhere-src-%{version}-%{beta}
-Source0: http://download.qt.io/development_releases/qt/%(echo %{version}|cut -d. -f1-2)/%{version}-%(echo %{beta} |sed -e "s,1$,,")/submodules/%{qttarballdir}.tar.xz
+# git://code.qt.io/qt/qtwebengine.git -- branch 5.15
+Source0: http://download.qt.io/development_releases/qt/%(echo %{version}|cut -d. -f1-2)/%{version}-%{beta}/submodules/%{qttarballdir}.tar.xz
+# git://code.qt.io/qt/qtwebengine-chromium.git -- branch 77-based
+Source1: qtwebengine-chromium-77-%{beta}.tar.xz
%else
-Release: 6
+Release: 1
%define qttarballdir qtwebengine-everywhere-src-%{version}
#Source0: http://download.qt.io/official_releases/qt/%(echo %{version}|cut -d. -f1-2)/%{version}/submodules/%{qttarballdir}-clean.tar.xz
Source0: http://download.qt.io/official_releases/qt/%(echo %{version}|cut -d. -f1-2)/%{version}/submodules/%{qttarballdir}.tar.xz
@@ -40,9 +46,6 @@ Source1000: %{name}.rpmlintrc
# https://github.com/rpmfusion/qt5-qtwebengine-freeworld
# some tweaks to linux.pri (system yasm, link libpci, run unbundling script)
Patch0: https://raw.githubusercontent.com/rpmfusion/qt5-qtwebengine-freeworld/master/qtwebengine-everywhere-src-5.10.0-linux-pri.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: https://raw.githubusercontent.com/rpmfusion/qt5-qtwebengine-freeworld/master/qtwebengine-opensource-src-5.12.1-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: https://raw.githubusercontent.com/rpmfusion/qt5-qtwebengine-freeworld/master/qtwebengine-opensource-src-5.9.0-no-neon.patch
@@ -52,9 +55,9 @@ Patch3: https://raw.githubusercontent.com/rpmfusion/qt5-qtwebengine-freeworld/m
# ../../../../src/3rdparty/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h:755:19: error: functional-style cast from 'neon::F' (aka 'V<float>') to '__fp16' is not allowed
# __fp16 fp16 = __fp16(f);
# ^~~~~~~~
-Patch4: qt5-qtwebengine-workaround-aarch64-build-failure.patch
+#Patch4: qt5-qtwebengine-workaround-aarch64-build-failure.patch
# remove Android dependencies from openmax_dl ARM NEON detection (detect.c)
-Patch10: https://raw.githubusercontent.com/rpmfusion/qt5-qtwebengine-freeworld/master/qtwebengine-opensource-src-5.9.0-openmax-dl-neon.patch
+#Patch10: https://raw.githubusercontent.com/rpmfusion/qt5-qtwebengine-freeworld/master/qtwebengine-opensource-src-5.9.0-openmax-dl-neon.patch
# Force verbose output from the GN bootstrap process
# Needs porting
#Patch21: https://raw.githubusercontent.com/rpmfusion/qt5-qtwebengine-freeworld/master/qtwebengine-everywhere-src-5.12.0-gn-bootstrap-verbose.patch
@@ -88,12 +91,14 @@ Patch1004: 881ef63.diff
# Support ffmpeg 3.5
Patch1010: chromium-65-ffmpeg-3.5.patch
Patch1011: ffmpeg-linkage.patch
-Patch1014: qtwebengine-everywhere-src-5.11.1-reduce-build-log-size.patch
+#Patch1014: qtwebengine-everywhere-src-5.11.1-reduce-build-log-size.patch
Patch1015: qtwebengine-QTBUG-75265.patch
# Keep in sync with the patch in Chromium...
Patch1016: enable-vaapi.patch
# Make it build with clang on i686
Patch1017: qtwebengine-5.13.0-b4-i686-missing-latomic.patch
+# https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=27947d92157b0987ceef9ae31fe0d3e7f8b653df
+#Patch1018: 34662922afe684e6561224cb217e220536bc8bcc..27947d92157b0987ceef9ae31fe0d3e7f8b653df.patch
BuildRequires: atomic-devel
BuildRequires: git-core
BuildRequires: nasm
@@ -131,9 +136,13 @@ BuildRequires: pkgconfig(Qt5Sensors)
BuildRequires: pkgconfig(Qt5QuickWidgets)
BuildRequires: pkgconfig(Qt5QuickControls2)
BuildRequires: pkgconfig(Qt5Location)
+BuildRequires: cmake(Qt5XcbQpa)
+BuildRequires: cmake(Qt5QmlModels)
+BuildRequires: qt5-qtqmlmodels-private-devel
# Designer plugin
BuildRequires: pkgconfig(Qt5Designer)
# end
+BuildRequires: pkgconfig(libdrm)
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(egl)
@@ -175,6 +184,7 @@ BuildRequires: snappy-devel
BuildRequires: srtp-devel
BuildRequires: qt5-qtquickcontrols2
BuildRequires: qt5-qtquick-private-devel
+BuildRequires: qt5-qtqmlmodels-private-devel
# FIXME this is evil - the build system should be fixed properly
# instead of making sure there's no previous version floating
# around.
@@ -286,12 +296,19 @@ Examples for QtWebEngine.
%{_libdir}/qt5/examples/webenginewidgets
%prep
-%autosetup -n %{qttarballdir} -p1
+%setup -n %{qttarballdir}
+%if "%{beta}" != ""
+cd src/3rdparty
+tar xf %{S:1}
+cd -
+%{_libdir}/qt5/bin/syncqt.pl -version %{version}
+%endif
+%autopatch -p1
# chromium is a huge bogosity -- references to hidden SQLite symbols, has
# asm files forcing an executable stack etc., but still tries to force ld
# into --fatal-warnings mode...
-sed -i -e 's|--fatal-warnings|-O2|' src/3rdparty/chromium/build/config/compiler/BUILD.gn src/3rdparty/chromium/build/common.gypi
+sed -i -e 's|--fatal-warnings|-O2|' src/3rdparty/chromium/build/config/compiler/BUILD.gn
# fix missing (bogus but required) file duplication
cp src/3rdparty/chromium/base/numerics/*_arm_impl.h src/3rdparty/gn/base/numerics/
@@ -354,14 +371,12 @@ export QMAKESPEC=%{_libdir}/qt5/mkspecs/${QMAKE_XSPEC}
%endif
mkdir %{_target_platform}
-pushd %{_target_platform}
+cd %{_target_platform}
mkdir bin
ln -s /usr/bin/python2 bin/python
export PATH="$(pwd)/bin:$PATH"
export NINJAFLAGS="-v %{_smp_mflags}"
-# use_system_icu <--- should be put back, currently disabled because of undefined reference
-# to base::i18n::GetRawIcuMemory()
%ifarch %{arm}
# FIXME figure out why -alsa fails to build on armv7hnl
%qmake_qt5 QMAKE_EXTRA_ARGS="-proprietary-codecs -pulseaudio -webp -printing-and-pdf -spellchecker -system-ffmpeg -system-opus -system-webengine-icu -verbose" LFLAGS="${LDFLAGS}" ..
@@ -370,7 +385,7 @@ export NINJAFLAGS="-v %{_smp_mflags}"
%endif
%make_build NINJA_PATH=ninja
-popd
+cd -
%install
export STRIP=strip
@@ -379,7 +394,7 @@ export PATH="$(pwd)/bin:$PATH"
## .prl/.la file love
# nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs
-pushd %{buildroot}%{_libdir}
+cd %{buildroot}%{_libdir}
for prl_file in libQt5*.prl ; do
sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" ${prl_file}
if [ -f "$(basename ${prl_file} .prl).so" ]; then
@@ -387,12 +402,12 @@ for prl_file in libQt5*.prl ; do
sed -i -e "/^QMAKE_PRL_LIBS/d" ${prl_file}
fi
done
-popd
+cd -
-# Allow QtWebEngine 5.13.0-beta* to coexist with other Qt modules from 5.12.x
-# In general, we want stable Qt, but QtWebEngine 5.13 is significantly better
-# than 5.12 due to the Chromium 73 sync...
-sed -i -e 's,5.13.0 \${_Qt5WebEngineCore_FIND_VERSION_EXACT},5.12.0 ${_Qt5WebEngineCore_FIND_VERSION_EXACT},g' %{buildroot}%{_libdir}/cmake/Qt5WebEngineCore/Qt5WebEngineCoreConfig.cmake
-sed -i -e 's,5.13.0 \${_Qt5WebEngineWidgets_FIND_VERSION_EXACT},5.12.0 ${_Qt5WebEngineWidgets_FIND_VERSION_EXACT},g' %{buildroot}%{_libdir}/cmake/Qt5WebEngineWidgets/Qt5WebEngineWidgetsConfig.cmake
+# Allow QtWebEngine 5.15.0-* to coexist with other Qt modules from 5.14.x
+# In general, we want stable Qt, but QtWebEngine 5.15 is significantly better
+# than 5.14 due to the Chromium 77 sync...
+sed -i -e 's,5.15.0 \${_Qt5WebEngineCore_FIND_VERSION_EXACT},5.14.0 ${_Qt5WebEngineCore_FIND_VERSION},g' %{buildroot}%{_libdir}/cmake/Qt5WebEngineCore/Qt5WebEngineCoreConfig.cmake
+sed -i -e 's,5.15.0 \${_Qt5WebEngineWidgets_FIND_VERSION_EXACT},5.14.0 ${_Qt5WebEngineWidgets_FIND_VERSION},g' %{buildroot}%{_libdir}/cmake/Qt5WebEngineWidgets/Qt5WebEngineWidgetsConfig.cmake
mkdir -p %{buildroot}%{_datadir}/qt5/qtwebengine_dictionaries
diff --git a/qtwebengine-everywhere-src-5.10.0-linux-pri.patch b/qtwebengine-everywhere-src-5.10.0-linux-pri.patch
index 4bcd376..995db84 100644
--- 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/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
+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
@@ -157,3 +157,19 @@
#qtConfig(webengine-system-jsoncpp): gn_args += use_system_jsoncpp=true
#qtConfig(webengine-system-libsrtp: gn_args += use_system_libsrtp=true
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.9.0-no-neon.patch b/qtwebengine-opensource-src-5.9.0-no-neon.patch
index 0fc7395..c812a38 100644
--- a/qtwebengine-opensource-src-5.9.0-no-neon.patch
+++ b/qtwebengine-opensource-src-5.9.0-no-neon.patch
@@ -1,6 +1,6 @@
-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
+diff -ur qtwebengine-opensource-src-5.9.0/src/buildtools/config/linux.pri qtwebengine-opensource-src-5.9.0-no-neon/src/buildtools/config/linux.pri
+--- qtwebengine-opensource-src-5.9.0/src/buildtools/config/linux.pri 2017-05-19 06:22:04.000000000 +0200
++++ qtwebengine-opensource-src-5.9.0-no-neon/src/buildtools/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
diff --git a/qtwebengine-opensource-src-5.9.0-openmax-dl-neon.patch b/qtwebengine-opensource-src-5.9.0-openmax-dl-neon.patch
index da2cc29..d1e08d6 100644
--- a/qtwebengine-opensource-src-5.9.0-openmax-dl-neon.patch
+++ b/qtwebengine-opensource-src-5.9.0-openmax-dl-neon.patch
@@ -1,13 +1,13 @@
-diff -up qtwebengine-everywhere-src-5.13.0-beta3/src/3rdparty/chromium/third_party/openmax_dl/dl/BUILD.gn.5~ qtwebengine-everywhere-src-5.13.0-beta3/src/3rdparty/chromium/third_party/openmax_dl/dl/BUILD.gn
---- qtwebengine-everywhere-src-5.13.0-beta3/src/3rdparty/chromium/third_party/openmax_dl/dl/BUILD.gn.5~ 2019-05-02 21:50:17.318567710 +0200
-+++ qtwebengine-everywhere-src-5.13.0-beta3/src/3rdparty/chromium/third_party/openmax_dl/dl/BUILD.gn 2019-05-02 21:51:45.262928030 +0200
+diff -up qtwebengine-everywhere-src-5.14.0-beta1/src/3rdparty/chromium/third_party/openmax_dl/dl/BUILD.gn.4~ qtwebengine-everywhere-src-5.14.0-beta1/src/3rdparty/chromium/third_party/openmax_dl/dl/BUILD.gn
+--- qtwebengine-everywhere-src-5.14.0-beta1/src/3rdparty/chromium/third_party/openmax_dl/dl/BUILD.gn.4~ 2019-10-10 00:18:41.655287805 +0200
++++ qtwebengine-everywhere-src-5.14.0-beta1/src/3rdparty/chromium/third_party/openmax_dl/dl/BUILD.gn 2019-10-10 00:19:20.767505486 +0200
@@ -207,14 +207,6 @@ if (current_cpu == "arm") {
"sp/src/arm/armv7/omxSP_FFTInv_CCSToR_F32_Sfs_s.S",
]
if (arm_optionally_use_neon) {
- # Run-time NEON detection.
- deps = [
-- "//third_party/android_tools:cpu_features",
+- "//third_party/android_sdk:cpu_features",
- ]
-
- # To get the __android_log_print routine
@@ -16,9 +16,9 @@ diff -up qtwebengine-everywhere-src-5.13.0-beta3/src/3rdparty/chromium/third_par
# Detection routine
sources += [ "sp/src/arm/detect.c" ]
}
-diff -up qtwebengine-everywhere-src-5.13.0-beta3/src/3rdparty/chromium/third_party/openmax_dl/dl/sp/src/arm/detect.c.5~ qtwebengine-everywhere-src-5.13.0-beta3/src/3rdparty/chromium/third_party/openmax_dl/dl/sp/src/arm/detect.c
---- qtwebengine-everywhere-src-5.13.0-beta3/src/3rdparty/chromium/third_party/openmax_dl/dl/sp/src/arm/detect.c.5~ 2019-04-10 14:24:58.000000000 +0200
-+++ qtwebengine-everywhere-src-5.13.0-beta3/src/3rdparty/chromium/third_party/openmax_dl/dl/sp/src/arm/detect.c 2019-05-02 21:50:17.318567710 +0200
+diff -up qtwebengine-everywhere-src-5.14.0-beta1/src/3rdparty/chromium/third_party/openmax_dl/dl/sp/src/arm/detect.c.4~ qtwebengine-everywhere-src-5.14.0-beta1/src/3rdparty/chromium/third_party/openmax_dl/dl/sp/src/arm/detect.c
+--- qtwebengine-everywhere-src-5.14.0-beta1/src/3rdparty/chromium/third_party/openmax_dl/dl/sp/src/arm/detect.c.4~ 2019-09-23 14:24:20.000000000 +0200
++++ qtwebengine-everywhere-src-5.14.0-beta1/src/3rdparty/chromium/third_party/openmax_dl/dl/sp/src/arm/detect.c 2019-10-10 00:18:41.655287805 +0200
@@ -9,13 +9,57 @@
*
*/