aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Nagy <robert@openbsd.org>2023-01-26 13:20:02 +0000
committerRene Ladan <rene@FreeBSD.org>2023-01-26 20:42:40 +0000
commit1324a75826c376c472c8a4a6b06367a15711defc (patch)
tree5f29cd2798733f5f2709e466530a78fee50af5a6
parent66ec370ddf5a680a7cb5556cf3d0f678fb11ee86 (diff)
downloadports-1324a75826c376c472c8a4a6b06367a15711defc.tar.gz
ports-1324a75826c376c472c8a4a6b06367a15711defc.zip
www/chromium: update to 109.0.5414.119
Security: https://vuxml.freebsd.org/freebsd/3d0a3eb0-9ca3-11ed-a925-3065ec8fd3ec.html (cherry picked from commit a6eba3de9aa1b6a1c4f7300f69c13388086fa8a6)
-rw-r--r--www/chromium/Makefile2
-rw-r--r--www/chromium/distinfo14
-rw-r--r--www/chromium/files/patch-content_browser_BUILD.gn4
-rw-r--r--www/chromium/files/patch-third__party_blink_common_features.cc14
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_platform_wtf_text_text__codec__icu.cc39
-rw-r--r--www/chromium/files/patch-third__party_pdfium_pdfium.gni11
6 files changed, 60 insertions, 24 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 45c3aa17838b..b706f6936c71 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -1,5 +1,5 @@
PORTNAME= chromium
-PORTVERSION= 109.0.5414.74
+PORTVERSION= 109.0.5414.119
CATEGORIES= www wayland
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
https://nerd.hu/distfiles/:external
diff --git a/www/chromium/distinfo b/www/chromium/distinfo
index 19b4f1ff07e9..bb7348a30c7c 100644
--- a/www/chromium/distinfo
+++ b/www/chromium/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1673422188
-SHA256 (chromium-109.0.5414.74.tar.xz) = eded233c26ab631be325ad49cb306c338513b6a6528197d42653e66187548e5d
-SIZE (chromium-109.0.5414.74.tar.xz) = 1747778008
-SHA256 (chrome-linux-109.0.5414.74-llvm13.profdata.tar.xz) = 7f178c51ffa9cafbf4f147f17ad6b6c6833c999c8885c50d56c21b6f4ba8212c
-SIZE (chrome-linux-109.0.5414.74-llvm13.profdata.tar.xz) = 26288820
-SHA256 (chromium-109.0.5414.74-testdata.tar.xz) = 74013c3e3c3cae2399df75fb16e918df3ca7e8f0810b6b77d5f3b616c353ce04
-SIZE (chromium-109.0.5414.74-testdata.tar.xz) = 262657092
+TIMESTAMP = 1674714013
+SHA256 (chromium-109.0.5414.119.tar.xz) = cbcdef5ee71acb53790ded3adef86871812b46e9f208dce8ec3f8ab04958be2d
+SIZE (chromium-109.0.5414.119.tar.xz) = 1747968612
+SHA256 (chrome-linux-109.0.5414.119-llvm13.profdata.tar.xz) = 0cf5a50597b0292127cdbee637ece41017b009a501e92bf73ce82bfe30124175
+SIZE (chrome-linux-109.0.5414.119-llvm13.profdata.tar.xz) = 26305372
+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/chromium/files/patch-content_browser_BUILD.gn b/www/chromium/files/patch-content_browser_BUILD.gn
index 40a208729c0d..ae9a1ac3aa55 100644
--- a/www/chromium/files/patch-content_browser_BUILD.gn
+++ b/www/chromium/files/patch-content_browser_BUILD.gn
@@ -1,6 +1,6 @@
---- content/browser/BUILD.gn.orig 2023-01-11 09:17:16 UTC
+--- content/browser/BUILD.gn.orig 2023-01-26 06:54:16 UTC
+++ content/browser/BUILD.gn
-@@ -2338,6 +2338,13 @@ source_set("browser") {
+@@ -2340,6 +2340,13 @@ source_set("browser") {
]
}
diff --git a/www/chromium/files/patch-third__party_blink_common_features.cc b/www/chromium/files/patch-third__party_blink_common_features.cc
deleted file mode 100644
index bf17f1fc5f89..000000000000
--- a/www/chromium/files/patch-third__party_blink_common_features.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- third_party/blink/common/features.cc.orig 2023-01-11 09:17:16 UTC
-+++ third_party/blink/common/features.cc
-@@ -1757,9 +1757,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/chromium/files/patch-third__party_blink_renderer_platform_wtf_text_text__codec__icu.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_text_text__codec__icu.cc
new file mode 100644
index 000000000000..cfb7bf5a37b6
--- /dev/null
+++ b/www/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 06:54:16 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/chromium/files/patch-third__party_pdfium_pdfium.gni b/www/chromium/files/patch-third__party_pdfium_pdfium.gni
new file mode 100644
index 000000000000..ca7d5fe38a01
--- /dev/null
+++ b/www/chromium/files/patch-third__party_pdfium_pdfium.gni
@@ -0,0 +1,11 @@
+--- third_party/pdfium/pdfium.gni.orig 2023-01-26 06:54:16 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