From nobody Fri Sep 01 04:59:02 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RcQmQ3N69z4s3l9; Fri, 1 Sep 2023 04:59:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RcQmQ36VYz4WBd; Fri, 1 Sep 2023 04:59:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693544342; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oTfPLjZwXPRUTIZbY81LFY5Tt4xbKHWImZS6igIqDEQ=; b=XrHZe2rmSMU9E8N4AWxmk6GVvnuTvW5Nw5gOT795RCIY4I888G2E9uZGrIzDH3EkuuJi15 ZKQ0RMhki3un/4WUhkdqMD+IJjwl2CzP3+R5C2sNJd3BFNvG2mCpJELQDiKxHAqRB2pp/R Q30p2118ruAs+Jo4owoD/MF2RAEV/f81mL4QsjRnomEpqde9RDc6L9s0J9vZuIsN2aMl76 LKs39f2BRbE6oIZdw1pz6rHWfVgrsIL8Q/fpXprCDe8mWH3KpReFQEGZWqmVn+t03bvtRD s2FXJ2vv5Q2YU/AKrSAJjD6sjEvIj3ERADacI1UO6f2jIcuGsWvt94LZS/GdAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693544342; a=rsa-sha256; cv=none; b=pN9xoH4vEm6ItHMKHb7QJ/r22pzLdCvmHQKM0hCOnw+kQaCY/Y7b9bpu6/KYXElT7wikX+ CJrubYCvblYNPKcWkKrnmMGAFuU5YOfUKfCQgiG2xnQlUttHJLm2wx3plJPikhMBhN6slQ I2z+E/ku11B6L5HAT+tCFOTvSE4tMMBln33GvfG0Fl4b1ey2V+Sk31pTQ/1HVkX3VOLTdk LlI35QuRsv3179hhteF2ZCQ2uzRC+JB0pkc8KU/90Ykxh7Robd2fzpRspzc5e6wC+Ihkt/ HiH3C3sIupczvNcf2kBZeDLlb2mkKBICZDI/ppjm/jeJF3WHmPNNi/1uKV8M4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693544342; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oTfPLjZwXPRUTIZbY81LFY5Tt4xbKHWImZS6igIqDEQ=; b=DWeKNEKQgOsum8cDFgx2uwoDvu+Zl8ZeWX9l0QsX5bU8izukwAl5zAu1NqZrjwtJPHOFs0 AmWZEvy4RPwQJSLLIa+2bQIU3ZuQD2Z4OgW8OO/T57GblWCoTDZLiboIpleYcEJUqVebI7 MrRUhpQ9Rx0F7dw1u+PipAd31bUIj6XdMIChz5CheYV0fH0/0c4oyEO8HpGvV2N9pqlMwp ORAoBO6BItPlRF/lAoGcatHdJORNtOtzItj3VJ4ZNdM3T0nPRUCY4NFJvlVD8+Iqmc5nOo 6BgGA9CgcmpfHBehQGgXaqVY/ZjFwkvfjzlpVaBaq7h9jRF9UgILbG75n/7GbQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RcQmQ29SJzmyM; Fri, 1 Sep 2023 04:59:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3814x2BP075753; Fri, 1 Sep 2023 04:59:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3814x2pd075750; Fri, 1 Sep 2023 04:59:02 GMT (envelope-from git) Date: Fri, 1 Sep 2023 04:59:02 GMT Message-Id: <202309010459.3814x2pd075750@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Nagy Subject: git: 16c1aaba3138 - 2023Q3 - www/ungoogled-chromium: update to 116.0.5845.140 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rnagy X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q3 X-Git-Reftype: branch X-Git-Commit: 16c1aaba3138949b0faf90683ef55c2ad235158c Auto-Submitted: auto-generated The branch 2023Q3 has been updated by rnagy: URL: https://cgit.FreeBSD.org/ports/commit/?id=16c1aaba3138949b0faf90683ef55c2ad235158c commit 16c1aaba3138949b0faf90683ef55c2ad235158c Author: Robert Nagy AuthorDate: 2023-09-01 04:58:05 +0000 Commit: Robert Nagy CommitDate: 2023-09-01 04:58:55 +0000 www/ungoogled-chromium: update to 116.0.5845.140 Security: https://vuxml.freebsd.org/freebsd/22fffa69-46fa-11ee-8290-a8a1599412c6.html (cherry picked from commit d45641c451ed2196fad768a9b16c75563abec8e8) --- www/ungoogled-chromium/Makefile | 3 +-- www/ungoogled-chromium/distinfo | 14 +++++++------- .../patch-chrome_app_generated__resources.grd | 12 ++++++------ .../files/patch-chrome_browser_about__flags.cc | 18 +++++++++--------- .../patch-chrome_browser_flag__descriptions.cc | 22 +++++++++++----------- .../patch-chrome_browser_flag__descriptions.h | 20 ++++++++++---------- ...chrome__browser__main__extra__parts__metrics.cc | 12 ++++++------ ..._chrome__browser__main__extra__parts__metrics.h | 6 +++--- .../files/patch-chrome_test_BUILD.gn | 4 ++-- 9 files changed, 55 insertions(+), 56 deletions(-) diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile index d897a238693d..651bbe2a6690 100644 --- a/www/ungoogled-chromium/Makefile +++ b/www/ungoogled-chromium/Makefile @@ -1,7 +1,6 @@ PORTNAME= ungoogled-chromium -PORTVERSION= 116.0.5845.110 +PORTVERSION= 116.0.5845.140 UGVERSION= ${DISTVERSION}-1 -PORTREVISION= 1 CATEGORIES= www wayland MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ https://nerd.hu/distfiles/:external diff --git a/www/ungoogled-chromium/distinfo b/www/ungoogled-chromium/distinfo index 78176e81402c..3007b1977d8d 100644 --- a/www/ungoogled-chromium/distinfo +++ b/www/ungoogled-chromium/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1692966677 -SHA256 (chromium-116.0.5845.110.tar.xz) = e85ef479a1a4972ffd4d2e389cbaf341df4c7cca63e4ebbb38d175fda106d9a9 -SIZE (chromium-116.0.5845.110.tar.xz) = 1599776928 -SHA256 (ungoogled-chromium-116.0.5845.110-1.tar.gz) = 4625adc65695ae2e040328e2f87b3fc369e9e6e94f7c63ca347a3e3745db1195 -SIZE (ungoogled-chromium-116.0.5845.110-1.tar.gz) = 673054 -SHA256 (chromium-116.0.5845.110-testdata.tar.xz) = 784577faa337801c8111bb5459f72a65043053f68bec037ab1920828c6534dc3 -SIZE (chromium-116.0.5845.110-testdata.tar.xz) = 267917840 +TIMESTAMP = 1693544019 +SHA256 (chromium-116.0.5845.140.tar.xz) = f89677b9da05baa569fd143a3456cb5cbce8bde9ea7d10b4f3907dcd1132716c +SIZE (chromium-116.0.5845.140.tar.xz) = 1599642528 +SHA256 (ungoogled-chromium-116.0.5845.140-1.tar.gz) = 773743829f782fabe33d84cb7f719bd8296875e270e37f954d1561a27ace8cc4 +SIZE (ungoogled-chromium-116.0.5845.140-1.tar.gz) = 673056 +SHA256 (chromium-116.0.5845.140-testdata.tar.xz) = 517e0fb137261ded43c1973d8d6cc35a37aa491d715efc3ab74340847269ac45 +SIZE (chromium-116.0.5845.140-testdata.tar.xz) = 267843724 SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734 diff --git a/www/ungoogled-chromium/files/patch-chrome_app_generated__resources.grd b/www/ungoogled-chromium/files/patch-chrome_app_generated__resources.grd index ab61b14422a3..8bea4ed51677 100644 --- a/www/ungoogled-chromium/files/patch-chrome_app_generated__resources.grd +++ b/www/ungoogled-chromium/files/patch-chrome_app_generated__resources.grd @@ -1,4 +1,4 @@ ---- chrome/app/generated_resources.grd.orig 2023-08-18 10:26:52 UTC +--- chrome/app/generated_resources.grd.orig 2023-09-01 04:52:40 UTC +++ chrome/app/generated_resources.grd @@ -2,7 +2,7 @@ @@ -45,7 +45,7 @@ Old versions of Chrome apps won't open on Linux devices after December 2022. You can check if there's a new version available. -@@ -9884,7 +9884,7 @@ Check your passwords anytime in Update @@ -54,7 +54,7 @@ Finish update -@@ -10220,7 +10220,7 @@ Check your passwords anytime in @@ -63,7 +63,7 @@ Use system title bar and borders -@@ -11193,7 +11193,7 @@ Check your passwords anytime in @@ -72,7 +72,7 @@ Share device signals? -@@ -11592,7 +11592,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -11610,7 +11610,7 @@ Please help our engineers fix this problem. Tell us wh Set as default @@ -81,7 +81,7 @@ Minimize -@@ -13784,7 +13784,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -13802,7 +13802,7 @@ Please help our engineers fix this problem. Tell us wh Open Anyway diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc b/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc index 695f0386d0ee..f69c90345b64 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc @@ -1,4 +1,4 @@ ---- chrome/browser/about_flags.cc.orig 2023-08-18 10:26:52 UTC +--- chrome/browser/about_flags.cc.orig 2023-09-01 04:52:40 UTC +++ chrome/browser/about_flags.cc @@ -224,7 +224,7 @@ #include "ui/ui_features.h" @@ -70,7 +70,7 @@ {"omnibox-domain-suggestions", flag_descriptions::kOmniboxDomainSuggestionsName, flag_descriptions::kOmniboxDomainSuggestionsDescription, kOsDesktop, -@@ -6687,7 +6687,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6691,7 +6691,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kParallelDownloadingDescription, kOsAll, FEATURE_VALUE_TYPE(download::features::kParallelDownloading)}, @@ -79,7 +79,7 @@ {"enable-async-dns", flag_descriptions::kAsyncDnsName, flag_descriptions::kAsyncDnsDescription, kOsWin | kOsLinux, FEATURE_VALUE_TYPE(features::kAsyncDns)}, -@@ -8377,7 +8377,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8381,7 +8381,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -88,7 +88,7 @@ {"quick-commands", flag_descriptions::kQuickCommandsName, flag_descriptions::kQuickCommandsDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kQuickCommands)}, -@@ -8638,7 +8638,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8642,7 +8642,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(ash::features::kWallpaperPerDesk)}, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -97,7 +97,7 @@ {"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName, flag_descriptions::kGetAllScreensMediaDescription, kOsCrOS | kOsLacros | kOsLinux, -@@ -8699,7 +8699,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8703,7 +8703,7 @@ const FeatureEntry kFeatureEntries[] = { #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -106,7 +106,7 @@ { "ui-debug-tools", flag_descriptions::kUIDebugToolsName, -@@ -9267,7 +9267,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9271,7 +9271,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -115,7 +115,7 @@ {"document-picture-in-picture-api", flag_descriptions::kDocumentPictureInPictureApiName, flag_descriptions::kDocumentPictureInPictureApiDescription, -@@ -9987,7 +9987,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9991,7 +9991,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kWebUIOmniboxPopupDescription, kOsDesktop, FEATURE_VALUE_TYPE(omnibox::kWebUIOmniboxPopup)}, @@ -124,7 +124,7 @@ {"webui-system-font", flag_descriptions::kWebUiSystemFontName, flag_descriptions::kWebUiSystemFontDescription, kOsAll, FEATURE_VALUE_TYPE(features::kWebUiSystemFont)}, -@@ -10172,7 +10172,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10176,7 +10176,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \ @@ -133,7 +133,7 @@ {"data-retention-policies-disable-sync-types-needed", flag_descriptions::kDataRetentionPoliciesDisableSyncTypesNeededName, flag_descriptions::kDataRetentionPoliciesDisableSyncTypesNeededDescription, -@@ -10580,7 +10580,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10584,7 +10584,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)}, #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.cc index 171c430b86c3..9d208ae6f9e6 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,6 +1,6 @@ ---- chrome/browser/flag_descriptions.cc.orig 2023-08-18 10:26:52 UTC +--- chrome/browser/flag_descriptions.cc.orig 2023-09-01 04:52:40 UTC +++ chrome/browser/flag_descriptions.cc -@@ -2516,7 +2516,7 @@ const char kWebUIOmniboxPopupName[] = "WebUI Omnibox P +@@ -2519,7 +2519,7 @@ const char kWebUIOmniboxPopupName[] = "WebUI Omnibox P const char kWebUIOmniboxPopupDescription[] = "If enabled, shows the omnibox suggestions popup in WebUI."; @@ -9,7 +9,7 @@ const char kWebUiSystemFontName[] = "WebUI System font"; const char kWebUiSystemFontDescription[] = "If enabled, all WebUI surfaces will use the default UI font of the " -@@ -6836,7 +6836,7 @@ const char kLibAssistantV2MigrationDescription[] = +@@ -6839,7 +6839,7 @@ const char kLibAssistantV2MigrationDescription[] = #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -18,7 +18,7 @@ const char kGetAllScreensMediaName[] = "GetAllScreensMedia API"; const char kGetAllScreensMediaDescription[] = "When enabled, the getAllScreensMedia API for capturing multiple screens " -@@ -7076,7 +7076,7 @@ const char kSearchWebInSidePanelDescription[] = +@@ -7079,7 +7079,7 @@ const char kSearchWebInSidePanelDescription[] = // Random platform combinations ----------------------------------------------- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,7 +27,7 @@ const char kQuickCommandsName[] = "Quick Commands"; const char kQuickCommandsDescription[] = "Enable a text interface to browser features. Invoke with Ctrl-Space."; -@@ -7085,7 +7085,7 @@ const char kQuickCommandsDescription[] = +@@ -7088,7 +7088,7 @@ const char kQuickCommandsDescription[] = // BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -36,7 +36,7 @@ const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel"; const char kFollowingFeedSidepanelDescription[] = "Enables the following feed in the sidepanel."; -@@ -7107,7 +7107,7 @@ const char kEnableProtoApiForClassifyUrlDescription[] +@@ -7110,7 +7110,7 @@ const char kEnableProtoApiForClassifyUrlDescription[] "instead of JSON."; #endif @@ -45,7 +45,7 @@ const char kUseOutOfProcessVideoDecodingName[] = "Use out-of-process video decoding (OOP-VD)"; const char kUseOutOfProcessVideoDecodingDescription[] = -@@ -7125,7 +7125,7 @@ const char kWebShareDescription[] = +@@ -7128,7 +7128,7 @@ const char kWebShareDescription[] = "platforms."; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) @@ -54,7 +54,7 @@ const char kOzonePlatformHintChoiceDefault[] = "Default"; const char kOzonePlatformHintChoiceAuto[] = "Auto"; const char kOzonePlatformHintChoiceX11[] = "X11"; -@@ -7145,7 +7145,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti +@@ -7148,7 +7148,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti "Bluetooth"; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -63,7 +63,7 @@ const char kSkipUndecryptablePasswordsName[] = "Skip undecryptable passwords to use the available decryptable " "passwords."; -@@ -7159,7 +7159,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail +@@ -7162,7 +7162,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail "storage and requests initial sync."; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) @@ -72,7 +72,7 @@ const char kAsyncDnsName[] = "Async DNS resolver"; const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver."; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -@@ -7260,7 +7260,7 @@ const char kElasticOverscrollDescription[] = +@@ -7263,7 +7263,7 @@ const char kElasticOverscrollDescription[] = #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -81,7 +81,7 @@ const char kUIDebugToolsName[] = "Debugging tools for UI"; const char kUIDebugToolsDescription[] = "Enables additional keyboard shortcuts to help debugging."; -@@ -7289,7 +7289,7 @@ const char kSigninInterceptBubbleV2Description[] = +@@ -7292,7 +7292,7 @@ const char kSigninInterceptBubbleV2Description[] = #endif #if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.h b/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.h index ed998a78b39e..9910995d0b31 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.h @@ -1,6 +1,6 @@ ---- chrome/browser/flag_descriptions.h.orig 2023-08-18 10:26:52 UTC +--- chrome/browser/flag_descriptions.h.orig 2023-09-01 04:52:40 UTC +++ chrome/browser/flag_descriptions.h -@@ -1415,7 +1415,7 @@ extern const char kOmniboxUpdatedConnectionSecurityInd +@@ -1418,7 +1418,7 @@ extern const char kOmniboxUpdatedConnectionSecurityInd extern const char kWebUIOmniboxPopupName[]; extern const char kWebUIOmniboxPopupDescription[]; @@ -9,7 +9,7 @@ extern const char kWebUiSystemFontName[]; extern const char kWebUiSystemFontDescription[]; #endif -@@ -3931,7 +3931,7 @@ extern const char kLacrosMergeIcuDataFileName[]; +@@ -3934,7 +3934,7 @@ extern const char kLacrosMergeIcuDataFileName[]; extern const char kLacrosMergeIcuDataFileDescription[]; #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) @@ -18,7 +18,7 @@ extern const char kGetAllScreensMediaName[]; extern const char kGetAllScreensMediaDescription[]; #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -4061,14 +4061,14 @@ extern const char kSearchWebInSidePanelDescription[]; +@@ -4064,14 +4064,14 @@ extern const char kSearchWebInSidePanelDescription[]; // Random platform combinations ----------------------------------------------- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -35,7 +35,7 @@ extern const char kWebShareName[]; extern const char kWebShareDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) -@@ -4078,7 +4078,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa +@@ -4081,7 +4081,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa extern const char kWebBluetoothConfirmPairingSupportDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -44,7 +44,7 @@ extern const char kOzonePlatformHintChoiceDefault[]; extern const char kOzonePlatformHintChoiceAuto[]; extern const char kOzonePlatformHintChoiceX11[]; -@@ -4088,7 +4088,7 @@ extern const char kOzonePlatformHintName[]; +@@ -4091,7 +4091,7 @@ extern const char kOzonePlatformHintName[]; extern const char kOzonePlatformHintDescription[]; #endif // BUILDFLAG(IS_LINUX) @@ -53,7 +53,7 @@ extern const char kSkipUndecryptablePasswordsName[]; extern const char kSkipUndecryptablePasswordsDescription[]; -@@ -4096,13 +4096,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt +@@ -4099,13 +4099,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt extern const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[]; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) @@ -69,7 +69,7 @@ extern const char kFollowingFeedSidepanelName[]; extern const char kFollowingFeedSidepanelDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -4118,7 +4118,7 @@ extern const char kEnableProtoApiForClassifyUrlName[]; +@@ -4121,7 +4121,7 @@ extern const char kEnableProtoApiForClassifyUrlName[]; extern const char kEnableProtoApiForClassifyUrlDescription[]; #endif // BUILDFLAG(ENABLE_SUPERVISED_USERS) @@ -78,7 +78,7 @@ extern const char kUseOutOfProcessVideoDecodingName[]; extern const char kUseOutOfProcessVideoDecodingDescription[]; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -4192,7 +4192,7 @@ extern const char kElasticOverscrollDescription[]; +@@ -4195,7 +4195,7 @@ extern const char kElasticOverscrollDescription[]; #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -87,7 +87,7 @@ extern const char kUIDebugToolsName[]; extern const char kUIDebugToolsDescription[]; -@@ -4210,7 +4210,7 @@ extern const char kSigninInterceptBubbleV2Description[ +@@ -4213,7 +4213,7 @@ extern const char kSigninInterceptBubbleV2Description[ #endif #if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc b/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc index de1a3c89fb7f..be95d9c9f566 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2023-08-18 10:26:52 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2023-09-01 04:52:40 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc -@@ -77,8 +77,10 @@ +@@ -78,8 +78,10 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -12,7 +12,7 @@ #include "base/linux_util.h" #include "base/strings/string_split.h" -@@ -107,7 +109,7 @@ +@@ -108,7 +110,7 @@ #include "chromeos/crosapi/cpp/crosapi_constants.h" #endif // BUILDFLAG(IS_CHROMEOS_LACROS) @@ -21,7 +21,7 @@ #include "chrome/browser/metrics/pressure/pressure_metrics_reporter.h" #endif // BUILDFLAG(IS_LINUX) -@@ -116,7 +118,7 @@ +@@ -117,7 +119,7 @@ #include "components/user_manager/user_manager.h" #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -30,7 +30,7 @@ #include "components/power_metrics/system_power_monitor.h" #endif -@@ -538,7 +540,7 @@ void RecordStartupMetrics() { +@@ -539,7 +541,7 @@ void RecordStartupMetrics() { // Record whether Chrome is the default browser or not. // Disabled on Linux due to hanging browser tests, see crbug.com/1216328. @@ -39,7 +39,7 @@ shell_integration::DefaultWebClientState default_state = shell_integration::GetDefaultBrowser(); base::UmaHistogramEnumeration("DefaultBrowser.State", default_state, -@@ -812,11 +814,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt +@@ -860,11 +862,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt } #endif // !BUILDFLAG(IS_ANDROID) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h b/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h index aee3c32b567b..618333dd53d0 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h.orig 2023-07-21 09:49:17 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h.orig 2023-09-01 04:52:40 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h -@@ -32,7 +32,7 @@ class PowerMetricsReporter; +@@ -33,7 +33,7 @@ class PowerMetricsReporter; class ProcessMonitor; #endif @@ -9,7 +9,7 @@ class PressureMetricsReporter; #endif // BUILDFLAG(IS_LINUX) -@@ -133,7 +133,7 @@ class ChromeBrowserMainExtraPartsMetrics : public Chro +@@ -139,7 +139,7 @@ class ChromeBrowserMainExtraPartsMetrics : public Chro std::unique_ptr battery_discharge_reporter_; #endif // !BUILDFLAG(IS_ANDROID) diff --git a/www/ungoogled-chromium/files/patch-chrome_test_BUILD.gn b/www/ungoogled-chromium/files/patch-chrome_test_BUILD.gn index 3461d9c1d3f3..2d0d3f12e3f1 100644 --- a/www/ungoogled-chromium/files/patch-chrome_test_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-chrome_test_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/test/BUILD.gn.orig 2023-08-18 10:26:52 UTC +--- chrome/test/BUILD.gn.orig 2023-09-01 04:52:40 UTC +++ chrome/test/BUILD.gn -@@ -10598,7 +10598,7 @@ test("chrome_app_unittests") { +@@ -10599,7 +10599,7 @@ test("chrome_app_unittests") { "//components/heap_profiling/in_process", "//components/safe_browsing:buildflags", ]