michael/chromium-build-helper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sad 2

Browse Source
This commit is contained in:
Michael Peters 2023-01-08 13:30:28 -08:00
parent ed6204655b
commit 533136b731
6 changed files with 266 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
aur-patches.sh Executable file
View File

@ -0,0 +1,39 @@
## MANUALLY ##
# Copy the "patch" lines from aur-ungoogled-chromium/PKGBUILD into the following target
# add cd chromium-src && before each line
# rename "../patches" to "../chromium-patches"
# rename "../" to "../aur-patches"
set -x
# Use the --oauth2-client-id= and --oauth2-client-secret= switches for
# setting GOOGLE_DEFAULT_CLIENT_ID and GOOGLE_DEFAULT_CLIENT_SECRET at
# runtime -- this allows signing into Chromium without baked-in values
patch -Np1 -i ../aur-patches/use-oauth2-client-switches-as-default.patch
# Upstream fixes
patch -Np1 -i ../aur-patches/re-fix-TFLite-build-error-on-linux-with-system-zlib.patch
patch -Np1 -i ../aur-patches/chromium-icu72.patch
patch -Np1 -d v8 < ../aur-patches/v8-enhance-Date-parser-to-take-Unicode-SPACE.patch
# Revert ffmpeg roll requiring new channel layout API support
# https://crbug.com/1325301
patch -Rp1 -i ../aur-patches/REVERT-roll-src-third_party-ffmpeg-m102.patch
# Revert switch from AVFrame::pkt_duration to AVFrame::duration
patch -Rp1 -i ../aur-patches/REVERT-roll-src-third_party-ffmpeg-m106.patch
# Disable kGlobalMediaControlsCastStartStop by default
# https://crbug.com/1314342
patch -Np1 -i ../aur-patches/disable-GlobalMediaControlsCastStartStop.patch
# https://crbug.com/angleproject/7582
patch -Np0 -i ../aur-patches/angle-wayland-include-protocol.patch
# Fixes for building with libstdc++ instead of libc++
patch -Np1 -i ../chromium-patches/chromium-103-VirtualCursor-std-layout.patch
# Enable vaapi on wayland
patch -Np1 -i ../aur-patches/ozone-add-va-api-support-to-wayland.patch
# Remove HEVC profile limits
patch -Np1 -i ../aur-patches/remove-main-main10-profile-limit.patch

114
aur-patches/chromium-icu72.patch Normal file
View File

@ -0,0 +1,114 @@
From 2c4d3c61aa33f3169e7923ea3433c71e3df0952f Mon Sep 17 00:00:00 2001
From: Frank Tang <ftang@chromium.org>
Date: Mon, 7 Nov 2022 22:08:05 +0000
Subject: [PATCH 1/2] Prepare for ICU72 landing
The date format may output U+202F Narrow SPACE between time
and AM/PM. So switch to use UTF8 and not restrict to ASCII which
will break when the output is not only ASCII.
Bug: 1371208
Change-Id: I05f9daadfba5c45d618f15ae23340da373f2f36a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4007076
Reviewed-by: Daniel Rubery <drubery@chromium.org>
Commit-Queue: Frank Tang <ftang@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1068343}
(cherry picked from commit ce2ffed84b95e2b7c068d6f066d86cd034212425)
---
.../safe_browsing/content/browser/web_ui/safe_browsing_ui.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/safe_browsing/content/browser/web_ui/safe_browsing_ui.cc b/components/safe_browsing/content/browser/web_ui/safe_browsing_ui.cc
index 92597a9d3a4..e6e7514a082 100644
--- a/components/safe_browsing/content/browser/web_ui/safe_browsing_ui.cc
+++ b/components/safe_browsing/content/browser/web_ui/safe_browsing_ui.cc
@@ -457,7 +457,7 @@ namespace {
std::string UserReadableTimeFromMillisSinceEpoch(int64_t time_in_milliseconds) {
base::Time time =
base::Time::UnixEpoch() + base::Milliseconds(time_in_milliseconds);
- return base::UTF16ToASCII(base::TimeFormatShortDateAndTime(time));
+ return base::UTF16ToUTF8(base::TimeFormatShortDateAndTime(time));
}
void AddStoreInfo(const DatabaseManagerInfo::DatabaseInfo::StoreInfo store_info,
From 8ba9d96da703978655cddf07d58b0a15f0a43a10 Mon Sep 17 00:00:00 2001
From: Frank Tang <ftang@chromium.org>
Date: Tue, 8 Nov 2022 00:13:16 +0000
Subject: [PATCH 2/2] Prepare the landing of ICU72/Unicode 15
See
https://www.unicode.org/emoji/charts-15.0/emoji-released.html
https://www.unicode.org/charts/PDF/U1F680.pdf
https://www.unicode.org/charts/PDF/U1FA70.pdf
for the newly added emoji to
Transport and Map Symbols
Symbols and Pictographs Extended-A blocks.
Update the kIsCJKIdeographOrSymbolRanges to Unicode 15
Needed to avoid test breakage of
CharacterTest.HammerEmojiVsCJKIdeographOrSymbol
Bug: 1371208
Change-Id: Ic7b319ba18f3aded46b252d8b484e3b1bc43eff4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4007098
Reviewed-by: Stephen Chenney <schenney@chromium.org>
Commit-Queue: Frank Tang <ftang@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1068422}
(cherry picked from commit d93a774bf6fac8ddaaa1041ea6ad2dd8e5ff4539)
---
.../platform/text/character_property_data.h | 24 +++++++++----------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/third_party/blink/renderer/platform/text/character_property_data.h b/third_party/blink/renderer/platform/text/character_property_data.h
index 9005c20a379..ee690563c28 100644
--- a/third_party/blink/renderer/platform/text/character_property_data.h
+++ b/third_party/blink/renderer/platform/text/character_property_data.h
@@ -107,7 +107,7 @@ static const UChar32 kIsCJKIdeographOrSymbolRanges[] = {
0x1F3FB, 0x1F3FF,
// Transport
- 0x1F6DD, 0x1F6DF,
+ 0x1F6DC, 0x1F6DF,
// Colored circles and squares for use with emoji.
0x1F7E0, 0x1F7EB,
@@ -118,25 +118,25 @@ static const UChar32 kIsCJKIdeographOrSymbolRanges[] = {
0x1F900, 0x1F90F,
// ZIPPER-MOUTH FACE...SIGN OF THE HORNS
0x1F910, 0x1F918, 0x1F919, 0x1F97F, 0x1F980, 0x1F9BF, 0x1F9C0, 0x1F9FF,
- // Clothing
- 0x1FA70, 0x1FA74,
- // Medical symbols
- 0x1FA78, 0x1FA7C,
+ // Clothing, heart and Medical symbols
+ 0x1FA70, 0x1FA7C,
// Toys and sport symbols
- 0x1FA80, 0x1FA86,
+ 0x1FA80, 0x1FA88,
// Miscellaneous objects
- 0x1FA90, 0x1FAAC,
// Animals and nature
- 0x1FAB0, 0x1FABA,
+ 0x1FA90, 0x1FABD,
+ // Animal
// Body parts
// People
- 0x1FAC0, 0x1FAC5,
+ 0x1FABF, 0x1FAC5,
+ // animal-mammal
+ 0x1FACE, 0x1FACF,
// Food and drink
- 0x1FAD0, 0x1FAD9,
+ 0x1FAD0, 0x1FADB,
// Face
- 0x1FAE0, 0x1FAE7,
+ 0x1FAE0, 0x1FAE8,
// Hand
- 0x1FAF0, 0x1FAF6,
+ 0x1FAF0, 0x1FAF8,
};
// https://html.spec.whatwg.org/C/#prod-potentialcustomelementname

13
aur-patches/disable-GlobalMediaControlsCastStartStop.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browser/media/router/media_router_feature.cc
index 862329ef314..47c89123876 100644
--- a/chrome/browser/media/router/media_router_feature.cc
+++ b/chrome/browser/media/router/media_router_feature.cc
@@ -54,7 +54,7 @@ BASE_FEATURE(kGlobalMediaControlsCastStartStop,
#else
BASE_FEATURE(kGlobalMediaControlsCastStartStop,
"GlobalMediaControlsCastStartStop",
- base::FEATURE_ENABLED_BY_DEFAULT);
+ base::FEATURE_DISABLED_BY_DEFAULT);
#endif // BUILDFLAG(IS_CHROMEOS)
#endif // !BUILDFLAG(IS_ANDROID)

41
aur-patches/re-fix-TFLite-build-error-on-linux-with-system-zlib.patch Normal file
View File

@ -0,0 +1,41 @@
From dda01a706453ded8c01c41775707cb5ef4e316f8 Mon Sep 17 00:00:00 2001
From: Andres Salomon <dilinger@queued.net>
Date: Tue, 25 Oct 2022 21:11:46 +0000
Subject: [PATCH] Re-fix TFLite build error on linux when using the system zlib
In commit ae0f9adb7e14c0d19ca695ef6ad40b321a8cb64c, I fixed some build
errors related to minizip patch inclusion in TFLite. However, after that
when TFLite Support was rolled to HEAD, a small part of that patch got
dropped. The result is the following build error with 107.0.5304.62:
../../third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc:22:10: fatal error: 'contrib/minizip/ioapi.h' file not found
^~~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.
This commit re-adds the lost fix.
R=junzou@chromium.org
Change-Id: Ie96c3571894b5100a1e2a2771da29699eff0beb3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3972087
Reviewed-by: Robert Ogden <robertogden@chromium.org>
Commit-Queue: Robert Ogden <robertogden@chromium.org>
Auto-Submit: Andres Salomon <dilinger@queued.net>
Cr-Commit-Position: refs/heads/main@{#1063478}
---
.../metadata/cc/utils/zip_readonly_mem_file.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc
index 392b6b411fe..525ae4a2b45 100644
--- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc
+++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc
@@ -19,7 +19,7 @@ limitations under the License.
#include <cstdio>
#include "absl/strings/string_view.h" // from @com_google_absl
-#include "contrib/minizip/ioapi.h"
+#include "third_party/zlib/contrib/minizip/ioapi.h"
namespace tflite {
namespace metadata {

58
aur-patches/v8-enhance-Date-parser-to-take-Unicode-SPACE.patch Normal file
View File

@ -0,0 +1,58 @@
From 81dd64c3705f89653859a5d0001dd0ca983a92e2 Mon Sep 17 00:00:00 2001
From: Frank Tang <ftang@chromium.org>
Date: Wed, 16 Nov 2022 09:18:45 -0800
Subject: [PATCH] [intl] Enhance Date parser to take Unicode SPACE
This is needed to prepare for the landing of ICU72.
Allow U+202F in the Date String, which the toLocaleString("en-US")
will generate w/ ICU72.
Bug: v8:13494
Change-Id: I41b83c4094ce3d0737a72dcd6310b52c68fdcdca
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4027341
Reviewed-by: Yang Guo <yangguo@chromium.org>
Reviewed-by: Jungshik Shin <jshin@chromium.org>
Commit-Queue: Frank Tang <ftang@chromium.org>
Cr-Commit-Position: refs/heads/main@{#84308}
(cherry picked from commit 2ada52cffbff11074abfaac18938bf02d85454f5)
---
src/date/dateparser-inl.h | 2 +-
src/date/dateparser.h | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/date/dateparser-inl.h b/src/date/dateparser-inl.h
index 623986d2b1..b45479dc51 100644
--- a/src/date/dateparser-inl.h
+++ b/src/date/dateparser-inl.h
@@ -192,7 +192,7 @@ DateParser::DateToken DateParser::DateStringTokenizer<CharType>::Scan() {
if (in_->Skip('+')) return DateToken::Symbol('+');
if (in_->Skip('.')) return DateToken::Symbol('.');
if (in_->Skip(')')) return DateToken::Symbol(')');
- if (in_->IsAsciiAlphaOrAbove()) {
+ if (in_->IsAsciiAlphaOrAbove() && !in_->IsWhiteSpaceChar()) {
DCHECK_EQ(KeywordTable::kPrefixLength, 3);
uint32_t buffer[3] = {0, 0, 0};
int length = in_->ReadWord(buffer, 3);
diff --git a/src/date/dateparser.h b/src/date/dateparser.h
index 1a0a0b15ab..59b2f3c9fd 100644
--- a/src/date/dateparser.h
+++ b/src/date/dateparser.h
@@ -91,7 +91,8 @@ class DateParser : public AllStatic {
// Return word length.
int ReadWord(uint32_t* prefix, int prefix_size) {
int len;
- for (len = 0; IsAsciiAlphaOrAbove(); Next(), len++) {
+ for (len = 0; IsAsciiAlphaOrAbove() && !IsWhiteSpaceChar();
+ Next(), len++) {
if (len < prefix_size) prefix[len] = AsciiAlphaToLower(ch_);
}
for (int i = len; i < prefix_size; i++) prefix[i] = 0;
@@ -115,6 +116,7 @@ class DateParser : public AllStatic {
bool IsEnd() const { return ch_ == 0; }
bool IsAsciiDigit() const { return IsDecimalDigit(ch_); }
bool IsAsciiAlphaOrAbove() const { return ch_ >= 'A'; }
+ bool IsWhiteSpaceChar() const { return IsWhiteSpace(ch_); }
bool IsAsciiSign() const { return ch_ == '+' || ch_ == '-'; }
// Return 1 for '+' and -1 for '-'.

1
last-install-version.txt Normal file
View File

@ -0,0 +1 @@
chromium-106.0.5249.119