git: 6c6a125c850f - main - www/ungoogled-chromium: update to 109.0.5414.119

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Rene Ladan <rene_at_FreeBSD.org>
Date: Thu, 26 Jan 2023 20:41:56 UTC
The branch main has been updated by rene:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6c6a125c850f6c1843732029f1000db68e308d81

commit 6c6a125c850f6c1843732029f1000db68e308d81
Author:     Robert Nagy <robert@openbsd.org>
AuthorDate: 2023-01-26 14:17:29 +0000
Commit:     Rene Ladan <rene@FreeBSD.org>
CommitDate: 2023-01-26 20:41:37 +0000

    www/ungoogled-chromium: update to 109.0.5414.119
    
    Security:       https://vuxml.freebsd.org/freebsd/3d0a3eb0-9ca3-11ed-a925-3065ec8fd3ec.html
---
 www/ungoogled-chromium/Makefile                    |  2 +-
 www/ungoogled-chromium/distinfo                    | 14 ++++----
 ...s_settings_appearance__page_appearance__page.ts | 17 +++-------
 .../files/patch-content_browser_BUILD.gn           |  4 +--
 .../patch-third__party_blink_common_features.cc    | 14 --------
 ..._renderer_platform_wtf_text_text__codec__icu.cc | 39 ++++++++++++++++++++++
 .../files/patch-third__party_pdfium_pdfium.gni     | 11 ++++++
 7 files changed, 64 insertions(+), 37 deletions(-)

diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile
index a58fb336da2e..0545d5db3e1a 100644
--- a/www/ungoogled-chromium/Makefile
+++ b/www/ungoogled-chromium/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	ungoogled-chromium
-PORTVERSION=	109.0.5414.74
+PORTVERSION=	109.0.5414.119
 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 b0d2c7792f5e..438b278cd563 100644
--- a/www/ungoogled-chromium/distinfo
+++ b/www/ungoogled-chromium/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1673600291
-SHA256 (chromium-109.0.5414.74.tar.xz) = eded233c26ab631be325ad49cb306c338513b6a6528197d42653e66187548e5d
-SIZE (chromium-109.0.5414.74.tar.xz) = 1747778008
-SHA256 (ungoogled-chromium-109.0.5414.74-1.tar.gz) = 2e07a6833ca7531ee5f64c24e31069192256bad5abbe1091ca12802ba2ad3a75
-SIZE (ungoogled-chromium-109.0.5414.74-1.tar.gz) = 671524
-SHA256 (chromium-109.0.5414.74-testdata.tar.xz) = 74013c3e3c3cae2399df75fb16e918df3ca7e8f0810b6b77d5f3b616c353ce04
-SIZE (chromium-109.0.5414.74-testdata.tar.xz) = 262657092
+TIMESTAMP = 1674739343
+SHA256 (chromium-109.0.5414.119.tar.xz) = cbcdef5ee71acb53790ded3adef86871812b46e9f208dce8ec3f8ab04958be2d
+SIZE (chromium-109.0.5414.119.tar.xz) = 1747968612
+SHA256 (ungoogled-chromium-109.0.5414.119-1.tar.gz) = e10fe46f3f4b7058c278ab86c6795cc2b68459bcb7ced5efad3355ab5c2f5de1
+SIZE (ungoogled-chromium-109.0.5414.119-1.tar.gz) = 671793
+SHA256 (chromium-109.0.5414.119-testdata.tar.xz) = 8781e0dde6b4ec48a2863cf14911d6d6e645b949134c9743e38e9522b889704f
+SIZE (chromium-109.0.5414.119-testdata.tar.xz) = 264800856
 SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
 SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts b/www/ungoogled-chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts
index e6acf44b522f..55fd1bdf5e85 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts
@@ -1,4 +1,4 @@
---- chrome/browser/resources/settings/appearance_page/appearance_page.ts.orig	2022-10-29 17:50:56 UTC
+--- chrome/browser/resources/settings/appearance_page/appearance_page.ts.orig	2023-01-26 13:28:14 UTC
 +++ chrome/browser/resources/settings/appearance_page/appearance_page.ts
 @@ -63,7 +63,7 @@ export interface SettingsAppearancePageElement {
  export enum SystemTheme {
@@ -45,21 +45,12 @@
    private systemThemePrefChanged_(systemTheme: SystemTheme) {
      this.systemTheme_ = systemTheme;
    }
-@@ -354,7 +354,7 @@ export class SettingsAppearancePageElement extends
+@@ -353,7 +353,7 @@ export class SettingsAppearancePageElement extends
+       return;
      }
  
-     let i18nId;
 -    // <if expr="is_linux">
 +    // <if expr="is_posix">
+     let i18nId;
      switch (this.systemTheme_) {
        case SystemTheme.GTK:
-         i18nId = 'gtkTheme';
-@@ -367,7 +367,7 @@ export class SettingsAppearancePageElement extends
-         break;
-     }
-     // </if>
--    // <if expr="not is_linux">
-+    // <if expr="not is_posix">
-     i18nId = 'chooseFromWebStore';
-     // </if>
-     this.themeSublabel_ = this.i18n(i18nId);
diff --git a/www/ungoogled-chromium/files/patch-content_browser_BUILD.gn b/www/ungoogled-chromium/files/patch-content_browser_BUILD.gn
index 3394a1a57f78..0ff0445c2f4f 100644
--- a/www/ungoogled-chromium/files/patch-content_browser_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-content_browser_BUILD.gn
@@ -1,6 +1,6 @@
---- content/browser/BUILD.gn.orig	2023-01-13 08:56:02 UTC
+--- content/browser/BUILD.gn.orig	2023-01-26 13:28:14 UTC
 +++ content/browser/BUILD.gn
-@@ -2338,6 +2338,13 @@ source_set("browser") {
+@@ -2340,6 +2340,13 @@ source_set("browser") {
      ]
    }
  
diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_common_features.cc b/www/ungoogled-chromium/files/patch-third__party_blink_common_features.cc
deleted file mode 100644
index a4bab031d72c..000000000000
--- a/www/ungoogled-chromium/files/patch-third__party_blink_common_features.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- third_party/blink/common/features.cc.orig	2023-01-13 08:56:02 UTC
-+++ third_party/blink/common/features.cc
-@@ -1759,9 +1759,10 @@ BASE_FEATURE(kSplitUserMediaQueues,
-              "SplitUserMediaQueues",
-              base::FEATURE_DISABLED_BY_DEFAULT);
- 
-+// XXX https://crbug.com/1382032
- BASE_FEATURE(kTextCodecCJKEnabled,
-              "TextCodecCJKEnabled",
--             base::FEATURE_ENABLED_BY_DEFAULT);
-+             base::FEATURE_DISABLED_BY_DEFAULT);
- 
- }  // namespace features
- }  // namespace blink
diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_wtf_text_text__codec__icu.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_wtf_text_text__codec__icu.cc
new file mode 100644
index 000000000000..a8b2b67457dd
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_wtf_text_text__codec__icu.cc
@@ -0,0 +1,39 @@
+--- third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc.orig	2023-01-26 13:28:14 UTC
++++ third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc
+@@ -116,6 +116,10 @@ void TextCodecICU::RegisterEncodingNames(EncodingNameR
+       continue;
+     }
+ #endif
++    // Avoid codecs supported by `TextCodecCJK`.
++    if (is_text_codec_cjk_enabled && TextCodecCJK::IsSupported(standard_name)) {
++      continue;
++    }
+ 
+ // A number of these aliases are handled in Chrome's copy of ICU, but
+ // Chromium can be compiled with the system ICU.
+@@ -144,12 +148,13 @@ void TextCodecICU::RegisterEncodingNames(EncodingNameR
+     }
+ #endif
+ 
+-    if (is_text_codec_cjk_enabled && TextCodecCJK::IsSupported(standard_name)) {
+-      continue;
++    // Avoid registering codecs registered by
++    // `TextCodecCJK::RegisterEncodingNames`.
++    if (!is_text_codec_cjk_enabled ||
++        !TextCodecCJK::IsSupported(standard_name)) {
++      registrar(standard_name, standard_name);
+     }
+ 
+-    registrar(standard_name, standard_name);
+-
+     uint16_t num_aliases = ucnv_countAliases(name, &error);
+     DCHECK(U_SUCCESS(error));
+     if (U_SUCCESS(error))
+@@ -289,6 +294,7 @@ void TextCodecICU::RegisterCodecs(TextCodecRegistrar r
+       continue;
+     }
+ #endif
++    // Avoid codecs supported by `TextCodecCJK`.
+     if (is_text_codec_cjk_enabled && TextCodecCJK::IsSupported(standard_name)) {
+       continue;
+     }
diff --git a/www/ungoogled-chromium/files/patch-third__party_pdfium_pdfium.gni b/www/ungoogled-chromium/files/patch-third__party_pdfium_pdfium.gni
new file mode 100644
index 000000000000..bc8530e2cf25
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-third__party_pdfium_pdfium.gni
@@ -0,0 +1,11 @@
+--- third_party/pdfium/pdfium.gni.orig	2023-01-26 13:28:14 UTC
++++ third_party/pdfium/pdfium.gni
+@@ -37,7 +37,7 @@ declare_args() {
+   pdf_enable_xfa_tiff = true
+ 
+   # Build PDFium with PartitionAlloc as the memory allocator.
+-  pdf_use_partition_alloc = pdf_use_partition_alloc_override
++  pdf_use_partition_alloc = pdf_use_partition_alloc_override && use_partition_alloc_as_malloc
+ 
+   # Build PDFium to use Skia (experimental) for all PDFium graphics.
+   # If enabled, coexists in build with AGG graphics and the default