Sync from SUSE:ALP:Source:Standard:1.0 libqt5-qtwebengine revision 257fb9c28fed3fd3b4a052148f5e77a9
This commit is contained in:
parent
09daceda1e
commit
753a89f625
@ -0,0 +1,35 @@
|
|||||||
|
From 1b74bce8ba1322d1853c7fd4467504a4a0d32d7b Mon Sep 17 00:00:00 2001
|
||||||
|
From: Adam Klein <adamk@chromium.org>
|
||||||
|
Date: Mon, 29 Nov 2021 15:11:39 -0800
|
||||||
|
Subject: [PATCH] Use default constructor in place of self-delegation for
|
||||||
|
Symbol()
|
||||||
|
|
||||||
|
This avoids a compile error when building with GCC in C++17 mode.
|
||||||
|
|
||||||
|
Bug: v8:12449
|
||||||
|
Change-Id: I14817895d31019fb71fc71b061f2ecf576dbc711
|
||||||
|
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3307102
|
||||||
|
Commit-Queue: Adam Klein <adamk@chromium.org>
|
||||||
|
Reviewed-by: Leszek Swirski <leszeks@chromium.org>
|
||||||
|
Reviewed-by: Tobias Tebbi <tebbi@chromium.org>
|
||||||
|
Cr-Commit-Position: refs/heads/main@{#78171}
|
||||||
|
---
|
||||||
|
src/3rdparty/chromium/v8/src/torque/earley-parser.h | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/3rdparty/chromium/v8/src/torque/earley-parser.h b/src/3rdparty/chromium/v8/src/torque/earley-parser.h
|
||||||
|
index e0dca24..0429fd2 100644
|
||||||
|
--- a/src/3rdparty/chromium/v8/src/torque/earley-parser.h
|
||||||
|
+++ b/src/3rdparty/chromium/v8/src/torque/earley-parser.h
|
||||||
|
@@ -248,7 +248,7 @@ class Rule final {
|
||||||
|
// used in the parser.
|
||||||
|
class Symbol {
|
||||||
|
public:
|
||||||
|
- Symbol() : Symbol({}) {}
|
||||||
|
+ Symbol() = default;
|
||||||
|
Symbol(std::initializer_list<Rule> rules) { *this = rules; }
|
||||||
|
|
||||||
|
V8_EXPORT_PRIVATE Symbol& operator=(std::initializer_list<Rule> rules);
|
||||||
|
--
|
||||||
|
2.45.1
|
||||||
|
|
12
Add-missing-dependencies.patch
Normal file
12
Add-missing-dependencies.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff --git a/chromium/content/public/browser/BUILD.gn b/chromium/content/public/browser/BUILD.gn
|
||||||
|
index 7cf82a4aacf..0e0dda2c3ca 100644
|
||||||
|
--- a/src/3rdparty/chromium/content/public/browser/BUILD.gn
|
||||||
|
+++ b/src/3rdparty/chromium/content/public/browser/BUILD.gn
|
||||||
|
@@ -469,6 +469,7 @@ jumbo_source_set("browser_sources") {
|
||||||
|
"//build:chromeos_buildflags",
|
||||||
|
"//cc",
|
||||||
|
"//components/viz/host",
|
||||||
|
+ "//components/spellcheck:buildflags",
|
||||||
|
"//content/browser", # Must not be public_deps!
|
||||||
|
"//device/fido",
|
||||||
|
"//gpu",
|
12
_service
12
_service
@ -1,19 +1,11 @@
|
|||||||
<services>
|
<services>
|
||||||
<service name="tar_scm" mode="disabled">
|
<service name="tar_scm" mode="disabled">
|
||||||
<param name="changesgenerate">enable</param>
|
<param name="changesgenerate">enable</param>
|
||||||
<param name="version">5.15.16</param>
|
<param name="version">5.15.17</param>
|
||||||
<param name="url">git://code.qt.io/qt/qtwebengine.git</param>
|
<param name="url">git://code.qt.io/qt/qtwebengine.git</param>
|
||||||
<param name="scm">git</param>
|
<param name="scm">git</param>
|
||||||
<param name="filename">qtwebengine-everywhere-src</param>
|
<param name="filename">qtwebengine-everywhere-src</param>
|
||||||
<param name="revision">v5.15.16-lts</param>
|
<param name="revision">v5.15.17-lts</param>
|
||||||
</service>
|
|
||||||
<service name="tar_scm" mode="disabled">
|
|
||||||
<param name="changesgenerate">disable</param>
|
|
||||||
<param name="url">https://chromium.googlesource.com/catapult</param>
|
|
||||||
<param name="revision">main</param>
|
|
||||||
<param name="scm">git</param>
|
|
||||||
<param name="filename">catapult</param>
|
|
||||||
<param name="versionformat">git</param>
|
|
||||||
</service>
|
</service>
|
||||||
<service name="recompress" mode="disabled">
|
<service name="recompress" mode="disabled">
|
||||||
<param name="file">*.tar</param>
|
<param name="file">*.tar</param>
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
<servicedata>
|
<servicedata>
|
||||||
<service name="tar_scm">
|
<service name="tar_scm">
|
||||||
<param name="url">git://code.qt.io/qt/qtwebengine.git</param>
|
<param name="url">git://code.qt.io/qt/qtwebengine.git</param>
|
||||||
<param name="changesrevision">224806a7022eed6d5c75b486bec8715a618cb314</param></service></servicedata>
|
<param name="changesrevision">17fd3176988586168bee8654008a097a5f23ec1d</param></service></servicedata>
|
BIN
catapult-git.tar.xz
(Stored with Git LFS)
BIN
catapult-git.tar.xz
(Stored with Git LFS)
Binary file not shown.
@ -1,3 +1,79 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu May 23 00:21:22 UTC 2024 - Christophe Marin <christophe@krop.fr>
|
||||||
|
|
||||||
|
- Add compatibility patches for ICU 75:
|
||||||
|
* qt5-webengine-icu-75.patch
|
||||||
|
* 0001-Use-default-constructor-in-place-of-self-delegation-.patch
|
||||||
|
- Consequently build with a newer compiler on Leap 15
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed May 22 08:20:33 UTC 2024 - christophe@krop.fr
|
||||||
|
|
||||||
|
- Update to version 5.15.17:
|
||||||
|
* Add option to chose python version for building 5.15 WebEngine
|
||||||
|
* Update Chromium. Backported fixes:
|
||||||
|
* [Backport] Security bug 325296797
|
||||||
|
* [Backport] CVE-2024-1059: Use after free in WebRTC
|
||||||
|
* [Backport] Security bug 1518994
|
||||||
|
* Fixup for [Backport] Security bug 1519980
|
||||||
|
* [Backport] CVE-2024-1283: Heap buffer overflow in Skia
|
||||||
|
* [Backport] CVE-2024-1060: Use after free in Canvas
|
||||||
|
* [Backport] CVE-2024-1077: Use after free in Network
|
||||||
|
* [Backport] Security bug 1519980
|
||||||
|
* [Backport] CVE-2024-0808: Integer underflow in WebUI
|
||||||
|
* [Backport] CVE-2024-0807: Use after free in WebAudio
|
||||||
|
* Fix ffmpeg assembly with newer binutil
|
||||||
|
* [Backport] Security bug 1511689
|
||||||
|
* [Backport] CVE-2024-0224: Use after free in WebAudio
|
||||||
|
* [Backport] CVE-2023-7024: Heap buffer overflow in WebRTC
|
||||||
|
* [Backport] Security bug 1506535
|
||||||
|
* [Backport] CVE-2024-0519: Out of bounds memory access in V8
|
||||||
|
* [Backport] CVE-2024-0518: Type Confusion in V8
|
||||||
|
* [Backport] CVE-2024-0333: Insufficient data validation in Extensions
|
||||||
|
* [Backport] CVE-2024-0222: Use after free in ANGLE
|
||||||
|
* Fixup: [Backport] Security bug 1488199
|
||||||
|
* FIXUP: Fix compilation with system ICU
|
||||||
|
* Fixup: [Backport] Security bug 1505632
|
||||||
|
* [Backport] Security bug 1505632
|
||||||
|
* [Backport] CVE-2023-6702: Type Confusion in V8
|
||||||
|
* [Backport] CVE-2023-6345: Integer overflow in Skia
|
||||||
|
* Bump V8_PATCH_LEVEL
|
||||||
|
* [Backport] Security bug 1488199 (2/2)
|
||||||
|
* [Backport] Security bug 1488199 (1/2)
|
||||||
|
* [Backport] CVE-2023-6510: Use after free in Media Capture
|
||||||
|
* Fix building with system libxml2
|
||||||
|
* [Backport] CVE-2023-6347: Use after free in Mojo
|
||||||
|
* [Backport] CVE-2023-6112: Use after free in Navigation
|
||||||
|
* [Backport] CVE-2023-5997: Use after free in Garbage Collection
|
||||||
|
- Drop patches, merged upstream:
|
||||||
|
* 0001-Fix-building-with-system-libxml2.patch
|
||||||
|
* qtwebengine-python3.patch
|
||||||
|
* python311-fixes.patch
|
||||||
|
- Update _service file, catapult snapshots are not needed anymore
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri May 17 05:53:59 UTC 2024 - Christoph G <foss@grueninger.de>
|
||||||
|
|
||||||
|
- Backport Ninja 1.12 compatibility patch (and adjust paths)
|
||||||
|
Add-missing-dependencies.patch from upstream
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Apr 19 14:57:37 UTC 2024 - Christophe Marin <christophe@krop.fr>
|
||||||
|
|
||||||
|
- Add patch to fix build with libxml >= 2.12:
|
||||||
|
* 0001-Fix-building-with-system-libxml2.patch
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat Feb 24 11:06:56 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
|
||||||
|
|
||||||
|
- Drop BuildRequire on libsrtp, qt builds a bundled copy.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Feb 20 14:42:07 UTC 2024 - Christophe Marin <christophe@krop.fr>
|
||||||
|
|
||||||
|
- Switch to '%patch -P'
|
||||||
|
- Build with python 3.11 on Leap
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Nov 22 09:44:27 UTC 2023 - christophe@krop.fr
|
Wed Nov 22 09:44:27 UTC 2023 - christophe@krop.fr
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package libqt5-qtwebengine
|
# spec file for package libqt5-qtwebengine
|
||||||
#
|
#
|
||||||
# Copyright (c) 2023 SUSE LLC
|
# Copyright (c) 2024 SUSE LLC
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -20,29 +20,29 @@
|
|||||||
%bcond_without system_minizip
|
%bcond_without system_minizip
|
||||||
%bcond_without pipewire
|
%bcond_without pipewire
|
||||||
# The default python version is too old on Leap 15
|
# The default python version is too old on Leap 15
|
||||||
%if 0%{?suse_version} < 1550
|
%{?sle15_python_module_pythons}
|
||||||
%bcond_without python39
|
%if 0%{?suse_version} == 1500
|
||||||
|
%define pyver python311
|
||||||
%else
|
%else
|
||||||
%bcond_without python3
|
# latest
|
||||||
|
%define pyver python3
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# spellchecking dictionary directory
|
# spellchecking dictionary directory
|
||||||
%global _qtwebengine_dictionaries_dir %{_libqt5_datadir}/qtwebengine_dictionaries
|
%global _qtwebengine_dictionaries_dir %{_libqt5_datadir}/qtwebengine_dictionaries
|
||||||
|
|
||||||
Name: libqt5-qtwebengine
|
Name: libqt5-qtwebengine
|
||||||
Version: 5.15.16
|
Version: 5.15.17
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Qt 5 WebEngine Library
|
Summary: Qt 5 WebEngine Library
|
||||||
License: LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
|
License: LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
|
||||||
Group: Development/Libraries/X11
|
Group: Development/Libraries/X11
|
||||||
URL: https://www.qt.io
|
URL: https://www.qt.io
|
||||||
%define base_name libqt5
|
%define base_name libqt5
|
||||||
%define real_version 5.15.16
|
%define real_version 5.15.17
|
||||||
%define so_version 5.15.16
|
%define so_version 5.15.17
|
||||||
%define tar_version qtwebengine-everywhere-src-%{version}
|
%define tar_version qtwebengine-everywhere-src-%{version}
|
||||||
Source: %{tar_version}.tar.xz
|
Source: %{tar_version}.tar.xz
|
||||||
# Use a git snapshot for catapult to build with python3 (git rev: 2da767c6)
|
|
||||||
Source1: catapult-git.tar.xz
|
|
||||||
Source99: libqt5-qtwebengine-rpmlintrc
|
Source99: libqt5-qtwebengine-rpmlintrc
|
||||||
# PATCH-FIX-UPSTREAM armv6-ffmpeg-no-thumb.patch - Fix ffmpeg configuration for armv6
|
# PATCH-FIX-UPSTREAM armv6-ffmpeg-no-thumb.patch - Fix ffmpeg configuration for armv6
|
||||||
Patch0: armv6-ffmpeg-no-thumb.patch
|
Patch0: armv6-ffmpeg-no-thumb.patch
|
||||||
@ -54,12 +54,13 @@ Patch2: rtc-dont-use-h264.patch
|
|||||||
Patch3: 0001-skia-Some-includes-to-fix-build-with-GCC-12.patch
|
Patch3: 0001-skia-Some-includes-to-fix-build-with-GCC-12.patch
|
||||||
# PATCH-FIX-UPSTREAM -- build with pipewire 0.3
|
# PATCH-FIX-UPSTREAM -- build with pipewire 0.3
|
||||||
Patch4: qtwebengine-pipewire-0.3.patch
|
Patch4: qtwebengine-pipewire-0.3.patch
|
||||||
# PATCH-FIX-OPENSUSE -- build with python 3
|
|
||||||
Patch5: qtwebengine-python3.patch
|
|
||||||
# PATCH-FIX-UPSTREAM -- handle futex_time64
|
# PATCH-FIX-UPSTREAM -- handle futex_time64
|
||||||
Patch6: sandbox_futex_time64.patch
|
Patch5: sandbox_futex_time64.patch
|
||||||
# PATCH-FIX-UPSTREAM -- python 3.11 fixes
|
# PATCH-FIX-UPSTREAM -- Add missing dependencies for compatibility with Ninja 1.12
|
||||||
Patch7: python311-fixes.patch
|
Patch6: Add-missing-dependencies.patch
|
||||||
|
# PATCH-FIX-UPSTREAM -- ICU 75 compatibility
|
||||||
|
Patch7: qt5-webengine-icu-75.patch
|
||||||
|
Patch8: 0001-Use-default-constructor-in-place-of-self-delegation-.patch
|
||||||
### Patch 50-99 are applied conditionally
|
### Patch 50-99 are applied conditionally
|
||||||
# PATCH-FIX-OPENSUSE -- allow building qtwebengine with ffmpeg5
|
# PATCH-FIX-OPENSUSE -- allow building qtwebengine with ffmpeg5
|
||||||
Patch50: qtwebengine-ffmpeg5.patch
|
Patch50: qtwebengine-ffmpeg5.patch
|
||||||
@ -72,6 +73,10 @@ BuildRequires: bison
|
|||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: flac-devel
|
BuildRequires: flac-devel
|
||||||
BuildRequires: flex
|
BuildRequires: flex
|
||||||
|
%if 0%{?suse_version} < 1550
|
||||||
|
BuildRequires: gcc13-PIE
|
||||||
|
BuildRequires: gcc13-c++
|
||||||
|
%endif
|
||||||
BuildRequires: git-core
|
BuildRequires: git-core
|
||||||
BuildRequires: gperf
|
BuildRequires: gperf
|
||||||
BuildRequires: krb5
|
BuildRequires: krb5
|
||||||
@ -100,16 +105,10 @@ BuildRequires: perl-JSON
|
|||||||
BuildRequires: pipewire-devel
|
BuildRequires: pipewire-devel
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
%if %{with python3}
|
BuildRequires: %{pyver}
|
||||||
BuildRequires: python3
|
BuildRequires: %{pyver}-devel
|
||||||
BuildRequires: python3-devel
|
BuildRequires: %{pyver}-html5lib
|
||||||
BuildRequires: python3-xml
|
BuildRequires: %{pyver}-xml
|
||||||
%endif
|
|
||||||
%if %{with python39}
|
|
||||||
BuildRequires: python39
|
|
||||||
BuildRequires: python39-devel
|
|
||||||
BuildRequires: python39-xml
|
|
||||||
%endif
|
|
||||||
BuildRequires: re2c
|
BuildRequires: re2c
|
||||||
BuildRequires: sed
|
BuildRequires: sed
|
||||||
BuildRequires: snappy-devel
|
BuildRequires: snappy-devel
|
||||||
@ -155,7 +154,6 @@ BuildRequires: pkgconfig(libmtp)
|
|||||||
BuildRequires: pkgconfig(libpci)
|
BuildRequires: pkgconfig(libpci)
|
||||||
BuildRequires: pkgconfig(libpng)
|
BuildRequires: pkgconfig(libpng)
|
||||||
BuildRequires: pkgconfig(libpulse)
|
BuildRequires: pkgconfig(libpulse)
|
||||||
BuildRequires: pkgconfig(libsrtp)
|
|
||||||
BuildRequires: pkgconfig(libudev)
|
BuildRequires: pkgconfig(libudev)
|
||||||
BuildRequires: pkgconfig(libusb-1.0)
|
BuildRequires: pkgconfig(libusb-1.0)
|
||||||
BuildRequires: pkgconfig(libwebp)
|
BuildRequires: pkgconfig(libwebp)
|
||||||
@ -191,6 +189,7 @@ BuildRequires: pkgconfig(xt)
|
|||||||
BuildRequires: pkgconfig(xtst)
|
BuildRequires: pkgconfig(xtst)
|
||||||
BuildRequires: pkgconfig(zlib)
|
BuildRequires: pkgconfig(zlib)
|
||||||
BuildRequires: yasm-devel
|
BuildRequires: yasm-devel
|
||||||
|
Provides: bundled(libsrtp2) = 2.2.0~pre
|
||||||
%requires_ge libQt5Network5
|
%requires_ge libQt5Network5
|
||||||
%requires_ge libQtQuick5
|
%requires_ge libQtQuick5
|
||||||
%requires_ge libQt5Widgets5
|
%requires_ge libQt5Widgets5
|
||||||
@ -292,28 +291,22 @@ Recommends: libqt5-qtpdf-devel
|
|||||||
Examples for the libqt5-qtpdf module.
|
Examples for the libqt5-qtpdf module.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
|
# Leap's rpm doesn't understand '%%autopatch -M N' nor '%%autopatch X Y Z -p1'
|
||||||
%setup -q -n %{tar_version}
|
%setup -q -n %{tar_version}
|
||||||
# Leap 15 doesn't understand '%%autopatch -m'
|
%patch -P0 -p1
|
||||||
%patch0 -p1
|
%patch -P1 -p1
|
||||||
%patch1 -p1
|
%patch -P2 -p1
|
||||||
%patch2 -p1
|
%patch -P3 -p1
|
||||||
%patch3 -p1
|
%patch -P4 -p1
|
||||||
%patch4 -p1
|
%patch -P5 -p1
|
||||||
%patch5 -p1
|
%patch -P6 -p1
|
||||||
%patch6 -p1
|
%patch -P7 -p1
|
||||||
%patch7 -p1
|
%patch -P8 -p1
|
||||||
|
|
||||||
# Replace the whole catapult folder rather than picking individual changes
|
|
||||||
pushd src/3rdparty/chromium/third_party
|
|
||||||
rm -r catapult
|
|
||||||
tar xJf %{SOURCE1}
|
|
||||||
mv catapult-git catapult
|
|
||||||
popd
|
|
||||||
|
|
||||||
# FFmpeg 5
|
# FFmpeg 5
|
||||||
%if %{with system_ffmpeg}
|
%if %{with system_ffmpeg}
|
||||||
%if %{pkg_vcmp libavcodec-devel >= 5}
|
%if %{pkg_vcmp pkgconfig(libavcodec) >= 5}
|
||||||
%patch50 -p1
|
%patch -P50 -p1
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -326,12 +319,11 @@ mkdir .git
|
|||||||
sed -i -e '/toolprefix = /d' -e 's/\${toolprefix}//g' \
|
sed -i -e '/toolprefix = /d' -e 's/\${toolprefix}//g' \
|
||||||
src/3rdparty/chromium/build/toolchain/linux/BUILD.gn
|
src/3rdparty/chromium/build/toolchain/linux/BUILD.gn
|
||||||
|
|
||||||
%build
|
|
||||||
rm -r src/3rdparty/chromium/third_party/openh264/src
|
rm -r src/3rdparty/chromium/third_party/openh264/src
|
||||||
|
|
||||||
%if %{with python39}
|
%build
|
||||||
sed -i 's#QMAKE_PYTHON = python3#QMAKE_PYTHON = python3.9#' mkspecs/features/functions.prf
|
%if 0%{?suse_version} < 1550
|
||||||
sed -i 's#python3#python3.9#' configure.pri
|
export CC=gcc-13 CXX=g++-13
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%ifnarch x86_64
|
%ifnarch x86_64
|
||||||
@ -348,6 +340,14 @@ export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -Wno-return-type"
|
|||||||
gn_args+="link_pulseaudio=true" \
|
gn_args+="link_pulseaudio=true" \
|
||||||
gn_args+="media_use_openh264=false" \
|
gn_args+="media_use_openh264=false" \
|
||||||
gn_args+="use_system_libxml=true use_system_libxslt=true" \
|
gn_args+="use_system_libxml=true use_system_libxslt=true" \
|
||||||
|
%if "%{pyver}" == "python311"
|
||||||
|
config.input.python_override=python3.11 \
|
||||||
|
%endif
|
||||||
|
%if 0%{?suse_version} < 1550
|
||||||
|
QMAKE_CC=gcc-13 \
|
||||||
|
QMAKE_CXX=g++-13 \
|
||||||
|
QMAKE_LINK=g++-13 \
|
||||||
|
%endif
|
||||||
qtwebengine.pro -- \
|
qtwebengine.pro -- \
|
||||||
-webengine-alsa \
|
-webengine-alsa \
|
||||||
-no-webengine-embedded-build \
|
-no-webengine-embedded-build \
|
||||||
@ -362,7 +362,10 @@ export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -Wno-return-type"
|
|||||||
-webengine-proprietary-codecs \
|
-webengine-proprietary-codecs \
|
||||||
%endif
|
%endif
|
||||||
%if %{with pipewire}
|
%if %{with pipewire}
|
||||||
-webengine-webrtc-pipewire
|
-webengine-webrtc-pipewire \
|
||||||
|
%endif
|
||||||
|
%if 0%{?suse_version} > 1500
|
||||||
|
-webengine-python-version python3
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# Determine the right number of parallel processes based on the available memory
|
# Determine the right number of parallel processes based on the available memory
|
||||||
|
@ -1,149 +0,0 @@
|
|||||||
From f90f49df8db04dcb72f7ce0c4d0b2fe329bab00c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Dan Harrington <harringtond@chromium.org>
|
|
||||||
Date: Fri, 04 Jun 2021 16:46:25 +0000
|
|
||||||
Subject: [PATCH] Migrate presubmit to python3
|
|
||||||
|
|
||||||
Fixed a couple warnings I found when running the unit
|
|
||||||
tests in python3.
|
|
||||||
|
|
||||||
Bug: 1212110
|
|
||||||
Change-Id: I3d1b5859b5c517ad5eea30cb816fad0389715f73
|
|
||||||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2934203
|
|
||||||
Reviewed-by: Jesse Doherty <jwd@chromium.org>
|
|
||||||
Commit-Queue: Dan H <harringtond@chromium.org>
|
|
||||||
Cr-Commit-Position: refs/heads/master@{#889331}
|
|
||||||
---
|
|
||||||
|
|
||||||
Index: qtwebengine-everywhere-src-5.15.13/src/3rdparty/chromium/tools/metrics/ukm/PRESUBMIT.py
|
|
||||||
===================================================================
|
|
||||||
--- qtwebengine-everywhere-src-5.15.13.orig/src/3rdparty/chromium/tools/metrics/ukm/PRESUBMIT.py
|
|
||||||
+++ qtwebengine-everywhere-src-5.15.13/src/3rdparty/chromium/tools/metrics/ukm/PRESUBMIT.py
|
|
||||||
@@ -8,6 +8,8 @@ See http://dev.chromium.org/developers/h
|
|
||||||
for more details on the presubmit API built into gcl.
|
|
||||||
"""
|
|
||||||
|
|
||||||
+USE_PYTHON3 = True
|
|
||||||
+
|
|
||||||
UKM_XML = 'ukm.xml'
|
|
||||||
|
|
||||||
|
|
||||||
Index: qtwebengine-everywhere-src-5.15.13/src/3rdparty/chromium/tools/metrics/ukm/gen_builders_test.py
|
|
||||||
===================================================================
|
|
||||||
--- qtwebengine-everywhere-src-5.15.13.orig/src/3rdparty/chromium/tools/metrics/ukm/gen_builders_test.py
|
|
||||||
+++ qtwebengine-everywhere-src-5.15.13/src/3rdparty/chromium/tools/metrics/ukm/gen_builders_test.py
|
|
||||||
@@ -25,8 +25,8 @@ class GenBuildersTest(unittest.TestCase)
|
|
||||||
|
|
||||||
def testGenerateCode(self):
|
|
||||||
relpath = '.'
|
|
||||||
- data = ukm_model.UKM_XML_TYPE.Parse(
|
|
||||||
- open('../../tools/metrics/ukm/ukm.xml').read())
|
|
||||||
+ with open('../../tools/metrics/ukm/ukm.xml') as f:
|
|
||||||
+ data = ukm_model.UKM_XML_TYPE.Parse(f.read())
|
|
||||||
event = data[ukm_model._EVENT_TYPE.tag][0]
|
|
||||||
metric = event[ukm_model._METRIC_TYPE.tag][0]
|
|
||||||
self.assertIsNotNone(event)
|
|
||||||
Index: qtwebengine-everywhere-src-5.15.13/src/3rdparty/chromium/tools/metrics/ukm/ukm_model.py
|
|
||||||
===================================================================
|
|
||||||
--- qtwebengine-everywhere-src-5.15.13.orig/src/3rdparty/chromium/tools/metrics/ukm/ukm_model.py
|
|
||||||
+++ qtwebengine-everywhere-src-5.15.13/src/3rdparty/chromium/tools/metrics/ukm/ukm_model.py
|
|
||||||
@@ -39,15 +39,16 @@ _INDEX_TYPE = models.ObjectNodeType(
|
|
||||||
],
|
|
||||||
single_line=True)
|
|
||||||
|
|
||||||
-_STATISTICS_TYPE = models.ObjectNodeType(
|
|
||||||
+_STATISTICS_TYPE = models.ObjectNodeType(
|
|
||||||
'statistics',
|
|
||||||
attributes=[
|
|
||||||
- ('export', str, r'^(?i)(|true|false)$'),
|
|
||||||
+ ('export', str, r'(?i)^(|true|false)$'),
|
|
||||||
],
|
|
||||||
children=[
|
|
||||||
models.ChildType(_QUANTILES_TYPE.tag, _QUANTILES_TYPE, multiple=False),
|
|
||||||
- models.ChildType(
|
|
||||||
- _ENUMERATION_TYPE.tag, _ENUMERATION_TYPE, multiple=False),
|
|
||||||
+ models.ChildType(_ENUMERATION_TYPE.tag,
|
|
||||||
+ _ENUMERATION_TYPE,
|
|
||||||
+ multiple=False),
|
|
||||||
])
|
|
||||||
|
|
||||||
_HISTORY_TYPE = models.ObjectNodeType(
|
|
||||||
@@ -90,25 +91,34 @@ _METRIC_TYPE = models.ObjectNodeType(
|
|
||||||
_AGGREGATION_TYPE.tag, _AGGREGATION_TYPE, multiple=True),
|
|
||||||
])
|
|
||||||
|
|
||||||
-_EVENT_TYPE = models.ObjectNodeType(
|
|
||||||
- 'event',
|
|
||||||
- attributes=[
|
|
||||||
- ('name', str, r'^[A-Za-z0-9.]+$'),
|
|
||||||
- ('singular', str, r'^(?i)(|true|false)$'),
|
|
||||||
- ],
|
|
||||||
- alphabetization=[
|
|
||||||
- (_OBSOLETE_TYPE.tag, _KEEP_ORDER),
|
|
||||||
- (_OWNER_TYPE.tag, _KEEP_ORDER),
|
|
||||||
- (_SUMMARY_TYPE.tag, _KEEP_ORDER),
|
|
||||||
- (_METRIC_TYPE.tag, _LOWERCASE_FN('name')),
|
|
||||||
- ],
|
|
||||||
- extra_newlines=(1, 1, 1),
|
|
||||||
- children=[
|
|
||||||
- models.ChildType(_OBSOLETE_TYPE.tag, _OBSOLETE_TYPE, multiple=False),
|
|
||||||
- models.ChildType(_OWNER_TYPE.tag, _OWNER_TYPE, multiple=True),
|
|
||||||
- models.ChildType(_SUMMARY_TYPE.tag, _SUMMARY_TYPE, multiple=False),
|
|
||||||
- models.ChildType(_METRIC_TYPE.tag, _METRIC_TYPE, multiple=True),
|
|
||||||
- ])
|
|
||||||
+_EVENT_TYPE = models.ObjectNodeType('event',
|
|
||||||
+ attributes=[
|
|
||||||
+ ('name', str, r'^[A-Za-z0-9.]+$'),
|
|
||||||
+ ('singular', str,
|
|
||||||
+ r'(?i)^(|true|false)$'),
|
|
||||||
+ ],
|
|
||||||
+ alphabetization=[
|
|
||||||
+ (_OBSOLETE_TYPE.tag, _KEEP_ORDER),
|
|
||||||
+ (_OWNER_TYPE.tag, _KEEP_ORDER),
|
|
||||||
+ (_SUMMARY_TYPE.tag, _KEEP_ORDER),
|
|
||||||
+ (_METRIC_TYPE.tag,
|
|
||||||
+ _LOWERCASE_FN('name')),
|
|
||||||
+ ],
|
|
||||||
+ extra_newlines=(1, 1, 1),
|
|
||||||
+ children=[
|
|
||||||
+ models.ChildType(_OBSOLETE_TYPE.tag,
|
|
||||||
+ _OBSOLETE_TYPE,
|
|
||||||
+ multiple=False),
|
|
||||||
+ models.ChildType(_OWNER_TYPE.tag,
|
|
||||||
+ _OWNER_TYPE,
|
|
||||||
+ multiple=True),
|
|
||||||
+ models.ChildType(_SUMMARY_TYPE.tag,
|
|
||||||
+ _SUMMARY_TYPE,
|
|
||||||
+ multiple=False),
|
|
||||||
+ models.ChildType(_METRIC_TYPE.tag,
|
|
||||||
+ _METRIC_TYPE,
|
|
||||||
+ multiple=True),
|
|
||||||
+ ])
|
|
||||||
|
|
||||||
_UKM_CONFIGURATION_TYPE = models.ObjectNodeType(
|
|
||||||
'ukm-configuration',
|
|
||||||
Index: qtwebengine-everywhere-src-5.15.13/src/3rdparty/chromium/PRESUBMIT_test_mocks.py
|
|
||||||
===================================================================
|
|
||||||
--- qtwebengine-everywhere-src-5.15.13.orig/src/3rdparty/chromium/PRESUBMIT_test_mocks.py
|
|
||||||
+++ qtwebengine-everywhere-src-5.15.13/src/3rdparty/chromium/PRESUBMIT_test_mocks.py
|
|
||||||
@@ -119,7 +119,7 @@ class MockInputApi(object):
|
|
||||||
def PresubmitLocalPath(self):
|
|
||||||
return self.presubmit_local_path
|
|
||||||
|
|
||||||
- def ReadFile(self, filename, mode='rU'):
|
|
||||||
+ def ReadFile(self, filename, mode='r'):
|
|
||||||
if hasattr(filename, 'AbsoluteLocalPath'):
|
|
||||||
filename = filename.AbsoluteLocalPath()
|
|
||||||
for file_ in self.files:
|
|
||||||
Index: qtwebengine-everywhere-src-5.15.13/src/3rdparty/chromium/tools/grit/grit/util.py
|
|
||||||
===================================================================
|
|
||||||
--- qtwebengine-everywhere-src-5.15.13.orig/src/3rdparty/chromium/tools/grit/grit/util.py
|
|
||||||
+++ qtwebengine-everywhere-src-5.15.13/src/3rdparty/chromium/tools/grit/grit/util.py
|
|
||||||
@@ -211,7 +211,7 @@ def ReadFile(filename, encoding):
|
|
||||||
mode = 'rb'
|
|
||||||
encoding = None
|
|
||||||
else:
|
|
||||||
- mode = 'rU'
|
|
||||||
+ mode = 'r'
|
|
||||||
|
|
||||||
with io.open(abs(filename), mode, encoding=encoding) as f:
|
|
||||||
return f.read()
|
|
102
qt5-webengine-icu-75.patch
Normal file
102
qt5-webengine-icu-75.patch
Normal file
@ -0,0 +1,102 @@
|
|||||||
|
Fix build with ICU 75.
|
||||||
|
Origin: Arch linux: https://gitlab.archlinux.org/archlinux/packaging/packages/qt5-webengine/-/blob/main/qt5-webengine-icu-75.patch?ref_type=heads
|
||||||
|
|
||||||
|
diff --git a/src/3rdparty/chromium/build/config/compiler/BUILD.gn b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
|
||||||
|
index b511a58c5a8..abd78a74ead 100644
|
||||||
|
--- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn
|
||||||
|
+++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
|
||||||
|
@@ -566,7 +566,7 @@ config("compiler") {
|
||||||
|
# Override Chromium's default for projects that wish to stay on C++11.
|
||||||
|
cflags_cc += [ "-std=${standard_prefix}++11" ]
|
||||||
|
} else {
|
||||||
|
- cflags_cc += [ "-std=${standard_prefix}++14" ]
|
||||||
|
+ cflags_cc += [ "-std=${standard_prefix}++17" ]
|
||||||
|
}
|
||||||
|
} else if (!is_win && !is_nacl) {
|
||||||
|
if (target_os == "android") {
|
||||||
|
diff --git a/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h b/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h
|
||||||
|
index f03ba1e4ab4..b1495f7ae74 100644
|
||||||
|
--- a/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h
|
||||||
|
+++ b/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h
|
||||||
|
@@ -195,7 +195,7 @@ NumPartitionPagesPerSuperPage() {
|
||||||
|
//
|
||||||
|
// __STDCPP_DEFAULT_NEW_ALIGNMENT__ is C++17. As such, it is not defined on all
|
||||||
|
// platforms, as Chrome's requirement is C++14 as of 2020.
|
||||||
|
-#if defined(__STDCPP_DEFAULT_NEW_ALIGNMENT__)
|
||||||
|
+#if 0
|
||||||
|
static constexpr size_t kAlignment =
|
||||||
|
std::max(alignof(std::max_align_t), __STDCPP_DEFAULT_NEW_ALIGNMENT__);
|
||||||
|
#else
|
||||||
|
diff --git a/src/3rdparty/chromium/third_party/webrtc/common_video/h264/sps_parser.h b/src/3rdparty/chromium/third_party/webrtc/common_video/h264/sps_parser.h
|
||||||
|
index 76e627d27a3..942435f44a0 100644
|
||||||
|
--- a/src/3rdparty/chromium/third_party/webrtc/common_video/h264/sps_parser.h
|
||||||
|
+++ b/src/3rdparty/chromium/third_party/webrtc/common_video/h264/sps_parser.h
|
||||||
|
@@ -12,6 +12,7 @@
|
||||||
|
#define COMMON_VIDEO_H264_SPS_PARSER_H_
|
||||||
|
|
||||||
|
#include "absl/types/optional.h"
|
||||||
|
+#include <cstdint>
|
||||||
|
|
||||||
|
namespace rtc {
|
||||||
|
class BitBuffer;
|
||||||
|
diff --git a/src/3rdparty/chromium/third_party/webrtc/common_video/h264/pps_parser.h b/src/3rdparty/chromium/third_party/webrtc/common_video/h264/pps_parser.h
|
||||||
|
index d6c31b06887..d8852dfd186 100644
|
||||||
|
--- a/src/3rdparty/chromium/third_party/webrtc/common_video/h264/pps_parser.h
|
||||||
|
+++ b/src/3rdparty/chromium/third_party/webrtc/common_video/h264/pps_parser.h
|
||||||
|
@@ -12,6 +12,7 @@
|
||||||
|
#define COMMON_VIDEO_H264_PPS_PARSER_H_
|
||||||
|
|
||||||
|
#include "absl/types/optional.h"
|
||||||
|
+#include <cstdint>
|
||||||
|
|
||||||
|
namespace rtc {
|
||||||
|
class BitBuffer;
|
||||||
|
diff --git a/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/reverb_model_estimator.h b/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/reverb_model_estimator.h
|
||||||
|
index 3b9971abae1..d4458038527 100644
|
||||||
|
--- a/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/reverb_model_estimator.h
|
||||||
|
+++ b/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/reverb_model_estimator.h
|
||||||
|
@@ -13,6 +13,7 @@
|
||||||
|
|
||||||
|
#include <array>
|
||||||
|
#include <vector>
|
||||||
|
+#include <memory>
|
||||||
|
|
||||||
|
#include "absl/types/optional.h"
|
||||||
|
#include "api/array_view.h"
|
||||||
|
diff --git a/src/3rdparty/chromium/third_party/webrtc/modules/include/module_common_types_public.h b/src/3rdparty/chromium/third_party/webrtc/modules/include/module_common_types_public.h
|
||||||
|
index 345e45ce127..e686e5d691a 100644
|
||||||
|
--- a/src/3rdparty/chromium/third_party/webrtc/modules/include/module_common_types_public.h
|
||||||
|
+++ b/src/3rdparty/chromium/third_party/webrtc/modules/include/module_common_types_public.h
|
||||||
|
@@ -12,6 +12,7 @@
|
||||||
|
#define MODULES_INCLUDE_MODULE_COMMON_TYPES_PUBLIC_H_
|
||||||
|
|
||||||
|
#include <limits>
|
||||||
|
+#include <cstdint>
|
||||||
|
|
||||||
|
#include "absl/types/optional.h"
|
||||||
|
|
||||||
|
diff --git a/src/3rdparty/chromium/third_party/blink/renderer/core/page/scrolling/text_fragment_selector_generator.cc b/src/3rdparty/chromium/third_party/blink/renderer/core/page/scrolling/text_fragment_selector_generator.cc
|
||||||
|
index 8fcc799b795..bc69ddcf18c 100644
|
||||||
|
--- a/src/3rdparty/chromium/third_party/blink/renderer/core/page/scrolling/text_fragment_selector_generator.cc
|
||||||
|
+++ b/src/3rdparty/chromium/third_party/blink/renderer/core/page/scrolling/text_fragment_selector_generator.cc
|
||||||
|
@@ -15,6 +15,7 @@
|
||||||
|
#include "third_party/blink/renderer/core/page/scrolling/text_fragment_anchor_metrics.h"
|
||||||
|
#include "third_party/blink/renderer/core/page/scrolling/text_fragment_finder.h"
|
||||||
|
#include "third_party/blink/renderer/platform/text/text_boundaries.h"
|
||||||
|
+#include "absl/base/attributes.h"
|
||||||
|
|
||||||
|
namespace blink {
|
||||||
|
|
||||||
|
diff --git a/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/options.h b/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/options.h
|
||||||
|
index df506f0fae6..1de105fed4a 100644
|
||||||
|
--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/options.h
|
||||||
|
+++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/options.h
|
||||||
|
@@ -180,7 +180,7 @@
|
||||||
|
// absl::variant is a typedef of std::variant, use the feature macro
|
||||||
|
// ABSL_USES_STD_VARIANT.
|
||||||
|
|
||||||
|
-#define ABSL_OPTION_USE_STD_VARIANT 2
|
||||||
|
+#define ABSL_OPTION_USE_STD_VARIANT 0
|
||||||
|
|
||||||
|
|
||||||
|
// ABSL_OPTION_USE_INLINE_NAMESPACE
|
BIN
qtwebengine-everywhere-src-5.15.16.tar.xz
(Stored with Git LFS)
BIN
qtwebengine-everywhere-src-5.15.16.tar.xz
(Stored with Git LFS)
Binary file not shown.
BIN
qtwebengine-everywhere-src-5.15.17.tar.xz
(Stored with Git LFS)
Normal file
BIN
qtwebengine-everywhere-src-5.15.17.tar.xz
(Stored with Git LFS)
Normal file
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user