Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 7 Nov 2024 07:29:03 GMT
From:      Robert Nagy <rnagy@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: 180d104868e2 - 2024Q4 - www/chromium: update to 130.0.6723.116
Message-ID:  <202411070729.4A77T3YG047399@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch 2024Q4 has been updated by rnagy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=180d104868e2fdd3ff8c2ece4bfde50f9ccf3a0e

commit 180d104868e2fdd3ff8c2ece4bfde50f9ccf3a0e
Author:     Robert Nagy <rnagy@FreeBSD.org>
AuthorDate: 2024-11-07 07:27:28 +0000
Commit:     Robert Nagy <rnagy@FreeBSD.org>
CommitDate: 2024-11-07 07:28:58 +0000

    www/chromium: update to 130.0.6723.116
    
    Security:https://vuxml.freebsd.org/freebsd/ab254c9d-9c36-11ef-8c1c-a8a1599412c6.html
    (cherry picked from commit 799f8ef64e3754b4dcf585c8c41e5df68c66f7d3)
---
 www/chromium/Makefile                               | 13 +++++++++----
 www/chromium/distinfo                               | 18 +++++++++++-------
 www/chromium/files/patch-.gn                        |  9 +++++++++
 .../files/patch-build_linux_unbundle_icu.gn         | 21 ++++++++++++++++++++-
 ...sed__user__google__auth__navigation__throttle.cc | 10 +++++-----
 5 files changed, 54 insertions(+), 17 deletions(-)

diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index ffef0c531f1a..5ac490aa13d4 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -1,15 +1,20 @@
 PORTNAME=	chromium
-PORTVERSION=	130.0.6723.91
+PORTVERSION=	130.0.6723.116
 PULSEMV=	16
 PULSEV=		${PULSEMV}.1
 CATEGORIES=	www wayland
 MASTER_SITES=	https://commondatastorage.googleapis.com/chromium-browser-official/ \
 		https://nerd.hu/distfiles/:external \
+		https://chromium-tarballs.syd1.cdn.digitaloceanspaces.com/:unofficial \
 		https://freedesktop.org/software/pulseaudio/releases/:pulseaudio
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:unofficial \
 		chrome-linux-${PORTVERSION}-llvm17.profdata${EXTRACT_SUFX}:external \
 		pulseaudio-${PULSEV}.tar.gz:pulseaudio
 
+# unofficial distfiles
+DISTFILES+=	chrome-v8-${PORTVERSION}.profdata.tar.xz:external \
+		chrome-gn-${PORTVERSION}-src.tar.xz:external
+
 MAINTAINER=	chromium@FreeBSD.org
 COMMENT=	Google web browser based on WebKit
 WWW=		https://www.chromium.org/Home
@@ -87,7 +92,7 @@ USE_PERL5=	build
 USE_XORG=	x11 xcb xcomposite xcursor xext xdamage xfixes xi \
 		xorgproto xrandr xrender xscrnsaver xtst
 USE_QT=		buildtools:build
-SHEBANG_FILES=	chrome/tools/build/linux/chrome-wrapper buildtools/linux64/clang-format
+SHEBANG_FILES=	chrome/tools/build/linux/chrome-wrapper #buildtools/linux64/clang-format
 
 MAKE_ARGS=	-C out/${BUILDTYPE}
 ALL_TARGET=	chrome
@@ -219,7 +224,7 @@ WIDEVINE_DESC=		Depend on foreign-cdm to enable playback of DRM content
 WIDEVINE_RUN_DEPENDS=	foreign-cdm>0:www/foreign-cdm
 
 .include "Makefile.tests"
-TEST_DISTFILES=		${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX}
+TEST_DISTFILES=		${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX}:unofficial
 TEST_ALL_TARGET=	${TEST_TARGETS}
 
 .include <bsd.port.options.mk>
diff --git a/www/chromium/distinfo b/www/chromium/distinfo
index eb3c35275cc5..c2acae28379f 100644
--- a/www/chromium/distinfo
+++ b/www/chromium/distinfo
@@ -1,9 +1,13 @@
-TIMESTAMP = 1730535141
-SHA256 (chromium-130.0.6723.91.tar.xz) = c2f13de70f2dcf61c930dcfe54ee118e584962afd03ecde19e3be48b3d86bec0
-SIZE (chromium-130.0.6723.91.tar.xz) = 6624503880
-SHA256 (chrome-linux-130.0.6723.91-llvm17.profdata.tar.xz) = bef743aadaa9fa977285a6357b1e26c865bdf78226b886000e18450ce7361734
-SIZE (chrome-linux-130.0.6723.91-llvm17.profdata.tar.xz) = 30484628
+TIMESTAMP = 1730895800
+SHA256 (chromium-130.0.6723.116.tar.xz) = 489f98fa4e44e97bfd2df73ab74d35f43a618d725098cd233e57b02fd43b9ee9
+SIZE (chromium-130.0.6723.116.tar.xz) = 4699442864
+SHA256 (chrome-linux-130.0.6723.116-llvm17.profdata.tar.xz) = a9176288e7af87bf42fd4f8d6f7340a750f73e112365bc8089bfb564c6f5158b
+SIZE (chrome-linux-130.0.6723.116-llvm17.profdata.tar.xz) = 30491052
 SHA256 (pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92
 SIZE (pulseaudio-16.1.tar.gz) = 2763111
-SHA256 (chromium-130.0.6723.91-testdata.tar.xz) = 66b4b339da273c53416165112d385a171fe6af79c87174a1f7951ba31c507cef
-SIZE (chromium-130.0.6723.91-testdata.tar.xz) = 281380152
+SHA256 (chrome-v8-130.0.6723.116.profdata.tar.xz) = dc08102a453c720f61a10b4392afbfc18e8c2056d17b4b64b587ad3218105b62
+SIZE (chrome-v8-130.0.6723.116.profdata.tar.xz) = 276108
+SHA256 (chrome-gn-130.0.6723.116-src.tar.xz) = 96fce8436bfa59677a28386742da15c2df8902a21ebdac322f947ba10e63da66
+SIZE (chrome-gn-130.0.6723.116-src.tar.xz) = 762476
+SHA256 (chromium-130.0.6723.116-testdata.tar.xz) = 7a4417cbf1344c3ef5a41f84d7ff2df6a8866b8fe16f86780911e14b62edf56b
+SIZE (chromium-130.0.6723.116-testdata.tar.xz) = 83048
diff --git a/www/chromium/files/patch-.gn b/www/chromium/files/patch-.gn
new file mode 100644
index 000000000000..ca6584d7aa0e
--- /dev/null
+++ b/www/chromium/files/patch-.gn
@@ -0,0 +1,9 @@
+--- .gn.orig	2024-11-06 12:34:11 UTC
++++ .gn
+@@ -172,4 +172,6 @@ exec_script_whitelist =
+ 
+       "//tools/grit/grit_rule.gni",
+       "//tools/gritsettings/BUILD.gn",
++
++      "//third_party/icu/BUILD.gn",
+     ]
diff --git a/www/chromium/files/patch-build_linux_unbundle_icu.gn b/www/chromium/files/patch-build_linux_unbundle_icu.gn
index 58312ff8a70a..d1588b8a6ff0 100644
--- a/www/chromium/files/patch-build_linux_unbundle_icu.gn
+++ b/www/chromium/files/patch-build_linux_unbundle_icu.gn
@@ -1,4 +1,4 @@
---- build/linux/unbundle/icu.gn.orig	2024-08-26 12:06:38 UTC
+--- build/linux/unbundle/icu.gn.orig	2024-11-06 12:34:11 UTC
 +++ build/linux/unbundle/icu.gn
 @@ -17,6 +17,15 @@ config("icu_config") {
      "USING_SYSTEM_ICU=1",
@@ -16,3 +16,22 @@
      # U_EXPORT (defined in unicode/platform.h) is used to set public visibility
      # on classes through the U_COMMON_API and U_I18N_API macros (among others).
      # When linking against the system ICU library, we want its symbols to have
+@@ -35,6 +44,18 @@ config("icu_config") {
+     # please see: https://crbug.com/822820
+     "U_IMPORT=U_EXPORT",
+   ]
++
++  _icu_version = exec_script(pkg_config_script,
++                              common_pkg_config_args + pkg_config_args + [
++                                    "icu-i18n",
++                                    "--version-as-components",
++                                  ],
++                              "value")
++
++  # Unbreak with icu 76 where private symbols are picked up
++  if (_icu_version[0] >= 76) {
++    defines += [ "U_HIDE_DRAFT_API" ]
++  }
+ }
+ 
+ pkg_config("system_icui18n") {
diff --git a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc
index f5c3c67451a1..20305c24b76a 100644
--- a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc
+++ b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc
@@ -1,15 +1,15 @@
---- chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc.orig	2024-10-22 08:31:56 UTC
+--- chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc.orig	2024-11-06 12:34:11 UTC
 +++ chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc
-@@ -29,7 +29,7 @@
- 
- #if BUILDFLAG(IS_ANDROID)
+@@ -31,7 +31,7 @@
  #include "chrome/browser/supervised_user/child_accounts/child_account_service_android.h"
+ #include "components/signin/public/identity_manager/identity_manager.h"
+ #include "ui/android/view_android.h"
 -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/supervised_user/supervised_user_verification_controller_client.h"
  #include "chrome/browser/supervised_user/supervised_user_verification_page.h"
  #endif
-@@ -145,7 +145,7 @@ SupervisedUserGoogleAuthNavigationThrottle::ShouldProc
+@@ -147,7 +147,7 @@ SupervisedUserGoogleAuthNavigationThrottle::ShouldProc
      return content::NavigationThrottle::DEFER;
    }
  



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202411070729.4A77T3YG047399>