The package rpms/qt5-qtwebengine.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/qt5-qtwebengine.git/commit/?id=09....
Change:
-%ifarch %{ix86} x86_64
Thanks.
Full change:
============
commit f523d61a98f04bdecf0f6c3c2835524ae00fe0c8
Author: Kevin Kofler <Kevin(a)tigcc.ticalc.org>
Date: Sun Jan 23 17:33:16 2022 +0100
Fix Provides: bundled(*), remove no longer used BR pkgconfig(protobuf).
* Sun Jan 23 2022 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 5.15.8-2
- Update Provides: bundled(*) version numbers, remove ones dropped upstream
- Restore Provides: bundled(protobuf), unbundling support dropped years ago
- Remove no longer used BuildRequires: yasm and pkgconfig(protobuf)
diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec
index b4d7110..b7caa59 100644
--- a/qt5-qtwebengine.spec
+++ b/qt5-qtwebengine.spec
@@ -56,7 +56,7 @@
Summary: Qt5 - QtWebEngine components
Name: qt5-qtwebengine
Version: 5.15.8
-Release: 1%{?dist}
+Release: 2%{?dist}
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
# See also
http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html
@@ -162,7 +162,6 @@ BuildRequires: pkgconfig(libwebp) >= 0.6.0
BuildRequires: pkgconfig(harfbuzz)
BuildRequires: pkgconfig(libdrm)
BuildRequires: pkgconfig(opus)
-BuildRequires: pkgconfig(protobuf)
BuildRequires: pkgconfig(libevent)
BuildRequires: pkgconfig(poppler-cpp)
BuildRequires: pkgconfig(zlib)
@@ -231,6 +230,13 @@ Provides: bundled(chromium) = 87.0.4280.144
# Bundled in src/3rdparty/chromium/third_party:
# Check src/3rdparty/chromium/third_party/*/README.chromium for version numbers,
# except where specified otherwise.
+# Note that many of those libraries are git snapshots, so version numbers are
+# necessarily approximate.
+# Also note that the list is probably not complete anymore due to Chromium
+# adding more and more bundled stuff at every release, some of which (but not
+# all) is actually built in QtWebEngine.
+# src/3rdparty/chromium/third_party/angle/doc/ChoosingANGLEBranch.md points to
+#
http://omahaproxy.appspot.com/deps.json?version=87.0.4280.144 chromium_branch
Provides: bundled(angle) = 2422
# Google's fork of OpenSSL
# We cannot build against NSS instead because it no longer works with NSS 3.21:
@@ -252,11 +258,11 @@ Provides: bundled(iccjpeg)
# bundled as "khronos", headers only
Provides: bundled(khronos_headers)
# bundled as "leveldatabase"
-Provides: bundled(leveldb) = 1.20
+Provides: bundled(leveldb) = 1.22
# bundled as "libjingle_xmpp"
Provides: bundled(libjingle)
# see src/3rdparty/chromium/third_party/libsrtp/CHANGES for the version number
-Provides: bundled(libsrtp) = 2.1.0
+Provides: bundled(libsrtp) = 2.2.0
%if !0%{?use_system_libvpx}
Provides: bundled(libvpx) = 1.8.2
%endif
@@ -272,12 +278,10 @@ Provides: bundled(libxslt) = 1.1.34
Provides: bundled(libXNVCtrl) = 302.17
Provides: bundled(libyuv) = 1768
Provides: bundled(modp_b64)
-Provides: bundled(openmax_dl) = 1.0.2
Provides: bundled(ots)
# see src/3rdparty/chromium/third_party/protobuf/CHANGES.txt for the version
-#Provides: bundled(protobuf) = 3.0.0-0.1.beta3
+Provides: bundled(protobuf) = 3.9.0
Provides: bundled(qcms) = 4
-Provides: bundled(sfntly)
Provides: bundled(skia)
# bundled as "smhasher"
Provides: bundled(SMHasher) = 0-147
@@ -294,7 +298,6 @@ Provides: bundled(x86inc)
# Bundled in src/3rdparty/chromium/base/third_party:
# Check src/3rdparty/chromium/third_party/base/*/README.chromium for version
# numbers, except where specified otherwise.
-Provides: bundled(dmg_fp)
Provides: bundled(dynamic_annotations) = 4384
Provides: bundled(superfasthash) = 0
Provides: bundled(symbolize)
@@ -319,7 +322,7 @@ Provides: bundled(nsURLParsers)
# Bundled outside of third_party, apparently not considered as such by Chromium:
Provides: bundled(mojo)
# see src/3rdparty/chromium/v8/include/v8_version.h for the version number
-Provides: bundled(v8) = 6.1.534.44
+Provides: bundled(v8) = 8.7.220.35
# bundled by v8 (src/3rdparty/chromium/v8/src/base/ieee754.cc)
# The version number is 5.3, the last version that upstream released, years ago:
#
http://www.netlib.org/fdlibm/readme
@@ -614,6 +617,11 @@ done
%changelog
+* Sun Jan 23 2022 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 5.15.8-2
+- Update Provides: bundled(*) version numbers, remove ones dropped upstream
+- Restore Provides: bundled(protobuf), unbundling support dropped years ago
+- Remove no longer used BuildRequires: yasm and pkgconfig(protobuf)
+
* Tue Jan 11 2022 Rex Dieter <rdieter(a)fedoraproject.org> - 5.15.8-1
- 5.15.8
- %%undefine _package_note_file (#2043178)
commit 09d69c316abdda8cc0dcc436d4f64bf909292d57
Author: Kevin Kofler <Kevin(a)tigcc.ticalc.org>
Date: Sun Jan 23 17:01:02 2022 +0100
Remove no longer used BuildRequires: yasm.
diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec
index 16ec784..b4d7110 100644
--- a/qt5-qtwebengine.spec
+++ b/qt5-qtwebengine.spec
@@ -144,9 +144,6 @@ BuildRequires: nodejs
BuildRequires: re2-devel
%endif
BuildRequires: snappy-devel
-%ifarch %{ix86} x86_64
-BuildRequires: yasm
-%endif
BuildRequires: pkgconfig(expat)
BuildRequires: pkgconfig(gobject-2.0)
BuildRequires: pkgconfig(glib-2.0)
commit 9aa6750784e697d9f976823baf754b63169ace43
Author: Kevin Kofler <Kevin(a)tigcc.ticalc.org>
Date: Sun Jan 23 16:36:40 2022 +0100
Delete qtwebengine-everywhere-src-5.10.0-linux-pri.patch.
The yasm part is obsolete because QtWebEngine uses nasm now (but
currently a bundled copy, that needs to be fixed).
The libpci part seems obsolete as well, -lpci is getting linked already.
Also restore an AWOL patch comment.
diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec
index e76dc3d..16ec784 100644
--- a/qt5-qtwebengine.spec
+++ b/qt5-qtwebengine.spec
@@ -79,9 +79,6 @@ 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)
-# FIXME/TODO: review, I *think* this is no longer needed -- rdieter
-Patch0: qtwebengine-everywhere-src-5.10.0-linux-pri.patch
# quick hack to avoid checking for the nonexistent icudtl.dat and silence the
# resulting warnings - not upstreamable as is because it removes the fallback
# mechanism for the ICU data directory (which is not used in our builds because
@@ -104,6 +101,7 @@ Patch7: chromium-hunspell-nullptr.patch
Patch24: qtwebengine-everywhere-src-5.11.3-aarch64-new-stat.patch
# Use Python2
Patch26: qtwebengine-everywhere-5.15.5-use-python2.patch
+# FTBFS TRUE/FALSE undeclared
Patch31: qtwebengine-everywhere-src-5.15.5-TRUE.patch
## Upstream patches:
@@ -392,7 +390,6 @@ mv pulse src/3rdparty/chromium/
pushd src/3rdparty/chromium
popd
-#patch0 -p1 -b .linux-pri
%if 0%{?use_system_libicu}
%patch1 -p1 -b .no-icudtl-dat
%endif
diff --git a/qtwebengine-everywhere-src-5.10.0-linux-pri.patch
b/qtwebengine-everywhere-src-5.10.0-linux-pri.patch
deleted file mode 100644
index 8d88773..0000000
--- a/qtwebengine-everywhere-src-5.10.0-linux-pri.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/src/buildtools/config/linux.pri b/src/buildtools/config/linux.pri
-index 56c18bd..cb17c7a 100644
---- a/src/buildtools/config/linux.pri
-+++ b/src/buildtools/config/linux.pri
-@@ -176,3 +176,19 @@ host_build {
- }
- gn_args += use_glib=false
- }
-+
-+# yasm is only used on x86, and passing use_system_yasm makes the build fail on
-+# other architectures (e.g., ARM), so make it conditional on the architecture
-+#contains(QT_ARCH, "x86_64")|contains(QT_ARCH, "i386") {
-+# gn_args += use_system_yasm=true
-+#}
-+
-+# link libpci instead of dlopening it, our Qt packaging depends on it anyway
-+gn_args += linux_link_libpci=true
-+
-+# run the unbundling script Chromium provides
-+CHROMIUM_SRC_DIR = "$$QTWEBENGINE_ROOT/$$getChromiumSrcDir()"
-+R_G_F_PY = "$$CHROMIUM_SRC_DIR/build/linux/unbundle/replace_gn_files.py"
-+R_G_F_PY_ARGS = "--system-libraries yasm"
-+log("Running python2 $$R_G_F_PY $$R_G_F_PY_ARGS$${EOL}")
-+!system("python2 $$R_G_F_PY $$R_G_F_PY_ARGS"): error("-- unbundling
failed")
commit c7db84b88585ea6c0a7e5c3e52682c7b2af3c7d7
Author: Kevin Kofler <Kevin(a)tigcc.ticalc.org>
Date: Sun Jan 23 16:22:27 2022 +0100
Include qtwebengine-release.sh as Source1.
(and increment the Source numbers of the cleanup scripts by 1)
diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec
index 2d8765b..e76dc3d 100644
--- a/qt5-qtwebengine.spec
+++ b/qt5-qtwebengine.spec
@@ -63,14 +63,16 @@ Release: 1%{?dist}
# 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.15/5.15.1/submodules/qtweben...
+# cleaned tarball with patent-encumbered codecs removed from the bundled FFmpeg
+# ./qtwebengine-release.sh
# ./clean_qtwebengine.sh 5.15.1
Source0: qtwebengine-everywhere-src-%{version}-clean.tar.xz
+# release script used above
+Source1: qtwebengine-release.sh
# cleanup scripts used above
-Source1: clean_qtwebengine.sh
-Source2: clean_ffmpeg.sh
-Source3: get_free_ffmpeg_source_files.py
+Source2: clean_qtwebengine.sh
+Source3: clean_ffmpeg.sh
+Source4: get_free_ffmpeg_source_files.py
# macros
Source10: macros.qt5-qtwebengine
commit e3cb59b44a87a6c9dfabc3432bfc460fb479891f
Author: Kevin Kofler <Kevin(a)tigcc.ticalc.org>
Date: Sun Jan 23 16:01:12 2022 +0100
Mark qtwebengine-release.sh executable.
diff --git a/qtwebengine-release.sh b/qtwebengine-release.sh
old mode 100644
new mode 100755
commit 9ae22d8d063baaa00144ec6c2538c96454e8bdc3
Author: Kevin Kofler <Kevin(a)tigcc.ticalc.org>
Date: Sat Jan 22 23:49:21 2022 +0100
%undefine _package_note_file (#2043178).
diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec
index e02237d..2d8765b 100644
--- a/qt5-qtwebengine.spec
+++ b/qt5-qtwebengine.spec
@@ -2,8 +2,8 @@
%global _hardened_build 1
-# This package uses the gold linker.
-%global _package_notes_linker gold
+# package-notes causes FTBFS (#2043178)
+%undefine _package_note_file
# define to build docs, may need to undef this for bootstrapping
# where qt5-qttools (qt5-doctools) builds are not yet available
@@ -620,7 +620,7 @@ done
%changelog
* Tue Jan 11 2022 Rex Dieter <rdieter(a)fedoraproject.org> - 5.15.8-1
- 5.15.8
-- Set "%%global _package_notes_linker gold" (#2043178)
+- %%undefine _package_note_file (#2043178)
* Sat Jan 08 2022 Miro Hrončok <mhroncok(a)redhat.com> - 5.15.6-3
- Rebuilt for libre2.so.9
commit 6d39634c0ea5d1d08e51a9816bc8be3af944603f
Author: Kevin Kofler <Kevin(a)tigcc.ticalc.org>
Date: Sat Jan 22 16:09:01 2022 +0100
Set "%%global _package_notes_linker gold" (#2043178).
diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec
index bed58ec..e02237d 100644
--- a/qt5-qtwebengine.spec
+++ b/qt5-qtwebengine.spec
@@ -2,6 +2,9 @@
%global _hardened_build 1
+# This package uses the gold linker.
+%global _package_notes_linker gold
+
# define to build docs, may need to undef this for bootstrapping
# where qt5-qttools (qt5-doctools) builds are not yet available
%global docs 1
@@ -617,6 +620,7 @@ done
%changelog
* Tue Jan 11 2022 Rex Dieter <rdieter(a)fedoraproject.org> - 5.15.8-1
- 5.15.8
+- Set "%%global _package_notes_linker gold" (#2043178)
* Sat Jan 08 2022 Miro Hrončok <mhroncok(a)redhat.com> - 5.15.6-3
- Rebuilt for libre2.so.9
@@ -637,7 +641,7 @@ done
- 5.15.5
* Wed Jun 16 2021 Rex Dieter <rdieter(a)fedoraproject.org> - 5.15.2-12
-- workaround SIGSTKSZ FTBFS (#19455950
+- workaround SIGSTKSZ FTBFS (#1945595)
- workaround 'TRUE'/'FALSE' was not declared in this scope
* Thu May 20 2021 Pete Walter <pwalter(a)fedoraproject.org> - 5.15.2-11
commit f6a6f07c22c61f1bc8fc1f9fb598043c85fb1835
Author: Kevin Kofler <Kevin(a)tigcc.ticalc.org>
Date: Sat Jan 22 16:06:22 2022 +0100
Revert "Drop "use_gold_linker" (see #2043178)."
This reverts commit b36104f4bb5c9ac82056c46249d5a404a6b4b228.
This fails to build on i686 due to ffmpeg text relocations (which
produce a warning from ld.bfd, and -Wl,--fatal-warnings gets passed):
https://bugzilla.redhat.com/show_bug.cgi?id=2043178#c14
diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec
index d2f4a89..bed58ec 100644
--- a/qt5-qtwebengine.spec
+++ b/qt5-qtwebengine.spec
@@ -458,7 +458,7 @@ export NINJA_PATH=%{__ninja}
%{qmake_qt5} \
%{?debug_config:CONFIG+="%{debug_config}}" \
- CONFIG+="link_pulseaudio" \
+ CONFIG+="link_pulseaudio use_gold_linker" \
%{?use_system_libicu:QMAKE_EXTRA_ARGS+="-system-webengine-icu"} \
QMAKE_EXTRA_ARGS+="-webengine-kerberos" \
.
@@ -617,7 +617,6 @@ done
%changelog
* Tue Jan 11 2022 Rex Dieter <rdieter(a)fedoraproject.org> - 5.15.8-1
- 5.15.8
-- drop "use_gold_linker" (see #2043178)
* Sat Jan 08 2022 Miro Hrončok <mhroncok(a)redhat.com> - 5.15.6-3
- Rebuilt for libre2.so.9
@@ -638,7 +637,7 @@ done
- 5.15.5
* Wed Jun 16 2021 Rex Dieter <rdieter(a)fedoraproject.org> - 5.15.2-12
-- workaround SIGSTKSZ FTBFS (#1945595)
+- workaround SIGSTKSZ FTBFS (#19455950
- workaround 'TRUE'/'FALSE' was not declared in this scope
* Thu May 20 2021 Pete Walter <pwalter(a)fedoraproject.org> - 5.15.2-11
commit b36104f4bb5c9ac82056c46249d5a404a6b4b228
Author: Kevin Kofler <Kevin(a)tigcc.ticalc.org>
Date: Sat Jan 22 13:47:09 2022 +0100
Drop "use_gold_linker" (see #2043178).
diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec
index bed58ec..d2f4a89 100644
--- a/qt5-qtwebengine.spec
+++ b/qt5-qtwebengine.spec
@@ -458,7 +458,7 @@ export NINJA_PATH=%{__ninja}
%{qmake_qt5} \
%{?debug_config:CONFIG+="%{debug_config}}" \
- CONFIG+="link_pulseaudio use_gold_linker" \
+ CONFIG+="link_pulseaudio" \
%{?use_system_libicu:QMAKE_EXTRA_ARGS+="-system-webengine-icu"} \
QMAKE_EXTRA_ARGS+="-webengine-kerberos" \
.
@@ -617,6 +617,7 @@ done
%changelog
* Tue Jan 11 2022 Rex Dieter <rdieter(a)fedoraproject.org> - 5.15.8-1
- 5.15.8
+- drop "use_gold_linker" (see #2043178)
* Sat Jan 08 2022 Miro Hrončok <mhroncok(a)redhat.com> - 5.15.6-3
- Rebuilt for libre2.so.9
@@ -637,7 +638,7 @@ done
- 5.15.5
* Wed Jun 16 2021 Rex Dieter <rdieter(a)fedoraproject.org> - 5.15.2-12
-- workaround SIGSTKSZ FTBFS (#19455950
+- workaround SIGSTKSZ FTBFS (#1945595)
- workaround 'TRUE'/'FALSE' was not declared in this scope
* Thu May 20 2021 Pete Walter <pwalter(a)fedoraproject.org> - 5.15.2-11
commit 0c04e957df90a03a3abefa9178719fd057d1ecb2
Author: Kevin Kofler <Kevin(a)tigcc.ticalc.org>
Date: Sat Jan 22 13:45:54 2022 +0100
Fix Provides: bundled(chromium).
diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec
index 16a7895..bed58ec 100644
--- a/qt5-qtwebengine.spec
+++ b/qt5-qtwebengine.spec
@@ -226,12 +226,7 @@ BuildRequires: pkgconfig(vpx) >= 1.8.0
# Of course, Chromium itself is bundled. It cannot be unbundled because it is
# not a library, but forked (modified) application code.
-# rdieter: unsure, chrome/VERSION says:
-#MAJOR=87
-#MINOR=0
-#BUILD=4280
-#PATCH=144
-Provides: bundled(chromium) = 90.0.44.30.228
+Provides: bundled(chromium) = 87.0.4280.144
# Bundled in src/3rdparty/chromium/third_party:
# Check src/3rdparty/chromium/third_party/*/README.chromium for version numbers,
commit c36afa25bff3a32acf943218aeb274afc37b9ba2
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Wed Jan 19 17:10:14 2022 -0600
one more nullptr.patch (hunspell)
diff --git a/chromium-hunspell-nullptr.patch b/chromium-hunspell-nullptr.patch
new file mode 100644
index 0000000..b215049
--- /dev/null
+++ b/chromium-hunspell-nullptr.patch
@@ -0,0 +1,12 @@
+diff -up
qtwebengine-everywhere-src-5.15.8/src/3rdparty/chromium/third_party/hunspell/src/hunspell/hunspell.cxx.nullptr
qtwebengine-everywhere-src-5.15.8/src/3rdparty/chromium/third_party/hunspell/src/hunspell/hunspell.cxx
+---
qtwebengine-everywhere-src-5.15.8/src/3rdparty/chromium/third_party/hunspell/src/hunspell/hunspell.cxx.nullptr 2021-12-15
10:09:27.000000000 -0600
++++
qtwebengine-everywhere-src-5.15.8/src/3rdparty/chromium/third_party/hunspell/src/hunspell/hunspell.cxx 2022-01-19
10:30:40.845051982 -0600
+@@ -1725,7 +1725,7 @@ std::string HunspellImpl::get_xml_par(co
+ if (end == '>')
+ end = '<';
+ else if (end != '\'' && end != '"')
+- return 0; // bad XML
++ return dest; // bad XML
+ for (par++; *par != '\0' && *par != end; ++par) {
+ dest.push_back(*par);
+ }
diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec
index bbbf040..16a7895 100644
--- a/qt5-qtwebengine.spec
+++ b/qt5-qtwebengine.spec
@@ -94,6 +94,7 @@ Patch4: qtwebengine-SIOCGSTAMP.patch
Patch5: qtwebengine-5.15.0-QT_DEPRECATED_VERSION.patch
# gcc-12 FTBFS "use of deleted function"
Patch6: chromium-angle-nullptr.patch
+Patch7: chromium-hunspell-nullptr.patch
# Fix/workaround FTBFS on aarch64 with newer glibc
Patch24: qtwebengine-everywhere-src-5.11.3-aarch64-new-stat.patch
# Use Python2
@@ -401,7 +402,8 @@ popd
%endif
%patch4 -p1 -b .SIOCGSTAMP
%patch5 -p1 -b .QT_DEPRECATED_VERSION
-%patch6 -p1 -b .nullptr
+%patch6 -p1 -b .angle_nullptr
+%patch7 -p1 -b .hunspell_nullptr
## upstream patches
%patch24 -p1 -b .aarch64-new-stat
commit 02956c858dbe7b2d21d3143ed51805c65066947d
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Wed Jan 19 09:36:28 2022 -0600
commit awol nullptr.patch
diff --git a/chromium-angle-nullptr.patch b/chromium-angle-nullptr.patch
new file mode 100644
index 0000000..78ae389
--- /dev/null
+++ b/chromium-angle-nullptr.patch
@@ -0,0 +1,12 @@
+diff -up
qtwebengine-everywhere-src-5.15.8/src/3rdparty/chromium/third_party/angle/src/common/utilities.cpp.nullptr
qtwebengine-everywhere-src-5.15.8/src/3rdparty/chromium/third_party/angle/src/common/utilities.cpp
+---
qtwebengine-everywhere-src-5.15.8/src/3rdparty/chromium/third_party/angle/src/common/utilities.cpp.nullptr 2021-12-15
10:09:27.000000000 -0600
++++
qtwebengine-everywhere-src-5.15.8/src/3rdparty/chromium/third_party/angle/src/common/utilities.cpp 2022-01-19
08:52:02.659577615 -0600
+@@ -254,7 +254,7 @@ std::string GetGLSLTypeString(GLenum typ
+ return "mat4";
+ default:
+ UNREACHABLE();
+- return nullptr;
++ return "";
+ }
+ }
+
commit 2126c351306f374b7b3cfe811174e1f47306aecc
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Wed Jan 19 09:35:51 2022 -0600
update bundle versions, nullptr gcc12 ftbfs fix
diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec
index 918083d..bbbf040 100644
--- a/qt5-qtwebengine.spec
+++ b/qt5-qtwebengine.spec
@@ -92,6 +92,8 @@ Patch3: qtwebengine-opensource-src-5.9.0-no-neon.patch
Patch4: qtwebengine-SIOCGSTAMP.patch
# fix build when using qt < 5.14
Patch5: qtwebengine-5.15.0-QT_DEPRECATED_VERSION.patch
+# gcc-12 FTBFS "use of deleted function"
+Patch6: chromium-angle-nullptr.patch
# Fix/workaround FTBFS on aarch64 with newer glibc
Patch24: qtwebengine-everywhere-src-5.11.3-aarch64-new-stat.patch
# Use Python2
@@ -223,6 +225,11 @@ BuildRequires: pkgconfig(vpx) >= 1.8.0
# Of course, Chromium itself is bundled. It cannot be unbundled because it is
# not a library, but forked (modified) application code.
+# rdieter: unsure, chrome/VERSION says:
+#MAJOR=87
+#MINOR=0
+#BUILD=4280
+#PATCH=144
Provides: bundled(chromium) = 90.0.44.30.228
# Bundled in src/3rdparty/chromium/third_party:
@@ -243,7 +250,7 @@ Provides: bundled(brotli)
# out. See clean_qtwebengine.sh, clean_ffmpeg.sh, and
# get_free_ffmpeg_source_files.py.
# see src/3rdparty/chromium/third_party/ffmpeg/Changelog for the version number
-Provides: bundled(ffmpeg) = 3.3
+Provides: bundled(ffmpeg) = 4.3
Provides: bundled(hunspell) = 1.6.0
Provides: bundled(iccjpeg)
# bundled as "khronos", headers only
@@ -255,20 +262,19 @@ Provides: bundled(libjingle)
# see src/3rdparty/chromium/third_party/libsrtp/CHANGES for the version number
Provides: bundled(libsrtp) = 2.1.0
%if !0%{?use_system_libvpx}
-# claims "Version: 1.6.0", but according to the fine print, this is actually a
-# snapshot from master from after the 1.6.1 release
-Provides: bundled(libvpx) = 1.6.1
+Provides: bundled(libvpx) = 1.8.2
%endif
%if !0%{?use_system_libwebp}
-Provides: bundled(libwebp) = 0.6.0
+Provides: bundled(libwebp) = 1.1.0-28-g55a080e5
%endif
# bundled as "libxml"
# see src/3rdparty/chromium/third_party/libxml/linux/include/libxml/xmlversion.h
-Provides: bundled(libxml2) = 2.9.4
+# post 2.9.9 snapshot?, 2.9.9-0b3c64d9f2f3e9ce1a98d8f19ee7a763c87e27d5
+Provides: bundled(libxml2) = 2.9.10
# see src/3rdparty/chromium/third_party/libxslt/linux/config.h for version
-Provides: bundled(libxslt) = 1.1.29
+Provides: bundled(libxslt) = 1.1.34
Provides: bundled(libXNVCtrl) = 302.17
-Provides: bundled(libyuv) = 1658
+Provides: bundled(libyuv) = 1768
Provides: bundled(modp_b64)
Provides: bundled(openmax_dl) = 1.0.2
Provides: bundled(ots)
@@ -278,8 +284,8 @@ Provides: bundled(qcms) = 4
Provides: bundled(sfntly)
Provides: bundled(skia)
# bundled as "smhasher"
-Provides: bundled(SMHasher) = 0-0.1.svn147
-Provides: bundled(sqlite) = 3.20
+Provides: bundled(SMHasher) = 0-147
+Provides: bundled(sqlite) = 3.35.5
Provides: bundled(usrsctp)
Provides: bundled(webrtc) = 90
@@ -395,9 +401,9 @@ popd
%endif
%patch4 -p1 -b .SIOCGSTAMP
%patch5 -p1 -b .QT_DEPRECATED_VERSION
+%patch6 -p1 -b .nullptr
## upstream patches
-
%patch24 -p1 -b .aarch64-new-stat
%patch26 -p1 -b .use-python2
%patch31 -p1 -b .TRUE
commit 2ea927dfdbc273e71d339ff2024455dd99dd522a
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Wed Jan 19 08:55:49 2022 -0600
drop old/unused patches
diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec
index c31a399..918083d 100644
--- a/qt5-qtwebengine.spec
+++ b/qt5-qtwebengine.spec
@@ -92,27 +92,11 @@ Patch3: qtwebengine-opensource-src-5.9.0-no-neon.patch
Patch4: qtwebengine-SIOCGSTAMP.patch
# fix build when using qt < 5.14
Patch5: qtwebengine-5.15.0-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
# 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.15.5-use-python2.patch
-# Fix sandbox issue breaking text rendering with glibc >= 2.33 (#1904652)
-#
https://bugs.chromium.org/p/chromium/issues/detail?id=1164975
-Patch28: qtwebengine-everywhere-src-5.15.5-#1904652.patch
-# Fix sandbox issue on 32-bit architectures with glibc >= 2.31 (from Debian)
-Patch29: qtwebengine-everywhere-src-5.15.5-sandbox-time64-syscalls.patch
-# don't assume type-ness of SIGSTKSZ,
-#
https://bugzilla.redhat.com/show_bug.cgi?id=1945595
-Patch30: qtwebengine-everywhere-src-5.15.5-SIGSTKSZ.patch
-# FTBFS TRUE/FALSE undeclared
Patch31: qtwebengine-everywhere-src-5.15.5-TRUE.patch
-# Issue 1213452: Sandbox doesn't work with clone3
-#
https://bugs.chromium.org/p/chromium/issues/detail?id=1213452
-Patch32: qtwebengine-everywhere-src-5.15.6-clone3.patch
-# Fix use of deprecated harfbuzz api's
-Patch33: qtwebengine-harfbuzz.patch
## Upstream patches:
@@ -414,16 +398,9 @@ popd
## upstream patches
-#patch10 -p1 -b .openmax-dl-neon
%patch24 -p1 -b .aarch64-new-stat
%patch26 -p1 -b .use-python2
-#patch28 -p1 -b .rh#1904652
-#patch29 -p1 -b .sandbox-time64-syscalls
-#patch30 -p1 -b .SIGSTKSZ
%patch31 -p1 -b .TRUE
-#patch32 -p1 -b .clone3
-## may need porting
-#patch33 -p1 -b .harfbuzz
# delete all "toolprefix = " lines from build/toolchain/linux/BUILD.gn, as we
# never cross-compile in native Fedora RPMs, fixes ARM and aarch64 FTBFS
diff --git a/qtwebengine-everywhere-src-5.15.5-#1904652.patch
b/qtwebengine-everywhere-src-5.15.5-#1904652.patch
deleted file mode 100644
index 7951e6b..0000000
--- a/qtwebengine-everywhere-src-5.15.5-#1904652.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-diff -up
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc.rh#1904652
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
----
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc.rh#1904652 2021-05-28
07:05:45.000000000 -0500
-+++
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc 2021-06-24
08:34:07.566783935 -0500
-@@ -257,6 +257,18 @@ ResultExpr EvaluateSyscallImpl(int fs_de
- return RestrictKillTarget(current_pid, sysno);
- }
-
-+#if defined(__NR_newfstatat)
-+ if (sysno == __NR_newfstatat) {
-+ return RewriteFstatatSIGSYS();
-+ }
-+#endif
-+
-+#if defined(__NR_fstatat64)
-+ if (sysno == __NR_fstatat64) {
-+ return RewriteFstatatSIGSYS();
-+ }
-+#endif
-+
- if (SyscallSets::IsFileSystem(sysno) ||
- SyscallSets::IsCurrentDirectory(sysno)) {
- return Error(fs_denied_errno);
-diff -up
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc.rh#1904652
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc
----
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc.rh#1904652 2021-05-28
07:05:45.000000000 -0500
-+++
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc 2021-06-24
08:40:08.552334787 -0500
-@@ -6,6 +6,8 @@
-
- #include "sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h"
-
-+#include <errno.h>
-+#include <fcntl.h>
- #include <stddef.h>
- #include <stdint.h>
- #include <string.h>
-@@ -355,6 +357,35 @@ intptr_t SIGSYSSchedHandler(const struct
- return -ENOSYS;
- }
-
-+intptr_t SIGSYSFstatatHandler(const struct arch_seccomp_data& args,
-+ void* aux) {
-+ switch (args.nr) {
-+#if defined(__NR_newfstatat)
-+ case __NR_newfstatat:
-+#endif
-+#if defined(__NR_fstatat64)
-+ case __NR_fstatat64:
-+#endif
-+#if defined(__NR_newfstatat) || defined(__NR_fstatat64)
-+ if (*reinterpret_cast<const char *>(args.args[1]) == '\0'
-+ && args.args[3] == static_cast<uint64_t>(AT_EMPTY_PATH)) {
-+ return sandbox::sys_fstat64(static_cast<int>(args.args[0]),
-+ reinterpret_cast<struct stat64
*>(args.args[2]));
-+ } else {
-+ errno = EACCES;
-+ return -1;
-+ }
-+ break;
-+#endif
-+ }
-+
-+ CrashSIGSYS_Handler(args, aux);
-+
-+ // Should never be reached.
-+ RAW_CHECK(false);
-+ return -ENOSYS;
-+}
-+
- bpf_dsl::ResultExpr CrashSIGSYS() {
- return bpf_dsl::Trap(CrashSIGSYS_Handler, NULL);
- }
-@@ -387,6 +418,10 @@ bpf_dsl::ResultExpr RewriteSchedSIGSYS()
- return bpf_dsl::Trap(SIGSYSSchedHandler, NULL);
- }
-
-+bpf_dsl::ResultExpr RewriteFstatatSIGSYS() {
-+ return bpf_dsl::Trap(SIGSYSFstatatHandler, NULL);
-+}
-+
- void AllocateCrashKeys() {
- #if !defined(OS_NACL_NONSFI)
- if (seccomp_crash_key)
-diff -up
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h.rh#1904652
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h
----
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h.rh#1904652 2021-05-28
07:05:45.000000000 -0500
-+++
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h 2021-06-24
08:39:31.205174337 -0500
-@@ -62,6 +62,10 @@ SANDBOX_EXPORT intptr_t SIGSYSPtraceFail
- // sched_setparam(), sched_setscheduler()
- SANDBOX_EXPORT intptr_t SIGSYSSchedHandler(const arch_seccomp_data& args,
- void* aux);
-+// If the fstatat syscall is actually a disguised fstat, calls the regular fstat
-+// syscall, otherwise, crashes in the same way as CrashSIGSYS_Handler.
-+SANDBOX_EXPORT intptr_t
-+ SIGSYSFstatatHandler(const struct arch_seccomp_data& args, void* aux);
-
- // Variants of the above functions for use with bpf_dsl.
- SANDBOX_EXPORT bpf_dsl::ResultExpr CrashSIGSYS();
-@@ -72,6 +76,7 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr Crash
- SANDBOX_EXPORT bpf_dsl::ResultExpr CrashSIGSYSFutex();
- SANDBOX_EXPORT bpf_dsl::ResultExpr CrashSIGSYSPtrace();
- SANDBOX_EXPORT bpf_dsl::ResultExpr RewriteSchedSIGSYS();
-+SANDBOX_EXPORT bpf_dsl::ResultExpr RewriteFstatatSIGSYS();
-
- // Allocates a crash key so that Seccomp information can be recorded.
- void AllocateCrashKeys();
-diff -up
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc.rh#1904652
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
----
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc.rh#1904652 2021-05-28
07:05:45.000000000 -0500
-+++
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc 2021-06-24
08:34:07.567783940 -0500
-@@ -261,4 +261,13 @@ int sys_sigaction(int signum,
-
- #endif // defined(MEMORY_SANITIZER)
-
-+SANDBOX_EXPORT int sys_fstat64(int fd, struct stat64 *buf)
-+{
-+#if defined(__NR_fstat64)
-+ return syscall(__NR_fstat64, fd, buf);
-+#else
-+ return syscall(__NR_fstat, fd, buf);
-+#endif
-+}
-+
- } // namespace sandbox
-diff -up
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.h.rh#1904652
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.h
----
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.h.rh#1904652 2021-05-28
07:05:45.000000000 -0500
-+++
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.h 2021-06-24
08:34:07.568783944 -0500
-@@ -17,6 +17,7 @@ struct sock_fprog;
- struct rlimit64;
- struct cap_hdr;
- struct cap_data;
-+struct stat64;
-
- namespace sandbox {
-
-@@ -84,6 +85,9 @@ SANDBOX_EXPORT int sys_sigaction(int sig
- const struct sigaction* act,
- struct sigaction* oldact);
-
-+// Recent glibc rewrites fstat to fstatat.
-+SANDBOX_EXPORT int sys_fstat64(int fd, struct stat64 *buf);
-+
- } // namespace sandbox
-
- #endif // SANDBOX_LINUX_SERVICES_SYSCALL_WRAPPERS_H_
diff --git a/qtwebengine-everywhere-src-5.15.5-SIGSTKSZ.patch
b/qtwebengine-everywhere-src-5.15.5-SIGSTKSZ.patch
deleted file mode 100644
index 2f32049..0000000
--- a/qtwebengine-everywhere-src-5.15.5-SIGSTKSZ.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc.SIGSTKSZ
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc
----
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc.SIGSTKSZ 2021-05-28
07:05:45.000000000 -0500
-+++
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc 2021-06-24
09:14:27.365186590 -0500
-@@ -135,7 +135,7 @@ static bool SetupAlternateStackOnce() {
- #else
- const size_t page_mask = sysconf(_SC_PAGESIZE) - 1;
- #endif
-- size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask;
-+ size_t stack_size = (std::max<size_t>(SIGSTKSZ, 65536) + page_mask) &
~page_mask;
- #if defined(ABSL_HAVE_ADDRESS_SANITIZER) || \
- defined(ABSL_HAVE_MEMORY_SANITIZER) || defined(ABSL_HAVE_THREAD_SANITIZER)
- // Account for sanitizer instrumentation requiring additional stack space.
-diff -up
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc.SIGSTKSZ
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
----
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc.SIGSTKSZ 2021-05-28
07:05:45.000000000 -0500
-+++
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc 2021-06-24
09:15:54.012558815 -0500
-@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() {
- // SIGSTKSZ may be too small to prevent the signal handlers from overrunning
- // the alternative stack. Ensure that the size of the alternative stack is
- // large enough.
-- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
-+ static const unsigned kSigStackSize = std::max<unsigned>(16384, SIGSTKSZ);
-
- // Only set an alternative stack if there isn't already one, or if the current
- // one is too small.
diff --git a/qtwebengine-everywhere-src-5.15.5-sandbox-time64-syscalls.patch
b/qtwebengine-everywhere-src-5.15.5-sandbox-time64-syscalls.patch
deleted file mode 100644
index 1a14bc9..0000000
--- a/qtwebengine-everywhere-src-5.15.5-sandbox-time64-syscalls.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-diff -up
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc.sandbox-time64-syscalls
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
----
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc.sandbox-time64-syscalls 2021-06-24
10:36:45.687826522 -0500
-+++
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc 2021-06-24
10:36:45.692826524 -0500
-@@ -157,7 +157,14 @@ ResultExpr EvaluateSyscallImpl(int fs_de
- return Allow();
- #endif
-
-- if (sysno == __NR_clock_gettime || sysno == __NR_clock_nanosleep) {
-+ if (sysno == __NR_clock_gettime || sysno == __NR_clock_nanosleep
-+#if defined(__NR_clock_gettime64)
-+ || sysno == __NR_clock_gettime64
-+#endif
-+#if defined(__NR_clock_nanosleep_time64)
-+ || sysno == __NR_clock_nanosleep_time64
-+#endif
-+ ) {
- return RestrictClockID();
- }
-
-diff -up
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc.sandbox-time64-syscalls
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc
----
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc.sandbox-time64-syscalls 2021-05-28
07:05:45.000000000 -0500
-+++
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc 2021-06-24
10:36:45.692826524 -0500
-@@ -60,6 +60,12 @@ class RestrictClockIdPolicy : public bpf
- case __NR_clock_gettime:
- case __NR_clock_getres:
- case __NR_clock_nanosleep:
-+#if defined(__NR_clock_nanosleep_time64)
-+ case __NR_clock_nanosleep_time64:
-+#endif
-+#if defined(__NR_clock_gettime64)
-+ case __NR_clock_gettime64:
-+#endif
- return RestrictClockID();
- default:
- return Allow();
-diff -up
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc.sandbox-time64-syscalls
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
----
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc.sandbox-time64-syscalls 2021-05-28
07:05:45.000000000 -0500
-+++
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc 2021-06-24
10:36:45.693826524 -0500
-@@ -39,6 +39,12 @@ bool SyscallSets::IsAllowedGettime(int s
- // filtered by RestrictClokID().
- case __NR_clock_gettime: // Parameters filtered by RestrictClockID().
- case __NR_clock_nanosleep: // Parameters filtered by RestrictClockID().
-+#if defined(__NR_clock_gettime64)
-+ case __NR_clock_gettime64: // Parameters filtered by RestrictClockID().
-+#endif
-+#if defined(__NR_clock_nanosleep_time64)
-+ case __NR_clock_nanosleep_time64: // Parameters filtered by RestrictClockID().
-+#endif
- case __NR_clock_settime: // Privileged.
- #if defined(__i386__) || \
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-diff -up
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h.sandbox-time64-syscalls
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
----
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h.sandbox-time64-syscalls 2021-06-24
10:36:45.694826524 -0500
-+++
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h 2021-06-24
10:37:50.383852263 -0500
-@@ -1441,6 +1441,14 @@
- #define __NR_io_pgetevents (__NR_SYSCALL_BASE+399)
- #endif
-
-+#if !defined(__NR_clock_gettime64)
-+#define __NR_clock_gettime64 (__NR_SYSCALL_BASE+403)
-+#endif
-+
-+#if !defined(__NR_clock_nanosleep_time64)
-+#define __NR_clock_nanosleep_time64 (__NR_SYSCALL_BASE+407)
-+#endif
-+
- // ARM private syscalls.
- #if !defined(__ARM_NR_BASE)
- #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000)
-diff -up
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h.sandbox-time64-syscalls
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h
----
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h.sandbox-time64-syscalls 2021-05-28
07:05:45.000000000 -0500
-+++
qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h 2021-06-24
10:36:45.695826525 -0500
-@@ -1433,4 +1433,12 @@
- #define __NR_memfd_create (__NR_Linux + 354)
- #endif
-
-+#if !defined(__NR_clock_gettime64)
-+#define __NR_clock_gettime64 (__NR_Linux + 403)
-+#endif
-+
-+#if !defined(__NR_clock_nanosleep_time64)
-+#define __NR_clock_nanosleep_time64 (__NR_Linux + 407)
-+#endif
-+
- #endif // SANDBOX_LINUX_SYSTEM_HEADERS_MIPS_LINUX_SYSCALLS_H_
diff --git a/qtwebengine-everywhere-src-5.15.6-clone3.patch
b/qtwebengine-everywhere-src-5.15.6-clone3.patch
deleted file mode 100644
index a89a363..0000000
--- a/qtwebengine-everywhere-src-5.15.6-clone3.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -up
qtwebengine-everywhere-src-5.15.6/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc.1213452
qtwebengine-everywhere-src-5.15.6/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
----
qtwebengine-everywhere-src-5.15.6/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc.1213452 2021-09-03
10:35:33.069779845 -0500
-+++
qtwebengine-everywhere-src-5.15.6/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc 2021-09-03
10:36:43.891325411 -0500
-@@ -172,6 +172,12 @@ ResultExpr EvaluateSyscallImpl(int fs_de
- return RestrictCloneToThreadsAndEPERMFork();
- }
-
-+ // clone3 takes a pointer argument which we cannot examine, so return ENOSYS
-+ // to force the libc to use clone. See
https://crbug.com/1213452.
-+ if (sysno == __NR_clone3) {
-+ return Error(ENOSYS);
-+ }
-+
- if (sysno == __NR_fcntl)
- return RestrictFcntlCommands();
-
diff --git a/qtwebengine-harfbuzz.patch b/qtwebengine-harfbuzz.patch
deleted file mode 100644
index cedfd16..0000000
--- a/qtwebengine-harfbuzz.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/src/3rdparty/chromium/components/paint_preview/common/subset_font.cc
b/src/3rdparty/chromium/components/paint_preview/common/subset_font.cc
-index ba5391708..f5fad4148 100644
---- a/src/3rdparty/chromium/components/paint_preview/common/subset_font.cc
-+++ b/src/3rdparty/chromium/components/paint_preview/common/subset_font.cc
-@@ -71,9 +71,9 @@ sk_sp<SkData> SubsetFont(SkTypeface* typeface, const
GlyphUsage& usage) {
- hb_set_t* glyphs =
- hb_subset_input_glyph_set(input.get()); // Owned by |input|.
- usage.ForEach(base::BindRepeating(&AddGlyphs, base::Unretained(glyphs)));
-- hb_subset_input_set_retain_gids(input.get(), true);
-+ hb_subset_input_set_flags(input.get(), HB_SUBSET_FLAGS_RETAIN_GIDS);
-
-- HbScoped<hb_face_t> subset_face(hb_subset(face.get(), input.get()));
-+ HbScoped<hb_face_t> subset_face(hb_subset_or_fail(face.get(), input.get()));
- HbScoped<hb_blob_t> subset_blob(hb_face_reference_blob(subset_face.get()));
- if (!subset_blob)
- return nullptr;
-diff --git a/src/3rdparty/chromium/third_party/skia/src/pdf/SkPDFSubsetFont.cpp
b/src/3rdparty/chromium/third_party/skia/src/pdf/SkPDFSubsetFont.cpp
-index 81c37eef3..1581fb8a9 100644
---- a/src/3rdparty/chromium/third_party/skia/src/pdf/SkPDFSubsetFont.cpp
-+++ b/src/3rdparty/chromium/third_party/skia/src/pdf/SkPDFSubsetFont.cpp
-@@ -71,11 +71,10 @@ static sk_sp<SkData> subset_harfbuzz(sk_sp<SkData>
fontData,
- hb_set_t* glyphs = hb_subset_input_glyph_set(input.get());
- glyphUsage.getSetValues([&glyphs](unsigned gid) { hb_set_add(glyphs, gid);});
-
-- hb_subset_input_set_retain_gids(input.get(), true);
- // TODO: When possible, check if a font is 'tricky' with FT_IS_TRICKY.
- // If it isn't known if a font is 'tricky', retain the hints.
-- hb_subset_input_set_drop_hints(input.get(), false);
-- HBFace subset(hb_subset(face.get(), input.get()));
-+ hb_subset_input_set_flags(input.get(), HB_SUBSET_FLAGS_RETAIN_GIDS |
HB_SUBSET_FLAGS_NO_HINTING);
-+ HBFace subset(hb_subset_or_fail(face.get(), input.get()));
- HBBlob result(hb_face_reference_blob(subset.get()));
- return to_data(std::move(result));
- }
diff --git a/qtwebengine-opensource-src-5.9.0-openmax-dl-neon.patch
b/qtwebengine-opensource-src-5.9.0-openmax-dl-neon.patch
deleted file mode 100644
index 09803b2..0000000
--- a/qtwebengine-opensource-src-5.9.0-openmax-dl-neon.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-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") {
- ]
- if (arm_optionally_use_neon) {
- # Run-time NEON detection.
-- 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
-@@ -9,13 +9,57 @@
- *
- */
-
--#include <cpu-features.h>
--
--#include "android/log.h"
- #include "dl/sp/api/omxSP.h"
-
-+// For ArmCpuCaps()
-+#include <stdio.h>
-+#include <string.h>
-+
-+// based on libvpx arm_cpudetect.c
-+static int ArmCpuCaps(const char* cpuinfo_name) {
-+ char cpuinfo_line[512];
-+ FILE* f = fopen(cpuinfo_name, "r");
-+ if (!f) {
-+ // Assume Neon if /proc/cpuinfo is unavailable.
-+ // This will occur for Chrome sandbox for Pepper or Render process.
-+ return 1;
-+ }
-+ while (fgets(cpuinfo_line, sizeof(cpuinfo_line) - 1, f)) {
-+ if (memcmp(cpuinfo_line, "Features", 8) == 0) {
-+ char* p = strstr(cpuinfo_line, " neon");
-+ if (p && (p[5] == ' ' || p[5] == '\n')) {
-+ fclose(f);
-+ return 1;
-+ }
-+ // aarch64 uses asimd for Neon.
-+ p = strstr(cpuinfo_line, " asimd");
-+ if (p && (p[6] == ' ' || p[6] == '\n')) {
-+ fclose(f);
-+ return 1;
-+ }
-+ }
-+ }
-+ fclose(f);
-+ return 0;
-+}
-+
- int omxSP_HasArmNeon() {
-- return (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) != 0;
-+#if defined(__arm__) || defined(__aarch64__)
-+// gcc -mfpu=neon defines __ARM_NEON__
-+// __ARM_NEON__ generates code that requires Neon. NaCL also requires Neon.
-+// For Linux, /proc/cpuinfo can be tested but without that assume Neon.
-+#if defined(__ARM_NEON__) || defined(__native_client__) || !defined(__linux__)
-+ return 1;
-+// For aarch64(arm64), /proc/cpuinfo's feature is not complete, e.g. no neon
-+// flag in it.
-+// So for aarch64, neon enabling is hard coded here.
-+#elif defined(__aarch64__)
-+ return 1;
-+#else
-+ // Linux arm parse text file for neon detect.
-+ return ArmCpuCaps("/proc/cpuinfo");
-+#endif
-+#endif // __arm__
- }
-
- static void SetFFTRoutines() {
-@@ -24,13 +68,9 @@ static void SetFFTRoutines() {
- * forward and inverse FFTs
- */
- if (omxSP_HasArmNeon()) {
-- __android_log_print(ANDROID_LOG_INFO, "OpenMAX DL FFT",
-- "Using NEON FFT");
- omxSP_FFTFwd_RToCCS_F32 = omxSP_FFTFwd_RToCCS_F32_Sfs;
- omxSP_FFTInv_CCSToR_F32 = omxSP_FFTInv_CCSToR_F32_Sfs;
- } else {
-- __android_log_print(ANDROID_LOG_INFO, "OpenMAX DL FFT",
-- "Using non-NEON FFT");
- omxSP_FFTFwd_RToCCS_F32 = omxSP_FFTFwd_RToCCS_F32_Sfs_vfp;
- omxSP_FFTInv_CCSToR_F32 = omxSP_FFTInv_CCSToR_F32_Sfs_vfp;
- }
commit b20c6739c1f612f0336ebef019b74d3f46014dc2
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Tue Jan 18 14:31:59 2022 -0600
5.15.8
diff --git a/.gitignore b/.gitignore
index d9f03a1..f3ee4f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,18 +1,2 @@
-/qtwebengine-everywhere-src-5.11.1-clean.tar.xz
-/qtwebengine-everywhere-src-5.11.2-clean.tar.xz
-/qtwebengine-everywhere-src-5.11.3-clean.tar.xz
-/qtwebengine-everywhere-src-5.12.1-clean.tar.xz
-/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
-/qtwebengine-everywhere-src-5.15.0-clean.tar.xz
-/qtwebengine-everywhere-src-5.15.1-clean.tar.xz
-/qtwebengine-everywhere-src-5.15.2-clean.tar.xz
-/qtwebengine-everywhere-src-5.15.5-clean.tar.xz
-/qtwebengine-everywhere-src-5.15.6-clean.tar.xz
+/qtwebengine-everywhere-src-5.15.8-clean.tar.xz
diff --git a/clean_qtwebengine.sh b/clean_qtwebengine.sh
index bc462b8..17f77fa 100755
--- 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.15.8"
exit 1
fi
@@ -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="-8 -T 2" tar cJf "$DIRNAME-clean.tar.xz" "$DIRNAME"
|| exit $?
echo "removing $DIRNAME"
rm -rf "$DIRNAME" || exit $?
diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec
index 91f41ea..c31a399 100644
--- a/qt5-qtwebengine.spec
+++ b/qt5-qtwebengine.spec
@@ -52,8 +52,8 @@
Summary: Qt5 - QtWebEngine components
Name: qt5-qtwebengine
-Version: 5.15.6
-Release: 3%{?dist}
+Version: 5.15.8
+Release: 1%{?dist}
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
# See also
http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html
@@ -417,12 +417,13 @@ popd
#patch10 -p1 -b .openmax-dl-neon
%patch24 -p1 -b .aarch64-new-stat
%patch26 -p1 -b .use-python2
-%patch28 -p1 -b .rh#1904652
-%patch29 -p1 -b .sandbox-time64-syscalls
-%patch30 -p1 -b .SIGSTKSZ
+#patch28 -p1 -b .rh#1904652
+#patch29 -p1 -b .sandbox-time64-syscalls
+#patch30 -p1 -b .SIGSTKSZ
%patch31 -p1 -b .TRUE
-%patch32 -p1 -b .clone3
-%patch33 -p1 -b .harfbuzz
+#patch32 -p1 -b .clone3
+## may need porting
+#patch33 -p1 -b .harfbuzz
# delete all "toolprefix = " lines from build/toolchain/linux/BUILD.gn, as we
# never cross-compile in native Fedora RPMs, fixes ARM and aarch64 FTBFS
@@ -634,6 +635,9 @@ done
%changelog
+* Tue Jan 11 2022 Rex Dieter <rdieter(a)fedoraproject.org> - 5.15.8-1
+- 5.15.8
+
* Sat Jan 08 2022 Miro Hrončok <mhroncok(a)redhat.com> - 5.15.6-3
- Rebuilt for libre2.so.9
diff --git a/qtwebengine-release.sh b/qtwebengine-release.sh
index 027cfc8..a05c100 100644
--- a/qtwebengine-release.sh
+++ b/qtwebengine-release.sh
@@ -1,6 +1,6 @@
#!/bin/sh
set -x
-VERSION=5.15.6
+VERSION=5.15.8
CHROMIUMHASH=`wget
https://code.qt.io/cgit/qt/qtwebengine.git/tree/src/3rdparty?h=$VERSION -q
--content-on-error -O - | grep "Bad object name: " | sed 's/^.*Bad object
name: \([0-9a-f]\{40\}\).*$/\1/g'`
rm -rf qtwebengine-$VERSION qtwebengine-$VERSION.tar.gz
qtwebengine-chromium-$CHROMIUMHASH qtwebengine-chromium-$CHROMIUMHASH.tar.gz
qtwebengine-everywhere-src-$VERSION
wget
https://github.com/qt/qtwebengine/archive/$VERSION.tar.gz -O
qtwebengine-$VERSION.tar.gz || exit $?
diff --git a/sources b/sources
index 9431908..71b9125 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (pulseaudio-12.2-headers.tar.gz) =
a5a9bcbb16030b3bc83cc0cc8f5e7f90e0723d3e83258a5c77eacb32eaa267118a73fa7814fbcc99a24e4907916a2b371ebb6dedc4f45541c3acf6c834fd35be
-SHA512 (qtwebengine-everywhere-src-5.15.6-clean.tar.xz) =
7c05934769bbfef181c591b65916c456449a3dd6e653d80b6e601a5b4e22904a2256538edd771453e31dceae56b2075c88c19b00cfab234e561ed6ca72bb143e
+SHA512 (qtwebengine-everywhere-src-5.15.8-clean.tar.xz) =
0ded6ec6106a79e66796fa65b9574debf59e602aecbfdd0cdf0aeb6d17530177c0a8650078402c426abfebcd40c97d1501f4277541c86f2c576543052f627c04
commit a8dd1a7a5855837bc20c964fd75d92ad198747f3
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Sat Jan 8 11:41:46 2022 +0100
Rebuilt for libre2.so.9
diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec
index a7d8154..91f41ea 100644
--- a/qt5-qtwebengine.spec
+++ b/qt5-qtwebengine.spec
@@ -53,7 +53,7 @@
Summary: Qt5 - QtWebEngine components
Name: qt5-qtwebengine
Version: 5.15.6
-Release: 2%{?dist}
+Release: 3%{?dist}
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
# See also
http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html
@@ -634,6 +634,9 @@ done
%changelog
+* Sat Jan 08 2022 Miro Hrončok <mhroncok(a)redhat.com> - 5.15.6-3
+- Rebuilt for libre2.so.9
+
* Mon Sep 20 2021 Rex Dieter <rdieter(a)fedoraproject.org> - 5.15.6-2
- patch use of deprecated harfbuzz apis
commit 1442be6d398979c09a98a49935c4a4961b0c9053
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Tue Sep 21 09:45:06 2021 -0500
respin harfbuzz.patch
diff --git a/qtwebengine-harfbuzz.patch b/qtwebengine-harfbuzz.patch
index 327874f..cedfd16 100644
--- a/qtwebengine-harfbuzz.patch
+++ b/qtwebengine-harfbuzz.patch
@@ -1,5 +1,5 @@
diff --git a/src/3rdparty/chromium/components/paint_preview/common/subset_font.cc
b/src/3rdparty/chromium/components/paint_preview/common/subset_font.cc
-index ba5391708..8565b67e3 100644
+index ba5391708..f5fad4148 100644
--- a/src/3rdparty/chromium/components/paint_preview/common/subset_font.cc
+++ b/src/3rdparty/chromium/components/paint_preview/common/subset_font.cc
@@ -71,9 +71,9 @@ sk_sp<SkData> SubsetFont(SkTypeface* typeface, const
GlyphUsage& usage) {
@@ -10,7 +10,7 @@ index ba5391708..8565b67e3 100644
+ hb_subset_input_set_flags(input.get(), HB_SUBSET_FLAGS_RETAIN_GIDS);
- HbScoped<hb_face_t> subset_face(hb_subset(face.get(), input.get()));
-+ HbFace subset_face(hb_subset_or_fail(face.get(), input.get()));
++ HbScoped<hb_face_t> subset_face(hb_subset_or_fail(face.get(), input.get()));
HbScoped<hb_blob_t> subset_blob(hb_face_reference_blob(subset_face.get()));
if (!subset_blob)
return nullptr;
commit db3b70b97f7ae84aa82a1ed241a969f72fefa911
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Tue Sep 21 08:58:51 2021 -0500
patch use of deprecated harfbuzz apis
diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec
index 1f22fa7..a7d8154 100644
--- a/qt5-qtwebengine.spec
+++ b/qt5-qtwebengine.spec
@@ -111,6 +111,8 @@ Patch31: qtwebengine-everywhere-src-5.15.5-TRUE.patch
# Issue 1213452: Sandbox doesn't work with clone3
#
https://bugs.chromium.org/p/chromium/issues/detail?id=1213452
Patch32: qtwebengine-everywhere-src-5.15.6-clone3.patch
+# Fix use of deprecated harfbuzz api's
+Patch33: qtwebengine-harfbuzz.patch
## Upstream patches:
@@ -420,6 +422,7 @@ popd
%patch30 -p1 -b .SIGSTKSZ
%patch31 -p1 -b .TRUE
%patch32 -p1 -b .clone3
+%patch33 -p1 -b .harfbuzz
# delete all "toolprefix = " lines from build/toolchain/linux/BUILD.gn, as we
# never cross-compile in native Fedora RPMs, fixes ARM and aarch64 FTBFS
@@ -632,7 +635,7 @@ done
%changelog
* Mon Sep 20 2021 Rex Dieter <rdieter(a)fedoraproject.org> - 5.15.6-2
-- rebuild (harfbuzz)
+- patch use of deprecated harfbuzz apis
* Fri Sep 03 2021 Rex Dieter <rdieter(a)fedoraproject.org> - 5.15.6-1
- 5.15.6
diff --git a/qtwebengine-harfbuzz.patch b/qtwebengine-harfbuzz.patch
new file mode 100644
index 0000000..327874f
--- /dev/null
+++ b/qtwebengine-harfbuzz.patch
@@ -0,0 +1,34 @@
+diff --git a/src/3rdparty/chromium/components/paint_preview/common/subset_font.cc
b/src/3rdparty/chromium/components/paint_preview/common/subset_font.cc
+index ba5391708..8565b67e3 100644
+--- a/src/3rdparty/chromium/components/paint_preview/common/subset_font.cc
++++ b/src/3rdparty/chromium/components/paint_preview/common/subset_font.cc
+@@ -71,9 +71,9 @@ sk_sp<SkData> SubsetFont(SkTypeface* typeface, const
GlyphUsage& usage) {
+ hb_set_t* glyphs =
+ hb_subset_input_glyph_set(input.get()); // Owned by |input|.
+ usage.ForEach(base::BindRepeating(&AddGlyphs, base::Unretained(glyphs)));
+- hb_subset_input_set_retain_gids(input.get(), true);
++ hb_subset_input_set_flags(input.get(), HB_SUBSET_FLAGS_RETAIN_GIDS);
+
+- HbScoped<hb_face_t> subset_face(hb_subset(face.get(), input.get()));
++ HbFace subset_face(hb_subset_or_fail(face.get(), input.get()));
+ HbScoped<hb_blob_t> subset_blob(hb_face_reference_blob(subset_face.get()));
+ if (!subset_blob)
+ return nullptr;
+diff --git a/src/3rdparty/chromium/third_party/skia/src/pdf/SkPDFSubsetFont.cpp
b/src/3rdparty/chromium/third_party/skia/src/pdf/SkPDFSubsetFont.cpp
+index 81c37eef3..1581fb8a9 100644
+--- a/src/3rdparty/chromium/third_party/skia/src/pdf/SkPDFSubsetFont.cpp
++++ b/src/3rdparty/chromium/third_party/skia/src/pdf/SkPDFSubsetFont.cpp
+@@ -71,11 +71,10 @@ static sk_sp<SkData> subset_harfbuzz(sk_sp<SkData>
fontData,
+ hb_set_t* glyphs = hb_subset_input_glyph_set(input.get());
+ glyphUsage.getSetValues([&glyphs](unsigned gid) { hb_set_add(glyphs, gid);});
+
+- hb_subset_input_set_retain_gids(input.get(), true);
+ // TODO: When possible, check if a font is 'tricky' with FT_IS_TRICKY.
+ // If it isn't known if a font is 'tricky', retain the hints.
+- hb_subset_input_set_drop_hints(input.get(), false);
+- HBFace subset(hb_subset(face.get(), input.get()));
++ hb_subset_input_set_flags(input.get(), HB_SUBSET_FLAGS_RETAIN_GIDS |
HB_SUBSET_FLAGS_NO_HINTING);
++ HBFace subset(hb_subset_or_fail(face.get(), input.get()));
+ HBBlob result(hb_face_reference_blob(subset.get()));
+ return to_data(std::move(result));
+ }
commit 09d1fc370fd9943063b594bc77fc073f4de9f62b
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Mon Sep 20 15:51:37 2021 -0500
rebuild (harfbuzz)
diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec
index 6f764b1..1f22fa7 100644
--- a/qt5-qtwebengine.spec
+++ b/qt5-qtwebengine.spec
@@ -53,7 +53,7 @@
Summary: Qt5 - QtWebEngine components
Name: qt5-qtwebengine
Version: 5.15.6
-Release: 1%{?dist}
+Release: 2%{?dist}
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
# See also
http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html
@@ -631,6 +631,9 @@ done
%changelog
+* Mon Sep 20 2021 Rex Dieter <rdieter(a)fedoraproject.org> - 5.15.6-2
+- rebuild (harfbuzz)
+
* Fri Sep 03 2021 Rex Dieter <rdieter(a)fedoraproject.org> - 5.15.6-1
- 5.15.6