rpms
/
chromium
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Update to 133.0.6943.53

Browse Source 
* CVE-2025-0444: Use after free in Skia
  * CVE-2025-0445: Use after free in V8
  * CVE-2025-0451: Inappropriate implementation in Extensions API
i9e
Arkady L. Shane 2 weeks ago
parent 6797ffd8b1
commit 2f283dc451
Signed by: tigro
GPG Key ID: 1EC08A25C9DB2503
14 changed files with 445 additions and 3352 deletions
Show Stats Download Patch File Download Diff File

4
.chromium.metadata
Unescape View File

@ -1,6 +1,6 @@
bfff570290514aae4b505e1c18fd9e8ba3d20f6d SOURCES/chromium-132.0.6834.159.tar.xz ea06e9381e5b28a56a1eb3d2d183e4b3ea3c7783 SOURCES/chromium-133.0.6943.53.tar.xz
f0fe87c901fd8d1e44eba483b8f4d8540d780308 SOURCES/Chromium-Gost-37dd7d5b7f087dce6afa0d354f4c1303681dbe8b.tar.xz
668e0721b89238cf10605bd02db809a9e5c3f9c7 SOURCES/msspi-7f7847892d4c69c454a58093553fa34d1b09c0a0.tar.xz 668e0721b89238cf10605bd02db809a9e5c3f9c7 SOURCES/msspi-7f7847892d4c69c454a58093553fa34d1b09c0a0.tar.xz
2db7a9fb9cf624f8d19a373e994bc5f589d50290 SOURCES/Chromium-Gost-fe3315a78e9fa6e79f613fa316e375cd471f1624.tar.xz
dea187019741602d57aaf189a80abba261fbd2aa SOURCES/linux-x64-0.19.2.tgz dea187019741602d57aaf189a80abba261fbd2aa SOURCES/linux-x64-0.19.2.tgz
7e5d2c7864c5c83ec789b59c77cd9c20d2594916 SOURCES/linux-arm64-0.19.2.tgz 7e5d2c7864c5c83ec789b59c77cd9c20d2594916 SOURCES/linux-arm64-0.19.2.tgz
769196d081c6a0ad37f1c63dec56febfff3370de SOURCES/node-v20.6.1-linux-x64.tar.xz 769196d081c6a0ad37f1c63dec56febfff3370de SOURCES/node-v20.6.1-linux-x64.tar.xz

4
.gitignore vendored
Unescape View File

@ -1,10 +1,10 @@
SOURCES/chromium-132.0.6834.159.tar.xz SOURCES/chromium-133.0.6943.53.tar.xz
SOURCES/linux-x64-0.19.2.tgz SOURCES/linux-x64-0.19.2.tgz
SOURCES/linux-arm64-0.19.2.tgz SOURCES/linux-arm64-0.19.2.tgz
SOURCES/node-v20.6.1-linux-x64.tar.xz SOURCES/node-v20.6.1-linux-x64.tar.xz
SOURCES/node-v20.6.1-linux-arm64.tar.xz SOURCES/node-v20.6.1-linux-arm64.tar.xz
SOURCES/chromium-browser-gost-icons.tar.xz SOURCES/chromium-browser-gost-icons.tar.xz
SOURCES/msspi-e91bd46306cc7044b2903cd07b788c13c36481e3.tar.xz SOURCES/msspi-e91bd46306cc7044b2903cd07b788c13c36481e3.tar.xz
SOURCES/Chromium-Gost-e60ce2a2a889f72a20dcd9d89c458b6836ee67f6.tar.xz SOURCES/Chromium-Gost-37dd7d5b7f087dce6afa0d354f4c1303681dbe8b.tar.xz
SOURCES/bindgen-cli-aarch64.tar.xz SOURCES/bindgen-cli-aarch64.tar.xz
SOURCES/bindgen-cli-x86_64.tar.xz SOURCES/bindgen-cli-x86_64.tar.xz

372
SOURCES/0001-Add-PPC64-support-for-boringssl.patch
Unescape View File

@ -1,7 +1,7 @@
Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/abi_self_test.cc Index: chromium-133.0.6943.35/third_party/boringssl/src/crypto/abi_self_test.cc
=================================================================== ===================================================================
--- chromium-130.0.6723.44.orig/third_party/boringssl/src/crypto/abi_self_test.cc --- chromium-133.0.6943.35.orig/third_party/boringssl/src/crypto/abi_self_test.cc
+++ chromium-130.0.6723.44/third_party/boringssl/src/crypto/abi_self_test.cc +++ chromium-133.0.6943.35/third_party/boringssl/src/crypto/abi_self_test.cc
@@ -521,3 +521,289 @@ TEST(ABITest, AArch64) { @@ -521,3 +521,289 @@ TEST(ABITest, AArch64) {
CHECK_ABI_NO_UNWIND(abi_test_clobber_v15_upper); CHECK_ABI_NO_UNWIND(abi_test_clobber_v15_upper);
} }
@ -292,10 +292,10 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/abi_self_test.cc
+ CHECK_ABI_NO_UNWIND(abi_test_clobber_lr); + CHECK_ABI_NO_UNWIND(abi_test_clobber_lr);
+} +}
+#endif // OPENSSL_PPC64LE && SUPPORTS_ABI_TEST +#endif // OPENSSL_PPC64LE && SUPPORTS_ABI_TEST
Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/cpu_ppc64le.c Index: chromium-133.0.6943.35/third_party/boringssl/src/crypto/cpu_ppc64le.cc
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-130.0.6723.44/third_party/boringssl/src/crypto/cpu_ppc64le.c +++ chromium-133.0.6943.35/third_party/boringssl/src/crypto/cpu_ppc64le.cc
@@ -0,0 +1,38 @@ @@ -0,0 +1,38 @@
+/* Copyright (c) 2016, Google Inc. +/* Copyright (c) 2016, Google Inc.
+ * + *
@ -335,11 +335,11 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/cpu_ppc64le.c
+} +}
+ +
+#endif // OPENSSL_PPC64LE +#endif // OPENSSL_PPC64LE
Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/crypto.c Index: chromium-133.0.6943.35/third_party/boringssl/src/crypto/crypto.cc
=================================================================== ===================================================================
--- chromium-130.0.6723.44.orig/third_party/boringssl/src/crypto/crypto.c --- chromium-133.0.6943.35.orig/third_party/boringssl/src/crypto/crypto.cc
+++ chromium-130.0.6723.44/third_party/boringssl/src/crypto/crypto.c +++ chromium-133.0.6943.35/third_party/boringssl/src/crypto/crypto.cc
@@ -66,6 +66,10 @@ uint32_t OPENSSL_get_ia32cap(int idx) { @@ -67,6 +67,10 @@ uint32_t OPENSSL_get_ia32cap(int idx) {
return OPENSSL_ia32cap_P[idx]; return OPENSSL_ia32cap_P[idx];
} }
@ -350,10 +350,10 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/crypto.c
#elif defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64) #elif defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64)
#include <openssl/arm_arch.h> #include <openssl/arm_arch.h>
Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesp8-ppc.pl Index: chromium-133.0.6943.35/third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesp8-ppc.pl
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-130.0.6723.44/third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesp8-ppc.pl +++ chromium-133.0.6943.35/third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesp8-ppc.pl
@@ -0,0 +1,3809 @@ @@ -0,0 +1,3809 @@
+#! /usr/bin/env perl +#! /usr/bin/env perl
+# Copyright 2014-2018 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2014-2018 The OpenSSL Project Authors. All Rights Reserved.
@ -4164,12 +4164,12 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/fipsmodule/aes/as
+} +}
+ +
+close STDOUT or die "error closing STDOUT: $!"; +close STDOUT or die "error closing STDOUT: $!";
Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h Index: chromium-133.0.6943.35/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h
=================================================================== ===================================================================
--- chromium-130.0.6723.44.orig/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h --- chromium-133.0.6943.35.orig/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h
+++ chromium-130.0.6723.44/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h +++ chromium-133.0.6943.35/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h
@@ -61,6 +61,12 @@ OPENSSL_INLINE int vpaes_capable(void) { @@ -82,6 +82,12 @@ inline int vpaes_capable(void) { return
OPENSSL_INLINE int vpaes_capable(void) { return CRYPTO_is_NEON_capable(); } inline int vpaes_capable(void) { return CRYPTO_is_NEON_capable(); }
#endif #endif
+#elif defined(OPENSSL_PPC64LE) +#elif defined(OPENSSL_PPC64LE)
@ -4181,23 +4181,23 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/fipsmodule/aes/in
#endif #endif
#endif // !NO_ASM #endif // !NO_ASM
Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/fipsmodule/bcm.c Index: chromium-133.0.6943.35/third_party/boringssl/src/crypto/fipsmodule/bcm.cc
=================================================================== ===================================================================
--- chromium-130.0.6723.44.orig/third_party/boringssl/src/crypto/fipsmodule/bcm.c --- chromium-133.0.6943.35.orig/third_party/boringssl/src/crypto/fipsmodule/bcm.cc
+++ chromium-130.0.6723.44/third_party/boringssl/src/crypto/fipsmodule/bcm.c +++ chromium-133.0.6943.35/third_party/boringssl/src/crypto/fipsmodule/bcm.cc
@@ -101,6 +101,7 @@ @@ -105,6 +105,7 @@
#include "self_check/fips.c.inc" #include "self_check/fips.cc.inc"
#include "self_check/self_check.c.inc" #include "self_check/self_check.cc.inc"
#include "service_indicator/service_indicator.c.inc" #include "service_indicator/service_indicator.cc.inc"
+#include "sha/sha1-altivec.c.inc" +#include "sha/sha1-altivec.cc.inc"
#include "sha/sha1.c.inc" #include "sha/sha1.cc.inc"
#include "sha/sha256.c.inc" #include "sha/sha256.cc.inc"
#include "sha/sha512.c.inc" #include "sha/sha512.cc.inc"
Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/fipsmodule/bn/bn.c.inc Index: chromium-133.0.6943.35/third_party/boringssl/src/crypto/fipsmodule/bn/bn.cc.inc
=================================================================== ===================================================================
--- chromium-130.0.6723.44.orig/third_party/boringssl/src/crypto/fipsmodule/bn/bn.c.inc --- chromium-133.0.6943.35.orig/third_party/boringssl/src/crypto/fipsmodule/bn/bn.cc.inc
+++ chromium-130.0.6723.44/third_party/boringssl/src/crypto/fipsmodule/bn/bn.c.inc +++ chromium-133.0.6943.35/third_party/boringssl/src/crypto/fipsmodule/bn/bn.cc.inc
@@ -384,6 +384,23 @@ int bn_expand(BIGNUM *bn, size_t bits) { @@ -325,6 +325,23 @@ int bn_expand(BIGNUM *bn, size_t bits) {
} }
int bn_resize_words(BIGNUM *bn, size_t words) { int bn_resize_words(BIGNUM *bn, size_t words) {
@ -4221,11 +4221,11 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/fipsmodule/bn/bn.
if ((size_t)bn->width <= words) { if ((size_t)bn->width <= words) {
if (!bn_wexpand(bn, words)) { if (!bn_wexpand(bn, words)) {
return 0; return 0;
Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.c.inc Index: chromium-133.0.6943.35/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.cc.inc
=================================================================== ===================================================================
--- chromium-130.0.6723.44.orig/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.c.inc --- chromium-133.0.6943.35.orig/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.cc.inc
+++ chromium-130.0.6723.44/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.c.inc +++ chromium-133.0.6943.35/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.cc.inc
@@ -1456,6 +1456,8 @@ int EVP_has_aes_hardware(void) { @@ -1230,6 +1230,8 @@ int EVP_has_aes_hardware(void) {
return hwaes_capable() && crypto_gcm_clmul_enabled(); return hwaes_capable() && crypto_gcm_clmul_enabled();
#elif defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64) #elif defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64)
return hwaes_capable() && CRYPTO_is_ARMv8_PMULL_capable(); return hwaes_capable() && CRYPTO_is_ARMv8_PMULL_capable();
@ -4234,10 +4234,10 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/fipsmodule/cipher
#else #else
return 0; return 0;
#endif #endif
Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghashp8-ppc.pl Index: chromium-133.0.6943.35/third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghashp8-ppc.pl
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-130.0.6723.44/third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghashp8-ppc.pl +++ chromium-133.0.6943.35/third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghashp8-ppc.pl
@@ -0,0 +1,671 @@ @@ -0,0 +1,671 @@
+#! /usr/bin/env perl +#! /usr/bin/env perl
+# Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved.
@ -4910,10 +4910,10 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/fipsmodule/modes/
+} +}
+ +
+close STDOUT or die "error closing STDOUT: $!"; # enforce flush +close STDOUT or die "error closing STDOUT: $!"; # enforce flush
Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/fipsmodule/modes/gcm.c.inc Index: chromium-133.0.6943.35/third_party/boringssl/src/crypto/fipsmodule/modes/gcm.cc.inc
=================================================================== ===================================================================
--- chromium-130.0.6723.44.orig/third_party/boringssl/src/crypto/fipsmodule/modes/gcm.c.inc --- chromium-133.0.6943.35.orig/third_party/boringssl/src/crypto/fipsmodule/modes/gcm.cc.inc
+++ chromium-130.0.6723.44/third_party/boringssl/src/crypto/fipsmodule/modes/gcm.c.inc +++ chromium-133.0.6943.35/third_party/boringssl/src/crypto/fipsmodule/modes/gcm.cc.inc
@@ -228,6 +228,13 @@ void CRYPTO_ghash_init(gmult_func *out_m @@ -228,6 +228,13 @@ void CRYPTO_ghash_init(gmult_func *out_m
*out_hash = gcm_ghash_neon; *out_hash = gcm_ghash_neon;
return; return;
@ -4928,11 +4928,11 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/fipsmodule/modes/
#endif #endif
gcm_init_nohw(out_table, H); gcm_init_nohw(out_table, H);
Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/fipsmodule/modes/gcm_test.cc Index: chromium-133.0.6943.35/third_party/boringssl/src/crypto/fipsmodule/modes/gcm_test.cc
=================================================================== ===================================================================
--- chromium-130.0.6723.44.orig/third_party/boringssl/src/crypto/fipsmodule/modes/gcm_test.cc --- chromium-133.0.6943.35.orig/third_party/boringssl/src/crypto/fipsmodule/modes/gcm_test.cc
+++ chromium-130.0.6723.44/third_party/boringssl/src/crypto/fipsmodule/modes/gcm_test.cc +++ chromium-133.0.6943.35/third_party/boringssl/src/crypto/fipsmodule/modes/gcm_test.cc
@@ -209,5 +209,15 @@ TEST(GCMTest, ABI) { @@ -170,5 +170,15 @@ TEST(GCMTest, ABI) {
} }
} }
#endif #endif
@ -4948,11 +4948,11 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/fipsmodule/modes/
+#endif // GHASH_ASM_PPC64LE +#endif // GHASH_ASM_PPC64LE
} }
#endif // SUPPORTS_ABI_TEST && !OPENSSL_NO_ASM #endif // SUPPORTS_ABI_TEST && !OPENSSL_NO_ASM
Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/fipsmodule/modes/internal.h Index: chromium-133.0.6943.35/third_party/boringssl/src/crypto/fipsmodule/modes/internal.h
=================================================================== ===================================================================
--- chromium-130.0.6723.44.orig/third_party/boringssl/src/crypto/fipsmodule/modes/internal.h --- chromium-133.0.6943.35.orig/third_party/boringssl/src/crypto/fipsmodule/modes/internal.h
+++ chromium-130.0.6723.44/third_party/boringssl/src/crypto/fipsmodule/modes/internal.h +++ chromium-133.0.6943.35/third_party/boringssl/src/crypto/fipsmodule/modes/internal.h
@@ -325,6 +325,13 @@ void aes_gcm_dec_kernel(const uint8_t *i @@ -260,6 +260,13 @@ void aes_gcm_dec_kernel(const uint8_t *i
const u128 Htable[16]); const u128 Htable[16]);
#endif #endif
@ -4966,10 +4966,10 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/fipsmodule/modes/
#endif #endif
#endif // OPENSSL_NO_ASM #endif // OPENSSL_NO_ASM
Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/rand_extra/getrandom_fillin.h Index: chromium-133.0.6943.35/third_party/boringssl/src/crypto/rand_extra/getrandom_fillin.h
=================================================================== ===================================================================
--- chromium-130.0.6723.44.orig/third_party/boringssl/src/crypto/rand_extra/getrandom_fillin.h --- chromium-133.0.6943.35.orig/third_party/boringssl/src/crypto/rand_extra/getrandom_fillin.h
+++ chromium-130.0.6723.44/third_party/boringssl/src/crypto/rand_extra/getrandom_fillin.h +++ chromium-133.0.6943.35/third_party/boringssl/src/crypto/rand_extra/getrandom_fillin.h
@@ -30,6 +30,8 @@ @@ -30,6 +30,8 @@
#define EXPECTED_NR_getrandom 278 #define EXPECTED_NR_getrandom 278
#elif defined(OPENSSL_ARM) #elif defined(OPENSSL_ARM)
@ -4979,11 +4979,11 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/rand_extra/getran
#elif defined(OPENSSL_RISCV64) #elif defined(OPENSSL_RISCV64)
#define EXPECTED_NR_getrandom 278 #define EXPECTED_NR_getrandom 278
#endif #endif
Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/fipsmodule/rand/rand.c.inc Index: chromium-133.0.6943.35/third_party/boringssl/src/crypto/fipsmodule/rand/rand.cc.inc
=================================================================== ===================================================================
--- chromium-130.0.6723.44.orig/third_party/boringssl/src/crypto/fipsmodule/rand/rand.c.inc --- chromium-133.0.6943.35.orig/third_party/boringssl/src/crypto/fipsmodule/rand/rand.cc.inc
+++ chromium-130.0.6723.44/third_party/boringssl/src/crypto/fipsmodule/rand/rand.c.inc +++ chromium-133.0.6943.35/third_party/boringssl/src/crypto/fipsmodule/rand/rand.cc.inc
@@ -427,6 +427,11 @@ bcm_infallible BCM_rand_bytes_with_addit @@ -431,6 +431,11 @@ bcm_infallible BCM_rand_bytes_with_addit
// Take a read lock around accesses to |state->drbg|. This is needed to // Take a read lock around accesses to |state->drbg|. This is needed to
// avoid returning bad entropy if we race with // avoid returning bad entropy if we race with
// |rand_thread_state_clear_all|. // |rand_thread_state_clear_all|.
@ -4995,10 +4995,10 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/fipsmodule/rand/r
CRYPTO_MUTEX_lock_read(&state->clear_drbg_lock); CRYPTO_MUTEX_lock_read(&state->clear_drbg_lock);
#endif #endif
if (!CTR_DRBG_reseed(&state->drbg, seed, reseed_additional_data, if (!CTR_DRBG_reseed(&state->drbg, seed, reseed_additional_data,
Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h Index: chromium-133.0.6943.35/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h
=================================================================== ===================================================================
--- chromium-130.0.6723.44.orig/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h --- chromium-133.0.6943.35.orig/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h
+++ chromium-130.0.6723.44/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h +++ chromium-133.0.6943.35/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h
@@ -23,6 +23,16 @@ @@ -23,6 +23,16 @@
extern "C" { extern "C" {
#endif #endif
@ -5016,16 +5016,16 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/fipsmodule/sha/in
// Define SHA{n}[_{variant}]_ASM if sha{n}_block_data_order[_{variant}] is // Define SHA{n}[_{variant}]_ASM if sha{n}_block_data_order[_{variant}] is
// defined in assembly. // defined in assembly.
Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/fipsmodule/sha/sha1-altivec.c.inc Index: chromium-133.0.6943.35/third_party/boringssl/src/crypto/fipsmodule/sha/sha1-altivec.cc.inc
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-130.0.6723.44/third_party/boringssl/src/crypto/fipsmodule/sha/sha1-altivec.c.inc +++ chromium-133.0.6943.35/third_party/boringssl/src/crypto/fipsmodule/sha/sha1-altivec.cc.inc
@@ -0,0 +1,361 @@ @@ -0,0 +1,369 @@
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) +/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.ccom)
+ * All rights reserved. + * All rights reserved.
+ * + *
+ * This package is an SSL implementation written + * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com). + * by Eric Young (eay@cryptsoft.ccom).
+ * The implementation was written so as to conform with Netscapes SSL. + * The implementation was written so as to conform with Netscapes SSL.
+ * + *
+ * This library is free for commercial and non-commercial use as long as + * This library is free for commercial and non-commercial use as long as
@ -5033,7 +5033,7 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/fipsmodule/sha/sh
+ * apply to all code found in this distribution, be it the RC4, RSA, + * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code. The SSL documentation + * lhash, DES, etc., code; not just the SSL code. The SSL documentation
+ * included with this distribution is covered by the same copyright terms + * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com). + * except that the holder is Tim Hudson (tjh@cryptsoft.ccom).
+ * + *
+ * Copyright remains Eric Young's, and as such any Copyright notices in + * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed. + * the code are not to be removed.
@ -5053,12 +5053,12 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/fipsmodule/sha/sh
+ * 3. All advertising materials mentioning features or use of this software + * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement: + * must display the following acknowledgement:
+ * "This product includes cryptographic software written by + * "This product includes cryptographic software written by
+ * Eric Young (eay@cryptsoft.com)" + * Eric Young (eay@cryptsoft.ccom)"
+ * The word 'cryptographic' can be left out if the rouines from the library + * The word 'cryptographic' can be left out if the rouines from the library
+ * being used are not cryptographic related :-). + * being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from + * 4. If you include any Windows specific code (or a derivative thereof) from
+ * the apps directory (application code) you must include an acknowledgement: + * the apps directory (application code) you must include an acknowledgement:
+ * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" + * "This product includes software written by Tim Hudson (tjh@cryptsoft.ccom)"
+ * + *
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND + * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@ -5080,7 +5080,7 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/fipsmodule/sha/sh
+// Altivec-optimized SHA1 in C. This is tested on ppc64le only. +// Altivec-optimized SHA1 in C. This is tested on ppc64le only.
+// +//
+// References: +// References:
+// https://software.intel.com/en-us/articles/improving-the-performance-of-the-secure-hash-algorithm-1 +// https://software.intel.ccom/en-us/articles/improving-the-performance-of-the-secure-hash-algorithm-1
+// http://arctic.org/~dean/crypto/sha1.html +// http://arctic.org/~dean/crypto/sha1.html
+// +//
+// This code used the generic SHA-1 from OpenSSL as a basis and AltiVec +// This code used the generic SHA-1 from OpenSSL as a basis and AltiVec
@ -5090,6 +5090,10 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/fipsmodule/sha/sh
+ +
+#if defined(OPENSSL_PPC64LE) +#if defined(OPENSSL_PPC64LE)
+ +
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+#include <altivec.h> +#include <altivec.h>
+ +
+void sha1_block_data_order_ppc64(uint32_t *state, const uint8_t *data, size_t num); +void sha1_block_data_order_ppc64(uint32_t *state, const uint8_t *data, size_t num);
@ -5175,7 +5179,7 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/fipsmodule/sha/sh
+ return w; + return w;
+} +}
+ +
+// As pointed out by Wei Dai <weidai@eskimo.com>, F() below can be simplified +// As pointed out by Wei Dai <weidai@eskimo.ccom>, F() below can be simplified
+// to the code in F_00_19. Wei attributes these optimisations to Peter +// to the code in F_00_19. Wei attributes these optimisations to Peter
+// Gutmann's SHS code, and he attributes it to Rich Schroeppel. #define +// Gutmann's SHS code, and he attributes it to Rich Schroeppel. #define
+// F(x,y,z) (((x) & (y)) | ((~(x)) & (z))) I've just become aware of another +// F(x,y,z) (((x) & (y)) | ((~(x)) & (z))) I've just become aware of another
@ -5368,6 +5372,10 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/fipsmodule/sha/sh
+ } + }
+} +}
+ +
+#if defined(__cplusplus)
+}
+#endif
+
+#endif // OPENSSL_PPC64LE +#endif // OPENSSL_PPC64LE
+ +
+#undef K_00_19 +#undef K_00_19
@ -5382,11 +5390,11 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/fipsmodule/sha/sh
+#undef BODY_20_39 +#undef BODY_20_39
+#undef BODY_40_59 +#undef BODY_40_59
+#undef BODY_60_79 +#undef BODY_60_79
Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/internal.h Index: chromium-133.0.6943.35/third_party/boringssl/src/crypto/internal.h
=================================================================== ===================================================================
--- chromium-130.0.6723.44.orig/third_party/boringssl/src/crypto/internal.h --- chromium-133.0.6943.35.orig/third_party/boringssl/src/crypto/internal.h
+++ chromium-130.0.6723.44/third_party/boringssl/src/crypto/internal.h +++ chromium-133.0.6943.35/third_party/boringssl/src/crypto/internal.h
@@ -183,8 +183,9 @@ extern "C" { @@ -56,8 +56,9 @@ extern "C" {
#if !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_STATIC_ARMCAP) && \ #if !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_STATIC_ARMCAP) && \
(defined(OPENSSL_X86) || defined(OPENSSL_X86_64) || \ (defined(OPENSSL_X86) || defined(OPENSSL_X86_64) || \
defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64)) defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64))
@ -5398,7 +5406,7 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/internal.h
#define NEED_CPUID #define NEED_CPUID
// OPENSSL_cpuid_setup initializes the platform-specific feature cache. This // OPENSSL_cpuid_setup initializes the platform-specific feature cache. This
@@ -1723,6 +1724,16 @@ OPENSSL_INLINE int CRYPTO_is_ARMv8_SHA51 @@ -1397,6 +1398,16 @@ inline int CRYPTO_is_ARMv8_SHA512_capabl
#endif // OPENSSL_ARM || OPENSSL_AARCH64 #endif // OPENSSL_ARM || OPENSSL_AARCH64
@ -5415,10 +5423,10 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/internal.h
#if defined(BORINGSSL_DISPATCH_TEST) #if defined(BORINGSSL_DISPATCH_TEST)
// Runtime CPU dispatch testing support // Runtime CPU dispatch testing support
Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/perlasm/ppc-xlate.pl Index: chromium-133.0.6943.35/third_party/boringssl/src/crypto/perlasm/ppc-xlate.pl
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-130.0.6723.44/third_party/boringssl/src/crypto/perlasm/ppc-xlate.pl +++ chromium-133.0.6943.35/third_party/boringssl/src/crypto/perlasm/ppc-xlate.pl
@@ -0,0 +1,320 @@ @@ -0,0 +1,320 @@
+#! /usr/bin/env perl +#! /usr/bin/env perl
+# Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved.
@ -5501,7 +5509,7 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/perlasm/ppc-xlate
+ $ret; + $ret;
+}; +};
+my $text = sub { +my $text = sub {
+ my $ret = ($flavour =~ /aix/) ? ".csect\t.text[PR],7" : ".text"; + my $ret = ($flavour =~ /aix/) ? ".ccsect\t.text[PR],7" : ".text";
+ $ret = ".abiversion 2\n".$ret if ($flavour =~ /linux.*64le/); + $ret = ".abiversion 2\n".$ret if ($flavour =~ /linux.*64le/);
+ $ret; + $ret;
+}; +};
@ -5734,16 +5742,16 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/perlasm/ppc-xlate
+print <<___; +print <<___;
+#endif // !OPENSSL_NO_ASM && __powerpc64__ && __ELF__ +#endif // !OPENSSL_NO_ASM && __powerpc64__ && __ELF__
+#if defined(__ELF__) +#if defined(__ELF__)
+// See https://www.airs.com/blog/archives/518. +// See https://www.airs.ccom/blog/archives/518.
+.section .note.GNU-stack,"",\%progbits +.section .note.GNU-stack,"",\%progbits
+#endif +#endif
+___ +___
+ +
+close STDOUT or die "error closing STDOUT: $!"; +close STDOUT or die "error closing STDOUT: $!";
Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/test/abi_test.h Index: chromium-133.0.6943.35/third_party/boringssl/src/crypto/test/abi_test.h
=================================================================== ===================================================================
--- chromium-130.0.6723.44.orig/third_party/boringssl/src/crypto/test/abi_test.h --- chromium-133.0.6943.35.orig/third_party/boringssl/src/crypto/test/abi_test.h
+++ chromium-130.0.6723.44/third_party/boringssl/src/crypto/test/abi_test.h +++ chromium-133.0.6943.35/third_party/boringssl/src/crypto/test/abi_test.h
@@ -179,7 +179,78 @@ struct alignas(16) Reg128 { @@ -179,7 +179,78 @@ struct alignas(16) Reg128 {
CALLER_STATE_REGISTER(uint64_t, x28) \ CALLER_STATE_REGISTER(uint64_t, x28) \
CALLER_STATE_REGISTER(uint64_t, x29) CALLER_STATE_REGISTER(uint64_t, x29)
@ -5850,10 +5858,10 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/test/abi_test.h
static_assert(sizeof...(args) <= 8, static_assert(sizeof...(args) <= 8,
"too many arguments for abi_test_trampoline"); "too many arguments for abi_test_trampoline");
Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/test/asm/trampoline-ppc.pl Index: chromium-133.0.6943.35/third_party/boringssl/src/crypto/test/asm/trampoline-ppc.pl
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-130.0.6723.44/third_party/boringssl/src/crypto/test/asm/trampoline-ppc.pl +++ chromium-133.0.6943.35/third_party/boringssl/src/crypto/test/asm/trampoline-ppc.pl
@@ -0,0 +1,262 @@ @@ -0,0 +1,262 @@
+#!/usr/bin/env perl +#!/usr/bin/env perl
+# Copyright (c) 2019, Google Inc. +# Copyright (c) 2019, Google Inc.
@ -6117,10 +6125,10 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/test/asm/trampoli
+ +
+print $code; +print $code;
+close STDOUT or die "error closing STDOUT: $!"; +close STDOUT or die "error closing STDOUT: $!";
Index: chromium-130.0.6723.44/third_party/boringssl/src/include/openssl/target.h Index: chromium-133.0.6943.35/third_party/boringssl/src/include/openssl/target.h
=================================================================== ===================================================================
--- chromium-130.0.6723.44.orig/third_party/boringssl/src/include/openssl/target.h --- chromium-133.0.6943.35.orig/third_party/boringssl/src/include/openssl/target.h
+++ chromium-130.0.6723.44/third_party/boringssl/src/include/openssl/target.h +++ chromium-133.0.6943.35/third_party/boringssl/src/include/openssl/target.h
@@ -34,6 +34,9 @@ @@ -34,6 +34,9 @@
#elif defined(__ARMEL__) || defined(_M_ARM) #elif defined(__ARMEL__) || defined(_M_ARM)
#define OPENSSL_32_BIT #define OPENSSL_32_BIT
@ -6131,11 +6139,11 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/include/openssl/target.h
#elif defined(__MIPSEL__) && !defined(__LP64__) #elif defined(__MIPSEL__) && !defined(__LP64__)
#define OPENSSL_32_BIT #define OPENSSL_32_BIT
#define OPENSSL_MIPS #define OPENSSL_MIPS
Index: chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc Index: chromium-133.0.6943.35/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc
=================================================================== ===================================================================
--- chromium-130.0.6723.44.orig/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc --- chromium-133.0.6943.35.orig/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc
+++ chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc +++ chromium-133.0.6943.35/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc
@@ -37,6 +37,8 @@ int main(int argc, char **argv) { @@ -38,6 +38,8 @@ int main(int argc, char **argv) {
puts("ARM (32-bit)"); puts("ARM (32-bit)");
#elif defined(OPENSSL_AARCH64) #elif defined(OPENSSL_AARCH64)
puts("aarch64 (64-bit)"); puts("aarch64 (64-bit)");
@ -6144,10 +6152,10 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/acvp/modu
#else #else
#error "FIPS build not supported on this architecture" #error "FIPS build not supported on this architecture"
#endif #endif
Index: chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/delocate/delocate.go Index: chromium-133.0.6943.35/third_party/boringssl/src/util/fipstools/delocate/delocate.go
=================================================================== ===================================================================
--- chromium-130.0.6723.44.orig/third_party/boringssl/src/util/fipstools/delocate/delocate.go --- chromium-133.0.6943.35.orig/third_party/boringssl/src/util/fipstools/delocate/delocate.go
+++ chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/delocate/delocate.go +++ chromium-133.0.6943.35/third_party/boringssl/src/util/fipstools/delocate/delocate.go
@@ -54,7 +54,8 @@ type stringWriter interface { @@ -54,7 +54,8 @@ type stringWriter interface {
type processorType int type processorType int
@ -6306,13 +6314,13 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/delocate/
+func (d *delocation) isPPC64LEAPair(statement *node32) (target, source, relative string, ok bool) { +func (d *delocation) isPPC64LEAPair(statement *node32) (target, source, relative string, ok bool) {
+ instruction := skipWS(statement.up).up + instruction := skipWS(statement.up).up
+ assertNodeType(instruction, ruleInstructionName) + assertNodeType(instruction, ruleInstructionName)
+ name1 := d.contents(instruction) + name1 := d.ccontents(instruction)
+ args1 := instructionArgs(instruction.next) + args1 := instructionArgs(instruction.next)
+ +
+ statement = statement.next + statement = statement.next
+ instruction = skipWS(statement.up).up + instruction = skipWS(statement.up).up
+ assertNodeType(instruction, ruleInstructionName) + assertNodeType(instruction, ruleInstructionName)
+ name2 := d.contents(instruction) + name2 := d.ccontents(instruction)
+ args2 := instructionArgs(instruction.next) + args2 := instructionArgs(instruction.next)
+ +
+ if name1 != "addis" || + if name1 != "addis" ||
@ -6322,16 +6330,16 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/delocate/
+ return "", "", "", false + return "", "", "", false
+ } + }
+ +
+ target = d.contents(args1[0]) + target = d.ccontents(args1[0])
+ relative = d.contents(args1[1]) + relative = d.ccontents(args1[1])
+ source1 := d.contents(args1[2]) + source1 := d.ccontents(args1[2])
+ source2 := d.contents(args2[2]) + source2 := d.ccontents(args2[2])
+ +
+ if !strings.HasSuffix(source1, "@ha") || + if !strings.HasSuffix(source1, "@ha") ||
+ !strings.HasSuffix(source2, "@l") || + !strings.HasSuffix(source2, "@l") ||
+ source1[:len(source1)-3] != source2[:len(source2)-2] || + source1[:len(source1)-3] != source2[:len(source2)-2] ||
+ d.contents(args2[0]) != target || + d.ccontents(args2[0]) != target ||
+ d.contents(args2[1]) != target { + d.ccontents(args2[1]) != target {
+ return "", "", "", false + return "", "", "", false
+ } + }
+ +
@ -6404,7 +6412,7 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/delocate/
+func (d *delocation) processPPCInstruction(statement, instruction *node32) (*node32, error) { +func (d *delocation) processPPCInstruction(statement, instruction *node32) (*node32, error) {
+ assertNodeType(instruction, ruleInstructionName) + assertNodeType(instruction, ruleInstructionName)
+ instructionName := d.contents(instruction) + instructionName := d.ccontents(instruction)
+ isBranch := instructionName[0] == 'b' + isBranch := instructionName[0] == 'b'
+ +
+ argNodes := instructionArgs(instruction.next) + argNodes := instructionArgs(instruction.next)
@ -6425,7 +6433,7 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/delocate/
+ +
+ switch arg.pegRule { + switch arg.pegRule {
+ case ruleRegisterOrConstant, ruleLocalLabelRef: + case ruleRegisterOrConstant, ruleLocalLabelRef:
+ args = append(args, d.contents(fullArg)) + args = append(args, d.ccontents(fullArg))
+ +
+ case ruleTOCRefLow: + case ruleTOCRefLow:
+ return nil, errors.New("Found low TOC reference outside preamble pattern") + return nil, errors.New("Found low TOC reference outside preamble pattern")
@ -6583,7 +6591,7 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/delocate/
+ } + }
+ +
+ for ; memRef != nil; memRef = memRef.next { + for ; memRef != nil; memRef = memRef.next {
+ argStr += d.contents(memRef) + argStr += d.ccontents(memRef)
+ } + }
+ +
+ args = append(args, argStr) + args = append(args, argStr)
@ -6629,7 +6637,7 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/delocate/
forEachPath(input.ast.up, func(node *node32) { forEachPath(input.ast.up, func(node *node32) {
+ node = node.up + node = node.up
+ assertNodeType(node, ruleLabelContainingDirectiveName) + assertNodeType(node, ruleLabelContainingDirectiveName)
+ directive := input.contents[node.begin:node.end] + directive := input.ccontents[node.begin:node.end]
+ if directive != ".localentry" { + if directive != ".localentry" {
+ return + return
+ } + }
@ -6638,7 +6646,7 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/delocate/
+ assertNodeType(node, ruleSymbolArgs) + assertNodeType(node, ruleSymbolArgs)
+ node = node.up + node = node.up
+ assertNodeType(node, ruleSymbolArg) + assertNodeType(node, ruleSymbolArg)
+ symbol := input.contents[node.begin:node.end] + symbol := input.ccontents[node.begin:node.end]
+ if _, ok := localEntrySymbols[symbol]; ok { + if _, ok := localEntrySymbols[symbol]; ok {
+ panic(fmt.Sprintf("Duplicate .localentry directive found: %q in %q", symbol, input.path)) + panic(fmt.Sprintf("Duplicate .localentry directive found: %q in %q", symbol, input.path))
+ } + }
@ -6738,7 +6746,7 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/delocate/
func isSynthesized(symbol string) bool { func isSynthesized(symbol string) bool {
return strings.HasSuffix(symbol, "_bss_get") || return strings.HasSuffix(symbol, "_bss_get") ||
symbol == "OPENSSL_ia32cap_get" || symbol == "OPENSSL_ia32cap_get" ||
@@ -1858,6 +2334,8 @@ func detectProcessor(input inputFile) pr @@ -1894,6 +2370,8 @@ func detectProcessor(input inputFile) pr
switch instructionName { switch instructionName {
case "movq", "call", "leaq": case "movq", "call", "leaq":
return x86_64 return x86_64
@ -6747,23 +6755,27 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/delocate/
case "str", "bl", "ldr", "st1": case "str", "bl", "ldr", "st1":
return aarch64 return aarch64
} }
Index: chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/delocate/delocate.peg Index: chromium-133.0.6943.35/third_party/boringssl/src/util/fipstools/delocate/delocate.peg
=================================================================== ===================================================================
--- chromium-130.0.6723.44.orig/third_party/boringssl/src/util/fipstools/delocate/delocate.peg --- chromium-133.0.6943.35.orig/third_party/boringssl/src/util/fipstools/delocate/delocate.peg
+++ chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/delocate/delocate.peg +++ chromium-133.0.6943.35/third_party/boringssl/src/util/fipstools/delocate/delocate.peg
@@ -12,7 +12,7 @@ @@ -12,9 +12,9 @@
# OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN # OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
-# This is a rough parser for x86-64 and aarch64 assembly designed to work with -# This is a rough parser for x86-64 and aarch64 assembly designed to work with
+# This is a rough parser for x86-64 and ppc64le assembly designed to work with -# https://github.com/pointlander/peg. delocate.go has a go:generate line for
# https://github.com/pointlander/peg. delocate.go has a go:generate line for -# rebuilding delocate.peg.go from this file.
# rebuilding delocate.peg.go from this file. +# This is a rough parser for x86-64, ppc64el, and aarch64 assembly designed
+# to work with https://github.com/pointlander/peg. delocate.go has a
+# go:generate line for rebuilding delocate.peg.go from this file.
Index: chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go # To regenerate delocate.peg.go:
#
Index: chromium-133.0.6943.35/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go
=================================================================== ===================================================================
--- chromium-130.0.6723.44.orig/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go --- chromium-133.0.6943.35.orig/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go
+++ chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go +++ chromium-133.0.6943.35/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go
@@ -39,6 +39,11 @@ func (test *delocateTest) Path(file stri @@ -39,6 +39,11 @@ func (test *delocateTest) Path(file stri
var delocateTests = []delocateTest{ var delocateTests = []delocateTest{
@ -6776,10 +6788,10 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/delocate/
{"x86_64-Basic", []string{"in.s"}, "out.s"}, {"x86_64-Basic", []string{"in.s"}, "out.s"},
{"x86_64-BSS", []string{"in.s"}, "out.s"}, {"x86_64-BSS", []string{"in.s"}, "out.s"},
{"x86_64-GOTRewrite", []string{"in.s"}, "out.s"}, {"x86_64-GOTRewrite", []string{"in.s"}, "out.s"},
Index: chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/in.s Index: chromium-133.0.6943.35/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/in.s
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/in.s +++ chromium-133.0.6943.35/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/in.s
@@ -0,0 +1,9 @@ @@ -0,0 +1,9 @@
+ .text + .text
+foo: +foo:
@ -6790,13 +6802,13 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/delocate/
+ .localentry foo,.-foo + .localentry foo,.-foo
+.LVL0: +.LVL0:
+ bl + bl
Index: chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/out.s Index: chromium-133.0.6943.35/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/out.s
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/out.s +++ chromium-133.0.6943.35/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/out.s
@@ -0,0 +1,62 @@ @@ -0,0 +1,62 @@
+.text +.text
+.file 1 "inserted_by_delocate.c" +.file 1 "inserted_by_delocate.cc"
+.loc 1 1 0 +.loc 1 1 0
+BORINGSSL_bcm_text_start: +BORINGSSL_bcm_text_start:
+ .text + .text
@ -6857,22 +6869,22 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/delocate/
+.byte 0xff +.byte 0xff
+.byte 0x31 +.byte 0x31
+.byte 0x80 +.byte 0x80
Index: chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/in.s Index: chromium-133.0.6943.35/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/in.s
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/in.s +++ chromium-133.0.6943.35/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/in.s
@@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
+ .text + .text
+foo: +foo:
+ addis 22,2,bar@toc@ha + addis 22,2,bar@toc@ha
+ ld 0,bar@toc@l(22) + ld 0,bar@toc@l(22)
Index: chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/out.s Index: chromium-133.0.6943.35/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/out.s
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/out.s +++ chromium-133.0.6943.35/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/out.s
@@ -0,0 +1,72 @@ @@ -0,0 +1,72 @@
+.text +.text
+.file 1 "inserted_by_delocate.c" +.file 1 "inserted_by_delocate.cc"
+.loc 1 1 0 +.loc 1 1 0
+BORINGSSL_bcm_text_start: +BORINGSSL_bcm_text_start:
+ .text + .text
@ -6943,12 +6955,12 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/delocate/
+.byte 0xff +.byte 0xff
+.byte 0x31 +.byte 0x31
+.byte 0x80 +.byte 0x80
Index: chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/in.s Index: chromium-133.0.6943.35/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/in.s
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/in.s +++ chromium-133.0.6943.35/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/in.s
@@ -0,0 +1,161 @@ @@ -0,0 +1,161 @@
+ .file "foo.c" + .file "foo.cc"
+ .abiversion 2 + .abiversion 2
+ .section ".toc","aw" + .section ".toc","aw"
+ .section ".text" + .section ".text"
@ -7109,16 +7121,16 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/delocate/
+ .size exported_function,.-exported_function + .size exported_function,.-exported_function
+ .ident "GCC: (Ubuntu 4.9.2-10ubuntu13) 4.9.2" + .ident "GCC: (Ubuntu 4.9.2-10ubuntu13) 4.9.2"
+ .section .note.GNU-stack,"",@progbits + .section .note.GNU-stack,"",@progbits
Index: chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/out.s Index: chromium-133.0.6943.35/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/out.s
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/out.s +++ chromium-133.0.6943.35/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/out.s
@@ -0,0 +1,552 @@ @@ -0,0 +1,552 @@
+.text +.text
+.file 1 "inserted_by_delocate.c" +.file 1 "inserted_by_delocate.cc"
+.loc 1 1 0 +.loc 1 1 0
+BORINGSSL_bcm_text_start: +BORINGSSL_bcm_text_start:
+ .file "foo.c" + .file "foo.cc"
+ .abiversion 2 + .abiversion 2
+ .section ".toc","aw" + .section ".toc","aw"
+# WAS .section ".text" +# WAS .section ".text"
@ -7666,12 +7678,12 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/delocate/
+.byte 0xff +.byte 0xff
+.byte 0x31 +.byte 0x31
+.byte 0x80 +.byte 0x80
Index: chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/in.s Index: chromium-133.0.6943.35/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/in.s
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/in.s +++ chromium-133.0.6943.35/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/in.s
@@ -0,0 +1,226 @@ @@ -0,0 +1,226 @@
+ .file "foo.c" + .file "foo.cc"
+ .abiversion 2 + .abiversion 2
+ .section ".toc","aw" + .section ".toc","aw"
+ .section ".text" + .section ".text"
@ -7897,16 +7909,16 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/delocate/
+ .zero 20 + .zero 20
+ .ident "GCC: (Ubuntu 4.9.2-10ubuntu13) 4.9.2" + .ident "GCC: (Ubuntu 4.9.2-10ubuntu13) 4.9.2"
+ .section .note.GNU-stack,"",@progbits + .section .note.GNU-stack,"",@progbits
Index: chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/out.s Index: chromium-133.0.6943.35/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/out.s
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/out.s +++ chromium-133.0.6943.35/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/out.s
@@ -0,0 +1,677 @@ @@ -0,0 +1,677 @@
+.text +.text
+.file 1 "inserted_by_delocate.c" +.file 1 "inserted_by_delocate.cc"
+.loc 1 1 0 +.loc 1 1 0
+BORINGSSL_bcm_text_start: +BORINGSSL_bcm_text_start:
+ .file "foo.c" + .file "foo.cc"
+ .abiversion 2 + .abiversion 2
+ .section ".toc","aw" + .section ".toc","aw"
+# WAS .section ".text" +# WAS .section ".text"
@ -8579,10 +8591,10 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/delocate/
+.byte 0xff +.byte 0xff
+.byte 0x31 +.byte 0x31
+.byte 0x80 +.byte 0x80
Index: chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/in.s Index: chromium-133.0.6943.35/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/in.s
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/in.s +++ chromium-133.0.6943.35/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/in.s
@@ -0,0 +1,23 @@ @@ -0,0 +1,23 @@
+ .text + .text
+foo: +foo:
@ -8607,13 +8619,13 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/delocate/
+ +
+ addis 4, 2, 1+foo-2@toc@ha+3 + addis 4, 2, 1+foo-2@toc@ha+3
+ addi 4, 4, 1+foo-2@toc@l+3 + addi 4, 4, 1+foo-2@toc@l+3
Index: chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/out.s Index: chromium-133.0.6943.35/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/out.s
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/out.s +++ chromium-133.0.6943.35/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/out.s
@@ -0,0 +1,178 @@ @@ -0,0 +1,178 @@
+.text +.text
+.file 1 "inserted_by_delocate.c" +.file 1 "inserted_by_delocate.cc"
+.loc 1 1 0 +.loc 1 1 0
+BORINGSSL_bcm_text_start: +BORINGSSL_bcm_text_start:
+ .text + .text
@ -8790,11 +8802,11 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/util/fipstools/delocate/
+.byte 0xff +.byte 0xff
+.byte 0x31 +.byte 0x31
+.byte 0x80 +.byte 0x80
Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/fipsmodule/sha/sha1.c.inc Index: chromium-133.0.6943.35/third_party/boringssl/src/crypto/fipsmodule/sha/sha1.cc.inc
=================================================================== ===================================================================
--- chromium-130.0.6723.44.orig/third_party/boringssl/src/crypto/fipsmodule/sha/sha1.c.inc --- chromium-133.0.6943.35.orig/third_party/boringssl/src/crypto/fipsmodule/sha/sha1.cc.inc
+++ chromium-130.0.6723.44/third_party/boringssl/src/crypto/fipsmodule/sha/sha1.c.inc +++ chromium-133.0.6943.35/third_party/boringssl/src/crypto/fipsmodule/sha/sha1.cc.inc
@@ -408,6 +408,10 @@ static void sha1_block_data_order(uint32 @@ -362,6 +362,10 @@ static void sha1_block_data_order(uint32
return; return;
} }
#endif #endif
@ -8805,11 +8817,11 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/crypto/fipsmodule/sha/sh
sha1_block_data_order_nohw(state, data, num); sha1_block_data_order_nohw(state, data, num);
} }
Index: chromium-130.0.6723.44/third_party/boringssl/src/build.json Index: chromium-133.0.6943.35/third_party/boringssl/src/build.json
=================================================================== ===================================================================
--- chromium-130.0.6723.44.orig/third_party/boringssl/src/build.json --- chromium-133.0.6943.35.orig/third_party/boringssl/src/build.json
+++ chromium-130.0.6723.44/third_party/boringssl/src/build.json +++ chromium-133.0.6943.35/third_party/boringssl/src/build.json
@@ -118,6 +118,10 @@ @@ -126,6 +126,10 @@
{"src": "crypto/fipsmodule/sha/asm/sha512-armv4.pl"}, {"src": "crypto/fipsmodule/sha/asm/sha512-armv4.pl"},
{"src": "crypto/fipsmodule/aes/asm/vpaes-armv7.pl"} {"src": "crypto/fipsmodule/aes/asm/vpaes-armv7.pl"}
], ],
@ -8820,15 +8832,15 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/build.json
"perlasm_x86": [ "perlasm_x86": [
{"src": "crypto/fipsmodule/aes/asm/aesni-x86.pl"}, {"src": "crypto/fipsmodule/aes/asm/aesni-x86.pl"},
{"src": "crypto/fipsmodule/bn/asm/bn-586.pl"}, {"src": "crypto/fipsmodule/bn/asm/bn-586.pl"},
@@ -219,6 +223,7 @@ @@ -229,6 +233,7 @@
"crypto/cpu_arm_freebsd.c", "crypto/cpu_arm_freebsd.cc",
"crypto/cpu_arm_linux.c", "crypto/cpu_arm_linux.cc",
"crypto/cpu_intel.c", "crypto/cpu_intel.cc",
+ "crypto/cpu_ppc64le.c", + "crypto/cpu_ppc64le.cc",
"crypto/crypto.c", "crypto/crypto.cc",
"crypto/curve25519/curve25519.c", "crypto/curve25519/curve25519.cc",
"crypto/curve25519/curve25519_64_adx.c", "crypto/curve25519/curve25519_64_adx.cc",
@@ -799,6 +804,9 @@ @@ -786,6 +791,9 @@
"perlasm_arm": [ "perlasm_arm": [
{"src": "crypto/test/asm/trampoline-armv4.pl"} {"src": "crypto/test/asm/trampoline-armv4.pl"}
], ],
@ -8838,10 +8850,10 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/build.json
"perlasm_x86": [ "perlasm_x86": [
{"src": "crypto/test/asm/trampoline-x86.pl"} {"src": "crypto/test/asm/trampoline-x86.pl"}
], ],
Index: chromium-130.0.6723.44/third_party/boringssl/src/util/pregenerate/build.go Index: chromium-133.0.6943.35/third_party/boringssl/src/util/pregenerate/build.go
=================================================================== ===================================================================
--- chromium-130.0.6723.44.orig/third_party/boringssl/src/util/pregenerate/build.go --- chromium-133.0.6943.35.orig/third_party/boringssl/src/util/pregenerate/build.go
+++ chromium-130.0.6723.44/third_party/boringssl/src/util/pregenerate/build.go +++ chromium-133.0.6943.35/third_party/boringssl/src/util/pregenerate/build.go
@@ -38,6 +38,7 @@ type InputTarget struct { @@ -38,6 +38,7 @@ type InputTarget struct {
// architecture. // architecture.
PerlasmAarch64 []PerlasmSource `json:"perlasm_aarch64,omitempty"` PerlasmAarch64 []PerlasmSource `json:"perlasm_aarch64,omitempty"`
@ -8860,10 +8872,10 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/util/pregenerate/build.g
for _, p := range in.PerlasmX86 { for _, p := range in.PerlasmX86 {
addPerlasmTask(&out.Asm, &p, "-apple.S", []string{"macosx", "-fPIC"}) addPerlasmTask(&out.Asm, &p, "-apple.S", []string{"macosx", "-fPIC"})
addPerlasmTask(&out.Asm, &p, "-linux.S", []string{"elf", "-fPIC"}) addPerlasmTask(&out.Asm, &p, "-linux.S", []string{"elf", "-fPIC"})
Index: chromium-130.0.6723.44/third_party/boringssl/README.ppc64le Index: chromium-133.0.6943.35/third_party/boringssl/README.ppc64le
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-130.0.6723.44/third_party/boringssl/README.ppc64le +++ chromium-133.0.6943.35/third_party/boringssl/README.ppc64le
@@ -0,0 +1,8 @@ @@ -0,0 +1,8 @@
+============================================================== +==============================================================
+To recreate boringssl pregenerated files patch for ppc64le: +To recreate boringssl pregenerated files patch for ppc64le:
@ -8873,11 +8885,11 @@ Index: chromium-130.0.6723.44/third_party/boringssl/README.ppc64le
+go run ./util/pregenerate +go run ./util/pregenerate
+cd ../../../../ +cd ../../../../
+diff -urN chromium-*/third_party/boringssl/src/gen.orig chromium-*/third_party/boringssl/src/gen +diff -urN chromium-*/third_party/boringssl/src/gen.orig chromium-*/third_party/boringssl/src/gen
Index: chromium-130.0.6723.44/third_party/boringssl/src/gen/sources.gni Index: chromium-133.0.6943.35/third_party/boringssl/src/gen/sources.gni
=================================================================== ===================================================================
--- chromium-130.0.6723.44.orig/third_party/boringssl/src/gen/sources.gni --- chromium-133.0.6943.35.orig/third_party/boringssl/src/gen/sources.gni
+++ chromium-130.0.6723.44/third_party/boringssl/src/gen/sources.gni +++ chromium-133.0.6943.35/third_party/boringssl/src/gen/sources.gni
@@ -107,6 +107,7 @@ bcm_sources_asm = [ @@ -119,6 +119,7 @@ bcm_sources_asm = [
"gen/bcm/aesv8-gcm-armv8-apple.S", "gen/bcm/aesv8-gcm-armv8-apple.S",
"gen/bcm/aesv8-gcm-armv8-linux.S", "gen/bcm/aesv8-gcm-armv8-linux.S",
"gen/bcm/aesv8-gcm-armv8-win.S", "gen/bcm/aesv8-gcm-armv8-win.S",
@ -8885,7 +8897,7 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/gen/sources.gni
"gen/bcm/armv4-mont-linux.S", "gen/bcm/armv4-mont-linux.S",
"gen/bcm/armv8-mont-apple.S", "gen/bcm/armv8-mont-apple.S",
"gen/bcm/armv8-mont-linux.S", "gen/bcm/armv8-mont-linux.S",
@@ -123,6 +124,7 @@ bcm_sources_asm = [ @@ -135,6 +136,7 @@ bcm_sources_asm = [
"gen/bcm/ghash-neon-armv8-apple.S", "gen/bcm/ghash-neon-armv8-apple.S",
"gen/bcm/ghash-neon-armv8-linux.S", "gen/bcm/ghash-neon-armv8-linux.S",
"gen/bcm/ghash-neon-armv8-win.S", "gen/bcm/ghash-neon-armv8-win.S",
@ -8893,11 +8905,11 @@ Index: chromium-130.0.6723.44/third_party/boringssl/src/gen/sources.gni
"gen/bcm/ghash-ssse3-x86-apple.S", "gen/bcm/ghash-ssse3-x86-apple.S",
"gen/bcm/ghash-ssse3-x86-linux.S", "gen/bcm/ghash-ssse3-x86-linux.S",
"gen/bcm/ghash-ssse3-x86_64-apple.S", "gen/bcm/ghash-ssse3-x86_64-apple.S",
@@ -314,6 +316,7 @@ crypto_sources = [ @@ -328,6 +330,7 @@ crypto_sources = [
"crypto/cpu_arm_freebsd.c", "crypto/cpu_arm_freebsd.cc",
"crypto/cpu_arm_linux.c", "crypto/cpu_arm_linux.cc",
"crypto/cpu_intel.c", "crypto/cpu_intel.cc",
+ "crypto/cpu_ppc64le.c", + "crypto/cpu_ppc64le.cc",
"crypto/crypto.c", "crypto/crypto.cc",
"crypto/curve25519/curve25519.c", "crypto/curve25519/curve25519.cc",
"crypto/curve25519/curve25519_64_adx.c", "crypto/curve25519/curve25519_64_adx.cc",

100
SOURCES/0001-Added-Yandex-search-bar-as-default-on-newtab-and-new.patch
Unescape View File

@ -1,6 +1,6 @@
From a7f4daf245fae8cbee949584a3d10d141c221a5a Mon Sep 17 00:00:00 2001 From 8eb02a2411be98b4910605bd1eb0c66c47619107 Mon Sep 17 00:00:00 2001
From: tigro <tigro@msvsphere-os.ru> From: tigro <tigro@msvsphere-os.ru>
Date: Thu, 19 Sep 2024 17:54:08 +0300 Date: Fri, 7 Feb 2025 21:40:01 +0300
Subject: [PATCH] Added Yandex search bar as default on newtab and new-tab-page Subject: [PATCH] Added Yandex search bar as default on newtab and new-tab-page
--- ---
@ -30,10 +30,10 @@ Subject: [PATCH] Added Yandex search bar as default on newtab and new-tab-page
23 files changed, 88 insertions(+), 33 deletions(-) 23 files changed, 88 insertions(+), 33 deletions(-)
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 47cecfd278..024a9dc2f6 100644 index 5571529484..64ad7631c2 100644
--- a/chrome/app/generated_resources.grd --- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd
@@ -7698,10 +7698,8 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -7615,10 +7615,8 @@ Keep your key file in a safe place. You will need it to create new versions of y
<!-- NTP --> <!-- NTP -->
<message name="IDS_GOOGLE_SEARCH_BOX_EMPTY_HINT_MD" desc="The text displayed in the fakebox (on the New Tab page) when it is empty, Google is the default search engine, and the Material Design UI is enabled."> <message name="IDS_GOOGLE_SEARCH_BOX_EMPTY_HINT_MD" desc="The text displayed in the fakebox (on the New Tab page) when it is empty, Google is the default search engine, and the Material Design UI is enabled.">
@ -45,10 +45,10 @@ index 47cecfd278..024a9dc2f6 100644
<message name="IDS_GOOGLE_SEARCH_BOX_EMPTY_HINT_MULTIMODAL" desc="The text displayed in the multimodal searchbox when it is empty. It is meant to invite the user to add a text query to the existing image query in order to issue a 'multimodal' (image + text) query."> <message name="IDS_GOOGLE_SEARCH_BOX_EMPTY_HINT_MULTIMODAL" desc="The text displayed in the multimodal searchbox when it is empty. It is meant to invite the user to add a text query to the existing image query in order to issue a 'multimodal' (image + text) query.">
Add to your search Add to your search
diff --git a/chrome/app/resources/generated_resources_be.xtb b/chrome/app/resources/generated_resources_be.xtb diff --git a/chrome/app/resources/generated_resources_be.xtb b/chrome/app/resources/generated_resources_be.xtb
index 03dc88027c..1f056930cd 100644 index d98a996fba..dc8316138b 100644
--- a/chrome/app/resources/generated_resources_be.xtb --- a/chrome/app/resources/generated_resources_be.xtb
+++ b/chrome/app/resources/generated_resources_be.xtb +++ b/chrome/app/resources/generated_resources_be.xtb
@@ -9816,7 +9816,7 @@ @@ -9903,7 +9903,7 @@
<translation id="8048728378294435881">Стварайце рэзервовыя копіі сваіх даных, каб іх можна было выкарыстоўваць на іншых прыладах</translation> <translation id="8048728378294435881">Стварайце рэзервовыя копіі сваіх даных, каб іх можна было выкарыстоўваць на іншых прыладах</translation>
<translation id="8048977114738515028">Стварыце ярлык на працоўным стале прылады, каб мець прамы доступ да гэтага профілю</translation> <translation id="8048977114738515028">Стварыце ярлык на працоўным стале прылады, каб мець прамы доступ да гэтага профілю</translation>
<translation id="8049029041626250638">Падключыце клавіятуру або мыш. Калі вы выкарыстоўваеце прылады з Bluetooth, упэўніцеся, што яны гатовыя да спалучэння.</translation> <translation id="8049029041626250638">Падключыце клавіятуру або мыш. Калі вы выкарыстоўваеце прылады з Bluetooth, упэўніцеся, што яны гатовыя да спалучэння.</translation>
@ -57,18 +57,18 @@ index 03dc88027c..1f056930cd 100644
<translation id="8049705080247101012">У Google пашырэнне "<ph name="EXTENSION_NAME" />" абазначана як шкоднае. Яго ўсталяванне было прадухілена</translation> <translation id="8049705080247101012">У Google пашырэнне "<ph name="EXTENSION_NAME" />" абазначана як шкоднае. Яго ўсталяванне было прадухілена</translation>
<translation id="8049948037269924837">Адваротная прагортка сэнсарнай панэллю</translation> <translation id="8049948037269924837">Адваротная прагортка сэнсарнай панэллю</translation>
<translation id="8050038245906040378">Камерцыйнае падпісванне кода ў Microsoft</translation> <translation id="8050038245906040378">Камерцыйнае падпісванне кода ў Microsoft</translation>
@@ -11578,4 +11578,4 @@ @@ -11674,4 +11674,4 @@
<translation id="997143476478634194">Пры наведванні сайтаў яны будуць аўтаматычна ўлічваць гэту наладу. Звычайна сайты адпраўляюць апавяшчэнні, каб паведаміць вам пра экстранныя навіны або новыя паведамленні ў чаце.</translation>
<translation id="99731366405731005">Каб выкарыстоўваць функцыю сінхранізацыі параметраў Wi-Fi, уключыце <ph name="LINK1_BEGIN" />Сінхранізацыю Chrome<ph name="LINK1_END" />. <ph name="LINK2_BEGIN" />Даведацца больш<ph name="LINK2_END" /></translation> <translation id="99731366405731005">Каб выкарыстоўваць функцыю сінхранізацыі параметраў Wi-Fi, уключыце <ph name="LINK1_BEGIN" />Сінхранізацыю Chrome<ph name="LINK1_END" />. <ph name="LINK2_BEGIN" />Даведацца больш<ph name="LINK2_END" /></translation>
<translation id="998347228911661591">Сінхранізуйце свае групы ўкладак</translation>
<translation id="998747458861718449">Пра&amp;верыць</translation> <translation id="998747458861718449">Пра&amp;верыць</translation>
-</translationbundle> -</translationbundle>
\ No newline at end of file \ No newline at end of file
+</translationbundle> +</translationbundle>
diff --git a/chrome/app/resources/generated_resources_en-GB.xtb b/chrome/app/resources/generated_resources_en-GB.xtb diff --git a/chrome/app/resources/generated_resources_en-GB.xtb b/chrome/app/resources/generated_resources_en-GB.xtb
index f283ab5ede..5d7368f6e7 100644 index dc0cecb2ed..90601cf3f3 100644
--- a/chrome/app/resources/generated_resources_en-GB.xtb --- a/chrome/app/resources/generated_resources_en-GB.xtb
+++ b/chrome/app/resources/generated_resources_en-GB.xtb +++ b/chrome/app/resources/generated_resources_en-GB.xtb
@@ -9827,7 +9827,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -9914,7 +9914,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
<translation id="8048728378294435881">Back up your stuff and use it on any device</translation> <translation id="8048728378294435881">Back up your stuff and use it on any device</translation>
<translation id="8048977114738515028">Create a desktop shortcut on your device to access directly to this profile</translation> <translation id="8048977114738515028">Create a desktop shortcut on your device to access directly to this profile</translation>
<translation id="8049029041626250638">Connect a keyboard or mouse. If you are using Bluetooth devices, make sure that your devices are ready to pair.</translation> <translation id="8049029041626250638">Connect a keyboard or mouse. If you are using Bluetooth devices, make sure that your devices are ready to pair.</translation>
@ -78,10 +78,10 @@ index f283ab5ede..5d7368f6e7 100644
<translation id="8049948037269924837">Touchpad reverse scrolling</translation> <translation id="8049948037269924837">Touchpad reverse scrolling</translation>
<translation id="8050038245906040378">Microsoft Commercial Code Signing</translation> <translation id="8050038245906040378">Microsoft Commercial Code Signing</translation>
diff --git a/chrome/app/resources/generated_resources_ru.xtb b/chrome/app/resources/generated_resources_ru.xtb diff --git a/chrome/app/resources/generated_resources_ru.xtb b/chrome/app/resources/generated_resources_ru.xtb
index 2cea179a09..60a3fd18a2 100644 index c1a038aa07..76842464c9 100644
--- a/chrome/app/resources/generated_resources_ru.xtb --- a/chrome/app/resources/generated_resources_ru.xtb
+++ b/chrome/app/resources/generated_resources_ru.xtb +++ b/chrome/app/resources/generated_resources_ru.xtb
@@ -9820,7 +9820,7 @@ @@ -9907,7 +9907,7 @@
<translation id="8048728378294435881">Создайте резервную копию данных и используйте их на любом устройстве.</translation> <translation id="8048728378294435881">Создайте резервную копию данных и используйте их на любом устройстве.</translation>
<translation id="8048977114738515028">Чтобы быстро переключаться на этот профиль, создайте ярлык на рабочем столе</translation> <translation id="8048977114738515028">Чтобы быстро переключаться на этот профиль, создайте ярлык на рабочем столе</translation>
<translation id="8049029041626250638">Подключите мышь или клавиатуру. Если вы используете устройства Bluetooth, убедитесь, что они готовы к подключению.</translation> <translation id="8049029041626250638">Подключите мышь или клавиатуру. Если вы используете устройства Bluetooth, убедитесь, что они готовы к подключению.</translation>
@ -91,10 +91,10 @@ index 2cea179a09..60a3fd18a2 100644
<translation id="8049948037269924837">Обратное направление прокрутки с помощью сенсорной панели</translation> <translation id="8049948037269924837">Обратное направление прокрутки с помощью сенсорной панели</translation>
<translation id="8050038245906040378">Подписывание коммерческого кода Microsoft</translation> <translation id="8050038245906040378">Подписывание коммерческого кода Microsoft</translation>
diff --git a/chrome/app/resources/generated_resources_uk.xtb b/chrome/app/resources/generated_resources_uk.xtb diff --git a/chrome/app/resources/generated_resources_uk.xtb b/chrome/app/resources/generated_resources_uk.xtb
index 2579b09b79..83edc733cb 100644 index fcd4a324fc..baf132a35e 100644
--- a/chrome/app/resources/generated_resources_uk.xtb --- a/chrome/app/resources/generated_resources_uk.xtb
+++ b/chrome/app/resources/generated_resources_uk.xtb +++ b/chrome/app/resources/generated_resources_uk.xtb
@@ -9830,7 +9830,7 @@ @@ -9917,7 +9917,7 @@
<translation id="8048728378294435881">Створюйте резервні копії даних і використовуйте їх на будь-якому пристрої</translation> <translation id="8048728378294435881">Створюйте резервні копії даних і використовуйте їх на будь-якому пристрої</translation>
<translation id="8048977114738515028">Створити ярлик на робочому столі, щоб відразу переходити до цього профілю</translation> <translation id="8048977114738515028">Створити ярлик на робочому столі, щоб відразу переходити до цього профілю</translation>
<translation id="8049029041626250638">Підключіть клавіатуру або мишу. Якщо ви користуєтеся пристроями з Bluetooth, переконайтеся, що вони готові до підключення.</translation> <translation id="8049029041626250638">Підключіть клавіатуру або мишу. Якщо ви користуєтеся пристроями з Bluetooth, переконайтеся, що вони готові до підключення.</translation>
@ -138,7 +138,7 @@ index 72bd92c5ab..2604d9c0dd 100644
<input name="ep" .value="${this.uploadUrlEntrypoint_}"></input> <input name="ep" .value="${this.uploadUrlEntrypoint_}"></input>
<input name="hl" .value="${this.language_}"></input> <input name="hl" .value="${this.language_}"></input>
diff --git a/chrome/browser/resources/new_tab_page/lens_form.ts b/chrome/browser/resources/new_tab_page/lens_form.ts diff --git a/chrome/browser/resources/new_tab_page/lens_form.ts b/chrome/browser/resources/new_tab_page/lens_form.ts
index cc89f05912..020eb1413d 100644 index 735aa28cb8..08db091029 100644
--- a/chrome/browser/resources/new_tab_page/lens_form.ts --- a/chrome/browser/resources/new_tab_page/lens_form.ts
+++ b/chrome/browser/resources/new_tab_page/lens_form.ts +++ b/chrome/browser/resources/new_tab_page/lens_form.ts
@@ -11,14 +11,14 @@ import {getCss} from './lens_form.css.js'; @@ -11,14 +11,14 @@ import {getCss} from './lens_form.css.js';
@ -203,10 +203,10 @@ index 09f613f71a..69ee3a7366 100644
<input id="inputBox" autocomplete="false" autocorrect="false" <input id="inputBox" autocomplete="false" autocorrect="false"
placeholder="$i18n{lensSearchUploadDialogTextPlaceholder}" placeholder="$i18n{lensSearchUploadDialogTextPlaceholder}"
diff --git a/chrome/browser/resources/new_tab_page/logo.css b/chrome/browser/resources/new_tab_page/logo.css diff --git a/chrome/browser/resources/new_tab_page/logo.css b/chrome/browser/resources/new_tab_page/logo.css
index f7c8d5c6e4..71e8d5455d 100644 index e744ffca3b..47dff94a63 100644
--- a/chrome/browser/resources/new_tab_page/logo.css --- a/chrome/browser/resources/new_tab_page/logo.css
+++ b/chrome/browser/resources/new_tab_page/logo.css +++ b/chrome/browser/resources/new_tab_page/logo.css
@@ -33,10 +33,7 @@ @@ -29,10 +29,7 @@
} }
:host([single-colored]) #logo { :host([single-colored]) #logo {
@ -219,10 +219,10 @@ index f7c8d5c6e4..71e8d5455d 100644
:host(:not([single-colored])) #logo { :host(:not([single-colored])) #logo {
diff --git a/chrome/browser/resources/new_tab_page/logo.ts b/chrome/browser/resources/new_tab_page/logo.ts diff --git a/chrome/browser/resources/new_tab_page/logo.ts b/chrome/browser/resources/new_tab_page/logo.ts
index 412c9bcf2c..e0c27819a5 100644 index fcd5b587b2..bdcdfc9737 100644
--- a/chrome/browser/resources/new_tab_page/logo.ts --- a/chrome/browser/resources/new_tab_page/logo.ts
+++ b/chrome/browser/resources/new_tab_page/logo.ts +++ b/chrome/browser/resources/new_tab_page/logo.ts
@@ -216,7 +216,7 @@ export class LogoElement extends CrLitElement { @@ -208,7 +208,7 @@ export class LogoElement extends CrLitElement {
} }
private computeShowLogo_(): boolean { private computeShowLogo_(): boolean {
@ -232,10 +232,10 @@ index 412c9bcf2c..e0c27819a5 100644
private computeShowDoodle_(): boolean { private computeShowDoodle_(): boolean {
diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc
index 40c586fb4f..fc046edf27 100644 index cb37fdb168..101f760a42 100644
--- a/chrome/browser/search/search.cc --- a/chrome/browser/search/search.cc
+++ b/chrome/browser/search/search.cc +++ b/chrome/browser/search/search.cc
@@ -174,6 +174,8 @@ struct NewTabURLDetails { @@ -173,6 +173,8 @@ struct NewTabURLDetails {
#if BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_ANDROID)
const GURL local_url; const GURL local_url;
@ -244,7 +244,7 @@ index 40c586fb4f..fc046edf27 100644
#else #else
const bool default_is_google = DefaultSearchProviderIsGoogle(profile); const bool default_is_google = DefaultSearchProviderIsGoogle(profile);
const GURL local_url(default_is_google const GURL local_url(default_is_google
@@ -240,6 +242,11 @@ bool DefaultSearchProviderIsGoogle(Profile* profile) { @@ -239,6 +241,11 @@ bool DefaultSearchProviderIsGoogle(Profile* profile) {
TemplateURLServiceFactory::GetForProfile(profile)); TemplateURLServiceFactory::GetForProfile(profile));
} }
@ -270,10 +270,10 @@ index c7ae65114f..5859d72731 100644
bool IsNTPOrRelatedURL(const GURL& url, Profile* profile); bool IsNTPOrRelatedURL(const GURL& url, Profile* profile);
diff --git a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc b/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc diff --git a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc b/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc
index 9fd661ba51..be7febae29 100644 index e6461f644e..3d2c828635 100644
--- a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc --- a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc
+++ b/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc +++ b/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc
@@ -36,6 +36,7 @@ @@ -32,6 +32,7 @@
#include "chrome/browser/search/background/ntp_custom_background_service_factory.h" #include "chrome/browser/search/background/ntp_custom_background_service_factory.h"
#include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/search_engines/template_url_service_factory.h"
#include "chrome/browser/search_provider_logos/logo_service_factory.h" #include "chrome/browser/search_provider_logos/logo_service_factory.h"
@ -281,9 +281,9 @@ index 9fd661ba51..be7febae29 100644
#include "chrome/browser/segmentation_platform/segmentation_platform_service_factory.h" #include "chrome/browser/segmentation_platform/segmentation_platform_service_factory.h"
#include "chrome/browser/signin/identity_manager_factory.h" #include "chrome/browser/signin/identity_manager_factory.h"
#include "chrome/browser/sync/sync_service_factory.h" #include "chrome/browser/sync/sync_service_factory.h"
@@ -453,6 +454,10 @@ content::WebUIDataSource* CreateAndAddNewTabPageUiHtmlSource(Profile* profile) { @@ -463,6 +464,10 @@ content::WebUIDataSource* CreateAndAddNewTabPageUiHtmlSource(Profile* profile) {
base::NumberToString( NewTabPageUI::IsManagedProfile(profile)) ||
ntp_features::kNtpCalendarModuleWindowEndDeltaParam.Get().InHours())); base::FeatureList::IsEnabled(ntp_features::kNtpSharepointModule)));
+ source->AddBoolean( + source->AddBoolean(
+ "googleLensForYandex", + "googleLensForYandex",
@ -334,34 +334,34 @@ index 98572faa77..cfb6727848 100644
#endif // COMPONENTS_SEARCH_SEARCH_H_ #endif // COMPONENTS_SEARCH_SEARCH_H_
diff --git a/components/search_engines/keyword_table.cc b/components/search_engines/keyword_table.cc diff --git a/components/search_engines/keyword_table.cc b/components/search_engines/keyword_table.cc
index c88f019f8d..85afef9757 100644 index 47d0d5d13e..f44955695f 100644
--- a/components/search_engines/keyword_table.cc --- a/components/search_engines/keyword_table.cc
+++ b/components/search_engines/keyword_table.cc +++ b/components/search_engines/keyword_table.cc
@@ -173,7 +173,9 @@ void BindURLToStatement(const TemplateURLData& data, @@ -564,7 +564,9 @@ std::optional<TemplateURLData> KeywordTable::GetKeywordDataFromStatement(
data.SetURL(s.ColumnString(4));
data.suggestions_url = s.ColumnString(10);
data.image_url = s.ColumnString(16);
+#if 0 // Disable new tab overriding by search engines
data.new_tab_url = s.ColumnString(20);
+#endif
data.search_url_post_params = s.ColumnString(17);
data.suggestions_url_post_params = s.ColumnString(18);
data.image_url_post_params = s.ColumnString(19);
@@ -675,7 +677,9 @@ void KeywordTable::BindURLToStatement(const TemplateURLData& data,
s->BindString(starting_column + 16, data.search_url_post_params); s->BindString(starting_column + 16, data.search_url_post_params);
s->BindString(starting_column + 17, data.suggestions_url_post_params); s->BindString(starting_column + 17, data.suggestions_url_post_params);
s->BindString(starting_column + 18, data.image_url_post_params); s->BindString(starting_column + 18, data.image_url_post_params);
+#if 0 // Disable new tab overriding by search engines +#if 0 // Disable new tab overriding by search engines
s->BindString(starting_column + 19, data.new_tab_url); s->BindString(starting_column + 19, data.new_tab_url);
+#endif +#endif
s->BindTime(starting_column + 20, data.last_visited); s->BindTime(starting_column + 20, data.last_visited);
s->BindBool(starting_column + 21, data.created_from_play_api); s->BindBool(starting_column + 21, data.created_from_play_api);
s->BindInt(starting_column + 22, static_cast<int>(data.is_active)); s->BindInt(starting_column + 22, static_cast<int>(data.is_active));
@@ -541,7 +543,9 @@ bool KeywordTable::GetKeywordDataFromStatement(sql::Statement& s,
data->SetURL(s.ColumnString(4));
data->suggestions_url = s.ColumnString(10);
data->image_url = s.ColumnString(16);
+#if 0 // Disable new tab overriding by search engines
data->new_tab_url = s.ColumnString(20);
+#endif
data->search_url_post_params = s.ColumnString(17);
data->suggestions_url_post_params = s.ColumnString(18);
data->image_url_post_params = s.ColumnString(19);
diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
index 2036ba59e6..5236f359f7 100644 index f14653e783..32762f552e 100644
--- a/components/search_engines/prepopulated_engines.json --- a/components/search_engines/prepopulated_engines.json
+++ b/components/search_engines/prepopulated_engines.json +++ b/components/search_engines/prepopulated_engines.json
@@ -838,7 +838,7 @@ @@ -835,7 +835,7 @@
"suggest_url": "https://suggest.yandex.by/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}", "suggest_url": "https://suggest.yandex.by/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}",
"image_url": "https://yandex.by/images/search/?rpt=imageview", "image_url": "https://yandex.by/images/search/?rpt=imageview",
"image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1", "image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1",
@ -370,7 +370,7 @@ index 2036ba59e6..5236f359f7 100644
"type": "SEARCH_ENGINE_YANDEX", "type": "SEARCH_ENGINE_YANDEX",
"id": 15 "id": 15
}, },
@@ -851,6 +851,7 @@ @@ -848,6 +848,7 @@
"suggest_url": "https://suggest.yandex.com/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}", "suggest_url": "https://suggest.yandex.com/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}",
"image_url": "https://yandex.com/images/search?rpt=imageview", "image_url": "https://yandex.com/images/search?rpt=imageview",
"image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1", "image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1",
@ -378,7 +378,7 @@ index 2036ba59e6..5236f359f7 100644
"type": "SEARCH_ENGINE_YANDEX", "type": "SEARCH_ENGINE_YANDEX",
"id": 15, "id": 15,
"regulatory_extensions": [ "regulatory_extensions": [
@@ -876,7 +877,7 @@ @@ -873,7 +874,7 @@
"suggest_url": "https://suggest.yandex.kz/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}", "suggest_url": "https://suggest.yandex.kz/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}",
"image_url": "https://yandex.kz/images/search/?rpt=imageview", "image_url": "https://yandex.kz/images/search/?rpt=imageview",
"image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1", "image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1",
@ -387,7 +387,7 @@ index 2036ba59e6..5236f359f7 100644
"type": "SEARCH_ENGINE_YANDEX", "type": "SEARCH_ENGINE_YANDEX",
"id": 15 "id": 15
}, },
@@ -890,7 +891,7 @@ @@ -887,7 +888,7 @@
"suggest_url": "https://suggest.yandex.ru/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}", "suggest_url": "https://suggest.yandex.ru/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}",
"image_url": "https://yandex.ru/images/search/?rpt=imageview", "image_url": "https://yandex.ru/images/search/?rpt=imageview",
"image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1", "image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1",
@ -396,7 +396,7 @@ index 2036ba59e6..5236f359f7 100644
"type": "SEARCH_ENGINE_YANDEX", "type": "SEARCH_ENGINE_YANDEX",
"id": 15 "id": 15
}, },
@@ -903,7 +904,7 @@ @@ -900,7 +901,7 @@
"suggest_url": "https://suggest.yandex.com.tr/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}", "suggest_url": "https://suggest.yandex.com.tr/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}",
"image_url": "https://yandex.com.tr/gorsel/search?rpt=imageview", "image_url": "https://yandex.com.tr/gorsel/search?rpt=imageview",
"image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1", "image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1",
@ -405,7 +405,7 @@ index 2036ba59e6..5236f359f7 100644
"type": "SEARCH_ENGINE_YANDEX", "type": "SEARCH_ENGINE_YANDEX",
"id": 15 "id": 15
}, },
@@ -917,7 +918,7 @@ @@ -914,7 +915,7 @@
"suggest_url": "https://suggest.yandex.ua/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}", "suggest_url": "https://suggest.yandex.ua/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}",
"image_url": "https://yandex.ua/images/search/?rpt=imageview", "image_url": "https://yandex.ua/images/search/?rpt=imageview",
"image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1", "image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1",
@ -468,7 +468,7 @@ index a4a0459de0..616430f279 100644
{SearchEngineTier::kTopEngines, &bing}, {SearchEngineTier::kTopEngines, &bing},
{SearchEngineTier::kTopEngines, &duckduckgo}, {SearchEngineTier::kTopEngines, &duckduckgo},
diff --git a/components/search_engines/template_url_data_util.cc b/components/search_engines/template_url_data_util.cc diff --git a/components/search_engines/template_url_data_util.cc b/components/search_engines/template_url_data_util.cc
index 18364f4324..6dc09f5e63 100644 index 127bfc536e..c075f110fa 100644
--- a/components/search_engines/template_url_data_util.cc --- a/components/search_engines/template_url_data_util.cc
+++ b/components/search_engines/template_url_data_util.cc +++ b/components/search_engines/template_url_data_util.cc
@@ -75,10 +75,12 @@ std::unique_ptr<TemplateURLData> TemplateURLDataFromDictionary( @@ -75,10 +75,12 @@ std::unique_ptr<TemplateURLData> TemplateURLDataFromDictionary(
@ -534,7 +534,7 @@ index 6c32b0e684..42e0d25e16 100644
} }
diff --git a/ui/webui/resources/cr_components/searchbox/searchbox.html b/ui/webui/resources/cr_components/searchbox/searchbox.html diff --git a/ui/webui/resources/cr_components/searchbox/searchbox.html b/ui/webui/resources/cr_components/searchbox/searchbox.html
index 0df21dda3f..b0c38b2b8b 100644 index e1de8f4ba4..50fe203291 100644
--- a/ui/webui/resources/cr_components/searchbox/searchbox.html --- a/ui/webui/resources/cr_components/searchbox/searchbox.html
+++ b/ui/webui/resources/cr_components/searchbox/searchbox.html +++ b/ui/webui/resources/cr_components/searchbox/searchbox.html
@@ -1,4 +1,11 @@ @@ -1,4 +1,11 @@
@ -550,5 +550,5 @@ index 0df21dda3f..b0c38b2b8b 100644
/* Embedders should define --cr-searchbox-min-width. */ /* Embedders should define --cr-searchbox-min-width. */
--cr-searchbox-width: var(--cr-searchbox-min-width); --cr-searchbox-width: var(--cr-searchbox-min-width);
-- --
2.47.0 2.48.1

11
SOURCES/0001-third-party-hwy-wrong-include.patch
Unescape View File

@ -0,0 +1,11 @@
--- a/third_party/highway/src/hwy/targets.cc
+++ b/third_party/highway/src/hwy/targets.cc
@@ -35,7 +35,7 @@
HWY_OS_LINUX
// sys/auxv.h does not always include asm/hwcap.h, or define HWCAP*, hence we
// still include this directly. See #1199.
-#ifndef TOOLCHAIN_MISS_ASM_HWCAP_H
+#if !defined(TOOLCHAIN_MISS_ASM_HWCAP_H) && !defined(HWY_ARCH_PPC)
#include <asm/hwcap.h>
#endif
#if HWY_HAVE_AUXV

2978
SOURCES/0002-Add-PPC64-generated-files-for-boringssl.patch
View File

File diff suppressed because it is too large Load Diff

57
SOURCES/0002-third_party-libvpx-Remove-bad-ppc64-config.patch
Unescape View File

@ -1,9 +1,10 @@
diff -Nur chromium-131.0.6778.69.orig/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h chromium-131.0.6778.69/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h Index: chromium-133.0.6943.35/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h
--- chromium-131.0.6778.69.orig/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h 2024-11-12 22:49:02.000000000 +0100 ===================================================================
+++ chromium-131.0.6778.69/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h 1970-01-01 01:00:00.000000000 +0100 --- chromium-133.0.6943.35.orig/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h
+++ /dev/null
@@ -1,330 +0,0 @@ @@ -1,330 +0,0 @@
-/* -/*
- * Copyright (c) 2024 The WebM project authors. All Rights Reserved. - * Copyright (c) 2025 The WebM project authors. All Rights Reserved.
- * - *
- * Use of this source code is governed by a BSD-style license - * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source - * that can be found in the LICENSE file in the root of the source
@ -332,12 +333,13 @@ diff -Nur chromium-131.0.6778.69.orig/third_party/libvpx/source/config/linux/ppc
-#endif -#endif
- -
-#endif // VP8_RTCD_H_ -#endif // VP8_RTCD_H_
diff -Nur chromium-131.0.6778.69.orig/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h chromium-131.0.6778.69/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h Index: chromium-133.0.6943.35/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h
--- chromium-131.0.6778.69.orig/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h 2024-11-12 22:49:02.000000000 +0100 ===================================================================
+++ chromium-131.0.6778.69/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h 1970-01-01 01:00:00.000000000 +0100 --- chromium-133.0.6943.35.orig/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h
+++ /dev/null
@@ -1,206 +0,0 @@ @@ -1,206 +0,0 @@
-/* -/*
- * Copyright (c) 2024 The WebM project authors. All Rights Reserved. - * Copyright (c) 2025 The WebM project authors. All Rights Reserved.
- * - *
- * Use of this source code is governed by a BSD-style license - * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source - * that can be found in the LICENSE file in the root of the source
@ -542,9 +544,10 @@ diff -Nur chromium-131.0.6778.69.orig/third_party/libvpx/source/config/linux/ppc
-#endif -#endif
- -
-#endif // VP9_RTCD_H_ -#endif // VP9_RTCD_H_
diff -Nur chromium-131.0.6778.69.orig/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm chromium-131.0.6778.69/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm Index: chromium-133.0.6943.35/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm
--- chromium-131.0.6778.69.orig/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm 2024-11-12 22:49:02.000000000 +0100 ===================================================================
+++ chromium-131.0.6778.69/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm 1970-01-01 01:00:00.000000000 +0100 --- chromium-133.0.6943.35.orig/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm
+++ /dev/null
@@ -1,108 +0,0 @@ @@ -1,108 +0,0 @@
-@ This file was created from a .asm file -@ This file was created from a .asm file
-@ using the ads2gas.pl script. -@ using the ads2gas.pl script.
@ -654,9 +657,10 @@ diff -Nur chromium-131.0.6778.69.orig/third_party/libvpx/source/config/linux/ppc
-.equ DECODE_WIDTH_LIMIT , 16384 -.equ DECODE_WIDTH_LIMIT , 16384
-.equ DECODE_HEIGHT_LIMIT , 16384 -.equ DECODE_HEIGHT_LIMIT , 16384
- .section .note.GNU-stack,"",%progbits - .section .note.GNU-stack,"",%progbits
diff -Nur chromium-131.0.6778.69.orig/third_party/libvpx/source/config/linux/ppc64/vpx_config.c chromium-131.0.6778.69/third_party/libvpx/source/config/linux/ppc64/vpx_config.c Index: chromium-133.0.6943.35/third_party/libvpx/source/config/linux/ppc64/vpx_config.c
--- chromium-131.0.6778.69.orig/third_party/libvpx/source/config/linux/ppc64/vpx_config.c 2024-11-12 22:49:02.000000000 +0100 ===================================================================
+++ chromium-131.0.6778.69/third_party/libvpx/source/config/linux/ppc64/vpx_config.c 1970-01-01 01:00:00.000000000 +0100 --- chromium-133.0.6943.35.orig/third_party/libvpx/source/config/linux/ppc64/vpx_config.c
+++ /dev/null
@@ -1,10 +0,0 @@ @@ -1,10 +0,0 @@
-/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */ -/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
-/* */ -/* */
@ -668,9 +672,10 @@ diff -Nur chromium-131.0.6778.69.orig/third_party/libvpx/source/config/linux/ppc
-#include "vpx/vpx_codec.h" -#include "vpx/vpx_codec.h"
-static const char* const cfg = "--target=ppc64le-linux-gcc --enable-external-build --enable-postproc --enable-multi-res-encoding --enable-temporal-denoising --enable-vp9-temporal-denoising --enable-vp9-postproc --size-limit=16384x16384 --enable-realtime-only --disable-install-docs --disable-libyuv --enable-unit-tests"; -static const char* const cfg = "--target=ppc64le-linux-gcc --enable-external-build --enable-postproc --enable-multi-res-encoding --enable-temporal-denoising --enable-vp9-temporal-denoising --enable-vp9-postproc --size-limit=16384x16384 --enable-realtime-only --disable-install-docs --disable-libyuv --enable-unit-tests";
-const char *vpx_codec_build_config(void) {return cfg;} -const char *vpx_codec_build_config(void) {return cfg;}
diff -Nur chromium-131.0.6778.69.orig/third_party/libvpx/source/config/linux/ppc64/vpx_config.h chromium-131.0.6778.69/third_party/libvpx/source/config/linux/ppc64/vpx_config.h Index: chromium-133.0.6943.35/third_party/libvpx/source/config/linux/ppc64/vpx_config.h
--- chromium-131.0.6778.69.orig/third_party/libvpx/source/config/linux/ppc64/vpx_config.h 2024-11-12 22:49:02.000000000 +0100 ===================================================================
+++ chromium-131.0.6778.69/third_party/libvpx/source/config/linux/ppc64/vpx_config.h 1970-01-01 01:00:00.000000000 +0100 --- chromium-133.0.6943.35.orig/third_party/libvpx/source/config/linux/ppc64/vpx_config.h
+++ /dev/null
@@ -1,117 +0,0 @@ @@ -1,117 +0,0 @@
-/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */ -/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
-/* */ -/* */
@ -789,12 +794,13 @@ diff -Nur chromium-131.0.6778.69.orig/third_party/libvpx/source/config/linux/ppc
-#define DECODE_WIDTH_LIMIT 16384 -#define DECODE_WIDTH_LIMIT 16384
-#define DECODE_HEIGHT_LIMIT 16384 -#define DECODE_HEIGHT_LIMIT 16384
-#endif /* VPX_CONFIG_H */ -#endif /* VPX_CONFIG_H */
diff -Nur chromium-131.0.6778.69.orig/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h chromium-131.0.6778.69/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h Index: chromium-133.0.6943.35/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h
--- chromium-131.0.6778.69.orig/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h 2024-11-12 22:49:02.000000000 +0100 ===================================================================
+++ chromium-131.0.6778.69/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h 1970-01-01 01:00:00.000000000 +0100 --- chromium-133.0.6943.35.orig/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h
+++ /dev/null
@@ -1,2138 +0,0 @@ @@ -1,2138 +0,0 @@
-/* -/*
- * Copyright (c) 2024 The WebM project authors. All Rights Reserved. - * Copyright (c) 2025 The WebM project authors. All Rights Reserved.
- * - *
- * Use of this source code is governed by a BSD-style license - * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source - * that can be found in the LICENSE file in the root of the source
@ -2931,12 +2937,13 @@ diff -Nur chromium-131.0.6778.69.orig/third_party/libvpx/source/config/linux/ppc
-#endif -#endif
- -
-#endif // VPX_DSP_RTCD_H_ -#endif // VPX_DSP_RTCD_H_
diff -Nur chromium-131.0.6778.69.orig/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h chromium-131.0.6778.69/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h Index: chromium-133.0.6943.35/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h
--- chromium-131.0.6778.69.orig/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h 2024-11-12 22:49:02.000000000 +0100 ===================================================================
+++ chromium-131.0.6778.69/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h 1970-01-01 01:00:00.000000000 +0100 --- chromium-133.0.6943.35.orig/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h
+++ /dev/null
@@ -1,110 +0,0 @@ @@ -1,110 +0,0 @@
-/* -/*
- * Copyright (c) 2024 The WebM project authors. All Rights Reserved. - * Copyright (c) 2025 The WebM project authors. All Rights Reserved.
- * - *
- * Use of this source code is governed by a BSD-style license - * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source - * that can be found in the LICENSE file in the root of the source

34
SOURCES/0008-sandbox-fix-ppc64le-glibc234.patch
Unescape View File

@ -1,7 +1,5 @@
Index: chromium-130.0.6723.44/sandbox/policy/linux/bpf_utility_policy_linux.cc --- a/sandbox/policy/linux/bpf_utility_policy_linux.cc
=================================================================== +++ b/sandbox/policy/linux/bpf_utility_policy_linux.cc
--- chromium-130.0.6723.44.orig/sandbox/policy/linux/bpf_utility_policy_linux.cc
+++ chromium-130.0.6723.44/sandbox/policy/linux/bpf_utility_policy_linux.cc
@@ -34,7 +34,7 @@ ResultExpr UtilityProcessPolicy::Evaluat @@ -34,7 +34,7 @@ ResultExpr UtilityProcessPolicy::Evaluat
case __NR_fdatasync: case __NR_fdatasync:
case __NR_fsync: case __NR_fsync:
@ -11,11 +9,9 @@ Index: chromium-130.0.6723.44/sandbox/policy/linux/bpf_utility_policy_linux.cc
case __NR_getrlimit: case __NR_getrlimit:
#endif #endif
#if defined(__i386__) || defined(__arm__) #if defined(__i386__) || defined(__arm__)
Index: chromium-130.0.6723.44/sandbox/policy/linux/bpf_renderer_policy_linux.cc --- a/sandbox/policy/linux/bpf_renderer_policy_linux.cc
=================================================================== +++ b/sandbox/policy/linux/bpf_renderer_policy_linux.cc
--- chromium-130.0.6723.44.orig/sandbox/policy/linux/bpf_renderer_policy_linux.cc @@ -90,7 +90,7 @@ ResultExpr RendererProcessPolicy::Evalua
+++ chromium-130.0.6723.44/sandbox/policy/linux/bpf_renderer_policy_linux.cc
@@ -87,7 +87,7 @@ ResultExpr RendererProcessPolicy::Evalua
case __NR_ftruncate64: case __NR_ftruncate64:
#endif #endif
#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
@ -24,10 +20,8 @@ Index: chromium-130.0.6723.44/sandbox/policy/linux/bpf_renderer_policy_linux.cc
case __NR_getrlimit: case __NR_getrlimit:
case __NR_setrlimit: case __NR_setrlimit:
// We allow setrlimit to dynamically adjust the address space limit as // We allow setrlimit to dynamically adjust the address space limit as
Index: chromium-130.0.6723.44/sandbox/linux/bpf_dsl/linux_syscall_ranges.h --- a/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
=================================================================== +++ b/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
--- chromium-130.0.6723.44.orig/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
+++ chromium-130.0.6723.44/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
@@ -58,9 +58,9 @@ @@ -58,9 +58,9 @@
#elif defined(__powerpc64__) #elif defined(__powerpc64__)
@ -40,10 +34,8 @@ Index: chromium-130.0.6723.44/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
#define MAX_SYSCALL MAX_PUBLIC_SYSCALL #define MAX_SYSCALL MAX_PUBLIC_SYSCALL
#else #else
Index: chromium-130.0.6723.44/sandbox/linux/services/credentials.cc --- a/sandbox/linux/services/credentials.cc
=================================================================== +++ b/sandbox/linux/services/credentials.cc
--- chromium-130.0.6723.44.orig/sandbox/linux/services/credentials.cc
+++ chromium-130.0.6723.44/sandbox/linux/services/credentials.cc
@@ -96,7 +96,8 @@ bool ChrootToSafeEmptyDir() { @@ -96,7 +96,8 @@ bool ChrootToSafeEmptyDir() {
int clone_flags = CLONE_FS | LINUX_SIGCHLD; int clone_flags = CLONE_FS | LINUX_SIGCHLD;
@ -65,11 +57,9 @@ Index: chromium-130.0.6723.44/sandbox/linux/services/credentials.cc
+ // configuration loading failures and no fonts will be displayed! + // configuration loading failures and no fonts will be displayed!
clone_flags |= CLONE_VM | CLONE_VFORK | CLONE_SETTLS; clone_flags |= CLONE_VM | CLONE_VFORK | CLONE_SETTLS;
char tls_buf[PTHREAD_STACK_MIN_CONST] = {0}; char tls_buf[PTHREAD_STACK_MIN_CONST] = {};
Index: chromium-130.0.6723.44/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc --- a/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc
=================================================================== +++ b/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc
--- chromium-130.0.6723.44.orig/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc
+++ chromium-130.0.6723.44/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc
@@ -362,7 +362,16 @@ intptr_t SIGSYSFstatatHandler(const stru @@ -362,7 +362,16 @@ intptr_t SIGSYSFstatatHandler(const stru
if (args.nr == __NR_fstatat_default) { if (args.nr == __NR_fstatat_default) {
if (*reinterpret_cast<const char*>(args.args[1]) == '\0' && if (*reinterpret_cast<const char*>(args.args[1]) == '\0' &&

12
SOURCES/chromium-125-disable-FFmpegAllowLists.patch
Unescape View File

@ -1,12 +0,0 @@
diff -up chromium-125.0.6422.41/media/base/media_switches.cc.disable-FFmpegAllowLists chromium-125.0.6422.41/media/base/media_switches.cc
--- chromium-125.0.6422.41/media/base/media_switches.cc.disable-FFmpegAllowLists 2024-05-12 21:28:43.694027396 +0200
+++ chromium-125.0.6422.41/media/base/media_switches.cc 2024-05-12 21:32:48.155063623 +0200
@@ -1753,7 +1753,7 @@ BASE_FEATURE(kUseWindowBoundsForPip,
// Enables FFmpeg allow lists for supported codecs / containers.
BASE_FEATURE(kFFmpegAllowLists,
"FFmpegAllowLists",
- base::FEATURE_ENABLED_BY_DEFAULT);
+ base::FEATURE_DISABLED_BY_DEFAULT);
#if BUILDFLAG(IS_WIN)
// Enables audio offload when supported by endpoints.

32
SOURCES/chromium-129-disable-H.264-video-parser-during-demuxing.patch
Unescape View File

@ -1,32 +0,0 @@
diff -up chromium-129.0.6668.42.old/media/filters/ffmpeg_glue.cc.me chromium-129.0.6668.42.old/media/filters/ffmpeg_glue.cc
--- chromium-129.0.6668.42.old/media/filters/ffmpeg_glue.cc.me 2024-09-15 22:12:33.945186323 +0200
+++ chromium-129.0.6668.42.old/media/filters/ffmpeg_glue.cc 2024-09-16 10:53:13.334970539 +0200
@@ -17,14 +17,11 @@
namespace media {
-// Kill switches in case things explode. Remove after M132.
+// Kill switch in case things explode. Remove after M132.
// TODO(crbug.com/355485812): Re-enable this flag.
BASE_FEATURE(kAllowOnlyAudioCodecsDuringDemuxing,
"AllowOnlyAudioCodecsDuringDemuxing",
base::FEATURE_ENABLED_BY_DEFAULT);
-BASE_FEATURE(kForbidH264ParsingDuringDemuxing,
- "ForbidH264ParsingDuringDemuxing",
- base::FEATURE_ENABLED_BY_DEFAULT);
// Internal buffer size used by AVIO for reading.
// TODO(dalecurtis): Experiment with this buffer size and measure impact on
@@ -118,12 +115,6 @@ FFmpegGlue::FFmpegGlue(FFmpegURLProtocol
// Enable fast, but inaccurate seeks for MP3.
format_context_->flags |= AVFMT_FLAG_FAST_SEEK;
- // We don't allow H.264 parsing during demuxing since we have our own parser
- // and the ffmpeg one increases memory usage unnecessarily.
- if (base::FeatureList::IsEnabled(kForbidH264ParsingDuringDemuxing)) {
- format_context_->flags |= AVFMT_FLAG_NOH264PARSE;
- }
-
// Ensures format parsing errors will bail out. From an audit on 11/2017, all
// instances were real failures. Solves bugs like http://crbug.com/710791.
format_context_->error_recognition |= AV_EF_EXPLODE;

12
SOURCES/chromium-133-disable-H.264-video-parser-during-demuxing.patch
Unescape View File

@ -0,0 +1,12 @@
diff -up chromium-133.0.6943.53/media/filters/ffmpeg_glue.cc.me chromium-133.0.6943.53/media/filters/ffmpeg_glue.cc
--- chromium-133.0.6943.53/media/filters/ffmpeg_glue.cc.me 2025-02-05 13:28:17.782881439 +0100
+++ chromium-133.0.6943.53/media/filters/ffmpeg_glue.cc 2025-02-05 13:33:15.256928027 +0100
@@ -111,7 +111,7 @@ FFmpegGlue::FFmpegGlue(FFmpegURLProtocol
// We don't allow H.264 parsing during demuxing since we have our own parser
// and the ffmpeg one increases memory usage unnecessarily.
- format_context_->flags |= AVFMT_FLAG_NOH264PARSE;
+ // format_context_->flags |= AVFMT_FLAG_NOH264PARSE;
// Ensures format parsing errors will bail out. From an audit on 11/2017, all
// instances were real failures. Solves bugs like http://crbug.com/710791.

144
SOURCES/chromium-129-el8-atk-compiler-error.patch → SOURCES/chromium-133-el8-atk-compiler-error.patch
Unescape View File

@ -1,6 +1,6 @@
diff -up chromium-129.0.6668.58/content/browser/accessibility/accessibility_auralinux_browsertest.cc.me chromium-129.0.6668.58/content/browser/accessibility/accessibility_auralinux_browsertest.cc diff -up chromium-133.0.6943.35/content/browser/accessibility/accessibility_auralinux_browsertest.cc.el8-atk-compiler-error chromium-133.0.6943.35/content/browser/accessibility/accessibility_auralinux_browsertest.cc
--- chromium-129.0.6668.58/content/browser/accessibility/accessibility_auralinux_browsertest.cc.me 2024-09-18 19:26:40.951100740 +0200 --- chromium-133.0.6943.35/content/browser/accessibility/accessibility_auralinux_browsertest.cc.el8-atk-compiler-error 2025-01-28 23:03:27.000000000 +0100
+++ chromium-129.0.6668.58/content/browser/accessibility/accessibility_auralinux_browsertest.cc 2024-09-18 19:28:06.219700474 +0200 +++ chromium-133.0.6943.35/content/browser/accessibility/accessibility_auralinux_browsertest.cc 2025-02-04 10:56:08.414126354 +0100
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
// found in the LICENSE file. // found in the LICENSE file.
@ -9,7 +9,7 @@ diff -up chromium-129.0.6668.58/content/browser/accessibility/accessibility_aura
#include <string> #include <string>
#include <vector> #include <vector>
@@ -547,6 +548,10 @@ IN_PROC_BROWSER_TEST_F(AccessibilityAura @@ -549,6 +550,10 @@ IN_PROC_BROWSER_TEST_F(AccessibilityAura
g_object_unref(div_element); g_object_unref(div_element);
} }
@ -20,7 +20,7 @@ diff -up chromium-129.0.6668.58/content/browser/accessibility/accessibility_aura
IN_PROC_BROWSER_TEST_F(AccessibilityAuraLinuxBrowserTest, IN_PROC_BROWSER_TEST_F(AccessibilityAuraLinuxBrowserTest,
TestCharacterExtentsWithInvalidArguments) { TestCharacterExtentsWithInvalidArguments) {
AtkText* atk_text = SetUpSampleParagraph(); AtkText* atk_text = SetUpSampleParagraph();
@@ -569,12 +574,14 @@ IN_PROC_BROWSER_TEST_F(AccessibilityAura @@ -571,12 +576,14 @@ IN_PROC_BROWSER_TEST_F(AccessibilityAura
EXPECT_EQ(expect, width); EXPECT_EQ(expect, width);
EXPECT_EQ(expect, height); EXPECT_EQ(expect, height);
@ -35,7 +35,7 @@ diff -up chromium-129.0.6668.58/content/browser/accessibility/accessibility_aura
atk_text_get_character_extents(atk_text, invalid_offset, &x, &y, &width, atk_text_get_character_extents(atk_text, invalid_offset, &x, &y, &width,
&height, ATK_XY_WINDOW); &height, ATK_XY_WINDOW);
@@ -593,12 +600,14 @@ IN_PROC_BROWSER_TEST_F(AccessibilityAura @@ -595,12 +602,14 @@ IN_PROC_BROWSER_TEST_F(AccessibilityAura
EXPECT_EQ(expect, width); EXPECT_EQ(expect, width);
EXPECT_EQ(expect, height); EXPECT_EQ(expect, height);
@ -50,7 +50,7 @@ diff -up chromium-129.0.6668.58/content/browser/accessibility/accessibility_aura
atk_text_get_character_extents(atk_text, invalid_offset, &x, &y, &width, atk_text_get_character_extents(atk_text, invalid_offset, &x, &y, &width,
&height, ATK_XY_WINDOW); &height, ATK_XY_WINDOW);
@@ -613,7 +622,9 @@ IN_PROC_BROWSER_TEST_F(AccessibilityAura @@ -615,7 +624,9 @@ IN_PROC_BROWSER_TEST_F(AccessibilityAura
AtkCoordType kCoordinateTypes[] = { AtkCoordType kCoordinateTypes[] = {
ATK_XY_SCREEN, ATK_XY_SCREEN,
ATK_XY_WINDOW, ATK_XY_WINDOW,
@ -60,7 +60,7 @@ diff -up chromium-129.0.6668.58/content/browser/accessibility/accessibility_aura
}; };
IN_PROC_BROWSER_TEST_F(AccessibilityAuraLinuxBrowserTest, IN_PROC_BROWSER_TEST_F(AccessibilityAuraLinuxBrowserTest,
@@ -872,6 +883,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityAura @@ -874,6 +885,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityAura
TestCharacterExtentsInScrollableInput(); TestCharacterExtentsInScrollableInput();
} }
@ -68,7 +68,7 @@ diff -up chromium-129.0.6668.58/content/browser/accessibility/accessibility_aura
typedef bool (*ScrollToPointFunc)(AtkComponent* component, typedef bool (*ScrollToPointFunc)(AtkComponent* component,
AtkCoordType coords, AtkCoordType coords,
gint x, gint x,
@@ -881,6 +893,18 @@ typedef bool (*ScrollToFunc)(AtkComponen @@ -883,6 +895,18 @@ typedef bool (*ScrollToFunc)(AtkComponen
// TODO(crbug.com/40866728): Enable this test. // TODO(crbug.com/40866728): Enable this test.
IN_PROC_BROWSER_TEST_F(AccessibilityAuraLinuxBrowserTest, IN_PROC_BROWSER_TEST_F(AccessibilityAuraLinuxBrowserTest,
DISABLED_TestScrollToPoint) { DISABLED_TestScrollToPoint) {
@ -87,7 +87,7 @@ diff -up chromium-129.0.6668.58/content/browser/accessibility/accessibility_aura
LoadSampleParagraphInScrollableDocument(); LoadSampleParagraphInScrollableDocument();
AtkText* atk_text = GetSampleParagraph(); AtkText* atk_text = GetSampleParagraph();
ASSERT_TRUE(ATK_IS_COMPONENT(atk_text)); ASSERT_TRUE(ATK_IS_COMPONENT(atk_text));
@@ -893,7 +917,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityAura @@ -895,7 +919,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityAura
AccessibilityNotificationWaiter location_changed_waiter( AccessibilityNotificationWaiter location_changed_waiter(
shell()->web_contents(), ui::kAXModeComplete, shell()->web_contents(), ui::kAXModeComplete,
ax::mojom::Event::kLocationChanged); ax::mojom::Event::kLocationChanged);
@ -96,7 +96,7 @@ diff -up chromium-129.0.6668.58/content/browser/accessibility/accessibility_aura
ASSERT_TRUE(location_changed_waiter.WaitForNotification()); ASSERT_TRUE(location_changed_waiter.WaitForNotification());
atk_component_get_extents(atk_component, &x, &y, nullptr, nullptr, atk_component_get_extents(atk_component, &x, &y, nullptr, nullptr,
@@ -902,20 +926,20 @@ IN_PROC_BROWSER_TEST_F(AccessibilityAura @@ -904,20 +928,20 @@ IN_PROC_BROWSER_TEST_F(AccessibilityAura
EXPECT_GT(prev_y, y); EXPECT_GT(prev_y, y);
constexpr int kScrollToY = 0; constexpr int kScrollToY = 0;
@ -120,7 +120,7 @@ diff -up chromium-129.0.6668.58/content/browser/accessibility/accessibility_aura
ASSERT_TRUE(location_changed_waiter.WaitForNotification()); ASSERT_TRUE(location_changed_waiter.WaitForNotification());
atk_component_get_extents(atk_component, nullptr, &y, nullptr, nullptr, atk_component_get_extents(atk_component, nullptr, &y, nullptr, nullptr,
ATK_XY_SCREEN); ATK_XY_SCREEN);
@@ -932,6 +956,17 @@ IN_PROC_BROWSER_TEST_F(AccessibilityAura @@ -934,6 +958,17 @@ IN_PROC_BROWSER_TEST_F(AccessibilityAura
// TODO(crbug.com/40866728): Enable this test. // TODO(crbug.com/40866728): Enable this test.
IN_PROC_BROWSER_TEST_F(AccessibilityAuraLinuxBrowserTest, IN_PROC_BROWSER_TEST_F(AccessibilityAuraLinuxBrowserTest,
DISABLED_TestScrollTo) { DISABLED_TestScrollTo) {
@ -138,7 +138,7 @@ diff -up chromium-129.0.6668.58/content/browser/accessibility/accessibility_aura
LoadInitialAccessibilityTreeFromHtml( LoadInitialAccessibilityTreeFromHtml(
R"HTML(<!DOCTYPE html> R"HTML(<!DOCTYPE html>
<html> <html>
@@ -973,8 +1008,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityAura @@ -975,8 +1010,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityAura
AccessibilityNotificationWaiter waiter( AccessibilityNotificationWaiter waiter(
shell()->web_contents(), ui::kAXModeComplete, shell()->web_contents(), ui::kAXModeComplete,
ax::mojom::Event::kScrollPositionChanged); ax::mojom::Event::kScrollPositionChanged);
@ -148,7 +148,7 @@ diff -up chromium-129.0.6668.58/content/browser/accessibility/accessibility_aura
ASSERT_TRUE(waiter.WaitForNotification()); ASSERT_TRUE(waiter.WaitForNotification());
int x, y; int x, y;
atk_component_get_extents(ATK_COMPONENT(target), &x, &y, nullptr, nullptr, atk_component_get_extents(ATK_COMPONENT(target), &x, &y, nullptr, nullptr,
@@ -982,40 +1016,35 @@ IN_PROC_BROWSER_TEST_F(AccessibilityAura @@ -984,40 +1018,35 @@ IN_PROC_BROWSER_TEST_F(AccessibilityAura
EXPECT_EQ(y, doc_y); EXPECT_EQ(y, doc_y);
EXPECT_NE(x, doc_x); EXPECT_NE(x, doc_x);
@ -194,7 +194,7 @@ diff -up chromium-129.0.6668.58/content/browser/accessibility/accessibility_aura
ASSERT_TRUE(waiter.WaitForNotification()); ASSERT_TRUE(waiter.WaitForNotification());
atk_component_get_extents(ATK_COMPONENT(target2), &x, &y, nullptr, nullptr, atk_component_get_extents(ATK_COMPONENT(target2), &x, &y, nullptr, nullptr,
ATK_XY_SCREEN); ATK_XY_SCREEN);
@@ -1047,10 +1076,39 @@ IN_PROC_BROWSER_TEST_F(AccessibilityAura @@ -1049,10 +1078,39 @@ IN_PROC_BROWSER_TEST_F(AccessibilityAura
g_object_unref(target2); g_object_unref(target2);
g_object_unref(target3); g_object_unref(target3);
} }
@ -234,7 +234,7 @@ diff -up chromium-129.0.6668.58/content/browser/accessibility/accessibility_aura
LoadInitialAccessibilityTreeFromHtml( LoadInitialAccessibilityTreeFromHtml(
R"HTML(<!DOCTYPE html> R"HTML(<!DOCTYPE html>
<html> <html>
@@ -1084,8 +1142,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityAura @@ -1086,8 +1144,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityAura
AccessibilityNotificationWaiter waiter( AccessibilityNotificationWaiter waiter(
shell()->web_contents(), ui::kAXModeComplete, shell()->web_contents(), ui::kAXModeComplete,
ax::mojom::Event::kScrollPositionChanged); ax::mojom::Event::kScrollPositionChanged);
@ -244,7 +244,7 @@ diff -up chromium-129.0.6668.58/content/browser/accessibility/accessibility_aura
ASSERT_TRUE(waiter.WaitForNotification()); ASSERT_TRUE(waiter.WaitForNotification());
int x, y; int x, y;
atk_text_get_character_extents(ATK_TEXT(target1), 1, &x, &y, nullptr, nullptr, atk_text_get_character_extents(ATK_TEXT(target1), 1, &x, &y, nullptr, nullptr,
@@ -1093,40 +1150,37 @@ IN_PROC_BROWSER_TEST_F(AccessibilityAura @@ -1095,40 +1152,37 @@ IN_PROC_BROWSER_TEST_F(AccessibilityAura
EXPECT_EQ(y, doc_y); EXPECT_EQ(y, doc_y);
EXPECT_NE(x, doc_x); EXPECT_NE(x, doc_x);
@ -292,7 +292,7 @@ diff -up chromium-129.0.6668.58/content/browser/accessibility/accessibility_aura
ASSERT_TRUE(waiter.WaitForNotification()); ASSERT_TRUE(waiter.WaitForNotification());
atk_text_get_character_extents(ATK_TEXT(target1), 1, &x, &y, nullptr, nullptr, atk_text_get_character_extents(ATK_TEXT(target1), 1, &x, &y, nullptr, nullptr,
ATK_XY_SCREEN); ATK_XY_SCREEN);
@@ -1136,9 +1190,42 @@ IN_PROC_BROWSER_TEST_F(AccessibilityAura @@ -1138,9 +1192,42 @@ IN_PROC_BROWSER_TEST_F(AccessibilityAura
g_object_unref(target1); g_object_unref(target1);
} }
@ -335,7 +335,7 @@ diff -up chromium-129.0.6668.58/content/browser/accessibility/accessibility_aura
LoadSampleParagraphInScrollableDocument(); LoadSampleParagraphInScrollableDocument();
AtkText* atk_text = GetSampleParagraph(); AtkText* atk_text = GetSampleParagraph();
ASSERT_TRUE(ATK_IS_COMPONENT(atk_text)); ASSERT_TRUE(ATK_IS_COMPONENT(atk_text));
@@ -1151,7 +1238,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityAura @@ -1153,7 +1240,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityAura
AccessibilityNotificationWaiter location_changed_waiter( AccessibilityNotificationWaiter location_changed_waiter(
shell()->web_contents(), ui::kAXModeComplete, shell()->web_contents(), ui::kAXModeComplete,
ax::mojom::Event::kLocationChanged); ax::mojom::Event::kLocationChanged);
@ -344,7 +344,7 @@ diff -up chromium-129.0.6668.58/content/browser/accessibility/accessibility_aura
ASSERT_TRUE(location_changed_waiter.WaitForNotification()); ASSERT_TRUE(location_changed_waiter.WaitForNotification());
atk_text_get_character_extents(atk_text, 1, &x, &y, nullptr, nullptr, atk_text_get_character_extents(atk_text, 1, &x, &y, nullptr, nullptr,
@@ -1160,22 +1247,20 @@ IN_PROC_BROWSER_TEST_F(AccessibilityAura @@ -1162,22 +1249,20 @@ IN_PROC_BROWSER_TEST_F(AccessibilityAura
EXPECT_GT(prev_y, y); EXPECT_GT(prev_y, y);
constexpr int kScrollToY = 0; constexpr int kScrollToY = 0;
@ -370,7 +370,7 @@ diff -up chromium-129.0.6668.58/content/browser/accessibility/accessibility_aura
ASSERT_TRUE(location_changed_waiter.WaitForNotification()); ASSERT_TRUE(location_changed_waiter.WaitForNotification());
atk_text_get_character_extents(atk_text, 1, &x, &y, nullptr, nullptr, atk_text_get_character_extents(atk_text, 1, &x, &y, nullptr, nullptr,
ATK_XY_SCREEN); ATK_XY_SCREEN);
@@ -1191,6 +1276,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityAura @@ -1193,6 +1278,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityAura
g_object_unref(atk_text); g_object_unref(atk_text);
} }
@ -378,10 +378,10 @@ diff -up chromium-129.0.6668.58/content/browser/accessibility/accessibility_aura
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
// Flaky on crbug.com/1026149 // Flaky on crbug.com/1026149
diff -up chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_auralinux.cc.me chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_auralinux.cc diff -up chromium-133.0.6943.35/ui/accessibility/platform/ax_platform_node_auralinux.cc.el8-atk-compiler-error chromium-133.0.6943.35/ui/accessibility/platform/ax_platform_node_auralinux.cc
--- chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_auralinux.cc.me 2024-09-18 19:26:26.040821017 +0200 --- chromium-133.0.6943.35/ui/accessibility/platform/ax_platform_node_auralinux.cc.el8-atk-compiler-error 2025-01-28 23:03:27.000000000 +0100
+++ chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_auralinux.cc 2024-09-18 19:28:06.220700493 +0200 +++ chromium-133.0.6943.35/ui/accessibility/platform/ax_platform_node_auralinux.cc 2025-02-04 10:56:08.424126602 +0100
@@ -2,7 +2,6 @@ @@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
@ -389,9 +389,7 @@ diff -up chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_aural
#ifdef UNSAFE_BUFFERS_BUILD #ifdef UNSAFE_BUFFERS_BUILD
// TODO(crbug.com/40285824): Remove this and convert code to safer constructs. // TODO(crbug.com/40285824): Remove this and convert code to safer constructs.
#pragma allow_unsafe_buffers #pragma allow_unsafe_buffers
@@ -10,6 +9,7 @@ #endif
#include "ui/accessibility/platform/ax_platform_node_auralinux.h"
+#include <dlfcn.h> +#include <dlfcn.h>
#include <stdint.h> #include <stdint.h>
@ -565,7 +563,7 @@ diff -up chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_aural
} }
const GInterfaceInfo Info = {reinterpret_cast<GInterfaceInitFunc>(Init), const GInterfaceInfo Info = {reinterpret_cast<GInterfaceInitFunc>(Init),
@@ -1232,6 +1262,7 @@ gboolean AddSelection(AtkText* atk_text, @@ -1310,6 +1340,7 @@ gboolean AddSelection(AtkText* atk_text,
return SetSelection(atk_text, 0, start_offset, end_offset); return SetSelection(atk_text, 0, start_offset, end_offset);
} }
@ -573,7 +571,7 @@ diff -up chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_aural
char* GetStringAtOffset(AtkText* atk_text, char* GetStringAtOffset(AtkText* atk_text,
int offset, int offset,
AtkTextGranularity atk_granularity, AtkTextGranularity atk_granularity,
@@ -1246,7 +1277,9 @@ char* GetStringAtOffset(AtkText* atk_tex @@ -1324,7 +1355,9 @@ char* GetStringAtOffset(AtkText* atk_tex
return GetTextWithBoundaryType(atk_text, offset, boundary, start_offset, return GetTextWithBoundaryType(atk_text, offset, boundary, start_offset,
end_offset); end_offset);
} }
@ -583,7 +581,7 @@ diff -up chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_aural
gfx::Rect GetUnclippedParentHypertextRangeBoundsRect( gfx::Rect GetUnclippedParentHypertextRangeBoundsRect(
AXPlatformNodeDelegate* ax_platform_node_delegate, AXPlatformNodeDelegate* ax_platform_node_delegate,
const int start_offset, const int start_offset,
@@ -1270,6 +1303,7 @@ gfx::Rect GetUnclippedParentHypertextRan @@ -1348,6 +1381,7 @@ gfx::Rect GetUnclippedParentHypertextRan
AXClippingBehavior::kClipped) AXClippingBehavior::kClipped)
.OffsetFromOrigin(); .OffsetFromOrigin();
} }
@ -591,7 +589,7 @@ diff -up chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_aural
void GetCharacterExtents(AtkText* atk_text, void GetCharacterExtents(AtkText* atk_text,
int offset, int offset,
@@ -1285,10 +1319,12 @@ void GetCharacterExtents(AtkText* atk_te @@ -1363,10 +1397,12 @@ void GetCharacterExtents(AtkText* atk_te
AXPlatformNodeAuraLinux::FromAtkObject(ATK_OBJECT(atk_text)); AXPlatformNodeAuraLinux::FromAtkObject(ATK_OBJECT(atk_text));
if (obj) { if (obj) {
switch (coordinate_type) { switch (coordinate_type) {
@ -604,7 +602,7 @@ diff -up chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_aural
default: default:
rect = obj->GetDelegate()->GetHypertextRangeBoundsRect( rect = obj->GetDelegate()->GetHypertextRangeBoundsRect(
obj->UnicodeToUTF16OffsetInText(offset), obj->UnicodeToUTF16OffsetInText(offset),
@@ -1324,10 +1360,12 @@ void GetRangeExtents(AtkText* atk_text, @@ -1402,10 +1438,12 @@ void GetRangeExtents(AtkText* atk_text,
AXPlatformNodeAuraLinux::FromAtkObject(ATK_OBJECT(atk_text)); AXPlatformNodeAuraLinux::FromAtkObject(ATK_OBJECT(atk_text));
if (obj) { if (obj) {
switch (coordinate_type) { switch (coordinate_type) {
@ -617,7 +615,7 @@ diff -up chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_aural
default: default:
rect = obj->GetDelegate()->GetHypertextRangeBoundsRect( rect = obj->GetDelegate()->GetHypertextRangeBoundsRect(
obj->UnicodeToUTF16OffsetInText(start_offset), obj->UnicodeToUTF16OffsetInText(start_offset),
@@ -1377,6 +1415,7 @@ AtkAttributeSet* GetDefaultAttributes(At @@ -1455,6 +1493,7 @@ AtkAttributeSet* GetDefaultAttributes(At
return ToAtkAttributeSet(obj->GetDefaultTextAttributes()); return ToAtkAttributeSet(obj->GetDefaultTextAttributes());
} }
@ -625,7 +623,7 @@ diff -up chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_aural
gboolean ScrollSubstringTo(AtkText* atk_text, gboolean ScrollSubstringTo(AtkText* atk_text,
gint start_offset, gint start_offset,
gint end_offset, gint end_offset,
@@ -1407,6 +1446,7 @@ gboolean ScrollSubstringToPoint(AtkText* @@ -1485,6 +1524,7 @@ gboolean ScrollSubstringToPoint(AtkText*
return obj->ScrollSubstringToPoint(start_offset, end_offset, atk_coord_type, return obj->ScrollSubstringToPoint(start_offset, end_offset, atk_coord_type,
x, y); x, y);
} }
@ -633,7 +631,7 @@ diff -up chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_aural
void Init(AtkTextIface* iface) { void Init(AtkTextIface* iface) {
iface->get_text = GetText; iface->get_text = GetText;
@@ -1429,12 +1469,16 @@ void Init(AtkTextIface* iface) { @@ -1507,12 +1547,16 @@ void Init(AtkTextIface* iface) {
iface->get_run_attributes = GetRunAttributes; iface->get_run_attributes = GetRunAttributes;
iface->get_default_attributes = GetDefaultAttributes; iface->get_default_attributes = GetDefaultAttributes;
@ -650,7 +648,7 @@ diff -up chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_aural
} }
const GInterfaceInfo Info = {reinterpret_cast<GInterfaceInitFunc>(Init), const GInterfaceInfo Info = {reinterpret_cast<GInterfaceInitFunc>(Init),
@@ -1837,11 +1881,15 @@ const GInterfaceInfo Info = {reinterpret @@ -1915,11 +1959,15 @@ const GInterfaceInfo Info = {reinterpret
} // namespace atk_table } // namespace atk_table
@ -667,7 +665,7 @@ diff -up chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_aural
if (const AXPlatformNodeBase* obj = if (const AXPlatformNodeBase* obj =
AXPlatformNodeAuraLinux::FromAtkObject(ATK_OBJECT(cell))) { AXPlatformNodeAuraLinux::FromAtkObject(ATK_OBJECT(cell))) {
@@ -1853,8 +1901,10 @@ gint GetColumnSpan(AtkTableCell* cell) { @@ -1931,8 +1979,10 @@ gint GetColumnSpan(AtkTableCell* cell) {
} }
GPtrArray* GetColumnHeaderCells(AtkTableCell* cell) { GPtrArray* GetColumnHeaderCells(AtkTableCell* cell) {
@ -679,7 +677,7 @@ diff -up chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_aural
GPtrArray* array = g_ptr_array_new_with_free_func(g_object_unref); GPtrArray* array = g_ptr_array_new_with_free_func(g_object_unref);
@@ -1888,8 +1938,10 @@ GPtrArray* GetColumnHeaderCells(AtkTable @@ -1966,8 +2016,10 @@ GPtrArray* GetColumnHeaderCells(AtkTable
} }
gboolean GetCellPosition(AtkTableCell* cell, gint* row, gint* column) { gboolean GetCellPosition(AtkTableCell* cell, gint* row, gint* column) {
@ -691,7 +689,7 @@ diff -up chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_aural
if (auto* obj = AXPlatformNodeAuraLinux::FromAtkObject(ATK_OBJECT(cell))) { if (auto* obj = AXPlatformNodeAuraLinux::FromAtkObject(ATK_OBJECT(cell))) {
std::optional<int> row_index = obj->GetTableRow(); std::optional<int> row_index = obj->GetTableRow();
@@ -1906,8 +1958,9 @@ gboolean GetCellPosition(AtkTableCell* c @@ -1984,8 +2036,9 @@ gboolean GetCellPosition(AtkTableCell* c
} }
gint GetRowSpan(AtkTableCell* cell) { gint GetRowSpan(AtkTableCell* cell) {
@ -702,7 +700,7 @@ diff -up chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_aural
if (auto* obj = AXPlatformNodeAuraLinux::FromAtkObject(ATK_OBJECT(cell))) { if (auto* obj = AXPlatformNodeAuraLinux::FromAtkObject(ATK_OBJECT(cell))) {
// If the object is not a cell, we return 0. // If the object is not a cell, we return 0.
@@ -1918,8 +1971,10 @@ gint GetRowSpan(AtkTableCell* cell) { @@ -1996,8 +2049,10 @@ gint GetRowSpan(AtkTableCell* cell) {
} }
GPtrArray* GetRowHeaderCells(AtkTableCell* cell) { GPtrArray* GetRowHeaderCells(AtkTableCell* cell) {
@ -714,7 +712,7 @@ diff -up chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_aural
GPtrArray* array = g_ptr_array_new_with_free_func(g_object_unref); GPtrArray* array = g_ptr_array_new_with_free_func(g_object_unref);
@@ -1953,8 +2008,10 @@ GPtrArray* GetRowHeaderCells(AtkTableCel @@ -2031,8 +2086,10 @@ GPtrArray* GetRowHeaderCells(AtkTableCel
} }
AtkObject* GetTable(AtkTableCell* cell) { AtkObject* GetTable(AtkTableCell* cell) {
@ -726,7 +724,7 @@ diff -up chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_aural
if (auto* obj = AXPlatformNodeAuraLinux::FromAtkObject(ATK_OBJECT(cell))) { if (auto* obj = AXPlatformNodeAuraLinux::FromAtkObject(ATK_OBJECT(cell))) {
if (auto* table = obj->GetTable()) if (auto* table = obj->GetTable())
@@ -1980,6 +2037,8 @@ const GInterfaceInfo Info = {reinterpret @@ -2058,6 +2115,8 @@ const GInterfaceInfo Info = {reinterpret
} // namespace atk_table_cell } // namespace atk_table_cell
@ -735,7 +733,7 @@ diff -up chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_aural
namespace atk_object { namespace atk_object {
gpointer kAXPlatformNodeAuraLinuxParentClass = nullptr; gpointer kAXPlatformNodeAuraLinuxParentClass = nullptr;
@@ -2246,6 +2305,50 @@ void Detach(AXPlatformNodeAuraLinuxObjec @@ -2324,6 +2383,50 @@ void Detach(AXPlatformNodeAuraLinuxObjec
} // namespace } // namespace
@ -786,7 +784,7 @@ diff -up chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_aural
void AXPlatformNodeAuraLinux::EnsureGTypeInit() { void AXPlatformNodeAuraLinux::EnsureGTypeInit() {
#if !GLIB_CHECK_VERSION(2, 36, 0) #if !GLIB_CHECK_VERSION(2, 36, 0)
static bool first_time = true; static bool first_time = true;
@@ -2353,8 +2456,11 @@ GType AXPlatformNodeAuraLinux::GetAccess @@ -2431,8 +2534,11 @@ GType AXPlatformNodeAuraLinux::GetAccess
g_type_add_interface_static(type, ATK_TYPE_TABLE, &atk_table::Info); g_type_add_interface_static(type, ATK_TYPE_TABLE, &atk_table::Info);
if (interface_mask_.Implements(ImplementedAtkInterfaces::Value::kTableCell)) { if (interface_mask_.Implements(ImplementedAtkInterfaces::Value::kTableCell)) {
@ -800,7 +798,7 @@ diff -up chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_aural
} }
return type; return type;
@@ -2584,9 +2690,9 @@ AtkRole AXPlatformNodeAuraLinux::GetAtkR @@ -2667,9 +2773,9 @@ AtkRole AXPlatformNodeAuraLinux::GetAtkR
case ax::mojom::Role::kComplementary: case ax::mojom::Role::kComplementary:
return ATK_ROLE_LANDMARK; return ATK_ROLE_LANDMARK;
case ax::mojom::Role::kContentDeletion: case ax::mojom::Role::kContentDeletion:
@ -812,7 +810,7 @@ diff -up chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_aural
case ax::mojom::Role::kContentInfo: case ax::mojom::Role::kContentInfo:
case ax::mojom::Role::kFooter: case ax::mojom::Role::kFooter:
return ATK_ROLE_LANDMARK; return ATK_ROLE_LANDMARK;
@@ -3020,12 +3126,14 @@ void AXPlatformNodeAuraLinux::GetAtkStat @@ -3105,12 +3211,14 @@ void AXPlatformNodeAuraLinux::GetAtkStat
static_cast<int32_t>(ax::mojom::AriaCurrentState::kFalse)) { static_cast<int32_t>(ax::mojom::AriaCurrentState::kFalse)) {
atk_state_set_add_state(atk_state_set, ATK_STATE_ACTIVE); atk_state_set_add_state(atk_state_set, ATK_STATE_ACTIVE);
} }
@ -827,7 +825,7 @@ diff -up chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_aural
if (GetBoolAttribute(ax::mojom::BoolAttribute::kBusy)) if (GetBoolAttribute(ax::mojom::BoolAttribute::kBusy))
atk_state_set_add_state(atk_state_set, ATK_STATE_BUSY); atk_state_set_add_state(atk_state_set, ATK_STATE_BUSY);
if (GetBoolAttribute(ax::mojom::BoolAttribute::kModal)) if (GetBoolAttribute(ax::mojom::BoolAttribute::kModal))
@@ -3064,9 +3172,11 @@ void AXPlatformNodeAuraLinux::GetAtkStat @@ -3149,9 +3257,11 @@ void AXPlatformNodeAuraLinux::GetAtkStat
if (GetData().GetRestriction() != ax::mojom::Restriction::kDisabled) { if (GetData().GetRestriction() != ax::mojom::Restriction::kDisabled) {
if (GetDelegate()->IsReadOnlySupported() && if (GetDelegate()->IsReadOnlySupported() &&
GetDelegate()->IsReadOnlyOrDisabled()) { GetDelegate()->IsReadOnlyOrDisabled()) {
@ -839,7 +837,7 @@ diff -up chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_aural
} else { } else {
atk_state_set_add_state(atk_state_set, ATK_STATE_ENABLED); atk_state_set_add_state(atk_state_set, ATK_STATE_ENABLED);
atk_state_set_add_state(atk_state_set, ATK_STATE_SENSITIVE); atk_state_set_add_state(atk_state_set, ATK_STATE_SENSITIVE);
@@ -3100,12 +3210,16 @@ struct AtkIntListRelation { @@ -3185,12 +3295,16 @@ struct AtkIntListRelation {
static AtkIntListRelation kIntListRelations[] = { static AtkIntListRelation kIntListRelations[] = {
{ax::mojom::IntListAttribute::kControlsIds, ATK_RELATION_CONTROLLER_FOR, {ax::mojom::IntListAttribute::kControlsIds, ATK_RELATION_CONTROLLER_FOR,
ATK_RELATION_CONTROLLED_BY}, ATK_RELATION_CONTROLLED_BY},
@ -856,7 +854,7 @@ diff -up chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_aural
{ax::mojom::IntListAttribute::kFlowtoIds, ATK_RELATION_FLOWS_TO, {ax::mojom::IntListAttribute::kFlowtoIds, ATK_RELATION_FLOWS_TO,
ATK_RELATION_FLOWS_FROM}, ATK_RELATION_FLOWS_FROM},
{ax::mojom::IntListAttribute::kLabelledbyIds, ATK_RELATION_LABELLED_BY, {ax::mojom::IntListAttribute::kLabelledbyIds, ATK_RELATION_LABELLED_BY,
@@ -3884,6 +3998,7 @@ void AXPlatformNodeAuraLinux::OnReadonly @@ -3981,6 +4095,7 @@ void AXPlatformNodeAuraLinux::OnReadonly
if (!obj) if (!obj)
return; return;
@ -864,7 +862,7 @@ diff -up chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_aural
// Runtime check in case we were compiled with a newer version of ATK. // Runtime check in case we were compiled with a newer version of ATK.
if (!PlatformSupportsState(ATK_STATE_READ_ONLY)) if (!PlatformSupportsState(ATK_STATE_READ_ONLY))
return; return;
@@ -3891,6 +4006,7 @@ void AXPlatformNodeAuraLinux::OnReadonly @@ -3988,6 +4103,7 @@ void AXPlatformNodeAuraLinux::OnReadonly
atk_object_notify_state_change( atk_object_notify_state_change(
obj, ATK_STATE_READ_ONLY, obj, ATK_STATE_READ_ONLY,
GetData().GetRestriction() == ax::mojom::Restriction::kReadOnly); GetData().GetRestriction() == ax::mojom::Restriction::kReadOnly);
@ -872,7 +870,7 @@ diff -up chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_aural
} }
void AXPlatformNodeAuraLinux::OnInvalidStatusChanged() { void AXPlatformNodeAuraLinux::OnInvalidStatusChanged() {
@@ -4217,11 +4333,13 @@ gfx::Rect AXPlatformNodeAuraLinux::GetEx @@ -4314,11 +4430,13 @@ gfx::Rect AXPlatformNodeAuraLinux::GetEx
extents.Offset(window_origin); extents.Offset(window_origin);
break; break;
} }
@ -886,7 +884,7 @@ diff -up chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_aural
} }
return extents; return extents;
@@ -4651,6 +4769,7 @@ bool AXPlatformNodeAuraLinux::IsInLiveRe @@ -4755,6 +4873,7 @@ bool AXPlatformNodeAuraLinux::IsInLiveRe
return HasStringAttribute(ax::mojom::StringAttribute::kContainerLiveStatus); return HasStringAttribute(ax::mojom::StringAttribute::kContainerLiveStatus);
} }
@ -894,7 +892,7 @@ diff -up chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_aural
void AXPlatformNodeAuraLinux::ScrollToPoint(AtkCoordType atk_coord_type, void AXPlatformNodeAuraLinux::ScrollToPoint(AtkCoordType atk_coord_type,
int x, int x,
int y) { int y) {
@@ -4723,7 +4842,9 @@ void AXPlatformNodeAuraLinux::ScrollNode @@ -4827,7 +4946,9 @@ void AXPlatformNodeAuraLinux::ScrollNode
rect -= rect.OffsetFromOrigin(); rect -= rect.OffsetFromOrigin();
ScrollNodeRectIntoView(rect, atk_scroll_type); ScrollNodeRectIntoView(rect, atk_scroll_type);
} }
@ -904,7 +902,7 @@ diff -up chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_aural
std::optional<gfx::Rect> std::optional<gfx::Rect>
AXPlatformNodeAuraLinux::GetUnclippedHypertextRangeBoundsRect(int start_offset, AXPlatformNodeAuraLinux::GetUnclippedHypertextRangeBoundsRect(int start_offset,
int end_offset) { int end_offset) {
@@ -4782,6 +4903,7 @@ bool AXPlatformNodeAuraLinux::ScrollSubs @@ -4886,6 +5007,7 @@ bool AXPlatformNodeAuraLinux::ScrollSubs
return true; return true;
} }
@ -912,7 +910,7 @@ diff -up chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_aural
void AXPlatformNodeAuraLinux::ComputeStylesIfNeeded() { void AXPlatformNodeAuraLinux::ComputeStylesIfNeeded() {
if (!offset_to_text_attributes_.empty()) if (!offset_to_text_attributes_.empty())
@@ -4964,8 +5086,10 @@ gfx::Point AXPlatformNodeAuraLinux::Conv @@ -5066,8 +5188,10 @@ gfx::Point AXPlatformNodeAuraLinux::Conv
switch (atk_coord_type) { switch (atk_coord_type) {
case ATK_XY_WINDOW: case ATK_XY_WINDOW:
return point + GetParentFrameOriginInScreenCoordinates(); return point + GetParentFrameOriginInScreenCoordinates();
@ -923,9 +921,9 @@ diff -up chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_aural
case ATK_XY_SCREEN: case ATK_XY_SCREEN:
default: default:
return point; return point;
diff -up chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_auralinux.h.me chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_auralinux.h diff -up chromium-133.0.6943.35/ui/accessibility/platform/ax_platform_node_auralinux.h.el8-atk-compiler-error chromium-133.0.6943.35/ui/accessibility/platform/ax_platform_node_auralinux.h
--- chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_auralinux.h.me 2024-09-18 19:26:54.167348688 +0200 --- chromium-133.0.6943.35/ui/accessibility/platform/ax_platform_node_auralinux.h.el8-atk-compiler-error 2025-01-28 23:03:27.000000000 +0100
+++ chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_auralinux.h 2024-09-18 19:28:06.220700493 +0200 +++ chromium-133.0.6943.35/ui/accessibility/platform/ax_platform_node_auralinux.h 2025-02-04 10:56:08.439126973 +0100
@@ -52,6 +52,31 @@ struct FindInPageResultInfo { @@ -52,6 +52,31 @@ struct FindInPageResultInfo {
} }
}; };
@ -958,18 +956,18 @@ diff -up chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_aural
// This class with an enum is used to generate a bitmask which tracks the ATK // This class with an enum is used to generate a bitmask which tracks the ATK
// interfaces that an AXPlatformNodeAuraLinux's ATKObject implements. // interfaces that an AXPlatformNodeAuraLinux's ATKObject implements.
class ImplementedAtkInterfaces { class ImplementedAtkInterfaces {
diff -up chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_auralinux_unittest.cc.me chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_auralinux_unittest.cc diff -up chromium-133.0.6943.35/ui/accessibility/platform/ax_platform_node_auralinux_unittest.cc.el8-atk-compiler-error chromium-133.0.6943.35/ui/accessibility/platform/ax_platform_node_auralinux_unittest.cc
--- chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_auralinux_unittest.cc.me 2024-09-18 19:27:10.728659400 +0200 --- chromium-133.0.6943.35/ui/accessibility/platform/ax_platform_node_auralinux_unittest.cc.el8-atk-compiler-error 2025-01-28 23:03:27.000000000 +0100
+++ chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_auralinux_unittest.cc 2024-09-18 19:28:06.221700512 +0200 +++ chromium-133.0.6943.35/ui/accessibility/platform/ax_platform_node_auralinux_unittest.cc 2025-02-04 12:06:15.819918562 +0100
@@ -8,6 +8,7 @@ @@ -11,6 +11,7 @@
#endif
#include <atk/atk.h> #include <atk/atk.h>
+#include <dlfcn.h> +#include <dlfcn.h>
#include <array>
#include <utility> #include <utility>
#include <vector> #include <vector>
@@ -887,6 +888,17 @@ typedef bool (*ScrollToPointFunc)(AtkCom
@@ -884,6 +885,17 @@ typedef bool (*ScrollToPointFunc)(AtkCom
typedef bool (*ScrollToFunc)(AtkComponent* component, AtkScrollType type); typedef bool (*ScrollToFunc)(AtkComponent* component, AtkScrollType type);
TEST_F(AXPlatformNodeAuraLinuxTest, AtkComponentScrollToPoint) { TEST_F(AXPlatformNodeAuraLinuxTest, AtkComponentScrollToPoint) {
@ -987,7 +985,7 @@ diff -up chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_aural
AXNodeData root; AXNodeData root;
root.id = 1; root.id = 1;
root.role = ax::mojom::Role::kRootWebArea; root.role = ax::mojom::Role::kRootWebArea;
@@ -911,8 +923,7 @@ TEST_F(AXPlatformNodeAuraLinuxTest, AtkC @@ -914,8 +926,7 @@ TEST_F(AXPlatformNodeAuraLinuxTest, AtkC
EXPECT_EQ(10, width); EXPECT_EQ(10, width);
EXPECT_EQ(10, height); EXPECT_EQ(10, height);
@ -997,7 +995,7 @@ diff -up chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_aural
atk_component_get_extents(ATK_COMPONENT(child_obj), &x_left, &y_top, &width, atk_component_get_extents(ATK_COMPONENT(child_obj), &x_left, &y_top, &width,
&height, ATK_XY_SCREEN); &height, ATK_XY_SCREEN);
EXPECT_EQ(610, x_left); EXPECT_EQ(610, x_left);
@@ -920,8 +931,7 @@ TEST_F(AXPlatformNodeAuraLinuxTest, AtkC @@ -923,8 +934,7 @@ TEST_F(AXPlatformNodeAuraLinuxTest, AtkC
EXPECT_EQ(10, width); EXPECT_EQ(10, width);
EXPECT_EQ(10, height); EXPECT_EQ(10, height);
@ -1007,7 +1005,7 @@ diff -up chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_aural
atk_component_get_extents(ATK_COMPONENT(child_obj), &x_left, &y_top, &width, atk_component_get_extents(ATK_COMPONENT(child_obj), &x_left, &y_top, &width,
&height, ATK_XY_SCREEN); &height, ATK_XY_SCREEN);
// The test wrapper scrolls every element when scrolling, so this should be // The test wrapper scrolls every element when scrolling, so this should be
@@ -938,6 +948,17 @@ TEST_F(AXPlatformNodeAuraLinuxTest, AtkC @@ -941,6 +951,17 @@ TEST_F(AXPlatformNodeAuraLinuxTest, AtkC
} }
TEST_F(AXPlatformNodeAuraLinuxTest, AtkComponentScrollTo) { TEST_F(AXPlatformNodeAuraLinuxTest, AtkComponentScrollTo) {
@ -1025,7 +1023,7 @@ diff -up chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_aural
AXNodeData root; AXNodeData root;
root.id = 1; root.id = 1;
root.role = ax::mojom::Role::kRootWebArea; root.role = ax::mojom::Role::kRootWebArea;
@@ -965,7 +986,7 @@ TEST_F(AXPlatformNodeAuraLinuxTest, AtkC @@ -968,7 +989,7 @@ TEST_F(AXPlatformNodeAuraLinuxTest, AtkC
EXPECT_EQ(10, width); EXPECT_EQ(10, width);
EXPECT_EQ(10, height); EXPECT_EQ(10, height);
@ -1034,9 +1032,9 @@ diff -up chromium-129.0.6668.58/ui/accessibility/platform/ax_platform_node_aural
atk_component_get_extents(ATK_COMPONENT(child_obj), &x_left, &y_top, &width, atk_component_get_extents(ATK_COMPONENT(child_obj), &x_left, &y_top, &width,
&height, ATK_XY_SCREEN); &height, ATK_XY_SCREEN);
EXPECT_EQ(0, x_left); EXPECT_EQ(0, x_left);
diff -up chromium-129.0.6668.58/ui/accessibility/platform/inspect/ax_tree_formatter_auralinux.cc.me chromium-129.0.6668.58/ui/accessibility/platform/inspect/ax_tree_formatter_auralinux.cc diff -up chromium-133.0.6943.35/ui/accessibility/platform/inspect/ax_tree_formatter_auralinux.cc.el8-atk-compiler-error chromium-133.0.6943.35/ui/accessibility/platform/inspect/ax_tree_formatter_auralinux.cc
--- chromium-129.0.6668.58/ui/accessibility/platform/inspect/ax_tree_formatter_auralinux.cc.me 2024-09-18 19:27:20.965851455 +0200 --- chromium-133.0.6943.35/ui/accessibility/platform/inspect/ax_tree_formatter_auralinux.cc.el8-atk-compiler-error 2025-01-28 23:03:27.000000000 +0100
+++ chromium-129.0.6668.58/ui/accessibility/platform/inspect/ax_tree_formatter_auralinux.cc 2024-09-18 19:28:06.221700512 +0200 +++ chromium-133.0.6943.35/ui/accessibility/platform/inspect/ax_tree_formatter_auralinux.cc 2025-02-04 10:56:08.464127592 +0100
@@ -474,18 +474,34 @@ void AXTreeFormatterAuraLinux::AddTableC @@ -474,18 +474,34 @@ void AXTreeFormatterAuraLinux::AddTableC
int row = 0, col = 0, row_span = 0, col_span = 0; int row = 0, col = 0, row_span = 0, col_span = 0;
int n_row_headers = 0, n_column_headers = 0; int n_row_headers = 0, n_column_headers = 0;

7
SOURCES/clean_ffmpeg.sh
Unescape View File

@ -183,6 +183,7 @@ header_files=" libavcodec/x86/inline_asm.h \
libavformat/iamf_parse.h \ libavformat/iamf_parse.h \
libavformat/iamf_reader.h \ libavformat/iamf_reader.h \
libavformat/iamf.h \ libavformat/iamf.h \
libavformat/dvdclut.h \
libavutil/aarch64/cpu.h \ libavutil/aarch64/cpu.h \
libavutil/aarch64/intreadwrite.h \ libavutil/aarch64/intreadwrite.h \
libavutil/x86/asm.h \ libavutil/x86/asm.h \
@ -236,6 +237,8 @@ manual_files=" libavcodec/aarch64/h264pred_neon.S \
libavcodec/aarch64/neon.S \ libavcodec/aarch64/neon.S \
libavcodec/aarch64/vorbisdsp_neon.S \ libavcodec/aarch64/vorbisdsp_neon.S \
libavcodec/aarch64/autorename_libavcodec_aarch64_vorbisdsp_neon.S \ libavcodec/aarch64/autorename_libavcodec_aarch64_vorbisdsp_neon.S \
libavcodec/aarch64/autorename_libavcodec_aarch64_vorbisdsp_init.c \
libavcodec/aarch64/autorename_libavcodec_aarch64_videodsp_init.c \
libavcodec/aarch64/vorbisdsp_init.c \ libavcodec/aarch64/vorbisdsp_init.c \
libavcodec/aarch64/vp8dsp_neon.S \ libavcodec/aarch64/vp8dsp_neon.S \
libavcodec/x86/hpeldsp.asm \ libavcodec/x86/hpeldsp.asm \
@ -269,10 +272,14 @@ manual_files=" libavcodec/aarch64/h264pred_neon.S \
libavformat/pcm.c \ libavformat/pcm.c \
libavformat/utils.c \ libavformat/utils.c \
libavformat/version.c \ libavformat/version.c \
libavformat/dvdclut.c \
libavutil/aarch64/asm.S \ libavutil/aarch64/asm.S \
libavutil/aarch64/cpu.c \ libavutil/aarch64/cpu.c \
libavutil/aarch64/cpu_sve.S \
libavutil/aarch64/float_dsp_init.c \ libavutil/aarch64/float_dsp_init.c \
libavutil/aarch64/float_dsp_neon.S \ libavutil/aarch64/float_dsp_neon.S \
libavutil/aarch64/autorename_libavutil_aarch64_cpu.c \
libavutil/aarch64/autorename_libavutil_aarch64_float_dsp_init.c \
libavutil/aarch64/autorename_libavutil_aarch64_float_dsp_neon.S \ libavutil/aarch64/autorename_libavutil_aarch64_float_dsp_neon.S \
libavutil/aarch64/tx_float_neon.S \ libavutil/aarch64/tx_float_neon.S \
libavutil/aarch64/timer.h \ libavutil/aarch64/timer.h \

30
SPECS/chromium.spec
Unescape View File

@ -167,7 +167,7 @@
# enable|disable use_custom_libcxx # enable|disable use_custom_libcxx
%global use_custom_libcxx 0 %global use_custom_libcxx 0
%if 0%{?rhel} || 0%{?fedora} == 39 %if 0%{?rhel} || 0%{?fedora} == 40
%global use_custom_libcxx 1 %global use_custom_libcxx 1
%endif %endif
@ -280,7 +280,7 @@
# Build with GOST patches # Build with GOST patches
# https://github.com/deemru/chromium-gost/ # https://github.com/deemru/chromium-gost/
%global gost_build 1 %global gost_build 1
%define chromium_gost_commit fe3315a78e9fa6e79f613fa316e375cd471f1624 %define chromium_gost_commit 37dd7d5b7f087dce6afa0d354f4c1303681dbe8b
%define msspi_commit 7f7847892d4c69c454a58093553fa34d1b09c0a0 %define msspi_commit 7f7847892d4c69c454a58093553fa34d1b09c0a0
%define chromium_path_gost %{_builddir}/chromium-gost %define chromium_path_gost %{_builddir}/chromium-gost
%endif %endif
@ -319,7 +319,7 @@
%endif %endif
Name: chromium%{chromium_channel} Name: chromium%{chromium_channel}
Version: 132.0.6834.159 Version: 133.0.6943.53
Release: 1%{?dist}.inferit Release: 1%{?dist}.inferit
Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use
Url: http://www.chromium.org/Home Url: http://www.chromium.org/Home
@ -359,10 +359,8 @@ Patch131: chromium-107-proprietary-codecs.patch
Patch132: chromium-118-sigtrap_system_ffmpeg.patch Patch132: chromium-118-sigtrap_system_ffmpeg.patch
# need for old ffmpeg 6.0/5.x on epel9 and fedora < 40 # need for old ffmpeg 6.0/5.x on epel9 and fedora < 40
Patch133: chromium-121-system-old-ffmpeg.patch Patch133: chromium-121-system-old-ffmpeg.patch
# disable FFmpegAllowLists by default to allow external ffmpeg
patch134: chromium-125-disable-FFmpegAllowLists.patch
# revert, it causes build error: use of undeclared identifier 'AVFMT_FLAG_NOH264PARSE' # revert, it causes build error: use of undeclared identifier 'AVFMT_FLAG_NOH264PARSE'
Patch135: chromium-129-disable-H.264-video-parser-during-demuxing.patch Patch135: chromium-133-disable-H.264-video-parser-during-demuxing.patch
# file conflict with old kernel on el8/el9 # file conflict with old kernel on el8/el9
Patch141: chromium-118-dma_buf_export_sync_file-conflict.patch Patch141: chromium-118-dma_buf_export_sync_file-conflict.patch
@ -379,7 +377,7 @@ Patch300: chromium-131-revert-decommit-pooled-pages-by-default.patch
Patch305: chromium-124-el8-arm64-memory_tagging.patch Patch305: chromium-124-el8-arm64-memory_tagging.patch
Patch306: chromium-127-el8-ifunc-header.patch Patch306: chromium-127-el8-ifunc-header.patch
# workaround for build error due to old atk version on el8 # workaround for build error due to old atk version on el8
Patch307: chromium-129-el8-atk-compiler-error.patch Patch307: chromium-133-el8-atk-compiler-error.patch
Patch308: chromium-132-el8-unsupport-clang-flags.patch Patch308: chromium-132-el8-unsupport-clang-flags.patch
Patch309: chromium-132-el8-unsupport-rustc-flags.patch Patch309: chromium-132-el8-unsupport-rustc-flags.patch
Patch310: chromium-132-el8-clang18-build-error.patch Patch310: chromium-132-el8-clang18-build-error.patch
@ -443,6 +441,7 @@ Patch385: 0002-Include-cstddef-to-fix-build.patch
Patch386: 0004-third_party-crashpad-port-curl-transport-ppc64.patch Patch386: 0004-third_party-crashpad-port-curl-transport-ppc64.patch
Patch387: HACK-third_party-libvpx-use-generic-gnu.patch Patch387: HACK-third_party-libvpx-use-generic-gnu.patch
Patch388: 0001-third-party-hwy-wrong-include.patch
Patch389: HACK-debian-clang-disable-base-musttail.patch Patch389: HACK-debian-clang-disable-base-musttail.patch
Patch390: 0001-Add-ppc64-target-to-libaom.patch Patch390: 0001-Add-ppc64-target-to-libaom.patch
Patch391: 0001-Add-pregenerated-config-for-libaom-on-ppc64.patch Patch391: 0001-Add-pregenerated-config-for-libaom-on-ppc64.patch
@ -486,8 +485,6 @@ Patch418: flatpak-Expose-Widevine-into-the-sandbox.patch
# Old Yandex patch # Old Yandex patch
Patch600: 0001-Yandex-as-default-search-engine.patch Patch600: 0001-Yandex-as-default-search-engine.patch
# MSVSphere
Patch601: 0001-Added-Russian-description-and-summary-for-gnome-soft.patch
# Yandex Search by default # Yandex Search by default
Patch602: 0001-Added-Yandex-search-bar-as-default-on-newtab-and-new.patch Patch602: 0001-Added-Yandex-search-bar-as-default-on-newtab-and-new.patch
@ -545,6 +542,8 @@ Source102: https://github.com/deemru/msspi/archive/%{msspi_commit}.tar.gz#/msspi
Source103: chromium-browser-gost-icons.tar.xz Source103: chromium-browser-gost-icons.tar.xz
%endif %endif
Source200: chromium-browser.appdata.xml
BuildRequires: clang BuildRequires: clang
BuildRequires: clang-tools-extra BuildRequires: clang-tools-extra
BuildRequires: llvm BuildRequires: llvm
@ -1185,7 +1184,6 @@ sed -i 's/std::string data_dir_basename = "chromium"/std::string data_dir_basena
#%%patch -P129 -p1 -R -b .ffmpeg-5.x-reordered_opaque #%%patch -P129 -p1 -R -b .ffmpeg-5.x-reordered_opaque
#%%patch -P130 -p1 -b .revert-av1enc #%%patch -P130 -p1 -b .revert-av1enc
#%%patch -P133 -p1 -b .system-old-ffmpeg #%%patch -P133 -p1 -b .system-old-ffmpeg
#%%patch -P134 -p1 -b .disable-FFmpegAllowLists
#%%patch -P135 -p1 -b .disable-H.264-video-parser-during-demuxing #%%patch -P135 -p1 -b .disable-H.264-video-parser-during-demuxing
#%%endif #%%endif
#%%endif #%%endif
@ -1261,6 +1259,7 @@ sed -i 's/std::string data_dir_basename = "chromium"/std::string data_dir_basena
%patch -P385 -p1 -b .0002-Include-cstddef-to-fix-build %patch -P385 -p1 -b .0002-Include-cstddef-to-fix-build
%patch -P386 -p1 -b .0004-third_party-crashpad-port-curl-transport-ppc64 %patch -P386 -p1 -b .0004-third_party-crashpad-port-curl-transport-ppc64
%patch -P387 -p1 -b .HACK-third_party-libvpx-use-generic-gnu %patch -P387 -p1 -b .HACK-third_party-libvpx-use-generic-gnu
%patch -P388 -p1 -b .0001-third-party-hwy-wrong-include.patch
%patch -P389 -p1 -b .HACK-debian-clang-disable-base-musttail %patch -P389 -p1 -b .HACK-debian-clang-disable-base-musttail
%patch -P390 -p1 -b .0001-Add-ppc64-target-to-libaom %patch -P390 -p1 -b .0001-Add-ppc64-target-to-libaom
%patch -P391 -p1 -b .0001-Add-pregenerated-config-for-libaom-on-ppc64 %patch -P391 -p1 -b .0001-Add-pregenerated-config-for-libaom-on-ppc64
@ -1294,7 +1293,6 @@ sed -i 's/std::string data_dir_basename = "chromium"/std::string data_dir_basena
%patch -P418 -p1 -b .flatpak-widevine %patch -P418 -p1 -b .flatpak-widevine
%endif %endif
%patch -P601 -p1 -b .Added-Russian-description-and-summary-for-gnome-soft
%if ! %{with gost} %if ! %{with gost}
%patch -P602 -p1 -b .Yandex-as-default-search-engine %patch -P602 -p1 -b .Yandex-as-default-search-engine
%else %else
@ -1936,7 +1934,7 @@ install -m 0644 %{SOURCE11} %{buildroot}%{_sysconfdir}/%{name}/
mkdir -p %{buildroot}%{_datadir}/applications/ mkdir -p %{buildroot}%{_datadir}/applications/
desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE4} desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE4}
install -D -m0644 chrome/installer/linux/common/chromium-browser/chromium-browser.appdata.xml \ install -D -m0644 %{SOURCE200} \
${RPM_BUILD_ROOT}%{_datadir}/metainfo/%{chromium_browser_channel}.appdata.xml ${RPM_BUILD_ROOT}%{_datadir}/metainfo/%{chromium_browser_channel}.appdata.xml
appstream-util validate-relax --nonet ${RPM_BUILD_ROOT}%{_datadir}/metainfo/%{chromium_browser_channel}.appdata.xml appstream-util validate-relax --nonet ${RPM_BUILD_ROOT}%{_datadir}/metainfo/%{chromium_browser_channel}.appdata.xml
@ -2132,7 +2130,13 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%endif %endif
%changelog %changelog
* Tue Jan 29 2025 Arkady L. Shane <tigro@msvsphere-os.ru> - 132.0.6834.159-1.inferit * Fri Feb 7 2025 Arkady L. Shane <tigro@msvsphere-os.ru> - 133.0.6943.53-1.inferit
- Update to 133.0.6943.53
* CVE-2025-0444: Use after free in Skia
* CVE-2025-0445: Use after free in V8
* CVE-2025-0451: Inappropriate implementation in Extensions API
* Wed Jan 29 2025 Arkady L. Shane <tigro@msvsphere-os.ru> - 132.0.6834.159-1.inferit
- Updated to 132.0.6834.159 - Updated to 132.0.6834.159
* Medium CVE-2025-0762: Use after free in DevTools * Medium CVE-2025-0762: Use after free in DevTools

Write Preview
Loading…
Cancel
Save