From 78806724a79bf2bc6b8fba399da0b6bdabe9e9d7 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Thu, 21 Mar 2024 01:24:51 +0100 Subject: [PATCH] chromium: update to 123.0.6312.86. --- .../patches/chromium-121-mnemonic-error.patch | 12 ------- .../patches/chromium-121-system-libxml.patch | 24 -------------- ...xpr.patch => chromium-123-constexpr.patch} | 33 ++++++++++++++----- ...> chromium-123-missing-header-files.patch} | 22 ------------- srcpkgs/chromium/template | 10 +++--- 5 files changed, 30 insertions(+), 71 deletions(-) delete mode 100644 srcpkgs/chromium/patches/chromium-121-mnemonic-error.patch delete mode 100644 srcpkgs/chromium/patches/chromium-121-system-libxml.patch rename srcpkgs/chromium/patches/{chromium-122-constexpr.patch => chromium-123-constexpr.patch} (68%) rename srcpkgs/chromium/patches/{chromium-122-missing-header-files.patch => chromium-123-missing-header-files.patch} (88%) diff --git a/srcpkgs/chromium/patches/chromium-121-mnemonic-error.patch b/srcpkgs/chromium/patches/chromium-121-mnemonic-error.patch deleted file mode 100644 index 61239e7f022764..00000000000000 --- a/srcpkgs/chromium/patches/chromium-121-mnemonic-error.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up chromium-121.0.6167.16/third_party/blink/renderer/core/BUILD.gn.mnemonic-error chromium-121.0.6167.16/third_party/blink/renderer/core/BUILD.gn ---- chromium-121.0.6167.16/third_party/blink/renderer/core/BUILD.gn.mnemonic-error 2023-12-19 18:14:43.027723832 +0100 -+++ chromium-121.0.6167.16/third_party/blink/renderer/core/BUILD.gn 2023-12-19 18:39:47.492384620 +0100 -@@ -1731,8 +1731,6 @@ action_foreach("element_locator_test_pro - python_path_root = "${root_out_dir}/pyproto" - python_path_proto = "${python_path_root}/third_party/blink/renderer/core/lcp_critical_path_predictor" - -- mnemonic = "ELOC_PROTO" -- - source_dir = "lcp_critical_path_predictor/test_proto" - sources = rebase_path([ "lcp_image_id.asciipb" ], "", source_dir) - sources += rebase_path([ "lcp_image_id_b.asciipb" ], "", source_dir) diff --git a/srcpkgs/chromium/patches/chromium-121-system-libxml.patch b/srcpkgs/chromium/patches/chromium-121-system-libxml.patch deleted file mode 100644 index da463c26d323a4..00000000000000 --- a/srcpkgs/chromium/patches/chromium-121-system-libxml.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up chromium-121.0.6167.139/third_party/blink/renderer/core/xml/xslt_processor.h.me chromium-121.0.6167.139/third_party/blink/renderer/core/xml/xslt_processor.h ---- chromium-121.0.6167.139/third_party/blink/renderer/core/xml/xslt_processor.h.me 2024-02-06 08:22:36.013021582 +0100 -+++ chromium-121.0.6167.139/third_party/blink/renderer/core/xml/xslt_processor.h 2024-02-06 08:23:08.281607499 +0100 -@@ -77,7 +77,7 @@ class XSLTProcessor final : public Scrip - - void reset(); - -- static void ParseErrorFunc(void* user_data, const xmlError*); -+ static void ParseErrorFunc(void* user_data, xmlError*); - static void GenericErrorFunc(void* user_data, const char* msg, ...); - - // Only for libXSLT callbacks -diff -up chromium-121.0.6167.139/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc.me chromium-121.0.6167.139/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc ---- chromium-121.0.6167.139/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc.me 2024-02-06 08:14:32.368066214 +0100 -+++ chromium-121.0.6167.139/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc 2024-02-06 08:23:08.282607518 +0100 -@@ -66,7 +66,7 @@ void XSLTProcessor::GenericErrorFunc(voi - // It would be nice to do something with this error message. - } - --void XSLTProcessor::ParseErrorFunc(void* user_data, const xmlError* error) { -+void XSLTProcessor::ParseErrorFunc(void* user_data, xmlError* error) { - FrameConsole* console = static_cast(user_data); - if (!console) - return; diff --git a/srcpkgs/chromium/patches/chromium-122-constexpr.patch b/srcpkgs/chromium/patches/chromium-123-constexpr.patch similarity index 68% rename from srcpkgs/chromium/patches/chromium-122-constexpr.patch rename to srcpkgs/chromium/patches/chromium-123-constexpr.patch index 282066cc4eab26..aa59c3e5e19472 100644 --- a/srcpkgs/chromium/patches/chromium-122-constexpr.patch +++ b/srcpkgs/chromium/patches/chromium-123-constexpr.patch @@ -25,15 +25,6 @@ diff -up chromium-122.0.6261.29/base/types/strong_alias.h.me chromium-122.0.6261 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 -@@ -29,7 +29,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. @@ -67,7 +67,7 @@ struct QueryParams { QueryParams(const QueryParams& other); QueryParams& operator=(const QueryParams& other); @@ -43,3 +34,27 @@ diff -up chromium-122.0.6261.29/components/performance_manager/resource_attribut 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-122-missing-header-files.patch b/srcpkgs/chromium/patches/chromium-123-missing-header-files.patch similarity index 88% rename from srcpkgs/chromium/patches/chromium-122-missing-header-files.patch rename to srcpkgs/chromium/patches/chromium-123-missing-header-files.patch index aa6bd70d7db567..f11142ea399985 100644 --- a/srcpkgs/chromium/patches/chromium-122-missing-header-files.patch +++ b/srcpkgs/chromium/patches/chromium-123-missing-header-files.patch @@ -99,28 +99,6 @@ diff -up chromium-122.0.6261.29/third_party/dawn/src/tint/lang/spirv/reader/ast_ #include #include #include -diff -up chromium-122.0.6261.29/third_party/material_color_utilities/src/cpp/palettes/tones.cc.missing-header-files chromium-122.0.6261.29/third_party/material_color_utilities/src/cpp/palettes/tones.cc ---- chromium-122.0.6261.29/third_party/material_color_utilities/src/cpp/palettes/tones.cc.missing-header-files 2024-02-07 19:52:34.000000000 +0100 -+++ chromium-122.0.6261.29/third_party/material_color_utilities/src/cpp/palettes/tones.cc 2024-02-12 14:59:48.143415190 +0100 -@@ -14,6 +14,7 @@ - * limitations under the License. - */ - -+#include - #include "cpp/palettes/tones.h" - - #include "cpp/cam/cam.h" -diff -up chromium-122.0.6261.29/third_party/ruy/src/ruy/profiler/instrumentation.h.missing-header-files chromium-122.0.6261.29/third_party/ruy/src/ruy/profiler/instrumentation.h ---- chromium-122.0.6261.29/third_party/ruy/src/ruy/profiler/instrumentation.h.missing-header-files 2024-02-07 19:52:59.000000000 +0100 -+++ chromium-122.0.6261.29/third_party/ruy/src/ruy/profiler/instrumentation.h 2024-02-12 14:59:48.143415190 +0100 -@@ -17,6 +17,7 @@ limitations under the License. - #define RUY_RUY_PROFILER_INSTRUMENTATION_H_ - - #ifdef RUY_PROFILER -+#include - #include - #include - #include diff -up chromium-122.0.6261.29/third_party/swiftshader/third_party/llvm-10.0/llvm/lib/Support/Unix/Signals.inc.missing-header-files chromium-122.0.6261.29/third_party/swiftshader/third_party/llvm-10.0/llvm/lib/Support/Unix/Signals.inc --- chromium-122.0.6261.29/third_party/swiftshader/third_party/llvm-10.0/llvm/lib/Support/Unix/Signals.inc.missing-header-files 2024-02-07 19:54:45.000000000 +0100 +++ chromium-122.0.6261.29/third_party/swiftshader/third_party/llvm-10.0/llvm/lib/Support/Unix/Signals.inc 2024-02-12 14:59:48.143415190 +0100 diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template index 53981f7cd367f8..fc7534f3f303c3 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=122.0.6261.94 +version=123.0.6312.86 revision=1 archs="i686* x86_64* aarch64* armv7l*" hostmakedepends=" @@ -28,15 +28,16 @@ maintainer="Duncaen " license="BSD-3-Clause" homepage="https://www.chromium.org/" distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz" -checksum=2d0294d9baf94c921e4e10af7841cc6c11e3880f120e83fd57409e87ce3cb1e7 +checksum=f4a78c1955dac4354d57ab45e93051fcda50fc5fccd681457f8116630746dffe lib32disabled=yes -build_options="clang libcxx debug vaapi pulseaudio sndio pipewire" +build_options="clang libcxx debug vaapi pulseaudio sndio pipewire lto" build_options_default="clang libcxx vaapi pulseaudio pipewire" desc_option_clang="Use clang to build" desc_option_libcxx="Use bundled libc++" desc_option_debug="Build with debug symbols" +desc_option_lto="Enable Link Time Optimization" desc_option_pipewire="Enable support for screen sharing for WebRTC via PipeWire" if [ "$XBPS_LIBC" = musl ]; then @@ -256,8 +257,9 @@ do_configure() { # segfaults with llvm-12.0.1 'is_cfi=false' - 'use_thin_lto=false' 'use_cfi_icall=false' + + "use_thin_lto=$(vopt_if lto true false)" 'chrome_pgo_phase=0' )