commit: 7818854b775ba129a5e22e052069553e5c117a35 Author: Matt Jolly <kangie <AT> gentoo <DOT> org> AuthorDate: Wed Sep 3 08:08:12 2025 +0000 Commit: Matt Jolly <kangie <AT> gentoo <DOT> org> CommitDate: Wed Sep 3 08:08:12 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7818854b
www-client/chromium: drop unused patches Signed-off-by: Matt Jolly <kangie <AT> gentoo.org> .../files/chromium-134-map_droppable-glibc.patch | 35 ----------------- .../chromium-134-oauth2-client-switches.patch | 35 ----------------- .../files/chromium-135-fix-non-wayland-build.patch | 45 ---------------------- www-client/chromium/files/chromium-135-gperf.patch | 28 -------------- .../files/chromium-135-webrtc-pipewire.patch | 29 -------------- .../files/chromium-136-drop-nodejs-ver-check.patch | 39 ------------------- .../files/chromium-137-pdfium-system-libpng.patch | 28 -------------- 7 files changed, 239 deletions(-) diff --git a/www-client/chromium/files/chromium-134-map_droppable-glibc.patch b/www-client/chromium/files/chromium-134-map_droppable-glibc.patch deleted file mode 100644 index 8220529b4bc3..000000000000 --- a/www-client/chromium/files/chromium-134-map_droppable-glibc.patch +++ /dev/null @@ -1,35 +0,0 @@ -From d1e4332f1a2361014175646fae4f4549b8c1abbf Mon Sep 17 00:00:00 2001 -From: Matt Jolly <[email protected]> -Date: Thu, 13 Feb 2025 16:56:53 +1000 -Subject: [PATCH] seccomp: Define MAP_DROPPABLE for glibc 2.41 - -Bug: https://bugs.gentoo.org/949654 ---- a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc -+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc -@@ -1,3 +1,4 @@ -+ - // Copyright 2013 The Chromium Authors - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. -@@ -35,6 +36,10 @@ - #include "sandbox/linux/system_headers/linux_syscalls.h" - #include "sandbox/linux/system_headers/linux_time.h" - -+#if !defined(MAP_DROPPABLE) -+#define MAP_DROPPABLE 0x08 // Zero memory under memory pressure. -+#endif -+ - #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ - !defined(__arm__) && !defined(__aarch64__) && \ - !defined(PTRACE_GET_THREAD_AREA) -@@ -238,7 +243,7 @@ ResultExpr RestrictMmapFlags() { - // TODO(davidung), remove MAP_DENYWRITE with updated Tegra libraries. - const uint64_t kAllowedMask = MAP_SHARED | MAP_PRIVATE | MAP_ANONYMOUS | - MAP_STACK | MAP_NORESERVE | MAP_FIXED | -- MAP_DENYWRITE | MAP_LOCKED | -+ MAP_DENYWRITE | MAP_LOCKED | MAP_DROPPABLE | - kArchSpecificAllowedMask; - const Arg<int> flags(3); - return If((flags & ~kAllowedMask) == 0, Allow()).Else(CrashSIGSYS()); --- -2.48.0 diff --git a/www-client/chromium/files/chromium-134-oauth2-client-switches.patch b/www-client/chromium/files/chromium-134-oauth2-client-switches.patch deleted file mode 100644 index b7137e524809..000000000000 --- a/www-client/chromium/files/chromium-134-oauth2-client-switches.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 628c8aad603791ec1276c6a5b8d3704a03840f86 Mon Sep 17 00:00:00 2001 -From: Matt Jolly <[email protected]> -Date: Sat, 18 Jan 2025 11:09:46 +1000 -Subject: [PATCH] www-client/chromium: work around dead oauth2 credentials - -Google doesn't let us bake in OAuth2 credentials, and for some time, -Google sign-in has been broken. Arch dealt with this in March, and so -did we to some degree, but in the last few months, our sign-in -credentials have been broken. It appears that we actually did remove API -credentials in March around Chrome 89, but they got added back, perhaps -when rotating newer versions to replace older versions. Work around this -by following Arch's lead: we remove the predefined credentials, as -before, but also we patch Chromium so that people can use their own -easily, using Arch's patch for that. ---- a/google_apis/api_key_cache.cc -+++ b/google_apis/api_key_cache.cc -@@ -192,13 +192,13 @@ ApiKeyCache::ApiKeyCache(const DefaultApiKeys& default_api_keys) { - - std::string default_client_id = CalculateKeyValue( - default_api_keys.google_default_client_id, -- STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), nullptr, std::string(), -+ STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), ::switches::kOAuth2ClientID, std::string(), - environment.get(), command_line, gaia_config, - default_api_keys.allow_override_via_environment, - default_api_keys.allow_unset_values); - std::string default_client_secret = CalculateKeyValue( - default_api_keys.google_default_client_secret, -- STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), nullptr, -+ STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), ::switches::kOAuth2ClientID, - std::string(), environment.get(), command_line, gaia_config, - default_api_keys.allow_override_via_environment, - default_api_keys.allow_unset_values); --- -2.48.0 - diff --git a/www-client/chromium/files/chromium-135-fix-non-wayland-build.patch b/www-client/chromium/files/chromium-135-fix-non-wayland-build.patch deleted file mode 100644 index a31462ac0f29..000000000000 --- a/www-client/chromium/files/chromium-135-fix-non-wayland-build.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 919cda539b142b51fc2ef2342dbf1803b65f5434 Mon Sep 17 00:00:00 2001 -From: Matt Jolly <[email protected]> -Date: Wed, 12 Feb 2025 20:13:09 +1000 -Subject: [PATCH] remoting: Linux: guard wayland includes - -During the refactor in 53f3429926deb4cb92d9cddcda5fc096a0332db3 -wayland support became required to build this component. - -Only include wayland components in the `platform_impls` target -if `ozone_platform_wayland` is true. - -Bug: 391722217 -See also: https://bugs.gentoo.org/948384 -Signed-off-by: Matt Jolly <[email protected]> ---- a/remoting/host/linux/BUILD.gn -+++ b/remoting/host/linux/BUILD.gn -@@ -192,7 +192,6 @@ source_set("platform_impls") { - "wayland_seat.h", - ] - deps = [ -- ":wayland", - ":x11", - ":x11_display_utils", - "//base", -@@ -214,9 +213,16 @@ source_set("platform_impls") { - "//ui/base", - "//ui/base/x", - "//ui/events:dom_keycode_converter", -- "//ui/events/platform/wayland:wayland_event_watcher", - "//ui/gfx/x", - ] -+ # ui/events/platform/wayland:wayland_event_watcher asserts that the wayland -+ # platform is enabled. -+ if (ozone_platform_wayland) { -+ deps += [ -+ ":wayland", -+ "//ui/events/platform/wayland:wayland_event_watcher", -+ ] -+ } - } - - source_set("x11_display_utils") { --- -2.48.0 - diff --git a/www-client/chromium/files/chromium-135-gperf.patch b/www-client/chromium/files/chromium-135-gperf.patch deleted file mode 100644 index 85e4706f3fde..000000000000 --- a/www-client/chromium/files/chromium-135-gperf.patch +++ /dev/null @@ -1,28 +0,0 @@ -https://bugs.gentoo.org/953436#c5 ---- a/third_party/blink/renderer/build/scripts/gperf.py -+++ b/third_party/blink/renderer/build/scripts/gperf.py -@@ -28,24 +28,6 @@ - stdout=subprocess.PIPE, - universal_newlines=True) - gperf_output = gperf.communicate(gperf_input)[0] -- # Massage gperf output to be more palatable for modern compilers. -- # TODO(thakis): Upstream these to gperf so we don't need massaging. -- # `register` is deprecated in C++11 and removed in C++17, so remove -- # it from gperf's output. -- # https://savannah.gnu.org/bugs/index.php?53028 -- 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]];') -- # -Wpointer-to-int-cast warns about casting pointers to smaller ints -- # Replace {(int)(long)&(foo), bar} with -- # {static_cast<int>(reinterpret_cast<uintptr_t>(&(foo)), bar} -- gperf_output = re.sub( -- r'\(int\)\(long\)(.*?),', -- r'static_cast<int>(reinterpret_cast<uintptr_t>(\1)),', -- gperf_output) - script = 'third_party/blink/renderer/build/scripts/gperf.py' - return '// Generated by %s\n' % script + gperf_output - except OSError: diff --git a/www-client/chromium/files/chromium-135-webrtc-pipewire.patch b/www-client/chromium/files/chromium-135-webrtc-pipewire.patch deleted file mode 100644 index c100643b69f0..000000000000 --- a/www-client/chromium/files/chromium-135-webrtc-pipewire.patch +++ /dev/null @@ -1,29 +0,0 @@ -https://webrtc.googlesource.com/src/+/0a9787897f3d36055130b0532967d31c31e8408f - -Pipewire 1.4 changed some functions from taking void* -to taking the actual type they expect, which makes -some code that built with 1.2 no longer build with 1.4. - -For older versions, this is effectively a no-op. - ---- a/third_party/webrtc/modules/video_capture/linux/pipewire_session.cc -+++ b/third_party/webrtc/modules/video_capture/linux/pipewire_session.cc - -@@ -87,7 +87,7 @@ - .param = OnNodeParam, - }; - -- pw_node_add_listener(proxy_, &node_listener_, &node_events, this); -+ pw_node_add_listener(reinterpret_cast<pw_node*>(proxy_), &node_listener_, &node_events, this); - } - - // static -@@ -119,7 +119,7 @@ - uint32_t id = info->params[i].id; - if (id == SPA_PARAM_EnumFormat && - info->params[i].flags & SPA_PARAM_INFO_READ) { -- pw_node_enum_params(that->proxy_, 0, id, 0, UINT32_MAX, nullptr); -+ pw_node_enum_params(reinterpret_cast<pw_node*>(that->proxy_), 0, id, 0, UINT32_MAX, nullptr); - break; - } - } diff --git a/www-client/chromium/files/chromium-136-drop-nodejs-ver-check.patch b/www-client/chromium/files/chromium-136-drop-nodejs-ver-check.patch deleted file mode 100644 index 9cde5a976120..000000000000 --- a/www-client/chromium/files/chromium-136-drop-nodejs-ver-check.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 3e06125358a050cc6535befd4fbd5b4f160a56b9 Mon Sep 17 00:00:00 2001 -From: Matt Jolly <[email protected]> -Date: Tue, 25 Mar 2025 13:33:48 +1000 -Subject: [PATCH] Remove nodejs version check - -Added in https://github.com/chromium/chromium/commit/0ff8528999941d7182be6fc77aeb12a110a3cd86, -this change is only really useful for gclient checkouts and breaks the -ability for downstreams to provide their own, compatible, nodejs -version via the system package manager (or for use on arches other than -those that Google provides binaries for): - -[ERR_ASSERTION]: Failed NodeJS version check: Expected version 'v22.11.0', but found 'v22.13.1'. Did you run 'gclient sync' - -This is google development footgun protection, working around -poor development practices and gclient's inability to ensure -that the source tree is in a consistent state. We don't need it -here. - -Signed-off-by: Matt Jolly <[email protected]> ---- a/third_party/node/node.gni -+++ b/third_party/node/node.gni -@@ -36,15 +36,5 @@ template("node") { - } - } - -- # Automatically add a dependency to ":check_version" to ensure NodeJS is -- # always running the expected version, except when the ':check_version' -- # target itself is running in which case it shouldn't depend on itself. -- if (get_label_info(":" + target_name, "label_no_toolchain") != -- "//third_party/node:check_version") { -- if (!defined(deps)) { -- deps = [] -- } -- deps += [ "//third_party/node:check_version" ] -- } - } - } --- -2.48.1 diff --git a/www-client/chromium/files/chromium-137-pdfium-system-libpng.patch b/www-client/chromium/files/chromium-137-pdfium-system-libpng.patch deleted file mode 100644 index eb74073c646b..000000000000 --- a/www-client/chromium/files/chromium-137-pdfium-system-libpng.patch +++ /dev/null @@ -1,28 +0,0 @@ -https://pdfium-review.googlesource.com/c/pdfium/+/132130 -From: Matt Jolly <[email protected]> -Date: Fri, 16 May 2025 14:38:04 +1000 -Subject: [PATCH] Fix build with system libpng - -`cbc692a42241970e1da492d5b14326e81ecb1061` refactored -`fxcodec::CFX_DIBAttribute` and changed the name of its members. - -Unfortunately this change appears to have been typo'd in the -'system libpng' build path, which is not checked by CI, resulting -in downstream build failures in Chromium. - -Signed-off-by: Matt Jolly <[email protected]> ---- a/third_party/pdfium/core/fxcodec/png/png_decoder.cpp -+++ b/third_party/pdfium/core/fxcodec/png/png_decoder.cpp -@@ -52,8 +52,8 @@ void _png_load_bmp_attribute(png_structp png_ptr, - CFX_DIBAttribute* pAttribute) { - if (pAttribute) { - #if defined(PNG_pHYs_SUPPORTED) -- pAttribute->xdpi_ = png_get_x_pixels_per_meter(png_ptr, info_ptr); -- pAttribute->ydpi_ = png_get_y_pixels_per_meter(png_ptr, info_ptr); -+ pAttribute->x_dpi_ = png_get_x_pixels_per_meter(png_ptr, info_ptr); -+ pAttribute->y_dpi_ = png_get_y_pixels_per_meter(png_ptr, info_ptr); - png_uint_32 res_x, res_y; - int unit_type; - png_get_pHYs(png_ptr, info_ptr, &res_x, &res_y, &unit_type); --- -2.49.0
