automatic version update by autodist [release 124.0.6367.118-1mamba;Fri May 03 2024]

This commit is contained in:
Automatic Build System 2024-05-05 10:27:44 +02:00
parent 1d3d0b5f4e
commit 1a98a1270d
2 changed files with 44 additions and 7 deletions

View File

@ -0,0 +1,29 @@
From a976cb05b4024b7a6452d1541378d718cdfe33e6 Mon Sep 17 00:00:00 2001
From: Takuto Ikuta <tikuta@chromium.org>
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 <tikuta@chromium.org>
Commit-Queue: Takuto Ikuta <tikuta@chromium.org>
Reviewed-by: Danil Somsikov <dsv@chromium.org>
Commit-Queue: Danil Somsikov <dsv@chromium.org>
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",

View File

@ -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: 123.0.6312.122
Version: 124.0.6367.118
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
@ -20,6 +20,7 @@ Patch3: chromium-119.0.6045.159-icu-74.patch
Patch4: chromium-122.0.6261.69-drop-flags-unsupported-by-clang16.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
@ -55,7 +56,6 @@ BuildRequires: libopus-devel
BuildRequires: libpango-devel
BuildRequires: libpng-devel
BuildRequires: libpulseaudio-devel
BuildRequires: libwebp-devel
BuildRequires: libxcb-devel
BuildRequires: libxkbcommon-devel
BuildRequires: libxml2-devel
@ -107,7 +107,8 @@ Chromium is an open-source browser project that aims to build a safer, faster, a
%prep
%setup -q -a2
#% setup -q -D -T
#% setup -q
#-D -T
#:<< ___EOF
# Allow building against system libraries in official builds
@ -116,13 +117,13 @@ sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
%patch 1 -p1 -b .use-oauth2-client-switches-as-default
%patch 2 -p1 -b .aarch64-include-limits
#%patch 3 -p1 -b .icu-74
%patch 4 -p1 -b .drop-flags-unsupported-by-clang16
%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
#patch -Np1 -i chromium-patches-*/chromium-117-material-color-include.patch
# Force script incompatible with Python 3 to use /usr/bin/python2
sed -i '1s|python$|&2|' third_party/dom_distiller_js/protoc_plugins/*.py
@ -164,7 +165,7 @@ declare -rgA _system_libs=(
[libjpeg]=libjpeg
[libpng]=libpng
#[libvpx]=libvpx
[libwebp]=libwebp
#[libwebp]=libwebp
[libxml]=libxml2
[libxslt]=libxslt
[opus]=opus
@ -294,7 +295,11 @@ gn gen out/Release --args="${chromium_conf[*]}" \
#_EOF
ninja -j4 -C out/Release chrome chrome_sandbox chromedriver.unstripped
%ifarch aarch64
ninja %{_smp_mflags} -C out/Release chrome chrome_sandbox chromedriver.unstripped
%else
ninja -C out/Release chrome chrome_sandbox chromedriver.unstripped
%endif
%install
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
@ -413,6 +418,9 @@ ln -s %{_libdir}/chromium/chromedriver %{buildroot}%{_bindir}/chromedriver
%{_mandir}/man1/chromium.1*
%changelog
* Fri May 03 2024 Automatic Build System <autodist@openmamba.org> 124.0.6367.118-1mamba
- automatic version update by autodist
* Thu Apr 11 2024 Automatic Build System <autodist@openmamba.org> 123.0.6312.122-1mamba
- automatic version update by autodist