From ca8cfdd82c23db758cc06bed4ad4a97669723fa1 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 3 May 2023 22:27:40 +0200 Subject: [PATCH] chromium: update to 113.0.5672.63. --- .../musl-patches/quiche-arena-size.patch | 15 ------ ...g-for-std-strlen-in-web_view_impl.cc.patch | 29 +++++++++++ ...karound_clang_bug-structured_binding.patch | 32 +++++++++++++ .../patches/download-bubble-typename.patch | 42 ++++++++++++++++ ...-constraints-on-VirtualCursor-layout.patch | 48 ------------------- .../chromium/patches/webauthn-variant.patch | 14 ++++++ srcpkgs/chromium/template | 4 +- 7 files changed, 119 insertions(+), 65 deletions(-) delete mode 100644 srcpkgs/chromium/files/musl-patches/quiche-arena-size.patch create mode 100644 srcpkgs/chromium/patches/add-cstring-for-std-strlen-in-web_view_impl.cc.patch create mode 100644 srcpkgs/chromium/patches/chromium-113-workaround_clang_bug-structured_binding.patch create mode 100644 srcpkgs/chromium/patches/download-bubble-typename.patch delete mode 100644 srcpkgs/chromium/patches/sql-relax-constraints-on-VirtualCursor-layout.patch create mode 100644 srcpkgs/chromium/patches/webauthn-variant.patch diff --git a/srcpkgs/chromium/files/musl-patches/quiche-arena-size.patch b/srcpkgs/chromium/files/musl-patches/quiche-arena-size.patch deleted file mode 100644 index 4d17c41b56d5..000000000000 --- a/srcpkgs/chromium/files/musl-patches/quiche-arena-size.patch +++ /dev/null @@ -1,15 +0,0 @@ -Source: https://git.alpinelinux.org/aports/plain/community/chromium/quiche-arena-size.patch -back in the day when net_unittests were ran, the block arena size was not big -enough for some reason. should look at this again --- ---- a/net/third_party/quiche/src/quiche/quic/core/quic_one_block_arena.h -+++ b/net/third_party/quiche/src/quiche/quic/core/quic_one_block_arena.h -@@ -69,7 +69,7 @@ - - // QuicConnections currently use around 1KB of polymorphic types which would - // ordinarily be on the heap. Instead, store them inline in an arena. --using QuicConnectionArena = QuicOneBlockArena<1280>; -+using QuicConnectionArena = QuicOneBlockArena<1504>; - - } // namespace quic - diff --git a/srcpkgs/chromium/patches/add-cstring-for-std-strlen-in-web_view_impl.cc.patch b/srcpkgs/chromium/patches/add-cstring-for-std-strlen-in-web_view_impl.cc.patch new file mode 100644 index 000000000000..6648fab5719d --- /dev/null +++ b/srcpkgs/chromium/patches/add-cstring-for-std-strlen-in-web_view_impl.cc.patch @@ -0,0 +1,29 @@ +Patch-Source: https://github.com/archlinux/svntogit-packages/blob/79b774aedeaecd4d31b2adb84e3e4b901dc980aa/trunk/add-cstring-for-std-strlen-in-web_view_impl.cc.patch +-- +From 2e14a3ac178ee87aa9154e5a15dcd986af1b6059 Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann +Date: Tue, 28 Mar 2023 14:34:55 +0000 +Subject: [PATCH] IWYU: add cstring for std::strlen in web_view_impl.cc + +Bug: 957519 +Change-Id: I15ad1e905eda3d96bbf164f5df8f3cf8e02bc370 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4376772 +Reviewed-by: Alex Ilin +Commit-Queue: Alex Ilin +Cr-Commit-Position: refs/heads/main@{#1123011} +--- + chrome/test/chromedriver/chrome/web_view_impl.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/chrome/test/chromedriver/chrome/web_view_impl.cc b/chrome/test/chromedriver/chrome/web_view_impl.cc +index f726627e88d..d96d481d0bc 100644 +--- a/chrome/test/chromedriver/chrome/web_view_impl.cc ++++ b/chrome/test/chromedriver/chrome/web_view_impl.cc +@@ -6,6 +6,7 @@ + + #include + #include ++#include + #include + #include + #include diff --git a/srcpkgs/chromium/patches/chromium-113-workaround_clang_bug-structured_binding.patch b/srcpkgs/chromium/patches/chromium-113-workaround_clang_bug-structured_binding.patch new file mode 100644 index 000000000000..8ba967876d7d --- /dev/null +++ b/srcpkgs/chromium/patches/chromium-113-workaround_clang_bug-structured_binding.patch @@ -0,0 +1,32 @@ +Source: https://src.fedoraproject.org/rpms/chromium/blob/439349f5608f8ecb21aec532e8f9ba6a5b4920f7/f/chromium-113-workaround_clang_bug-structured_binding.patch +workaround llvm15 compiler bug +diff -up chromium-113.0.5672.63/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.me chromium-113.0.5672.63/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc +--- chromium-113.0.5672.63/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.me 2023-05-03 16:30:34.244612573 +0200 ++++ chromium-113.0.5672.63/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc 2023-05-03 16:37:36.732278590 +0200 +@@ -516,8 +516,11 @@ wtf_size_t NGGridLayoutAlgorithm::BuildG + row_auto_repetitions); + + bool has_nested_subgrid = false; +- auto& [grid_items, layout_data, subtree_size] = +- sizing_tree->CreateSizingData(); ++ ++ auto& workaround_clang_bug = sizing_tree->CreateSizingData(); ++ auto& grid_items = workaround_clang_bug.grid_items; ++ auto& layout_data = workaround_clang_bug.layout_data; ++ auto& subtree_size = workaround_clang_bug.subtree_size; + + if (!must_ignore_children) { + // Construct grid items that are not subgridded. +@@ -1540,8 +1543,10 @@ void NGGridLayoutAlgorithm::InitializeTr + NGGridSizingTree* sizing_tree) const { + DCHECK(sizing_tree && current_grid_index < sizing_tree->Size()); + +- auto& [grid_items, layout_data, subtree_size] = +- sizing_tree->At(current_grid_index); ++ auto& workaround_clang_bug = sizing_tree->At(current_grid_index); ++ auto& grid_items = workaround_clang_bug.grid_items; ++ auto& layout_data = workaround_clang_bug.layout_data; ++ auto& subtree_size = workaround_clang_bug.subtree_size + + auto InitAndCacheTrackSizes = [&](GridTrackSizingDirection track_direction) { + InitializeTrackCollection(opt_subgrid_data, track_direction, &layout_data); diff --git a/srcpkgs/chromium/patches/download-bubble-typename.patch b/srcpkgs/chromium/patches/download-bubble-typename.patch new file mode 100644 index 000000000000..8edb46974a5b --- /dev/null +++ b/srcpkgs/chromium/patches/download-bubble-typename.patch @@ -0,0 +1,42 @@ +Patch-Source: https://github.com/archlinux/svntogit-packages/blob/79b774aedeaecd4d31b2adb84e3e4b901dc980aa/trunk/download-bubble-typename.patch +-- +diff --git a/chrome/browser/download/bubble/download_bubble_update_service.cc b/chrome/browser/download/bubble/download_bubble_update_service.cc +index 13460309d0e..a18d2f8a272 100644 +--- a/chrome/browser/download/bubble/download_bubble_update_service.cc ++++ b/chrome/browser/download/bubble/download_bubble_update_service.cc +@@ -87,7 +87,7 @@ ItemSortKey GetSortKey(const Item& item) { + // Helper to get an iterator to the last element in the cache. The cache + // must not be empty. + template +-SortedItems::iterator GetLastIter(SortedItems& cache) { ++typename SortedItems::iterator GetLastIter(SortedItems& cache) { + CHECK(!cache.empty()); + auto it = cache.end(); + return std::prev(it); +@@ -656,9 +656,9 @@ bool DownloadBubbleUpdateService::RemoveItemFromCacheImpl( + } + + template +-SortedItems::iterator ++typename SortedItems::iterator + DownloadBubbleUpdateService::RemoveItemFromCacheByIter( +- SortedItems::iterator iter, ++ typename SortedItems::iterator iter, + SortedItems& cache, + IterMap& iter_map) { + CHECK(iter != cache.end()); +diff --git a/chrome/browser/download/bubble/download_bubble_update_service.h b/chrome/browser/download/bubble/download_bubble_update_service.h +index 4c3c0bc1193..38048873aa9 100644 +--- a/chrome/browser/download/bubble/download_bubble_update_service.h ++++ b/chrome/browser/download/bubble/download_bubble_update_service.h +@@ -179,8 +179,8 @@ class DownloadBubbleUpdateService + + // Removes item if we already have the iterator to it. Returns next iterator. + template +- SortedItems::iterator RemoveItemFromCacheByIter( +- SortedItems::iterator iter, ++ typename SortedItems::iterator RemoveItemFromCacheByIter( ++ typename SortedItems::iterator iter, + SortedItems& cache, + IterMap& iter_map); + diff --git a/srcpkgs/chromium/patches/sql-relax-constraints-on-VirtualCursor-layout.patch b/srcpkgs/chromium/patches/sql-relax-constraints-on-VirtualCursor-layout.patch deleted file mode 100644 index d1e65ee1561c..000000000000 --- a/srcpkgs/chromium/patches/sql-relax-constraints-on-VirtualCursor-layout.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 7d1394bd639e3bcf68082ac3fc33eeed6a00d2e6 Mon Sep 17 00:00:00 2001 -From: Elly Fong-Jones -Date: Thu, 2 Mar 2023 00:15:11 +0000 -Subject: [PATCH] sql: relax constraints on VirtualCursor layout - -VirtualCursor::FromSqliteCursor required that VirtualCursor had a -standard layout, but in fact VirtualCursor shouldn't have a standard -layout, and the fact that it does with libc++ is a deviation from the -C++ standard. This change: - -1. Relaxes the requirement that VirtualCursor has a standard layout, and -2. Relaxes the requirement that the sqlite_cursor_ field has to be at - offset 0 - -by use of offsetof() and pointer subtraction. This change both improves -standards compliance and makes this code build with libstdc++. - -Bug: 1380656 -Change-Id: I9c47abd9197b187da0360ca5619ccf7dadab4f33 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4292313 -Reviewed-by: Austin Sullivan -Commit-Queue: Elly Fong-Jones -Cr-Commit-Position: refs/heads/main@{#1111925} ---- - sql/recover_module/cursor.h | 10 ++++------ - 1 file changed, 4 insertions(+), 6 deletions(-) - -diff --git a/sql/recover_module/cursor.h b/sql/recover_module/cursor.h -index 1970bdca8c6..4cb06557009 100644 ---- a/sql/recover_module/cursor.h -+++ b/sql/recover_module/cursor.h -@@ -63,12 +63,10 @@ class VirtualCursor { - // |sqlite_cursor| must have been returned by VirtualTable::SqliteCursor(). - static inline VirtualCursor* FromSqliteCursor( - sqlite3_vtab_cursor* sqlite_cursor) { -- static_assert(std::is_standard_layout::value, -- "needed for the reinterpret_cast below"); -- static_assert(offsetof(VirtualCursor, sqlite_cursor_) == 0, -- "sqlite_cursor_ must be the first member of the class"); -- VirtualCursor* result = reinterpret_cast(sqlite_cursor); -- DCHECK_EQ(sqlite_cursor, &result->sqlite_cursor_); -+ VirtualCursor* result = reinterpret_cast( -+ (reinterpret_cast(sqlite_cursor) - -+ offsetof(VirtualCursor, sqlite_cursor_))); -+ CHECK_EQ(sqlite_cursor, &result->sqlite_cursor_); - return result; - } - diff --git a/srcpkgs/chromium/patches/webauthn-variant.patch b/srcpkgs/chromium/patches/webauthn-variant.patch new file mode 100644 index 000000000000..2ee02f5e5fe1 --- /dev/null +++ b/srcpkgs/chromium/patches/webauthn-variant.patch @@ -0,0 +1,14 @@ +Patch-Source: https://github.com/archlinux/svntogit-packages/blob/79b774aedeaecd4d31b2adb84e3e4b901dc980aa/trunk/webauthn-variant.patch +-- +diff --git a/chrome/browser/webauthn/authenticator_request_dialog_model.h b/chrome/browser/webauthn/authenticator_request_dialog_model.h +index f4992a74bd6..45cabe39974 100644 +--- a/chrome/browser/webauthn/authenticator_request_dialog_model.h ++++ b/chrome/browser/webauthn/authenticator_request_dialog_model.h +@@ -7,6 +7,7 @@ + + #include + #include ++#include + #include + + #include "base/containers/span.h" diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template index e50c739d3ee7..c3a1cd59eafe 100644 --- a/srcpkgs/chromium/template +++ b/srcpkgs/chromium/template @@ -1,7 +1,7 @@ # Template file for 'chromium' pkgname=chromium # See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version -version=112.0.5615.49 +version=113.0.5672.63 revision=1 archs="i686* x86_64* aarch64* armv7l*" hostmakedepends=" @@ -28,7 +28,7 @@ maintainer="Duncaen " license="BSD-3-Clause" homepage="https://www.chromium.org/" distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz" -checksum=ddfd37373c1fa0f433a6ac11f0baa2b1f3fdfb9c7b5867e32a4300f2eb5aff41 +checksum=76cec11dc13abe6703305b0300e1fe24c8f547c1ff313f7be09db0e23d12ee1e lib32disabled=yes