Skip to content

Commit 80fd5c5

Browse files
authored
chromium-stable: bump to 132.0.6834.159 (#39)
[skip ci]
1 parent fa6a4f6 commit 80fd5c5

7 files changed

+45
-26
lines changed

tur-chromium/chromium-stable/0001-compiler-use-android-target.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
--- a/build/config/compiler/BUILD.gn
22
+++ b/build/config/compiler/BUILD.gn
3-
@@ -960,8 +960,8 @@
3+
@@ -1242,8 +1242,8 @@
4+
}
45
} else if (current_cpu == "arm") {
5-
if (is_clang && !is_android && !is_nacl &&
6-
!(is_chromeos_lacros && is_chromeos_device)) {
6+
if (is_clang && !is_android && !is_nacl && !is_chromeos_device) {
77
- cflags += [ "--target=arm-linux-gnueabihf" ]
88
- ldflags += [ "--target=arm-linux-gnueabihf" ]
99
+ cflags += [ "--target=armv7a-linux-android24" ]
1010
+ ldflags += [ "--target=armv7a-linux-android24" ]
1111
}
1212
if (!is_nacl) {
1313
cflags += [
14-
@@ -975,8 +975,8 @@
14+
@@ -1257,8 +1257,8 @@
1515
} else if (current_cpu == "arm64") {
1616
if (is_clang && !is_android && !is_nacl && !is_fuchsia &&
17-
!(is_chromeos_lacros && is_chromeos_device)) {
17+
!is_chromeos_device) {
1818
- cflags += [ "--target=aarch64-linux-gnu" ]
1919
- ldflags += [ "--target=aarch64-linux-gnu" ]
2020
+ cflags += [ "--target=aarch64-linux-android24" ]
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
--- a/chrome/browser/ui/startup/infobar_utils.cc
2+
+++ b/chrome/browser/ui/startup/infobar_utils.cc
3+
@@ -154,7 +154,11 @@
4+
infobars::ContentInfoBarManager* infobar_manager =
5+
infobars::ContentInfoBarManager::FromWebContents(web_contents);
6+
7+
+#ifdef __TERMUX__
8+
+ if (0) {
9+
+#else
10+
if (!google_apis::HasAPIKeyConfigured()) {
11+
+#endif
12+
GoogleApiKeysInfoBarDelegate::Create(infobar_manager);
13+
}
14+

tur-chromium/chromium-stable/1009-chromium-no-glibc-version.patch

Lines changed: 0 additions & 15 deletions
This file was deleted.

tur-chromium/chromium-stable/2017-vk-layers-no-android-log.patch

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
[[maybe_unused]] static const char *kForceDefaultCallbackKey = "debug.vvl.forcelayerlog";
1212
--- a/third_party/vulkan-validation-layers/src/layers/vk_layer_config.cpp
1313
+++ b/third_party/vulkan-validation-layers/src/layers/vk_layer_config.cpp
14-
@@ -74,7 +74,7 @@
14+
@@ -52,7 +52,7 @@
1515
#endif
1616

1717
std::string GetEnvironment(const char *variable) {
@@ -20,6 +20,15 @@
2020
const char *output = getenv(variable);
2121
return output == NULL ? "" : output;
2222
#elif defined(_WIN32)
23+
@@ -90,7 +90,7 @@
24+
}
25+
26+
void SetEnvironment(const char *variable, const char *value) {
27+
-#if !defined(__ANDROID__) && !defined(_WIN32)
28+
+#if (!defined(__ANDROID__) && !defined(_WIN32)) || defined(__TERMUX__)
29+
setenv(variable, value, 1);
30+
#elif defined(_WIN32)
31+
SetEnvironmentVariable(variable, value);
2332
--- a/third_party/vulkan-validation-layers/src/layers/utils/android_ndk_types.h
2433
+++ b/third_party/vulkan-validation-layers/src/layers/utils/android_ndk_types.h
2534
@@ -29,7 +29,9 @@
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- a/pdf/pdfium/pdfium_api_wrappers.cc
2+
+++ b/pdf/pdfium/pdfium_api_wrappers.cc
3+
@@ -147,7 +147,7 @@
4+
5+
// Number of characters, including the NUL.
6+
const size_t expected_size = base::checked_cast<size_t>(buflen_bytes / 2);
7+
- PDFiumAPIStringBufferAdapter adapter(&name, expected_size,
8+
+ PDFiumAPIStringBufferAdapter<std::u16string> adapter(&name, expected_size,
9+
/*check_expected_size=*/true);
10+
unsigned long actual_buflen_bytes = 0; // NOLINT(runtime/int)
11+
bool result =

tur-chromium/chromium-stable/build.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ TERMUX_PKG_HOMEPAGE=https://www.chromium.org/Home
22
TERMUX_PKG_DESCRIPTION="Chromium web browser"
33
TERMUX_PKG_LICENSE="BSD 3-Clause"
44
TERMUX_PKG_MAINTAINER="Chongyun Lee <[email protected]>"
5-
TERMUX_PKG_VERSION=131.0.6778.264
5+
TERMUX_PKG_VERSION=132.0.6834.159
66
TERMUX_PKG_SRCURL=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$TERMUX_PKG_VERSION.tar.xz
7-
TERMUX_PKG_SHA256=7e02c65865a3095180d60838d2d7a912873d8d4f582c27c2afb9ef876152f2a5
7+
TERMUX_PKG_SHA256=564cc8a258b16d1c6151721a2a72e43ba80642326b33aa79439bba354e686068
88
TERMUX_PKG_DEPENDS="atk, cups, dbus, fontconfig, gtk3, krb5, libc++, libdrm, libevdev, libxkbcommon, libminizip, libnss, libwayland, libx11, mesa, openssl, pango, pulseaudio, zlib"
99
# Chromium doesn't support i686 on Linux.
1010
TERMUX_PKG_BLACKLISTED_ARCHES="i686"
1111

12-
SYSTEM_LIBRARIES=" libdrm fontconfig"
13-
# TERMUX_PKG_DEPENDS="libdrm, fontconfig"
12+
SYSTEM_LIBRARIES=" fontconfig"
13+
# TERMUX_PKG_DEPENDS="fontconfig"
1414

1515
termux_step_post_get_source() {
1616
python3 build/linux/unbundle/replace_gn_files.py --system-libraries \
@@ -158,7 +158,7 @@ chrome_pgo_phase = 0
158158
treat_warnings_as_errors = false
159159
# Use system libraries as little as possible
160160
use_system_freetype = false
161-
use_system_libdrm = true
161+
# use_system_libdrm = true
162162
use_system_libffi = true
163163
use_custom_libcxx = false
164164
use_custom_libcxx_for_host = true

0 commit comments

Comments
 (0)