diff options
Diffstat (limited to 'dev-qt/qtwebengine/files')
4 files changed, 90 insertions, 12 deletions
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-extra_gn.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2-extra_gn.patch deleted file mode 100644 index 0488122ce92f..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-extra_gn.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/core/gn_run.pro b/src/core/gn_run.pro -index 3d6fda80e..3d0bc86fe 100644 ---- a/src/core/gn_run.pro -+++ b/src/core/gn_run.pro -@@ -38,5 +38,6 @@ build_pass|!debug_and_release { - } - -+ gn_args += $$(EXTRA_GN) - gn_args = $$system_quote($$gn_args) - gn_src_root = $$system_quote($$system_path($$QTWEBENGINE_ROOT/$$getChromiumSrcDir())) - gn_build_root = $$system_quote($$system_path($$OUT_PWD/$$getConfigDir())) - gn_python = "--script-executable=$$pythonPathForSystem()" diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-gcc12-includes.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-gcc12-includes.patch new file mode 100644 index 000000000000..cd476564037a --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-gcc12-includes.patch @@ -0,0 +1,32 @@ +https://build.opensuse.org/package/view_file/KDE:Qt:5.15/libqt5-qtwebengine/0001-skia-Some-includes-to-fix-build-with-GCC-12.patch?expand=1 +https://bugs.gentoo.org/840326 + +From 68799a1e0815b20ca59ce354a55280399257a201 Mon Sep 17 00:00:00 2001 +From: Fabian Vogt <fvogt@suse.de> +Date: Fri, 25 Mar 2022 15:29:28 +0100 +Subject: [PATCH] skia: Some includes to fix build with GCC 12 + +Those includes got introduced upstream for other reasons and fixed building +with GCC 12 as a side effect. +--- a/src/3rdparty/chromium/third_party/skia/include/core/SkColor.h ++++ b/src/3rdparty/chromium/third_party/skia/include/core/SkColor.h +@@ -12,6 +12,8 @@ + #include "include/core/SkScalar.h" + #include "include/core/SkTypes.h" + ++#include <array> ++ + /** \file SkColor.h + + Types, consts, functions, and macros for colors. +--- a/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp ++++ b/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp +@@ -8,6 +8,8 @@ + + #include "include/utils/SkParse.h" + ++#include <algorithm> // std::lower_bound ++ + static constexpr const char* gColorNames[] = { + "aliceblue", + "antiquewhite", diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220505-extra-gn.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220505-extra-gn.patch new file mode 100644 index 000000000000..a319f521ca67 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220505-extra-gn.patch @@ -0,0 +1,10 @@ +--- a/src/core/gn_run.pro ++++ b/src/core/gn_run.pro +@@ -64,6 +64,7 @@ + } + } else { + gn_args+= "qtwebengine_target=\"$$system_path($$OUT_PWD/$$getConfigDir()):QtWebEngineCore\"" ++ gn_args += $$(EXTRA_GN) + gn_args = $$system_quote($$gn_args) + gn_build_root = $$system_quote($$system_path($$OUT_PWD/$$getConfigDir())) + gn_run = $$gn_binary gen $$gn_build_root $$gn_python --args=$$gn_args --root=$$gn_src_root diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-fixup-CVE-2022-0796.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-fixup-CVE-2022-0796.patch new file mode 100644 index 000000000000..c38bf1bdeeb3 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-fixup-CVE-2022-0796.patch @@ -0,0 +1,48 @@ +From 7e11d69b957595a172a3eb60db17141daed29d63 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io> +Date: Mon, 20 Jun 2022 17:19:58 +0200 +Subject: Fixup: CVE-2022-0796: Use after free in Media + +Commit ecc2bb74f1f accidentally introduced a build break due to an +apparent typo. + +This fixes it. + +Change-Id: I746c6f10ecd2b212b847a291677e24e527d6b922 +Reviewed-by: Michal Klocek <michal.klocek@qt.io> +--- + chromium/content/renderer/media/batching_media_log.h | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/3rdparty/chromium/content/renderer/media/batching_media_log.h b/src/3rdparty/chromium/content/renderer/media/batching_media_log.h +index b68535aea42..a28d426878f 100644 +--- a/src/3rdparty/chromium/content/renderer/media/batching_media_log.h ++++ b/src/3rdparty/chromium/content/renderer/media/batching_media_log.h +@@ -72,18 +72,18 @@ class CONTENT_EXPORT BatchingMediaLog : public media::MediaLog { + // guarantees provided by MediaLog, since SendQueuedMediaEvents must also + // be synchronized with respect to AddEvent. + mutable base::Lock lock_; +- const base::TickClock* tick_clock_ GUARDED_BY(LOCK); +- base::TimeTicks last_ipc_send_time_ GUARDED_BY(LOCK); +- std::vector<media::MediaLogRecord> queued_media_events_ GUARDED_BY(LOCK); ++ const base::TickClock* tick_clock_ GUARDED_BY(lock_); ++ base::TimeTicks last_ipc_send_time_ GUARDED_BY(lock_); ++ std::vector<media::MediaLogRecord> queued_media_events_ GUARDED_BY(lock_); + + // impl for sending queued events. +- std::vector<std::unique_ptr<EventHandler>> event_handlers_ GUARDED_BY(LOCK); ++ std::vector<std::unique_ptr<EventHandler>> event_handlers_ GUARDED_BY(lock_); + + // For enforcing max 1 pending send. +- bool ipc_send_pending_ GUARDED_BY(LOCK); ++ bool ipc_send_pending_ GUARDED_BY(lock_); + + // Limits the number of events we send over IPC to one. +- std::unique_ptr<media::MediaLogRecord> last_duration_changed_event_ GUARDED_BY(LOCK); ++ std::unique_ptr<media::MediaLogRecord> last_duration_changed_event_ GUARDED_BY(lock_); + + // Holds the earliest MEDIA_ERROR_LOG_ENTRY event added to this log. This is + // most likely to contain the most specific information available describing +-- +cgit v1.2.1 + |