fix building with system icu

3 files changed, 25 insertions, 1 deletions

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 5f41f01..31a7a10 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -20,6 +20,7 @@ AUX chromium-128-compiler-r1.patch 11600 BLAKE2B f4ce3e65a5cd31b80dff1de3899dd2b
 AUX chromium-128-compiler.patch 11361 BLAKE2B 786fdfecae585caf661bddd5ba7d27f2061bfa74a996b0f36d89604246a23d95b2a70c9b8bc19b5413af33f52a831ca3145aa932cda18763fe732cd70d4051cd SHA512 b222f685e7365d0763ee67e970043fa83dabfe3e1bddecf7dd473b7f33d8d5b89c96fadda715bd45705e9ba9fedbebd0897de4a093482812ff49a7be601b00d4
 AUX chromium-131-EnumTable-crash.patch 3000 BLAKE2B 4c80e86a9346a6ad68b264975fc048bf2f99a3b08d1f0f107d005d5a7cd0becc5cdc070acc4a5b505d6497318e47b18fe59905f6be6ef7b631f8fa5fd4d615c6 SHA512 351233bbece8b3d36fdd5c0436532797061ca72bb0146e3455f0fe254da43f003c03372fae7aaf29cb25749d9270fb045af01857111a1539036b27ceca4e0bed
 AUX chromium-131-compiler.patch 11595 BLAKE2B 8a4e264140dfc64324d8007586a1c1d961bedc9937a8be73d7834703c37f55e1005ef732ffc994fe8bda7090a1ae41769dd400864db37aafb4415bbb05ba05c7 SHA512 dd2bbdee91e70eaeae4e4485833345edf606c1a12eab15ca3860d97d773f127c0674fb1edab970236d69d44ab81c7a0b058b6c21abc92ea08cd1caceb5572442
+AUX chromium-131-text_codec_icu-system-icu.patch 1204 BLAKE2B 97bfcc1ef1e72da9fc3c9a473c32e0077a3eae9a19e7cac65b457ac8196075ea86c66d7ec13638abf617b18b53ab93fe6df4d6423acdedfb086497cadc2a3dff SHA512 f742b9f7b1c7d26e0b3795ad59d00c726e48e872233186cf880021609b27026882ab27e1cbcacfba882ed3381b08fe29912e5ea2553dbdbbe16730b4b63c1f96
 AUX chromium-131-use-oauth2-client-switches-as-default.patch 1194 BLAKE2B 040f8161c659d015bfda3f8f2f9c3f904b0b1318233569550c80b4c1a6cfeca8e3d39998e8ebec87880948ec2444214fd0551f0a65111363c3c40fe3c0d717c8 SHA512 20621cc7ee69bb0e53d1806f6e78381357fb31c99d339ed9b385a669dcdc92b800f2b3c2d6833bb36e94348793afe790a6f3f3d5d2f330c57407305fa8095a5a
 AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca
 AUX chromium-cross-compile.patch 323 BLAKE2B 8d5091ce5287422c9688ede2563360a96b8bd34b9750dc1c8f0b6ca9aeff2c066fac2da169396baa131d971c087c78f9af53999df0e102d1f57176f5e8d3dd57 SHA512 06d3afc1aa19e57daac0e4bad37e1f365a68408240430e5e818e5a4f12e3b7519214eafa463633e447e7029f4ae13ea864ca347ad1fac117702a0be88718a954
@@ -31,4 +32,4 @@ DIST chromium-130.0.6683.2.tar.xz 6686066448 BLAKE2B 6a4fb05d05c875b793f352edd24
 DIST chromium-131.0.6738.0.tar.xz 6608599384 BLAKE2B 9a415ee207231c4d952435011770e285f4954e2daf3960913b127ac4524e33aff15dcefb10ec0961104bf523c8eca5202451e4bf1b8fc18c34944c73242557ee SHA512 67210dc723d30af7c73c07a88d8bb8e1c17320492f036a75b7a945447ad973a69740d6a0fcfbf0eecd296b0634701c099b6493b1dc6e8810889d0e25bc610a76
 DIST chromium-profiler-0.2.tar 259952640 BLAKE2B 5e82389fce00b267280d633b26551231c558b80f0c92cd7d60271095a3503365ab673e7a46dc5f74f8a82db1f21262cb24dcc0531d954bab5fb3b175dab3394d SHA512 9fa89a5ab728419683e7495ae676567480987d68a2d589f2aa97bfcbcf123f3c8f97f8bca5f65e5e3f6e41475535add473ded83b9c7a33bb4746a9d05b298a6c
 EBUILD chromium-130.0.6683.2.ebuild 40545 BLAKE2B 252c06a46c748663e805359ad0e2664defc65a4a95d64d10d861931d4773bb65f39b82c0b3451fe7be51c79c838b1842b0741631241f1ef689d901bd22f81683 SHA512 bec458184e1028a7fb8041444b0fc4a259d82d056877101b545d72086388575daf66362cbd3aa185bf84853cb0aaccd1151646894cd161674359c0fe61998f01
-EBUILD chromium-131.0.6738.0.ebuild 40442 BLAKE2B a855c22cfee7426cb0f5deed2013cc912ce0574c47146797a410b436bd028e619887ff9c16d7dff36063e4d5cbb802e0e7b9a4d45f278d05df8defe0b354a298 SHA512 40a4c207af91700ef74e4e97ce5d3a532f5115b87d0e351d1fb998d9f1d0acff5c4be53f2d509f1632358c07f7260fefdae592b0a0ce79c5b54ba950e156e1a1
+EBUILD chromium-131.0.6738.0.ebuild 40503 BLAKE2B 1de56a3b2637555914e4c0a2c3abc429761c4e386aa8fb11677d8e6c29635ad4cb932f40d5b619a30e79fb524052f02d7c218b071c0d17b4a9c661725832793c SHA512 102b63fba3e12ec610c8dac4d39d96422ce1945d6c1b5bcd05da0b1d355aab5605b655205a2f907e211dfd78a7c9b899ef837a3186bef099f50fed69bf2c8365
diff --git a/www-client/chromium/chromium-131.0.6738.0.ebuild b/www-client/chromium/chromium-131.0.6738.0.ebuild
index 34ac3b9..751b3a7 100644
--- a/www-client/chromium/chromium-131.0.6738.0.ebuild
+++ b/www-client/chromium/chromium-131.0.6738.0.ebuild
@@ -326,6 +326,7 @@ src_prepare() {
 		"${FILESDIR}/chromium-118-material-color-utils.patch"
 		"${FILESDIR}/chromium-126-freetype-blink.patch"
 		"${FILESDIR}/chromium-124-metrics-histograms-nodepotbin.patch"
+		"${FILESDIR}/chromium-131-text_codec_icu-system-icu.patch"
 
 		"${FILESDIR}/chromium-111-InkDropHost-crash.patch"
 		"${FILESDIR}/chromium-131-EnumTable-crash.patch"
diff --git a/www-client/chromium/files/chromium-131-text_codec_icu-system-icu.patch b/www-client/chromium/files/chromium-131-text_codec_icu-system-icu.patch
new file mode 100644
index 0000000..50ada83
--- /dev/null
+++ b/www-client/chromium/files/chromium-131-text_codec_icu-system-icu.patch
@@ -0,0 +1,22 @@
+diff --git a/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc b/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc
+index dfa1cb1369..ecffa654a2 100644
+--- a/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc
++++ b/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc
+@@ -323,7 +323,7 @@ void TextCodecICU::CreateICUConverter() const {
+   DCHECK(!converter_icu_);
+ 
+ #if defined(USING_SYSTEM_ICU)
+-  const char* name = encoding_.GetName();
++  const char* name = encoding_.GetName().Utf8().c_str();
+   needs_gbk_fallbacks_ =
+       name[0] == 'G' && name[1] == 'B' && name[2] == 'K' && !name[3];
+ #endif
+@@ -448,7 +448,7 @@ String TextCodecICU::Decode(base::span<const uint8_t> data,
+   // <http://bugs.webkit.org/show_bug.cgi?id=17014>
+   // Simplified Chinese pages use the code A3A0 to mean "full-width space", but
+   // ICU decodes it as U+E5E5.
+-  if (!strcmp(encoding_.GetName(), "GBK")) {
++  if (!strcmp(encoding_.GetName().Utf8().c_str(), "GBK")) {
+     if (EqualIgnoringASCIICase(encoding_.GetName(), "gb18030"))
+       resultString.Replace(0xE5E5, kIdeographicSpaceCharacter);
+     // Make GBK compliant to the encoding spec and align with GB18030