diff options
| author | Ľubomír Kučera | 2024-05-13 12:02:13 +0200 |
|---|---|---|
| committer | Ľubomír Kučera | 2024-05-13 14:45:48 +0200 |
| commit | f2fdb2d25da91dfebb816f712e13e864b0cca91e (patch) | |
| tree | 11f0e1ec8ad8f869ca3b033c30216629cf1a974f | |
| parent | 152dcb12ed9edea7d4e5027e89b1809c94fa6aea (diff) | |
| parent | 8477a3fb61bcf057d97cc8f5d208d4d3c35691d5 (diff) | |
| download | aur-f2fdb2d25da91dfebb816f712e13e864b0cca91e.tar.gz | |
Merge remote-tracking branch 'upstream'
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | PKGBUILD | 15 | ||||
| -rw-r--r-- | abseil-remove-unused-targets.patch | 247 | ||||
| -rwxr-xr-x | produce-abseil-patch | 1 |
5 files changed, 57 insertions, 217 deletions
@@ -1,6 +1,6 @@ pkgbase = cronet pkgdesc = The networking stack of Chromium put into a library - pkgver = 124.0.6367.201 + pkgver = 125.0.6422.41 pkgrel = 1 url = https://chromium.googlesource.com/chromium/src/+/refs/heads/main/components/cronet arch = x86_64 @@ -23,8 +23,8 @@ pkgbase = cronet depends = minizip depends = double-conversion options = !lto - source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-124.0.6367.201.tar.xz - source = https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/122/chromium-patches-122.tar.bz2 + source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-125.0.6422.41.tar.xz + source = chromium-125-system-zstd.patch::https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/chromium-125-system-zstd.patch?id=9549b6e8362e0a5a5cc950ca4f0604353ac87152 source = drop-flag-unsupported-by-clang17.patch source = compiler-rt-adjust-paths.patch source = abseil-remove-unused-targets.patch @@ -32,8 +32,8 @@ pkgbase = cronet source = fix-no-matching-strcat.patch source = fix-numeric_limits.patch source = fix-undeclared-isnan.patch - sha256sums = 11773c4cfce4b39ae1bbe711b2907cb86e9aa299b7c6a71656edb876f0c85992 - sha256sums = 1f6acf165578288dc84edc7d9dcfabf7d38f55153b63a37ee5afa929f0e2baad + sha256sums = 05652bf7a89c637f99cfc02cc9d312da074d2d0bce34d311434de3d36543dc72 + sha256sums = 1259768f2d835a124fc8038353093c896b442680969eee7ed6880d17a2601c0b sha256sums = 3bd35dab1ded5d9e1befa10d5c6c4555fe0a76d909fb724ac57d0bf10cb666c1 sha256sums = b3de01b7df227478687d7517f61a777450dca765756002c80c4915f271e2d961 sha256sums = SKIP diff --git a/.gitignore b/.gitignore index b8305af1c122..338536b74ce7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ *.tar *.tar.* +chromium-125-system-zstd.patch pkg src @@ -4,7 +4,7 @@ # Maintainer: Ľubomír 'the-k' Kučera <lubomir.kucera.jr at gmail.com> pkgname=cronet -pkgver=124.0.6367.201 +pkgver=125.0.6422.41 pkgrel=1 _manual_clone=0 _system_clang=1 @@ -16,7 +16,7 @@ depends=('nss' 'libffi') makedepends=('python' 'gn' 'ninja' 'clang' 'lld' 'gperf' 'rust' 'git') options=('!lto') # Chromium adds its own flags for ThinLTO source=(https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$pkgver.tar.xz - https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/122/chromium-patches-122.tar.bz2 + "chromium-125-system-zstd.patch::https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/chromium-125-system-zstd.patch?id=9549b6e8362e0a5a5cc950ca4f0604353ac87152" drop-flag-unsupported-by-clang17.patch compiler-rt-adjust-paths.patch abseil-remove-unused-targets.patch @@ -24,8 +24,8 @@ source=(https://commondatastorage.googleapis.com/chromium-browser-official/chrom fix-no-matching-strcat.patch fix-numeric_limits.patch fix-undeclared-isnan.patch) -sha256sums=('11773c4cfce4b39ae1bbe711b2907cb86e9aa299b7c6a71656edb876f0c85992' - '1f6acf165578288dc84edc7d9dcfabf7d38f55153b63a37ee5afa929f0e2baad' +sha256sums=('05652bf7a89c637f99cfc02cc9d312da074d2d0bce34d311434de3d36543dc72' + '1259768f2d835a124fc8038353093c896b442680969eee7ed6880d17a2601c0b' '3bd35dab1ded5d9e1befa10d5c6c4555fe0a76d909fb724ac57d0bf10cb666c1' 'b3de01b7df227478687d7517f61a777450dca765756002c80c4915f271e2d961' SKIP @@ -47,6 +47,7 @@ declare -gA _system_libs=( # [absl_base]=abseil-cpp # [absl_cleanup]= # [absl_container]= + # [absl_crc]= # [absl_debugging]= # [absl_flags]= # [absl_functional]= @@ -79,6 +80,7 @@ _unwanted_bundled_libs=( # third_party/abseil-cpp/absl/base # third_party/abseil-cpp/absl/cleanup # third_party/abseil-cpp/absl/container + # third_party/abseil-cpp/absl/crc # third_party/abseil-cpp/absl/debugging # third_party/abseil-cpp/absl/flags # third_party/abseil-cpp/absl/functional @@ -168,7 +170,7 @@ prepare() { # Disables logging as it's unconfigurable, which is undesired in a library patch -p0 -i ../disable-logging.patch - # Fixes building with system Abseil (needs libstdc++) + # Fixes building with system Abseil (needs libstdc++ and yet unreleased HexStringToBytes() variant) # patch -p0 -i ../abseil-remove-unused-targets.patch # Fixes `implicit instantiation of undefined template 'std::numeric_limits<unsigned long>'` error @@ -180,7 +182,7 @@ prepare() { # Make building with system zstd possible rm -f build/linux/unbundle/zstd.gn - patch -Np1 -i ../chromium-patches-*/chromium-117-system-zstd.patch + patch -Np1 -i ../chromium-125-system-zstd.patch if (( !_system_clang )); then # Use prebuilt rust as system rust cannot be used due to the error: @@ -199,6 +201,7 @@ prepare() { find "$_lib" -type f \ \! -path "$_lib/chromium/*" \ \! -path "$_lib/google/*" \ + \! -path "third_party/abseil-cpp/absl/base/dynamic_annotations.h" \ \! -regex '.*\.\(gn\|gni\|isolate\)' \ -delete done diff --git a/abseil-remove-unused-targets.patch b/abseil-remove-unused-targets.patch index 6b19444d2825..3ef91157b75d 100644 --- a/abseil-remove-unused-targets.patch +++ b/abseil-remove-unused-targets.patch @@ -1,216 +1,51 @@ These targets are dead code and they aren't available with system Abseil. Based on: https://build.opensuse.org/package/view_file/openSUSE:Factory:ARM/nodejs-electron ---- third_party/abseil-cpp/BUILD.gn 2024-03-13 20:35:54.618683000 +0100 -+++ third_party/abseil-cpp/BUILD.gn 2024-03-16 12:55:25.440050645 +0100 -@@ -61,9 +61,6 @@ - "//third_party/abseil-cpp/absl/base", - "//third_party/abseil-cpp/absl/base:config", - "//third_party/abseil-cpp/absl/base:core_headers", -- "//third_party/abseil-cpp/absl/base:no_destructor", -- "//third_party/abseil-cpp/absl/base:nullability", -- "//third_party/abseil-cpp/absl/base:prefetch", - "//third_party/abseil-cpp/absl/cleanup", - "//third_party/abseil-cpp/absl/container:btree", - "//third_party/abseil-cpp/absl/container:fixed_array", -@@ -78,24 +75,17 @@ - "//third_party/abseil-cpp/absl/functional:any_invocable", - "//third_party/abseil-cpp/absl/functional:bind_front", - "//third_party/abseil-cpp/absl/functional:function_ref", -- "//third_party/abseil-cpp/absl/functional:overload", - "//third_party/abseil-cpp/absl/hash", -- "//third_party/abseil-cpp/absl/log:absl_check", -- "//third_party/abseil-cpp/absl/log:absl_log", -- "//third_party/abseil-cpp/absl/log:die_if_null", - "//third_party/abseil-cpp/absl/memory", - "//third_party/abseil-cpp/absl/meta:type_traits", - "//third_party/abseil-cpp/absl/numeric:bits", - "//third_party/abseil-cpp/absl/numeric:int128", - "//third_party/abseil-cpp/absl/random", -- "//third_party/abseil-cpp/absl/random:distributions", - "//third_party/abseil-cpp/absl/status", - "//third_party/abseil-cpp/absl/status:statusor", - "//third_party/abseil-cpp/absl/strings", - "//third_party/abseil-cpp/absl/strings:cord", -- "//third_party/abseil-cpp/absl/strings:has_ostream_operator", - "//third_party/abseil-cpp/absl/strings:str_format", -- "//third_party/abseil-cpp/absl/strings:string_view", - "//third_party/abseil-cpp/absl/synchronization", - "//third_party/abseil-cpp/absl/time", - "//third_party/abseil-cpp/absl/types:optional", -@@ -194,37 +184,22 @@ - "absl/algorithm:algorithm_test", - "absl/algorithm:container_test", - "absl/base:config_test", -- "absl/base:no_destructor_test", -- "absl/base:nullability_test", - "absl/base:prefetch_test", - "absl/cleanup:cleanup_test", +--- third_party/abseil-cpp/BUILD.gn 2024-05-08 22:30:02.272433000 +0200 ++++ third_party/abseil-cpp/BUILD.gn 2024-05-13 13:11:28.294308251 +0200 +@@ -150,20 +150,15 @@ + public_deps = [ + # Banned because each flag registration generates a static initializer, and + # the flag registration mechanism is problematic in component builds. +- "//third_party/abseil-cpp/absl/flags:config", + "//third_party/abseil-cpp/absl/flags:flag", + "//third_party/abseil-cpp/absl/flags:parse", +- "//third_party/abseil-cpp/absl/flags:reflection", + "//third_party/abseil-cpp/absl/flags:usage", - # TODO(mbonadei): Fix issue with EXPECT_DEATH and uncomment. - # "absl/container:btree_test", - "absl/container:common_policy_traits_test", -- "absl/container:fixed_array_test", -- "absl/container:flat_hash_map_test", -- "absl/container:flat_hash_set_test", -- "absl/container:hash_function_defaults_test", - "absl/container:inlined_vector_test", - "absl/container:node_slot_policy_test", -- "absl/container:raw_hash_set_allocator_test", -- "absl/container:raw_hash_set_test", - "absl/container:sample_element_size_test", - "absl/crc:crc32c_test", - "absl/crc:crc_cord_state_test", - "absl/crc:crc_memcpy_test", - "absl/crc:non_temporal_memcpy_test", -- "absl/debugging:stacktrace_test", -- "absl/flags:flag_test", - "absl/functional:any_invocable_test", -- "absl/functional:function_ref_test", -- "absl/functional:overload_test", -- "absl/hash:hash_instantiated_test", - "absl/hash:hash_test", - "absl/hash:low_level_hash_test", -- "absl/log:absl_check_test", -- "absl/log:absl_log_basic_test", - "absl/log:die_if_null_test", - "absl/log:flags_test", - "absl/log:globals_test", -@@ -236,19 +211,13 @@ - "absl/log:log_streamer_test", - "absl/log:scoped_mock_log_test", - "absl/log:stripping_test", -- "absl/log:vlog_is_on_test", -- "absl/log/internal:fnmatch_test", - "absl/log/internal:stderr_log_sink_test", - "absl/memory:memory_test", - "absl/meta:type_traits_test", -- "absl/numeric:int128_test", - "absl/profiling:exponential_biased_test", - "absl/profiling:periodic_sampler_test", -- "absl/status:status_test", - "absl/status:statusor_test", - "absl/strings:ascii_test", -- "absl/strings:char_formatting_test", -- "absl/strings:charset_test", - "absl/strings:cord_buffer_test", - "absl/strings:cord_data_edge_test", - "absl/strings:cord_rep_btree_navigator_test", -@@ -261,26 +230,11 @@ - "absl/strings:cordz_test", - "absl/strings:cordz_update_scope_test", - "absl/strings:cordz_update_tracker_test", -- "absl/strings:damerau_levenshtein_distance_test", -- "absl/strings:has_absl_stringify_test", -- "absl/strings:has_ostream_operator_test", - "absl/strings:match_test", -- "absl/strings:str_format_arg_test", -- "absl/strings:str_format_bind_test", -- "absl/strings:str_format_checker_test", -- "absl/strings:str_format_convert_test", -- "absl/strings:str_format_extension_test", -- "absl/strings:str_format_output_test", -- "absl/strings:str_format_parser_test", -- "absl/strings:str_format_test", - "absl/strings:str_replace_test", - "absl/strings:string_view_test", -- "absl/synchronization:kernel_timeout_internal_test", -- "absl/synchronization:waiter_test", -- "absl/time:time_test", - "absl/types:optional_test", - "absl/types:variant_test", -- "absl/utility:if_constexpr_test", - "//third_party/googletest:gtest_main", - ] - } ---- third_party/abseil-cpp/absl/crc/BUILD.gn 2024-03-13 20:35:54.646685100 +0100 -+++ third_party/abseil-cpp/absl/crc/BUILD.gn 2024-03-16 12:55:25.533373392 +0100 -@@ -28,9 +28,6 @@ - ":cpu_detect", - "//third_party/abseil-cpp/absl/base:config", - "//third_party/abseil-cpp/absl/base:core_headers", -- "//third_party/abseil-cpp/absl/base:endian", -- "//third_party/abseil-cpp/absl/base:prefetch", -- "//third_party/abseil-cpp/absl/base:raw_logging_internal", - "//third_party/abseil-cpp/absl/memory", - "//third_party/abseil-cpp/absl/numeric:bits", - ] -@@ -56,10 +53,7 @@ - ":non_temporal_memcpy", - "//third_party/abseil-cpp/absl/base:config", - "//third_party/abseil-cpp/absl/base:core_headers", -- "//third_party/abseil-cpp/absl/base:endian", -- "//third_party/abseil-cpp/absl/base:prefetch", - "//third_party/abseil-cpp/absl/strings:str_format", -- "//third_party/abseil-cpp/absl/strings:string_view", - ] - } + # Banned because the LOG and CHECK macros conflict with Chrome's version of + # those macros. + "//third_party/abseil-cpp/absl/log", +- "//third_party/abseil-cpp/absl/log:check", -@@ -69,7 +63,6 @@ - ":crc32c", - "//third_party/abseil-cpp/absl/strings", - "//third_party/abseil-cpp/absl/strings:str_format", -- "//third_party/abseil-cpp/absl/strings:string_view", + # TODO(danilchap): Investigate if these targets need to be banned in 3rd party library code. +- "//third_party/abseil-cpp/absl/log:globals", +- "//third_party/abseil-cpp/absl/log:initialize", + "//third_party/abseil-cpp/absl/random:bit_gen_ref", ] - } -@@ -95,9 +88,7 @@ - ":crc32c", - "//third_party/abseil-cpp/absl/memory", - "//third_party/abseil-cpp/absl/random", -- "//third_party/abseil-cpp/absl/random:distributions", - "//third_party/abseil-cpp/absl/strings", -- "//third_party/abseil-cpp/absl/strings:string_view", +@@ -172,7 +167,7 @@ + ":absl_full", ] - } -@@ -112,7 +103,6 @@ - deps = [ - ":crc32c", - "//third_party/abseil-cpp/absl/base:config", -- "//third_party/abseil-cpp/absl/base:no_destructor", - "//third_party/abseil-cpp/absl/numeric:bits", - ] - visibility = [ ---- third_party/fuzztest/BUILD.gn 2024-03-13 20:36:14.852145700 +0100 -+++ third_party/fuzztest/BUILD.gn 2024-03-16 12:55:25.553371123 +0100 -@@ -74,7 +74,6 @@ - deps = [ - "//third_party/abseil-cpp:absl", - "//third_party/abseil-cpp/absl/log:check", -- "//third_party/abseil-cpp/absl/log:log", - ] - configs += [ ":fuzztest_internal_config" ] - configs -= fuzzing_engine_remove_configs -@@ -100,7 +99,6 @@ - deps = [ - ":centipede_common", - "//third_party/abseil-cpp:absl", -- "//third_party/abseil-cpp/absl/log:log", - ] - configs += [ ":fuzztest_internal_config" ] - configs -= fuzzing_engine_remove_configs -@@ -201,7 +199,6 @@ - "//third_party/abseil-cpp:absl", - "//third_party/abseil-cpp/absl/flags:flag", - "//third_party/abseil-cpp/absl/log:check", -- "//third_party/abseil-cpp/absl/log:log", - ] - sources = [ - "src/centipede/centipede_main.cc", -@@ -289,7 +286,6 @@ - deps = [ - "//testing/gtest", - "//third_party/abseil-cpp/absl/flags:flag", -- "//third_party/abseil-cpp/absl/random:bit_gen_ref", - ] +- public_configs = [ "//third_party/abseil-cpp/absl/flags:absl_flags_config" ] ++ public_configs = [] + } - if (build_with_chromium) { -@@ -334,7 +330,6 @@ - deps = [ - "//testing/gtest", - "//third_party/abseil-cpp/absl/flags:flag", -- "//third_party/abseil-cpp/absl/log:log", - ] - if (use_centipede) { - # If we are building for centipede, we want to make fuzztest executables + config("absl_include_config") { +@@ -278,7 +273,6 @@ + "absl/container:fixed_array_test", + "absl/container:flat_hash_map_test", + "absl/container:flat_hash_set_test", +- "absl/container:hash_function_defaults_test", + "absl/container:inlined_vector_test", + "absl/container:node_slot_policy_test", + "absl/container:raw_hash_set_allocator_test", +@@ -352,7 +346,6 @@ + "absl/synchronization:waiter_test", + "absl/time:time_test", + "absl/types:optional_test", +- "absl/types:span_test", + "absl/types:variant_test", + "absl/utility:if_constexpr_test", + "//third_party/googletest:gtest_main", diff --git a/produce-abseil-patch b/produce-abseil-patch index 1dca165d62c3..98b0e2238527 100755 --- a/produce-abseil-patch +++ b/produce-abseil-patch @@ -36,6 +36,7 @@ while IFS= read -r line; do base_name=${dependency#"//${lib_path}/"} sed -i -e "\|^\s*\"\(//${lib_path}/\)\{0,1\}${base_name}\",\$|d" \ + -e "s|\[\s*\"\(//${lib_path}/\)\{0,1\}${base_name}\"\s*\]|[]|g" \ "${tmp_dir}/${build_file}" done |