diff options
Diffstat (limited to 'www-client/chromium')
| -rw-r--r-- | www-client/chromium/Manifest | 6 | ||||
| -rw-r--r-- | www-client/chromium/chromium-123.0.6272.2.ebuild (renamed from www-client/chromium/chromium-122.0.6170.5.ebuild) | 12 | ||||
| -rw-r--r-- | www-client/chromium/files/chromium-123-EnumTable-crash.patch | 76 | ||||
| -rw-r--r-- | www-client/chromium/files/chromium-123-qrgen-disablerust.patch | 92 |
4 files changed, 177 insertions, 9 deletions
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index b3d448e..42b6f76 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -33,6 +33,8 @@ AUX chromium-121-icu74.patch 667 BLAKE2B 5370787b44b68eee8180429f58b183da325756f AUX chromium-121-qrgen-disablerust.patch 3295 BLAKE2B 6ba03f01ee7c14d7dff1c8d8890f5242e4ef706fba4582cd232fd48a02ed360fa51ad4f34f4e4a3a36864549f855bbd984eb9e34d766eea65e7e7079088640db SHA512 dfd94c7fa2c414e5a7f78bcb1a17618fe20796a23ea8449a88e69e8bf508a693052bbe3c033ff45fdd6d06b6765db43fcfc7faea483d55e46a51b67ec7bd9d1f AUX chromium-122-VirtualCursor-std-layout.patch 8472 BLAKE2B 872bd935eb702967dbbaf6045722f6f34b768ff607c6a53c42b92fd38dad6a8dc9d286f0e1f05ff30f03d402a04ee196f02d5fc977ea97b8ea1245c0aae1c428 SHA512 bdcaa80e36e0f9938b7e2f782baf1de8714cd1f5a032cdabbd885678ff2c77a98c69d4436cb01726e160bdb3ef4b10155f3a3b92b8b54a0726a25cc8c65b1393 AUX chromium-122-qrgen-disablerust.patch 3378 BLAKE2B 34ac10a8f53f46cce4e77ad2b9d8e78113905be04a45965532ed8b6f5a0ee8348636a1f38970b3dcdeec6730d508b429db1f952da5a63979b0e11c175b97376d SHA512 6377ea12dae8caee1daab4c2ec29920e4211b3ebde1dbf3e2f1eb034aedc1ef97a7bfbe3723c869d8b39cad47848e40733bed2998e0e9bb3fd6912d71a203471 +AUX chromium-123-EnumTable-crash.patch 2978 BLAKE2B 44b18e702b82f4839a8a4cc639d1f91b6a4ed96fe266a4ee690c766361c36e7bce49e32455388eacd76ad408b72e6d458d9653a841b8483afa739df163621730 SHA512 5b56cb55aa1aef874963ce656ed610eddd0e09d6ab320f55ecac609c5ee26406c67295a96adcbcc6c2f4e1d86df46da0610c555a61c65215a486f448541fe136 +AUX chromium-123-qrgen-disablerust.patch 3371 BLAKE2B d4d8d37fc7c971f97467441c22bdf7dba1a22c17d73c47978b926565759b5b113c8a03a91d76cdb1e8f8d1fc3902c86bcc7ed703e84959927548cccfbc45836b SHA512 c3a5f6424806fc6528ee7eab83e13169218d82b18750298e916696a0d6fa288b1881e267a72a57cb03291fe642d7edf91d365e320587d40277ed9e7a860b497a AUX chromium-78-protobuf-RepeatedPtrField-export.patch 694 BLAKE2B 3fffcb6a7289bac848b89275a9f76e4302042362fa9bcf2689df01e0a00806c7e838210fa8696ee8e2134127ec4cfb5c3b632e2739c225f8e9586e01de7035ce SHA512 e3a80775d958740eedc7c3df0e9dd12b0e6a51ccf871a2085ab77246814e748428133d27c60322a102eb8f50bb65fc2c607e0d2665a92393be55befcbf566ab0 AUX chromium-93-InkDropHost-crash.patch 1134 BLAKE2B 1593c406c48b629ea3170a518cf86e936af36c554bc97a380324ab6fc930e49a359dc3ef6787ab08314a6a8f5da85714b0fa9d8589d6a46b1d06cbbd7e401f22 SHA512 474d7f55505e1275238d71d1723d74a66fc9f27a16ed293aa80ffefbe5500cd65a0bf13ec76a9bca0334a245f22120099fb367d12b93adc14500104d11cd3bff AUX chromium-98-EnumTable-crash.patch 2854 BLAKE2B 4478e14e7f0c0d251b659546c2e4b83b712b072317c35f63376d7d58e2fa3563f0518b4cc333c5902140cfcd333b5860737d4c7ccbb3680fee1b60de25ad0917 SHA512 a1b55b04da7218cda037a38a543032aa741a589d2f0691d69f28eb173ffeff284d2f4da2cab1708335ecfc0a3c12ecbd57c4c48dee3eca44d659d9a3f9a7dff6 @@ -43,8 +45,8 @@ AUX chromium-launcher-r7.sh 1631 BLAKE2B ae28d758264446511fd2b64ba69fe920144b351 AUX chromium-shim_headers.patch 1510 BLAKE2B 9716cd250b249c6255aca01a385ef8a2a6f1df9ea3cf7499715543c14f8be62fd323b6048b890aa2be45891e7a765d92de3f41c3b3a88c08dae4b806c048e20f SHA512 c74bcf690a41b4f9b364477d23408d493aa674e3bd014940098a594471297c2a425241f908510061b5f11c9cfe009c4a803370edd757d3c0ab8d9c0cc128135c AUX chromium-use-oauth2-client-switches-as-default.patch 1085 BLAKE2B baf3c463305934c126af4f7c5be305863edc7eec3add5b5ada30565b49b5944021eb40f1a9643e7eec3f973c502d9b02426f00b760570fcea5f1509219e41c6f SHA512 fe2878ee45778bac894ea17a668511d27ad2ca40988d5f11439790b700bfefd6560f3931415b4e6c543fcbbfc7cfef55cc757ed4ace1d111039ae78c46b81945 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739 -DIST chromium-122.0.6170.5.tar.xz 3309112384 BLAKE2B 639f1bf86b425abd9ea5a0ca66390be77333723b010ea3eb30f1f0d0ddea3b18398c14884022e46a5e63c8dbf26d642685105cba8a4b84ac0f205db4c2d04cd1 SHA512 eac05555aac60baf86459328b28737d05e50bffe9f1e8c04c55f78f9c425ea30e51445fe197a6daa63c7bc22c81704c74669df0ded2db03745281b122abc8b76 DIST chromium-122.0.6226.2.tar.xz 3305442564 BLAKE2B dc1030f1913f18ebdf382bab858a66ea555b0ee213cb02a6116cd7e68eaefec90fe2539a951efb9de01cb288106f6d521c833417f77e78a60367a4603a8d55e8 SHA512 69843914e50479111b993eadae3fa7a467d5c84c60e8ec1aa1a7e69a2401432d4d3ecf54ee71a9873e8f0f0207940a3729da67b3caf761c237b1afa9ab2976ad +DIST chromium-123.0.6272.2.tar.xz 3402595812 BLAKE2B 4c3e2edd56585972635c2006fa6dbdcf4e3f10d6d884e8ad3a787097d47dd1af826e42cc9064fd2e52423ad8cf2086c219be047cf6d590c4378fab0f12e2aee8 SHA512 c69855b4deb0d2693eed32866bfb95591605516df7d77ed7895a7b4791b9cb9a41b5d3052f0cdfb7d166823e9ffe9547c9e48c360cb8095719d9e8da4b5b595d DIST chromium-profiler-0.2.tar 259952640 BLAKE2B 5e82389fce00b267280d633b26551231c558b80f0c92cd7d60271095a3503365ab673e7a46dc5f74f8a82db1f21262cb24dcc0531d954bab5fb3b175dab3394d SHA512 9fa89a5ab728419683e7495ae676567480987d68a2d589f2aa97bfcbcf123f3c8f97f8bca5f65e5e3f6e41475535add473ded83b9c7a33bb4746a9d05b298a6c -EBUILD chromium-122.0.6170.5.ebuild 39048 BLAKE2B 487dcb1f9aa3572f38dcaf01b9887d758d4f59e6724f4ebe43222a0c14416d48033df53a2fe416fec2167b2a471788a0df4a17fe1bde4fb7a07200d04b7a24b9 SHA512 0a0ab962ac73ce8e43ab2e6644d14a2dcc5ff2d3a5ecb6d53124177e98371c8c0f4bd8cbb4b03e501a4e0bf6b6f82c09121b313eff1e6f4d3f5192e7bad8b2cd EBUILD chromium-122.0.6226.2.ebuild 39062 BLAKE2B 16b8b306d5e4340dcadb29a631fb7495df0241646e7f1692159854c5c0271b27839432421b808a767f79ca97b8e9da2179aa8f6b1f5520efe94b9516fb9e4de5 SHA512 023b44df6a05890ca89ae8cdc57f38be5303e78545be44456c5227c0db8018b96596573240404c5750847acf1bb9c4fd53b69662f7c12b7f93ab2bb5138e5b50 +EBUILD chromium-123.0.6272.2.ebuild 38886 BLAKE2B 8a597f7fd7943047f7e4f5c9b559448ea54b47d9ad21ffc441e8b0246d734fd25189a3f63fa056a472d4e5b208890ffcd08928085a74a765e2812465f38aa6c1 SHA512 73a566f4b0ca147f5c8ae37768f6cbcdb462b682f975f22eb46bc2e50effeee9549b94550663a4e169b8fb9312c09adbf6992126308d11db218b52219f09033f diff --git a/www-client/chromium/chromium-122.0.6170.5.ebuild b/www-client/chromium/chromium-123.0.6272.2.ebuild index dd2529d..9699d2e 100644 --- a/www-client/chromium/chromium-122.0.6170.5.ebuild +++ b/www-client/chromium/chromium-123.0.6272.2.ebuild @@ -319,19 +319,16 @@ src_prepare() { local PATCHES=( "${FILESDIR}/chromium-105-protobuf-RepeatedPtrField-export.patch" "${FILESDIR}/chromium-120-compiler.patch" - "${FILESDIR}/chromium-114-VirtualCursor-std-layout.patch" + "${FILESDIR}/chromium-122-VirtualCursor-std-layout.patch" "${FILESDIR}/chromium-119-minizip.patch" - "${FILESDIR}/chromium-113-authenticator-request-dialog-model-include.patch" - "${FILESDIR}/chromium-118-blink-buildgn.patch" "${FILESDIR}/chromium-118-material-color-utils.patch" "${FILESDIR}/chromium-118-freetype-blink.patch" - "${FILESDIR}/chromium-119-minizip-types.patch" "${FILESDIR}/chromium-121-blink_libxml2_downgrade.patch" - "${FILESDIR}/chromium-121-qrgen-disablerust.patch" + "${FILESDIR}/chromium-123-qrgen-disablerust.patch" "${FILESDIR}/chromium-121-icu74.patch" "${FILESDIR}/chromium-111-InkDropHost-crash.patch" - "${FILESDIR}/chromium-109-EnumTable-crash.patch" + "${FILESDIR}/chromium-123-EnumTable-crash.patch" "${FILESDIR}/chromium-use-oauth2-client-switches-as-default.patch" "${FILESDIR}/chromium-cross-compile.patch" ) @@ -476,6 +473,7 @@ src_prepare() { third_party/libxcb-keysyms third_party/libxml/chromium third_party/libyuv + third_party/lit third_party/llvm third_party/lottie third_party/lss @@ -1010,7 +1008,7 @@ chromium_configure() { fi # broken in 119 - myconf_gn+=" enable_nocompile_tests_new=false" + myconf_gn+=" enable_nocompile_tests=false" einfo "Configuring Chromium..." set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release diff --git a/www-client/chromium/files/chromium-123-EnumTable-crash.patch b/www-client/chromium/files/chromium-123-EnumTable-crash.patch new file mode 100644 index 0000000..3c64789 --- /dev/null +++ b/www-client/chromium/files/chromium-123-EnumTable-crash.patch @@ -0,0 +1,76 @@ +diff --git a/components/media_router/common/providers/cast/channel/enum_table.h b/components/media_router/common/providers/cast/channel/enum_table.h +index dd58e6cfea..a0fa270bf2 100644 +--- a/components/media_router/common/providers/cast/channel/enum_table.h ++++ b/components/media_router/common/providers/cast/channel/enum_table.h +@@ -9,6 +9,7 @@ + #include <cstring> + #include <optional> + #include <ostream> ++#include <vector> + + #include "base/check_op.h" + #include "base/notreached.h" +@@ -187,7 +188,6 @@ class + inline constexpr GenericEnumTableEntry(int32_t value); + inline constexpr GenericEnumTableEntry(int32_t value, base::StringPiece str); + +- GenericEnumTableEntry(const GenericEnumTableEntry&) = delete; + GenericEnumTableEntry& operator=(const GenericEnumTableEntry&) = delete; + + private: +@@ -253,7 +253,6 @@ class EnumTable { + constexpr Entry(E value, base::StringPiece str) + : GenericEnumTableEntry(static_cast<int32_t>(value), str) {} + +- Entry(const Entry&) = delete; + Entry& operator=(const Entry&) = delete; + }; + +@@ -312,15 +311,14 @@ class EnumTable { + if (is_sorted_) { + const std::size_t index = static_cast<std::size_t>(value); + if (ANALYZER_ASSUME_TRUE(index < data_.size())) { +- const auto& entry = data_.begin()[index]; ++ const auto& entry = data_[index]; + if (ANALYZER_ASSUME_TRUE(entry.has_str())) + return entry.str(); + } + return std::nullopt; + } + return GenericEnumTableEntry::FindByValue( +- reinterpret_cast<const GenericEnumTableEntry*>(data_.begin()), +- data_.size(), static_cast<int32_t>(value)); ++ &data_[0], data_.size(), static_cast<int32_t>(value)); + } + + // This overload of GetString is designed for cases where the argument is a +@@ -348,8 +346,7 @@ class EnumTable { + // enum value directly. + std::optional<E> GetEnum(base::StringPiece str) const { + auto* entry = GenericEnumTableEntry::FindByString( +- reinterpret_cast<const GenericEnumTableEntry*>(data_.begin()), +- data_.size(), str); ++ &data_[0], data_.size(), str); + return entry ? static_cast<E>(entry->value) : std::optional<E>(); + } + +@@ -364,7 +361,7 @@ class EnumTable { + // Align the data on a cache line boundary. + alignas(64) + #endif +- std::initializer_list<Entry> data_; ++ const std::vector<Entry> data_; + bool is_sorted_; + + constexpr EnumTable(std::initializer_list<Entry> data, bool is_sorted) +@@ -376,8 +373,8 @@ class EnumTable { + + for (std::size_t i = 0; i < data.size(); i++) { + for (std::size_t j = i + 1; j < data.size(); j++) { +- const Entry& ei = data.begin()[i]; +- const Entry& ej = data.begin()[j]; ++ const Entry& ei = data[i]; ++ const Entry& ej = data[j]; + DCHECK(ei.value != ej.value) + << "Found duplicate enum values at indices " << i << " and " << j; + DCHECK(!(ei.has_str() && ej.has_str() && ei.str() == ej.str())) diff --git a/www-client/chromium/files/chromium-123-qrgen-disablerust.patch b/www-client/chromium/files/chromium-123-qrgen-disablerust.patch new file mode 100644 index 0000000..ef58655 --- /dev/null +++ b/www-client/chromium/files/chromium-123-qrgen-disablerust.patch @@ -0,0 +1,92 @@ +diff --git a/components/qr_code_generator/BUILD.gn b/components/qr_code_generator/BUILD.gn +index c45d0c4039..ba2e27878b 100644 +--- a/components/qr_code_generator/BUILD.gn ++++ b/components/qr_code_generator/BUILD.gn +@@ -3,7 +3,7 @@ + # found in the LICENSE file. + + import("//build/buildflag_header.gni") +-import("//build/config/rust.gni") ++# import("//build/config/rust.gni") + import("//testing/libfuzzer/fuzzer_test.gni") + + declare_args() { +@@ -40,20 +40,20 @@ source_set("qr_code_generator") { + ] + deps = [ + ":qr_code_generator_features", +- ":qr_code_generator_ffi_glue", ++# ":qr_code_generator_ffi_glue", + "//base", + ] + public_deps = [ "//base" ] + } + +-rust_static_library("qr_code_generator_ffi_glue") { +- allow_unsafe = true # Needed for FFI that underpins the `cxx` crate. +- crate_root = "qr_code_generator_ffi_glue.rs" +- sources = [ "qr_code_generator_ffi_glue.rs" ] +- cxx_bindings = [ "qr_code_generator_ffi_glue.rs" ] +- visibility = [ ":qr_code_generator" ] +- deps = [ "//third_party/rust/qr_code/v2:lib" ] +-} ++#rust_static_library("qr_code_generator_ffi_glue") { ++# allow_unsafe = true # Needed for FFI that underpins the `cxx` crate. ++# crate_root = "qr_code_generator_ffi_glue.rs" ++# sources = [ "qr_code_generator_ffi_glue.rs" ] ++# cxx_bindings = [ "qr_code_generator_ffi_glue.rs" ] ++# visibility = [ ":qr_code_generator" ] ++# deps = [ "//third_party/rust/qr_code/v2:lib" ] ++#} + + source_set("unit_tests") { + testonly = true +diff --git a/components/qr_code_generator/qr_code_generator.cc b/components/qr_code_generator/qr_code_generator.cc +index b1531f5026..da5a4c5382 100644 +--- a/components/qr_code_generator/qr_code_generator.cc ++++ b/components/qr_code_generator/qr_code_generator.cc +@@ -11,12 +11,12 @@ + #include <vector> + + #include "base/check_op.h" +-#include "base/containers/span_rust.h" ++//#include "base/containers/span_rust.h" + #include "base/memory/raw_ptr.h" + #include "base/notreached.h" + #include "base/numerics/safe_conversions.h" + #include "components/qr_code_generator/features.h" +-#include "components/qr_code_generator/qr_code_generator_ffi_glue.rs.h" ++//#include "components/qr_code_generator/qr_code_generator_ffi_glue.rs.h" + + namespace qr_code_generator { + +@@ -572,7 +572,7 @@ size_t SegmentSpanLength(base::span<const QRCodeGenerator::Segment> segments) { + return sum; + } + +-std::optional<QRCodeGenerator::GeneratedCode> GenerateQrCodeUsingRust( ++/*std::optional<QRCodeGenerator::GeneratedCode> GenerateQrCodeUsingRust( + base::span<const uint8_t> in, + std::optional<int> min_version) { + rust::Slice<const uint8_t> rs_in = base::SpanToRustSlice(in); +@@ -595,7 +595,7 @@ std::optional<QRCodeGenerator::GeneratedCode> GenerateQrCodeUsingRust( + code.qr_size = base::checked_cast<int>(result_width); + CHECK_EQ(code.data.size(), static_cast<size_t>(code.qr_size * code.qr_size)); + return code; +-} ++}*/ + + } // namespace + +@@ -613,9 +613,9 @@ QRCodeGenerator::GeneratedCode::~GeneratedCode() = default; + std::optional<QRCodeGenerator::GeneratedCode> QRCodeGenerator::Generate( + base::span<const uint8_t> in, + std::optional<int> min_version) { +- if (IsRustyQrCodeGeneratorFeatureEnabled()) { ++ /*if (IsRustyQrCodeGeneratorFeatureEnabled()) { + return GenerateQrCodeUsingRust(in, min_version); +- } ++ }*/ + + if (in.size() > kMaxInputSize) { + return std::nullopt; |