$ git diff --patch-with-stat --summary f4ac2d90d79b40bb71b2f60f50d88bb3b85f21b2..3eefc69d40709be9cd1f442917081b2a775f9b57
.abf.yml | 4 +---
...ebengine-workaround-aarch64-build-failure.patch | 21 +++++++++++++++++++++
qt5-qtwebengine.spec | 22 +++++++++++++++++-----
...ne-opensource-src-5.12.1-fix-extractcflag.patch | 12 ------------
4 files changed, 39 insertions(+), 20 deletions(-)
create mode 100644 qt5-qtwebengine-workaround-aarch64-build-failure.patch
delete mode 100644 qtwebengine-opensource-src-5.12.1-fix-extractcflag.patch
diff --git a/.abf.yml b/.abf.yml
index 39643e5..843bd16 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,4 +1,2 @@
sources:
- qtwebengine-everywhere-src-5.13.0-rc.tar.xz: 67d85d39e997de2ea5370bd49eed806baa1537aa
- qtwebengine-everywhere-src-5.13.0-rc3.tar.xz: 6fb353ee2ded446f6c076bfce483fe2797af96fa
- qtwebengine-everywhere-src-5.13.0.tar.xz: 378c7b4879779919a9cb0b42ccffa57020f675e5
+ qtwebengine-everywhere-src-5.13.1.tar.xz: 163f9927d5f0357a5e551f4eb929568cd6d3de32
diff --git a/qt5-qtwebengine-workaround-aarch64-build-failure.patch b/qt5-qtwebengine-workaround-aarch64-build-failure.patch
new file mode 100644
index 0000000..764cfc3
--- /dev/null
+++ b/qt5-qtwebengine-workaround-aarch64-build-failure.patch
@@ -0,0 +1,21 @@
+diff -up qtwebengine-everywhere-src-5.13.0/src/3rdparty/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h.omv~ qtwebengine-everywhere-src-5.13.0/src/3rdparty/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h
+--- qtwebengine-everywhere-src-5.13.0/src/3rdparty/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h.omv~ 2019-08-12 10:48:30.162172722 +0200
++++ qtwebengine-everywhere-src-5.13.0/src/3rdparty/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h 2019-08-12 10:52:18.145523193 +0200
+@@ -729,7 +729,7 @@ SI F approx_powf(F x, F y) {
+ }
+
+ SI F from_half(U16 h) {
+-#if defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
++#if 0 && defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
+ __fp16 fp16;
+ memcpy(&fp16, &h, sizeof(U16));
+ return float(fp16);
+@@ -751,7 +751,7 @@ SI F from_half(U16 h) {
+ }
+
+ SI U16 to_half(F f) {
+-#if defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
++#if 0 && defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
+ __fp16 fp16 = __fp16(f);
+ U16 u16;
+ memcpy(&u16, &fp16, sizeof(U16));
diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec
index 979c351..c80bf0e 100644
--- a/qt5-qtwebengine.spec
+++ b/qt5-qtwebengine.spec
@@ -14,15 +14,20 @@
# Build with gcc instead of clang
%bcond_with gcc
+%ifarch %{ix86}
+%global optflags %{optflags} -Wl,-z,notext
+%global ldflags %{ldflags} -Wl,-z,notext
+%endif
+
Summary: Qt WebEngine
Name: qt5-qtwebengine
-Version: 5.13.0
+Version: 5.13.1
%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
%else
-Release: 2
+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
@@ -35,12 +40,16 @@ 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
+# ../../../../src/3rdparty/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h:734:5: warning: 'memcpy' will always overflow; destination buffer has size 2, but size argument is 8 [-Wfortify-source]
+# memcpy(&fp16, &h, sizeof(U16));
+# ^
+# ../../../../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
# 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
# Force verbose output from the GN bootstrap process
@@ -169,6 +178,9 @@ BuildRequires: qt5-qtquick-private-devel
# But as of 5.5.1, QtWebEngine will find system Qt5WebEngine and
# use its headers -- preventing it from accessing new APIs
BuildConflicts: pkgconfig(Qt5WebEngineCore)
+# dlopened
+Requires: %mklibname freebl 3
+Requires: nss-shlibsign
%dependinglibpackage Qt5WebEngineWidgets 5
%dependinglibpackage Qt5WebEngineCore 5
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)