From nobody Fri Jun 16 11:17:15 2023 X-Original-To: dev-commits-ports-main@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 4QjGpM6CbVz4dq6Y; Fri, 16 Jun 2023 11:17:15 +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 4QjGpM5wqXz4Wm1; Fri, 16 Jun 2023 11:17:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686914235; 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=r+rTvrZTj/keDg+sZoUdtnVm9Mzh0KRy0UE82kB5o5Y=; b=HwtVHjhhozkNjE3apBM7iCUG81PmUS+Rgm2I8VL0E/pGraXSGB3HlN9dkGpXHQqQekRm15 +WiYpcRJr1GTyM2yn+5CGQAQSfog33cgCjFTRZSQmcVbP5eScwM1RCqs/nUbzOiqi5a309 XhYevk8Eq/TduVlQlyZZTjgrtNm/EQ/bfniE3nzeHA/fJkrDl1IqFYeX4apRH1EBqGWD9A ZH2BI42Y1jbh68u+HEkTHNAQOVP/PtYtxF9XIXK2cuE7675zDe/dybvFS/8rSftgdbu4qR xF5KfwHUWHgyKnCwrSXZO91vTzf4aAcVd3PXtXOI2WDmPXEzrkcSfwVDHX4wYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686914235; 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=r+rTvrZTj/keDg+sZoUdtnVm9Mzh0KRy0UE82kB5o5Y=; b=g3cDWNc69JR9eqaCIusArBhmfPqO1LLyPXBb/d1PosLRL5/D+qy7ADWJpvWeFn4nKwkDP6 i4pfS/3YjHjOsuMgBO1FNH5CyfrzwK6efLK794eJuADZxHa/DAXMHilr+1SlDRjUFPfMtI fx/qeDtj2YFRJzILuJpHielHTl466V3sc8QiY8vXcg0kY5zdvMrRPOeHZkGgxLOwE173PU G6IDkFyqEnMl4rBVx1jnK27MuS6dudP/BA+UHWwMnNsL5r41FigKSlBA+NunPbm7Ltc5E9 G17w/rCC9ROUC46I/0TKBdzBnFkfpU97quEp7hXKEj1QVH9AB+cfT3d+bEBjWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686914235; a=rsa-sha256; cv=none; b=mVXKMO+nfE17olChwC/9XJTINjs/+FzAedrPyVn4v5+aT5xYS4n3/zMGMtmDBnIk0sGvwS x9ra9pllaOc28yGuwdrX6VnR6egOLcfwANJ8nUbvDpHdBADgIPJlBG5hy5l8yjmY02rn2C xi/7igPR5ZODzCJUQ940XhMOuHe6IR07kdncQ7zoFByWEukOuucHKXX1ndAJlCHcYUx03E zghlHD0HJOEIL1AxlzBLAq7XscwXsWxW26PArDNdoGa9hjuoMNd0aUfI2q9tHAwSRAgEfy Dg5JkVUMPGIBzDvnEmmbemM84V267W15N2NRYItTBFNJTu1wWijhzgdY8rOMDw== 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 4QjGpM50qGzR4t; Fri, 16 Jun 2023 11:17:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35GBHFpU029658; Fri, 16 Jun 2023 11:17:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35GBHFdR029657; Fri, 16 Jun 2023 11:17:15 GMT (envelope-from git) Date: Fri, 16 Jun 2023 11:17:15 GMT Message-Id: <202306161117.35GBHFdR029657@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Nagy Subject: git: 0374fba75dd2 - main - www/ungoogled-chromium: update to 114.0.5735.133 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: 0374fba75dd2ee604a3ce46e304c9f16f75524c3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rnagy: URL: https://cgit.FreeBSD.org/ports/commit/?id=0374fba75dd2ee604a3ce46e304c9f16f75524c3 commit 0374fba75dd2ee604a3ce46e304c9f16f75524c3 Author: Robert Nagy AuthorDate: 2023-06-16 11:16:42 +0000 Commit: Robert Nagy CommitDate: 2023-06-16 11:17:06 +0000 www/ungoogled-chromium: update to 114.0.5735.133 Approved by: rene (mentor, implicit) Security: https://vuxml.freebsd.org/freebsd/1567be8c-0a15-11ee-8290-a8a1599412c6.html --- www/ungoogled-chromium/Makefile | 2 +- www/ungoogled-chromium/distinfo | 14 +++++----- .../files/patch-chrome_browser_about__flags.cc | 32 +++++++++++----------- .../patch-chrome_browser_chrome__browser__main.cc | 6 ++-- .../patch-chrome_browser_flag__descriptions.cc | 22 +++++++-------- .../patch-chrome_browser_flag__descriptions.h | 20 +++++++------- ...i_webui_chrome__web__ui__controller__factory.cc | 14 +++++----- .../patch-chrome_common_webui__url__constants.cc | 4 +-- 8 files changed, 57 insertions(+), 57 deletions(-) diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile index a00fa4f83c7c..4717d6adc6a1 100644 --- a/www/ungoogled-chromium/Makefile +++ b/www/ungoogled-chromium/Makefile @@ -1,5 +1,5 @@ PORTNAME= ungoogled-chromium -PORTVERSION= 114.0.5735.106 +PORTVERSION= 114.0.5735.133 UGVERSION= ${DISTVERSION}-1 CATEGORIES= www wayland MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ diff --git a/www/ungoogled-chromium/distinfo b/www/ungoogled-chromium/distinfo index a984efaa67f0..dd44e253be6a 100644 --- a/www/ungoogled-chromium/distinfo +++ b/www/ungoogled-chromium/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1686219225 -SHA256 (chromium-114.0.5735.106.tar.xz) = df18b0b28bf52b1c099acde54e568fbfa2c9225150108bce9d53d8b31f71304a -SIZE (chromium-114.0.5735.106.tar.xz) = 1570627752 -SHA256 (ungoogled-chromium-114.0.5735.106-1.tar.gz) = b0042d6660988a587c4f0713a558959434aae3df52ecd32711904ded7d6a4f51 -SIZE (ungoogled-chromium-114.0.5735.106-1.tar.gz) = 682329 -SHA256 (chromium-114.0.5735.106-testdata.tar.xz) = e9fff6ac6fbf8fb8a55ede9a083b7e707087c0942cbbff87c563232f2d4c05cd -SIZE (chromium-114.0.5735.106-testdata.tar.xz) = 263429292 +TIMESTAMP = 1686913534 +SHA256 (chromium-114.0.5735.133.tar.xz) = 8289ec1ec9e2540313af10bcf97721ec560789c931fc0583a2f5a545f223d262 +SIZE (chromium-114.0.5735.133.tar.xz) = 1570531072 +SHA256 (ungoogled-chromium-114.0.5735.133-1.tar.gz) = c6e1908df4ddea8145ca3a77c829901b79a75b8c9573bfa1af4a1d442033a123 +SIZE (ungoogled-chromium-114.0.5735.133-1.tar.gz) = 664283 +SHA256 (chromium-114.0.5735.133-testdata.tar.xz) = 96a5f4760b029f3950dc47a7e66d6090c5df4a316cd117b15d49da075d5a5003 +SIZE (chromium-114.0.5735.133-testdata.tar.xz) = 257230152 SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734 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 a274dc7a503f..43d57e02f364 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc @@ -1,6 +1,6 @@ ---- chrome/browser/about_flags.cc.orig 2023-06-05 19:39:05 UTC +--- chrome/browser/about_flags.cc.orig 2023-06-16 11:04:37 UTC +++ chrome/browser/about_flags.cc -@@ -222,7 +222,7 @@ +@@ -223,7 +223,7 @@ #include "ui/ui_features.h" #include "url/url_features.h" @@ -9,7 +9,7 @@ #include "base/allocator/buildflags.h" #endif -@@ -315,7 +315,7 @@ +@@ -316,7 +316,7 @@ #include "device/vr/public/cpp/features.h" #endif @@ -18,7 +18,7 @@ #include "ui/ozone/buildflags.h" #include "ui/ozone/public/ozone_switches.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -@@ -421,7 +421,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap +@@ -422,7 +422,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap {"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}}; #endif @@ -27,7 +27,7 @@ const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = { {flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""}, {flag_descriptions::kOzonePlatformHintChoiceAuto, -@@ -1448,7 +1448,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202 +@@ -1449,7 +1449,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202 std::size(kChromeRefresh2023Level1), nullptr}}; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -36,7 +36,7 @@ const FeatureEntry::FeatureParam kOmniboxDocumentProviderCapLowQualitySuggestionsTo1[] = { {"DocumentProviderMaxLowQualitySuggestions", "1"}, -@@ -4756,13 +4756,13 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4759,13 +4759,13 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kWebShare)}, #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -52,7 +52,7 @@ {"skip-undecryptable-passwords", flag_descriptions::kSkipUndecryptablePasswordsName, flag_descriptions::kSkipUndecryptablePasswordsDescription, -@@ -5039,7 +5039,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5042,7 +5042,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(feed::kDiscoFeedEndpoint)}, #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -61,7 +61,7 @@ {"following-feed-sidepanel", flag_descriptions::kFollowingFeedSidepanelName, flag_descriptions::kFollowingFeedSidepanelDescription, kOsDesktop, FEATURE_VALUE_TYPE(feed::kWebUiFeed)}, -@@ -5686,7 +5686,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5692,7 +5692,7 @@ const FeatureEntry kFeatureEntries[] = { kOsAll, FEATURE_VALUE_TYPE(omnibox::kUseExistingAutocompleteClient)}, #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -70,7 +70,7 @@ {"omnibox-experimental-keyword-mode", flag_descriptions::kOmniboxExperimentalKeywordModeName, flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop, -@@ -6470,7 +6470,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6476,7 +6476,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)}, -@@ -7343,7 +7343,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7349,7 +7349,7 @@ const FeatureEntry kFeatureEntries[] = { #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -88,7 +88,7 @@ {"global-media-controls-modern-ui", flag_descriptions::kGlobalMediaControlsModernUIName, flag_descriptions::kGlobalMediaControlsModernUIDescription, -@@ -8118,7 +8118,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8124,7 +8124,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -97,7 +97,7 @@ {"quick-commands", flag_descriptions::kQuickCommandsName, flag_descriptions::kQuickCommandsDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kQuickCommands)}, -@@ -8363,7 +8363,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8369,7 +8369,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(ash::features::kWallpaperPerDesk)}, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -106,7 +106,7 @@ {"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName, flag_descriptions::kGetAllScreensMediaDescription, kOsCrOS | kOsLacros | kOsLinux, -@@ -8424,7 +8424,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8430,7 +8430,7 @@ const FeatureEntry kFeatureEntries[] = { #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -115,7 +115,7 @@ { "ui-debug-tools", flag_descriptions::kUIDebugToolsName, -@@ -9001,7 +9001,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9007,7 +9007,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -124,7 +124,7 @@ {"document-picture-in-picture-api", flag_descriptions::kDocumentPictureInPictureApiName, flag_descriptions::kDocumentPictureInPictureApiDescription, -@@ -9699,7 +9699,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9705,7 +9705,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kWebUIOmniboxPopupDescription, kOsDesktop, FEATURE_VALUE_TYPE(omnibox::kWebUIOmniboxPopup)}, @@ -133,7 +133,7 @@ {"webui-system-font", flag_descriptions::kWebUiSystemFontName, flag_descriptions::kWebUiSystemFontDescription, kOsAll, FEATURE_VALUE_TYPE(features::kWebUiSystemFont)}, -@@ -9900,7 +9900,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9906,7 +9906,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main.cc b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main.cc index 81f84168ec31..55e0eecc1e55 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main.cc @@ -1,4 +1,4 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2023-06-05 19:39:05 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2023-06-16 11:04:37 UTC +++ chrome/browser/chrome_browser_main.cc @@ -241,11 +241,11 @@ @@ -23,7 +23,7 @@ #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h" #include "chrome/browser/metrics/desktop_session_duration/touch_mode_stats_tracker.h" #include "chrome/browser/profiles/profile_activity_metrics_recorder.h" -@@ -992,7 +992,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -993,7 +993,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs); } @@ -32,7 +32,7 @@ // Create directory for user-level Native Messaging manifest files. This // makes it less likely that the directory will be created by third-party // software with incorrect owner or permission. See crbug.com/725513 . -@@ -1048,7 +1048,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1049,7 +1049,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || 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 f9a82428028e..6fcc1d73a260 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-06-05 19:39:05 UTC +--- chrome/browser/flag_descriptions.cc.orig 2023-06-16 11:04:37 UTC +++ chrome/browser/flag_descriptions.cc -@@ -2454,7 +2454,7 @@ const char kWebUIOmniboxPopupName[] = "WebUI Omnibox P +@@ -2460,7 +2460,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 " -@@ -6597,7 +6597,7 @@ const char kLibAssistantV2MigrationDescription[] = +@@ -6603,7 +6603,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 " -@@ -6843,7 +6843,7 @@ const char kSearchWebInSidePanelDescription[] = +@@ -6849,7 +6849,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."; -@@ -6852,7 +6852,7 @@ const char kQuickCommandsDescription[] = +@@ -6858,7 +6858,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."; -@@ -6874,7 +6874,7 @@ const char kEnableProtoApiForClassifyUrlDescription[] +@@ -6880,7 +6880,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[] = -@@ -6892,7 +6892,7 @@ const char kWebShareDescription[] = +@@ -6898,7 +6898,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"; -@@ -6912,7 +6912,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti +@@ -6918,7 +6918,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."; -@@ -6926,7 +6926,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail +@@ -6932,7 +6932,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) -@@ -7027,7 +7027,7 @@ const char kElasticOverscrollDescription[] = +@@ -7033,7 +7033,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."; -@@ -7056,7 +7056,7 @@ const char kSigninInterceptBubbleV2Description[] = +@@ -7062,7 +7062,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 76c6409c8901..2c716810ea6a 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-06-05 19:39:05 UTC +--- chrome/browser/flag_descriptions.h.orig 2023-06-16 11:04:37 UTC +++ chrome/browser/flag_descriptions.h -@@ -1382,7 +1382,7 @@ extern const char kOmniboxUpdatedConnectionSecurityInd +@@ -1385,7 +1385,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 -@@ -3818,7 +3818,7 @@ extern const char kLacrosScreenCoordinatesEnabledName[ +@@ -3821,7 +3821,7 @@ extern const char kLacrosScreenCoordinatesEnabledName[ extern const char kLacrosScreenCoordinatesEnabledDescription[]; #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) -@@ -3945,14 +3945,14 @@ extern const char kSearchWebInSidePanelDescription[]; +@@ -3948,14 +3948,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) -@@ -3962,7 +3962,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa +@@ -3965,7 +3965,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[]; -@@ -3972,7 +3972,7 @@ extern const char kOzonePlatformHintName[]; +@@ -3975,7 +3975,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[]; -@@ -3980,13 +3980,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt +@@ -3983,13 +3983,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) || -@@ -4002,7 +4002,7 @@ extern const char kEnableProtoApiForClassifyUrlName[]; +@@ -4005,7 +4005,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) -@@ -4076,7 +4076,7 @@ extern const char kElasticOverscrollDescription[]; +@@ -4079,7 +4079,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[]; -@@ -4094,7 +4094,7 @@ extern const char kSigninInterceptBubbleV2Description[ +@@ -4097,7 +4097,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_ui_webui_chrome__web__ui__controller__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc index 68787c346d19..335fc05405d5 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2023-06-05 19:39:05 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2023-06-16 11:04:37 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -325,7 +325,7 @@ +@@ -326,7 +326,7 @@ #include "chrome/browser/ui/webui/app_launcher_page_ui.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/ui/webui/webui_js_error/webui_js_error_ui.h" #endif -@@ -351,17 +351,17 @@ +@@ -352,17 +352,17 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -30,7 +30,7 @@ #include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h" #endif -@@ -702,7 +702,7 @@ bool IsAboutUI(const GURL& url) { +@@ -703,7 +703,7 @@ bool IsAboutUI(const GURL& url) { #if !BUILDFLAG(IS_ANDROID) || url.host_piece() == chrome::kChromeUITermsHost #endif @@ -39,7 +39,7 @@ || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost #endif #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -982,7 +982,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -983,7 +983,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we return &NewWebUI; } #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -48,7 +48,7 @@ if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost) return &NewWebUI; #endif -@@ -1037,7 +1037,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -1038,7 +1038,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUINaClHost) return &NewWebUI; #endif @@ -57,7 +57,7 @@ defined(TOOLKIT_VIEWS)) || \ defined(USE_AURA) if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost) -@@ -1105,27 +1105,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -1106,27 +1106,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we } #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.cc b/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.cc index 8df90c46e69a..d94490a2080c 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.cc +++ b/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.cc @@ -1,4 +1,4 @@ ---- chrome/common/webui_url_constants.cc.orig 2023-06-05 19:39:05 UTC +--- chrome/common/webui_url_constants.cc.orig 2023-06-16 11:04:37 UTC +++ chrome/common/webui_url_constants.cc @@ -515,18 +515,18 @@ const char kOsUIShortcutCustomizationAppURL[] = "os:// const char kOsUIVersionURL[] = "os://version"; @@ -57,7 +57,7 @@ const char kChromeUIWebAppSettingsURL[] = "chrome://app-settings/"; const char kChromeUIWebAppSettingsHost[] = "app-settings"; #endif -@@ -869,7 +869,7 @@ const char* const kChromeDebugURLs[] = { +@@ -870,7 +870,7 @@ const char* const kChromeDebugURLs[] = { blink::kChromeUIGpuJavaCrashURL, kChromeUIJavaCrashURL, #endif