diff options
Diffstat (limited to 'dev-qt/qtwebengine/files')
| -rw-r--r-- | dev-qt/qtwebengine/files/qtwebengine-6.8.3-gperf3.2.patch | 26 | ||||
| -rw-r--r-- | dev-qt/qtwebengine/files/qtwebengine-6.9.1-CVE-2025-5419.patch | 36 |
2 files changed, 0 insertions, 62 deletions
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.8.3-gperf3.2.patch b/dev-qt/qtwebengine/files/qtwebengine-6.8.3-gperf3.2.patch deleted file mode 100644 index b44934ab59d3..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-6.8.3-gperf3.2.patch +++ /dev/null @@ -1,26 +0,0 @@ -Patch status: fixed in >=chromium-137.0.7126.0 - -A old workaround for a gperf-3.1 issue[1] breaks building with the -now fixed gperf-3.2, backport the conditional check[2] which should -work with either. - -[1] https://savannah.gnu.org/bugs/index.php?53029 -[2] https://crrev.com/f8f21fb4aa01f75acbb12abf5ea8c263c6817141 ---- a/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/gperf.py -+++ b/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/gperf.py -@@ -36,8 +36,11 @@ - gperf_output = re.sub(r'\bregister ', '', gperf_output) - # -Wimplicit-fallthrough needs an explicit fallthrough statement, -- # so replace gperf's /*FALLTHROUGH*/ comment with the statement. -- # https://savannah.gnu.org/bugs/index.php?53029 -- gperf_output = gperf_output.replace('/*FALLTHROUGH*/', -- ' [[fallthrough]];') -+ # so replace gperf 3.1's /*FALLTHROUGH*/ comment with the statement. -+ # https://savannah.gnu.org/bugs/index.php?53029 (fixed in 3.2) -+ if re.search( -+ r'/\* C\+\+ code produced by gperf version 3\.[01](\.\d+)? \*/', -+ gperf_output): -+ gperf_output = gperf_output.replace('/*FALLTHROUGH*/', -+ ' [[fallthrough]];') - # -Wpointer-to-int-cast warns about casting pointers to smaller ints - # Replace {(int)(long)&(foo), bar} with diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.9.1-CVE-2025-5419.patch b/dev-qt/qtwebengine/files/qtwebengine-6.9.1-CVE-2025-5419.patch deleted file mode 100644 index f42c854f46ca..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-6.9.1-CVE-2025-5419.patch +++ /dev/null @@ -1,36 +0,0 @@ -https://bugs.gentoo.org/957076 -https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/650558 ---- a/src/3rdparty/chromium/v8/src/compiler/turboshaft/store-store-elimination-reducer-inl.h -+++ b/src/3rdparty/chromium/v8/src/compiler/turboshaft/store-store-elimination-reducer-inl.h -@@ -325,8 +325,9 @@ - // access once available. - const bool is_on_heap_store = store.kind.tagged_base; -- const bool is_field_store = !store.index().valid(); -+ const bool is_fixed_offset_store = !store.index().valid(); - const uint8_t size = store.stored_rep.SizeInBytes(); -- // For now we consider only stores of fields of objects on the heap. -- if (is_on_heap_store && is_field_store) { -+ // For now we consider only stores of fixed offsets of objects on the -+ // heap. -+ if (is_on_heap_store && is_fixed_offset_store) { - bool is_eliminable_store = false; - switch (table_.GetObservability(store.base(), store.offset, size)) { -@@ -415,9 +416,14 @@ - // access once available. - const bool is_on_heap_load = load.kind.tagged_base; -- const bool is_field_load = !load.index().valid(); -+ const bool is_fixed_offset_load = !load.index().valid(); - // For now we consider only loads of fields of objects on the heap. -- if (is_on_heap_load && is_field_load) { -- table_.MarkPotentiallyAliasingStoresAsObservable(load.base(), -- load.offset); -+ if (is_on_heap_load) { -+ if (is_fixed_offset_load) { -+ table_.MarkPotentiallyAliasingStoresAsObservable(load.base(), -+ load.offset); -+ } else { -+ // A dynamically indexed load might alias any fixed offset. -+ table_.MarkAllStoresAsObservable(); -+ } - } - break; |