diff --git a/chromium-122.0.6261.69-drop-flags-unsupported-by-clang16.patch b/chromium-122.0.6261.69-drop-flags-unsupported-by-clang16.patch deleted file mode 100644 index a146a6d..0000000 --- a/chromium-122.0.6261.69-drop-flags-unsupported-by-clang16.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index 89b4755ac8b3..94b457385663 100644 ---- a/build/config/compiler/BUILD.gn -+++ b/build/config/compiler/BUILD.gn -@@ -618,24 +618,6 @@ config("compiler") { - } - } - -- # TODO(crbug.com/1488374): This causes binary size growth and potentially -- # other problems. -- # TODO(crbug.com/1491036): This isn't supported by Cronet's mainline llvm version. -- if (default_toolchain != "//build/toolchain/cros:target" && -- !llvm_android_mainline) { -- cflags += [ -- "-mllvm", -- "-split-threshold-for-reg-with-hint=0", -- ] -- if (use_thin_lto && is_a_target_toolchain) { -- if (is_win) { -- ldflags += [ "-mllvm:-split-threshold-for-reg-with-hint=0" ] -- } else { -- ldflags += [ "-Wl,-mllvm,-split-threshold-for-reg-with-hint=0" ] -- } -- } -- } -- - # TODO(crbug.com/1235145): Investigate why/if this should be needed. - if (is_win) { - cflags += [ "/clang:-ffp-contract=off" ] -@@ -802,10 +784,6 @@ config("compiler") { - if (is_apple) { - ldflags += [ "-Wcrl,object_path_lto" ] - } -- -- # We only use one version of LLVM within a build so there's no need to -- # upgrade debug info, which can be expensive since it runs the verifier. -- ldflags += [ "-Wl,-mllvm,-disable-auto-upgrade-debug-info" ] - } - - # TODO(https://crbug.com/1211155): investigate why this isn't effective on diff --git a/chromium-124.0.6367.118-fix-a-missing-build-dependency.patch b/chromium-124.0.6367.118-fix-a-missing-build-dependency.patch deleted file mode 100644 index 7de5cd9..0000000 --- a/chromium-124.0.6367.118-fix-a-missing-build-dependency.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a976cb05b4024b7a6452d1541378d718cdfe33e6 Mon Sep 17 00:00:00 2001 -From: Takuto Ikuta -Date: Thu, 25 Apr 2024 07:25:32 +0000 -Subject: [PATCH] [devtools] fix a missing build dependency to a generated file - -Bug: 336911498 -Change-Id: I6e6d3afaf33ace53a68271b70165b8c3ab596340 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5487538 -Auto-Submit: Takuto Ikuta -Commit-Queue: Takuto Ikuta -Reviewed-by: Danil Somsikov -Commit-Queue: Danil Somsikov -Cr-Commit-Position: refs/heads/main@{#1292300} ---- - chrome/browser/devtools/BUILD.gn | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/chrome/browser/devtools/BUILD.gn b/chrome/browser/devtools/BUILD.gn -index f0c07cad8cfb..053199e462f5 100644 ---- a/chrome/browser/devtools/BUILD.gn -+++ b/chrome/browser/devtools/BUILD.gn -@@ -117,6 +117,7 @@ static_library("devtools") { - "//chrome/browser/autofill:autofill", - "//components/autofill/content/browser:browser", - "//components/autofill/core/browser:browser", -+ "//components/enterprise/buildflags", - "//components/paint_preview/buildflags:buildflags", - "//components/variations/service:service", - "//components/webapps/common:common", diff --git a/chromium-125.0.6422.60-use-oauth2-client-switches-as-default.patch b/chromium-125.0.6422.60-use-oauth2-client-switches-as-default.patch deleted file mode 100644 index 55289a8..0000000 --- a/chromium-125.0.6422.60-use-oauth2-client-switches-as-default.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/google_apis/google_api_keys-inc.cc b/google_apis/google_api_keys-inc.cc -index 49c396d69d17..9493e7e5aa48 100644 ---- a/google_apis/google_api_keys-inc.cc -+++ b/google_apis/google_api_keys-inc.cc -@@ -182,11 +182,11 @@ class APIKeyCache { - - std::string default_client_id = CalculateKeyValue( - GOOGLE_DEFAULT_CLIENT_ID, -- STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), nullptr, -+ STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), ::switches::kOAuth2ClientID, - std::string(), environment.get(), command_line, gaia_config); - std::string default_client_secret = CalculateKeyValue( - GOOGLE_DEFAULT_CLIENT_SECRET, -- STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), nullptr, -+ STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), ::switches::kOAuth2ClientSecret, - std::string(), environment.get(), command_line, gaia_config); - - // We currently only allow overriding the baked-in values for the diff --git a/chromium-126.0.6478.126-drop-flags-unsupported-by-clang17.patch b/chromium-126.0.6478.126-drop-flags-unsupported-by-clang17.patch new file mode 100644 index 0000000..d5f6c1d --- /dev/null +++ b/chromium-126.0.6478.126-drop-flags-unsupported-by-clang17.patch @@ -0,0 +1,29 @@ +diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn +index 6efe967eb0a1..590a2c274ac1 100644 +--- a/build/config/compiler/BUILD.gn ++++ b/build/config/compiler/BUILD.gn +@@ -568,24 +568,6 @@ config("compiler") { + } + } + +- # TODO(crbug.com/40283598): This causes binary size growth and potentially +- # other problems. +- # TODO(crbug.com/40284925): This isn't supported by Cronet's mainline llvm version. +- if (default_toolchain != "//build/toolchain/cros:target" && +- !llvm_android_mainline) { +- cflags += [ +- "-mllvm", +- "-split-threshold-for-reg-with-hint=0", +- ] +- if (use_thin_lto && is_a_target_toolchain) { +- if (is_win) { +- ldflags += [ "-mllvm:-split-threshold-for-reg-with-hint=0" ] +- } else { +- ldflags += [ "-Wl,-mllvm,-split-threshold-for-reg-with-hint=0" ] +- } +- } +- } +- + # TODO(crbug.com/40192287): Investigate why/if this should be needed. + if (is_win) { + cflags += [ "/clang:-ffp-contract=off" ] diff --git a/chromium-126.0.6478.126-use-oauth2-client-switches-as-default.patch b/chromium-126.0.6478.126-use-oauth2-client-switches-as-default.patch new file mode 100644 index 0000000..888b67b --- /dev/null +++ b/chromium-126.0.6478.126-use-oauth2-client-switches-as-default.patch @@ -0,0 +1,18 @@ +diff --git a/google_apis/google_api_keys-inc.cc b/google_apis/google_api_keys-inc.cc +index 4d13e697a54d..61aac7b48662 100644 +--- a/google_apis/google_api_keys-inc.cc ++++ b/google_apis/google_api_keys-inc.cc +@@ -193,11 +193,11 @@ class APIKeyCache { + std::string default_client_id = CalculateKeyValue( + GOOGLE_DEFAULT_CLIENT_ID, + STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), std::string(), +- nullptr, std::string(), environment.get(), command_line, gaia_config); ++ ::switches::kOAuth2ClientID, std::string(), environment.get(), command_line, gaia_config); + std::string default_client_secret = CalculateKeyValue( + GOOGLE_DEFAULT_CLIENT_SECRET, + STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), std::string(), +- nullptr, std::string(), environment.get(), command_line, gaia_config); ++ ::switches::kOAuth2ClientSecret, std::string(), environment.get(), command_line, gaia_config); + + // We currently only allow overriding the baked-in values for the + // default OAuth2 client ID and secret using a command-line diff --git a/chromium.spec b/chromium.spec index 05bf8a5..58bd75f 100644 --- a/chromium.spec +++ b/chromium.spec @@ -3,7 +3,7 @@ %define clang_version %(clang --version | grep -m1 version | sed 's/[^0-9.]//g' | cut -d. -f1) Name: chromium Epoch: 3 -Version: 125.0.6422.76 +Version: 126.0.6478.126 Release: 1mamba Summary: An open-source browser project that aims to build a safer, faster, and more stable way to experience the web Group: Graphical Desktop/Applications/Internet @@ -12,14 +12,13 @@ Distribution: openmamba Packager: Silvan Calarco URL: https://www.chromium.org Source: https://commondatastorage.googleapis.com/chromium-browser-official/chromium-%{version}.tar.xz -Source1: %{name}-master_preferences +Source1: chromium-master_preferences Source2: https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/%{chromium_patches_ver}/chromium-patches-%{chromium_patches_ver}.tar.bz2 -Patch1: chromium-125.0.6422.60-use-oauth2-client-switches-as-default.patch +Patch1: chromium-126.0.6478.126-use-oauth2-client-switches-as-default.patch Patch2: chromium-116-0.5845.110-aarch64-include-limits.patch -Patch4: chromium-122.0.6261.69-drop-flags-unsupported-by-clang16.patch +Patch4: chromium-126.0.6478.126-drop-flags-unsupported-by-clang17.patch Patch5: chromium-123.0.6312.86-clang-18.patch Patch6: chromium-123.0.6312.86-clang-18-2.patch -Patch7: chromium-124.0.6367.118-fix-a-missing-build-dependency.patch License: BSD ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -105,21 +104,27 @@ Chromium is an open-source browser project that aims to build a safer, faster, a %global __provides_exclude_from ^%{_libdir}/chromium/.*$ %prep -%setup -q -a2 -#% setup -q -#-D -T -#:<< ___EOF +#% setup -q -a2 +%setup -q -D -T +:<< ___EOF # Allow building against system libraries in official builds sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \ tools/generate_shim_headers/generate_shim_headers.py +# https://crbug.com/893950 +sed -i -e 's/\/malloc/' -e 's/\/free/' \ + -e '1i #include ' \ + third_party/blink/renderer/core/xml/*.cc \ + third_party/blink/renderer/core/xml/parser/xml_document_parser.cc \ + third_party/libxml/chromium/*.cc \ + third_party/maldoca/src/maldoca/ole/oss_utils.h + %patch 1 -p1 -b .use-oauth2-client-switches-as-default %patch 2 -p1 -b .aarch64-include-limits -%patch 4 -p1 -b .drop-flags-unsupported-by-clang16 +%patch 4 -p1 -b .drop-flags-unsupported-by-clang17 %patch 5 -p1 -b .clang-18 %patch 6 -p1 -b .clang-18-2 -%patch 7 -p1 -b .fix-a-missing-build-dependency # Fixes for building with libstdc++ instead of libc++ #patch -Np1 -i chromium-patches-*/chromium-117-material-color-include.patch @@ -417,6 +422,9 @@ ln -s %{_libdir}/chromium/chromedriver %{buildroot}%{_bindir}/chromedriver %{_mandir}/man1/chromium.1* %changelog +* Sun Jun 30 2024 Automatic Build System 126.0.6478.126-1mamba +- automatic version update by autodist + * Wed May 22 2024 Automatic Build System 125.0.6422.76-1mamba - automatic version update by autodist