From 8adddcec22cf746a567a9954cdc47f4f7f1c940e Mon Sep 17 00:00:00 2001 From: Duncaen Date: Tue, 23 Apr 2024 15:55:43 +0200 Subject: [PATCH] chromium: update to 124.0.6367.60. --- .../patches/chromium-123-constexpr.patch | 60 ------------- ...um-124-iwyu-sys-select-dawn-terminal.patch | 24 +++++ .../patches/chromium-124-libavif-deps.patch | 11 +++ .../chromium-124-wayland-regression.patch | 88 +++++++++++++++++++ .../chromium-i686-vaapi-fpermissive.patch | 23 ----- .../chromium/patches/musl-no-execinfo.patch | 47 ++++------ srcpkgs/chromium/template | 4 +- 7 files changed, 140 insertions(+), 117 deletions(-) delete mode 100644 srcpkgs/chromium/patches/chromium-123-constexpr.patch create mode 100644 srcpkgs/chromium/patches/chromium-124-iwyu-sys-select-dawn-terminal.patch create mode 100644 srcpkgs/chromium/patches/chromium-124-libavif-deps.patch create mode 100644 srcpkgs/chromium/patches/chromium-124-wayland-regression.patch delete mode 100644 srcpkgs/chromium/patches/chromium-i686-vaapi-fpermissive.patch diff --git a/srcpkgs/chromium/patches/chromium-123-constexpr.patch b/srcpkgs/chromium/patches/chromium-123-constexpr.patch deleted file mode 100644 index aa59c3e5e19472..00000000000000 --- a/srcpkgs/chromium/patches/chromium-123-constexpr.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff -up chromium-122.0.6261.29/components/autofill/core/common/unique_ids.h.me chromium-122.0.6261.29/components/autofill/core/common/unique_ids.h ---- chromium-122.0.6261.29/components/autofill/core/common/unique_ids.h.me 2024-02-13 13:07:24.982184485 +0100 -+++ chromium-122.0.6261.29/components/autofill/core/common/unique_ids.h 2024-02-13 13:07:45.510551589 +0100 -@@ -137,7 +137,7 @@ struct GlobalId { - - friend constexpr auto operator<=>(const GlobalId& lhs, - const GlobalId& rhs) = default; -- friend constexpr bool operator==(const GlobalId& lhs, -+ friend bool operator==(const GlobalId& lhs, - const GlobalId& rhs) = default; - }; - -diff -up chromium-122.0.6261.29/base/types/strong_alias.h.me chromium-122.0.6261.29/base/types/strong_alias.h ---- chromium-122.0.6261.29/base/types/strong_alias.h.me 2024-02-13 14:13:20.311374288 +0100 -+++ chromium-122.0.6261.29/base/types/strong_alias.h 2024-02-13 12:30:38.596913951 +0100 -@@ -110,7 +110,7 @@ class StrongAlias { - // a `StrongAlias`. - friend constexpr auto operator<=>(const StrongAlias& lhs, - const StrongAlias& rhs) = default; -- friend constexpr bool operator==(const StrongAlias& lhs, -+ friend bool operator==(const StrongAlias& lhs, - const StrongAlias& rhs) = default; - - // Hasher to use in std::unordered_map, std::unordered_set, etc. -diff -up chromium-122.0.6261.29/components/performance_manager/resource_attribution/query_params.h.constexpr chromium-122.0.6261.29/components/performance_manager/resource_attribution/query_params.h ---- chromium-122.0.6261.29/components/performance_manager/resource_attribution/query_params.h.constexpr 2024-02-07 19:49:31.000000000 +0100 -+++ chromium-122.0.6261.29/components/performance_manager/resource_attribution/query_params.h 2024-02-13 11:12:52.913338699 +0100 -@@ -67,7 +67,7 @@ struct QueryParams { - QueryParams(const QueryParams& other); - QueryParams& operator=(const QueryParams& other); - -- friend constexpr bool operator==(const QueryParams&, -+ friend bool operator==(const QueryParams&, - const QueryParams&) = default; - - // Resource types to measure. -diff -up chromium-123.0.6312.46/components/performance_manager/resource_attribution/context_collection.h.me chromium-123.0.6312.46/components/performance_manager/resource_attribution/context_collection.h ---- chromium-123.0.6312.46/components/performance_manager/resource_attribution/context_collection.h.me 2024-03-17 11:57:22.097161565 +0100 -+++ chromium-123.0.6312.46/components/performance_manager/resource_attribution/context_collection.h 2024-03-17 22:18:25.442101825 +0100 -@@ -28,7 +28,7 @@ class ContextCollection { - ContextCollection(const ContextCollection& other); - ContextCollection& operator=(const ContextCollection& other); - -- friend constexpr bool operator==(const ContextCollection&, -+ friend bool operator==(const ContextCollection&, - const ContextCollection&) = default; - - // Adds `context` to the collection. -diff -up chromium-123.0.6312.46/components/autofill/core/browser/metrics/log_event.h.me chromium-123.0.6312.46/components/autofill/core/browser/metrics/log_event.h ---- chromium-123.0.6312.46/components/autofill/core/browser/metrics/log_event.h.me 2024-03-16 23:38:10.437128249 +0100 -+++ chromium-123.0.6312.46/components/autofill/core/browser/metrics/log_event.h 2024-03-16 23:59:50.868080652 +0100 -@@ -57,7 +57,7 @@ struct IsRequired { - // This function is not defined and consteval. Therefore, any evaluation will - // fail and fail at compile time. - template -- consteval operator T(); // NOLINT -+ operator T(); // NOLINT - }; - - } // namespace internal diff --git a/srcpkgs/chromium/patches/chromium-124-iwyu-sys-select-dawn-terminal.patch b/srcpkgs/chromium/patches/chromium-124-iwyu-sys-select-dawn-terminal.patch new file mode 100644 index 00000000000000..cc7299aafffc39 --- /dev/null +++ b/srcpkgs/chromium/patches/chromium-124-iwyu-sys-select-dawn-terminal.patch @@ -0,0 +1,24 @@ +From cf993f56ce699ca0ed66ca5a6b88fe7b31c03a75 Mon Sep 17 00:00:00 2001 +From: "lauren n. liberda" +Date: Fri, 5 Apr 2024 06:08:21 +0200 +Subject: [PATCH] iwyu: sys/select.h in terminal utils + +required for fd_set. fixes building on musl libc + +Change-Id: I5c03d58c8337c1af871024a436b09117ad9206d4 +--- + src/tint/utils/system/terminal_posix.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/third_party/dawn/src/tint/utils/system/terminal_posix.cc b/third_party/dawn/src/tint/utils/system/terminal_posix.cc +index e820774244..a97eab7db8 100644 +--- a/third_party/dawn/src/tint/utils/system/terminal_posix.cc ++++ b/third_party/dawn/src/tint/utils/system/terminal_posix.cc +@@ -27,6 +27,7 @@ + + // GEN_BUILD:CONDITION(tint_build_is_linux || tint_build_is_mac) + ++#include + #include + + #include diff --git a/srcpkgs/chromium/patches/chromium-124-libavif-deps.patch b/srcpkgs/chromium/patches/chromium-124-libavif-deps.patch new file mode 100644 index 00000000000000..6298217f54e302 --- /dev/null +++ b/srcpkgs/chromium/patches/chromium-124-libavif-deps.patch @@ -0,0 +1,11 @@ +diff -up chromium-124.0.6367.49/third_party/libavif/BUILD.gn.me chromium-124.0.6367.49/third_party/libavif/BUILD.gn +--- chromium-124.0.6367.49/third_party/libavif/BUILD.gn.me 2024-04-15 22:29:28.024287328 +0200 ++++ chromium-124.0.6367.49/third_party/libavif/BUILD.gn 2024-04-15 22:29:33.205411066 +0200 +@@ -85,7 +85,6 @@ component("libavif_enc") { + configs += [ ":avif_config" ] + + deps = [ +- "//third_party/libwebp:libwebp_sharpyuv", + "//third_party/libyuv", + ] + defines = [ "AVIF_LIBSHARPYUV_ENABLED" ] diff --git a/srcpkgs/chromium/patches/chromium-124-wayland-regression.patch b/srcpkgs/chromium/patches/chromium-124-wayland-regression.patch new file mode 100644 index 00000000000000..9cebf66830fb67 --- /dev/null +++ b/srcpkgs/chromium/patches/chromium-124-wayland-regression.patch @@ -0,0 +1,88 @@ +commit c7f4c58f896a651eba80ad805ebdb49d19ebdbd4 +Author: Tom Anderson +Date: Wed Mar 20 00:00:12 2024 +0000 + + Fix --ozone-platform-hint + + This fixes a regression after r1269993 which moved ozone platform + early initialization before the ozone platform hint flag was + processed. This CL ensures the flag processing happens even earlier. + + R=sky + + Change-Id: Icc9649beb0b86753265be2b6cdf3059611eb410f + Bug: None + Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5375669 + Reviewed-by: Scott Violet + Auto-Submit: Thomas Anderson + Commit-Queue: Thomas Anderson + Cr-Commit-Position: refs/heads/main@{#1275306} + +diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc +index 73b6ab0934b14..0b4c44be679d0 100644 +--- a/chrome/app/chrome_main_delegate.cc ++++ b/chrome/app/chrome_main_delegate.cc +@@ -249,6 +249,9 @@ + #include "base/scoped_add_feature_flags.h" + #include "ui/base/ui_base_features.h" + #include "ui/ozone/public/ozone_platform.h" ++#if BUILDFLAG(IS_LINUX) ++#include "chrome/browser/chrome_browser_main_extra_parts_linux.h" ++#endif + #endif // BUILDFLAG(IS_OZONE) + + base::LazyInstance::DestructorAtExit +@@ -959,6 +962,9 @@ std::optional ChromeMainDelegate::PostEarlyInitialization( + // Initialize Ozone platform and add required feature flags as per platform's + // properties. Must be added before feature list is created otherwise the + // added flag won't be picked up. ++#if BUILDFLAG(IS_LINUX) ++ ChromeBrowserMainExtraPartsLinux::InitOzonePlatformHint(); ++#endif + ui::OzonePlatform::PreEarlyInitialization(); + AddFeatureFlagsToCommandLine(); + #endif // BUILDFLAG(IS_OZONE) +diff --git a/chrome/browser/chrome_browser_main_extra_parts_linux.cc b/chrome/browser/chrome_browser_main_extra_parts_linux.cc +index dba7b116ecaa0..ea0487022dcdc 100644 +--- a/chrome/browser/chrome_browser_main_extra_parts_linux.cc ++++ b/chrome/browser/chrome_browser_main_extra_parts_linux.cc +@@ -168,7 +168,13 @@ ChromeBrowserMainExtraPartsLinux::ChromeBrowserMainExtraPartsLinux() = default; + + ChromeBrowserMainExtraPartsLinux::~ChromeBrowserMainExtraPartsLinux() = default; + +-void ChromeBrowserMainExtraPartsLinux::PreEarlyInitialization() { ++void ChromeBrowserMainExtraPartsLinux::PostBrowserStart() { ++ RecordDisplayServerProtocolSupport(); ++ ChromeBrowserMainExtraPartsOzone::PostBrowserStart(); ++} ++ ++// static ++void ChromeBrowserMainExtraPartsLinux::InitOzonePlatformHint() { + #if BUILDFLAG(IS_LINUX) + // On the desktop, we fix the platform name if necessary. + // See https://crbug.com/1246928. +@@ -189,8 +195,3 @@ void ChromeBrowserMainExtraPartsLinux::PreEarlyInitialization() { + } + #endif // BUILDFLAG(IS_LINUX) + } +- +-void ChromeBrowserMainExtraPartsLinux::PostBrowserStart() { +- RecordDisplayServerProtocolSupport(); +- ChromeBrowserMainExtraPartsOzone::PostBrowserStart(); +-} +diff --git a/chrome/browser/chrome_browser_main_extra_parts_linux.h b/chrome/browser/chrome_browser_main_extra_parts_linux.h +index 3847bd2090e28..4f188a7bdfe38 100644 +--- a/chrome/browser/chrome_browser_main_extra_parts_linux.h ++++ b/chrome/browser/chrome_browser_main_extra_parts_linux.h +@@ -17,9 +17,10 @@ class ChromeBrowserMainExtraPartsLinux + const ChromeBrowserMainExtraPartsLinux&) = delete; + ~ChromeBrowserMainExtraPartsLinux() override; + ++ static void InitOzonePlatformHint(); ++ + private: + // ChromeBrowserMainExtraParts overrides. +- void PreEarlyInitialization() override; + void PostBrowserStart() override; + }; + diff --git a/srcpkgs/chromium/patches/chromium-i686-vaapi-fpermissive.patch b/srcpkgs/chromium/patches/chromium-i686-vaapi-fpermissive.patch deleted file mode 100644 index 77c0b58c94e11d..00000000000000 --- a/srcpkgs/chromium/patches/chromium-i686-vaapi-fpermissive.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/media/gpu/vaapi/BUILD.gn.orig -+++ b/media/gpu/vaapi/BUILD.gn -@@ -14,6 +14,12 @@ - assert(is_linux || is_chromeos) - assert(use_vaapi) - -+config("vaapi_permissive") { -+ if (target_cpu == "x86") { -+ cflags = [ "-fpermissive" ] -+ } -+} -+ - generate_stubs("libva_stubs") { - extra_header = "va_stub_header.fragment" - sigs = [ "va.sigs" ] -@@ -90,6 +96,7 @@ - configs += [ - "//build/config/linux/libva", - "//third_party/libvpx:libvpx_config", -+ ":vaapi_permissive", - ] - - deps = [ diff --git a/srcpkgs/chromium/patches/musl-no-execinfo.patch b/srcpkgs/chromium/patches/musl-no-execinfo.patch index 7407f1b9db38ae..b1705f5d85f680 100644 --- a/srcpkgs/chromium/patches/musl-no-execinfo.patch +++ b/srcpkgs/chromium/patches/musl-no-execinfo.patch @@ -1,4 +1,3 @@ -Source: https://git.alpinelinux.org/aports/plain/community/chromium/no-execinfo.patch musl does not have execinfo.h, and hence no implementation of . backtrace() . backtrace_symbols() @@ -27,51 +26,35 @@ for discussion about this, see https://www.openwall.com/lists/musl/2021/07/16/1 // The array of names is malloc'ed. However, each name string is static --- a/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h +++ b/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h -@@ -17,7 +17,11 @@ - #define ENABLE_CRASH_OVERRIDES 0 - - /* Define to 1 if you have the `backtrace' function. */ -+#ifdef __GLIBC__ - #define HAVE_BACKTRACE 1 -+#else -+#define HAVE_BACKTRACE 0 -+#endif - - /* Define to 1 if you have the header file. */ - /* #undef HAVE_CRASHREPORTERCLIENT_H */ -@@ -58,7 +62,11 @@ +@@ -58,7 +58,7 @@ #define HAVE_ERRNO_H 1 /* Define to 1 if you have the header file. */ -+#ifdef __GLIBC__ - #define HAVE_EXECINFO_H 1 -+#else -+#define HAVE_EXECINFO_H 0 -+#endif +-#define HAVE_EXECINFO_H 1 ++/* #define HAVE_EXECINFO_H 1 */ /* Define to 1 if you have the header file. */ #define HAVE_FCNTL_H 1 --- a/base/debug/stack_trace.cc +++ b/base/debug/stack_trace.cc -@@ -251,7 +253,9 @@ +@@ -291,7 +291,7 @@ } - - void StackTrace::OutputToStream(std::ostream* os) const { + std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const { + std::stringstream stream; +-#if !defined(__UCLIBC__) && !defined(_AIX) +#if defined(__GLIBC__) && !defined(_AIX) - OutputToStreamWithPrefix(os, nullptr); -+#endif + if (ShouldSuppressOutput()) { + return "Backtrace suppressed."; + } +@@ -301,7 +301,7 @@ } - std::string StackTrace::ToString() const { -@@ -281,7 +281,7 @@ - } - std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const { - std::stringstream stream; + std::ostream& operator<<(std::ostream& os, const StackTrace& s) { -#if !defined(__UCLIBC__) && !defined(_AIX) +#if defined(__GLIBC__) && !defined(_AIX) - OutputToStreamWithPrefix(&stream, prefix_string); - #endif - return stream.str(); + s.OutputToStream(&os); + #else + os << "StackTrace::OutputToStream not implemented."; --- a/base/debug/stack_trace_unittest.cc +++ b/base/debug/stack_trace_unittest.cc @@ -33,7 +33,7 @@ diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template index fc7534f3f303c3..ce0cdc70a4cee9 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=123.0.6312.86 +version=124.0.6367.60 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=f4a78c1955dac4354d57ab45e93051fcda50fc5fccd681457f8116630746dffe +checksum=ebd553527149cb8477a522df90acd6cea2388a6f431e2db589a0301df1d0cae2 lib32disabled=yes