-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
www-client/ungoogled-chromium: other fixes
- Loading branch information
Showing
4 changed files
with
73 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
www-client/ungoogled-chromium/files/chromium-131-const-atomicstring-conversion.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| From 403ee5b14df12c8ee3b3583177bbd30d930e9aaf Mon Sep 17 00:00:00 2001 | ||
| From: Matt Jolly <[email protected]> | ||
| Date: Sat, 12 Oct 2024 13:45:37 +1000 | ||
| Subject: [PATCH] Convert 'Const AtomicString' to 'const char *'. | ||
|
|
||
| I don't know why this is suddenly required? | ||
| --- 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,10 @@ void TextCodecICU::CreateICUConverter() const { | ||
| DCHECK(!converter_icu_); | ||
|
|
||
| #if defined(USING_SYSTEM_ICU) | ||
| - const char* name = encoding_.GetName(); | ||
| + //convert to WTF::String to use existing `const char *` dependent functions | ||
| + WTF::String nameString = encoding_.GetName(); | ||
| + std::string nameUtf8 = nameString.Utf8(); | ||
| + const char* name = nameUtf8.c_str(); | ||
| needs_gbk_fallbacks_ = | ||
| name[0] == 'G' && name[1] == 'B' && name[2] == 'K' && !name[3]; | ||
| #endif | ||
| @@ -448,7 +451,10 @@ 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")) { | ||
| + // Convert AtomicString to String | ||
| + WTF::String nameString = encoding_.GetName(); | ||
| + std::string nameUtf8 = nameString.Utf8(); | ||
| + if (!strcmp(nameUtf8.c_str(), "GBK")) { | ||
| if (EqualIgnoringASCIICase(encoding_.GetName(), "gb18030")) | ||
| resultString.Replace(0xE5E5, kIdeographicSpaceCharacter); | ||
| // Make GBK compliant to the encoding spec and align with GB18030 | ||
| -- | ||
| 2.46.2 | ||
|
|
21 changes: 21 additions & 0 deletions
21
www-client/ungoogled-chromium/files/chromium-131-webrtc-fixes.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| --- a/third_party/webrtc/rtc_base/ssl_stream_adapter.h | ||
| +++ b/third_party/webrtc/rtc_base/ssl_stream_adapter.h | ||
| @@ -15,6 +15,7 @@ | ||
| #include <stdint.h> | ||
|
|
||
| #include <memory> | ||
| +#include <optional> | ||
| #include <string> | ||
| #include <vector> | ||
|
|
||
| --- a/third_party/webrtc/rtc_base/openssl_stream_adapter.h | ||
| +++ b/third_party/webrtc/rtc_base/openssl_stream_adapter.h | ||
| @@ -102,7 +102,7 @@ | ||
| void Close() override; | ||
| StreamState GetState() const override; | ||
|
|
||
| - std::optional<absl::string_view> GetTlsCipherSuiteName() const override; | ||
| + std::optional<absl::string_view> GetTlsCipherSuiteName() const; | ||
|
|
||
| bool GetSslCipherSuite(int* cipher) const override; | ||
| [[deprecated("Use GetSslVersionBytes")]] SSLProtocolVersion GetSslVersion() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters