Browse Source

Update to 91.0.4472.77

master
wchen342 2 years ago
parent
commit
11f3bdc462
Signed by: wchen342 GPG Key ID: 9C19365D69B04CEC
  1. 13
      chromium-83.0.4103.61-disable-fontconfig-cache-magic.patch
  2. 15
      chromium-89.0.4389.72-initial_prefs-etc-path.patch
  3. 29
      chromium-89.0.4389.82-support-futex_time64.patch
  4. 29
      chromium-90-CrossThreadCopier-qualification.patch
  5. 24
      chromium-90-TokenizedOutput-include.patch
  6. 28
      chromium-90-angle-constexpr.patch
  7. 24
      chromium-90-quantization_utils-include.patch
  8. 18
      chromium-90.0.4430.93-epel8-aarch64-libpng16-symbol-prefixes.patch
  9. 91
      chromium-91-libyuv-aarch64.patch
  10. 47
      chromium-91-pcscan-vector-types.patch
  11. 14
      chromium-91.0.4472.77-aarch64-cxxflags-addition.patch
  12. 13
      chromium-91.0.4472.77-disable-fontconfig-cache-magic.patch
  13. 15
      chromium-91.0.4472.77-initial_prefs-etc-path.patch
  14. 13
      chromium-91.0.4472.77-java-only-allowed-in-android-builds.patch
  15. 12203
      chromium-91.0.4472.77-update-highway-0.12.2.patch
  16. 2
      clean_ffmpeg.sh
  17. 4
      sources
  18. 21
      ungoogled-chromium-fix.patch
  19. 66
      ungoogled-chromium.spec

13
chromium-83.0.4103.61-disable-fontconfig-cache-magic.patch

@ -1,13 +0,0 @@
diff -up chromium-83.0.4103.61/base/test/BUILD.gn.nofontconfigcache chromium-83.0.4103.61/base/test/BUILD.gn
--- chromium-83.0.4103.61/base/test/BUILD.gn.nofontconfigcache 2020-05-29 12:30:03.409707011 -0400
+++ chromium-83.0.4103.61/base/test/BUILD.gn 2020-05-29 12:30:22.593275137 -0400
@@ -188,9 +188,6 @@ static_library("test_support") {
sources += [ "test_file_util_linux.cc" ]
public_deps += [ ":fontconfig_util_linux" ]
data_deps = [ "//third_party/test_fonts" ]
- if (current_toolchain == host_toolchain) {
- data_deps += [ ":do_generate_fontconfig_caches" ]
- }
}
if (is_mac) {

15
chromium-89.0.4389.72-initial_prefs-etc-path.patch

@ -1,15 +0,0 @@
diff -up chromium-89.0.4389.72/chrome/browser/first_run/first_run_internal_linux.cc.etc chromium-89.0.4389.72/chrome/browser/first_run/first_run_internal_linux.cc
--- chromium-89.0.4389.72/chrome/browser/first_run/first_run_internal_linux.cc.etc 2021-03-04 11:12:14.394002900 -0500
+++ chromium-89.0.4389.72/chrome/browser/first_run/first_run_internal_linux.cc 2021-03-04 11:13:00.909220323 -0500
@@ -19,9 +19,9 @@ bool IsOrganicFirstRun() {
base::FilePath InitialPrefsPath() {
// The standard location of the initial prefs is next to the chrome binary.
+ // ...but we patch it to use /etc/chromium
base::FilePath initial_prefs;
- if (!base::PathService::Get(base::DIR_EXE, &initial_prefs))
- return base::FilePath();
+ initial_prefs = base::FilePath("/etc/chromium");
return initial_prefs.AppendASCII(installer::kLegacyInitialPrefs);
}

29
chromium-89.0.4389.82-support-futex_time64.patch

@ -1,29 +0,0 @@
diff -up chromium-89.0.4389.82/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc.futex-time64 chromium-89.0.4389.82/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
--- chromium-89.0.4389.82/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc.futex-time64 2021-03-15 15:31:09.440719811 -0400
+++ chromium-89.0.4389.82/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc 2021-03-15 15:33:27.494393985 -0400
@@ -191,7 +191,11 @@ ResultExpr EvaluateSyscallImpl(int fs_de
}
#endif
- if (sysno == __NR_futex)
+ if (sysno == __NR_futex
+#if defined(__NR_futex_time64)
+ || sysno == __NR_futex_time64
+#endif
+ )
return RestrictFutex();
if (sysno == __NR_set_robust_list)
diff -up chromium-89.0.4389.82/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc.futex-time64 chromium-89.0.4389.82/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
--- chromium-89.0.4389.82/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc.futex-time64 2021-03-15 15:33:45.018479568 -0400
+++ chromium-89.0.4389.82/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc 2021-03-15 15:34:55.002821350 -0400
@@ -420,6 +420,9 @@ bool SyscallSets::IsAllowedFutex(int sys
case __NR_get_robust_list:
case __NR_set_robust_list:
case __NR_futex:
+#if defined(__NR_futex_time64)
+ case __NR_futex_time64:
+#endif
default:
return false;
}

29
chromium-90-CrossThreadCopier-qualification.patch

@ -1,29 +0,0 @@
From 644e45c7fa836d628de39badc3a168f3d7e9e9dc Mon Sep 17 00:00:00 2001
From: Stephan Hartmann <[email protected]>
Date: Thu, 25 Feb 2021 14:28:40 +0000
Subject: [PATCH] GCC: remove extra qualification from CrossThreadCopier
Extra qualification is invalid C++ and also not required here,
because it is already inside namespace WTF.
---
.../blink/renderer/platform/graphics/resource_id_traits.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/third_party/blink/renderer/platform/graphics/resource_id_traits.h b/third_party/blink/renderer/platform/graphics/resource_id_traits.h
index b370d7c..565dfee 100644
--- a/third_party/blink/renderer/platform/graphics/resource_id_traits.h
+++ b/third_party/blink/renderer/platform/graphics/resource_id_traits.h
@@ -15,8 +15,8 @@
namespace WTF {
template <>
-struct WTF::CrossThreadCopier<viz::ResourceId>
- : public WTF::CrossThreadCopierPassThrough<viz::ResourceId> {};
+struct CrossThreadCopier<viz::ResourceId>
+ : public CrossThreadCopierPassThrough<viz::ResourceId> {};
template <>
struct HashTraits<viz::ResourceId> : GenericHashTraits<viz::ResourceId> {
--
2.26.2

24
chromium-90-TokenizedOutput-include.patch

@ -1,24 +0,0 @@
From 30dcae908492a3ec811b5f5b9f518d792a01da38 Mon Sep 17 00:00:00 2001
From: Stephan Hartmann <[email protected]>
Date: Sun, 28 Feb 2021 12:36:04 +0000
Subject: [PATCH] IWYU: include missing cstring for strlen
---
.../translate/core/language_detection/ngram_hash_ops_utils.cc | 1 +
1 file changed, 1 insertion(+)
diff --git a/components/translate/core/language_detection/ngram_hash_ops_utils.cc b/components/translate/core/language_detection/ngram_hash_ops_utils.cc
index cf91033..dd03a3d 100644
--- a/components/translate/core/language_detection/ngram_hash_ops_utils.cc
+++ b/components/translate/core/language_detection/ngram_hash_ops_utils.cc
@@ -4,6 +4,7 @@
#include "components/translate/core/language_detection/ngram_hash_ops_utils.h"
+#include <cstring>
#include <vector>
#include "third_party/utf/src/include/utf.h"
--
2.26.2

28
chromium-90-angle-constexpr.patch

@ -1,28 +0,0 @@
From b1669139f475ebe39ded6f7905f4c901f17eef83 Mon Sep 17 00:00:00 2001
From: Stephan Hartmann <[email protected]>
Date: Wed, 24 Feb 2021 07:38:37 +0000
Subject: [PATCH] add missing static constexpr member definition
C++14 requires to definition of static constexpr members to
emit a linker symbol.
---
.../angle/src/libANGLE/renderer/glslang_wrapper_utils.cpp | 3 +++
1 file changed, 3 insertions(+)
diff --git a/third_party/angle/src/libANGLE/renderer/glslang_wrapper_utils.cpp b/third_party/angle/src/libANGLE/renderer/glslang_wrapper_utils.cpp
index 56b46e6..8f8158c 100644
--- a/third_party/angle/src/libANGLE/renderer/glslang_wrapper_utils.cpp
+++ b/third_party/angle/src/libANGLE/renderer/glslang_wrapper_utils.cpp
@@ -2069,6 +2069,9 @@ class SpirvTransformFeedbackCodeGenerator final : angle::NonCopyable
spirv::IdRef mTransformFeedbackExtensionPositionId;
};
+constexpr size_t SpirvTransformFeedbackCodeGenerator::kXfbDecorationCount;
+constexpr spv::Decoration SpirvTransformFeedbackCodeGenerator::kXfbDecorations[kXfbDecorationCount];
+
void SpirvTransformFeedbackCodeGenerator::visitVariable(const ShaderInterfaceVariableInfo &info,
gl::ShaderType shaderType,
const spirv::LiteralString &name,
--
2.26.2

24
chromium-90-quantization_utils-include.patch

@ -1,24 +0,0 @@
From 980ae0fbe6d985efce517c8f6c9aa139b076322b Mon Sep 17 00:00:00 2001
From: Stephan Hartmann <[email protected]>
Date: Sun, 28 Feb 2021 12:55:19 +0000
Subject: [PATCH] IWYU: add missing cstdint for uint32_t
---
.../translate/core/language_detection/quantization_utils.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/components/translate/core/language_detection/quantization_utils.h b/components/translate/core/language_detection/quantization_utils.h
index eb8f6d1..699a488 100644
--- a/components/translate/core/language_detection/quantization_utils.h
+++ b/components/translate/core/language_detection/quantization_utils.h
@@ -7,6 +7,7 @@
#include <algorithm>
#include <cmath>
+#include <cstdint>
namespace translate {
--
2.26.2

18
chromium-90.0.4430.93-epel8-aarch64-libpng16-symbol-prefixes.patch

@ -0,0 +1,18 @@
diff -up chromium-90.0.4430.93/third_party/llvm/lldb/test/API/functionalities/postmortem/netbsd-core/1lwp_SIGSEGV.aarch64 chromium-90.0.4430.93/third_party/llvm/lldb/test/API/functionalities/postmortem/netbsd-core/1lwp_SIGSEGV
diff -up chromium-90.0.4430.93/third_party/llvm/lldb/test/API/functionalities/postmortem/netbsd-core/2lwp_process_SIGSEGV.aarch64 chromium-90.0.4430.93/third_party/llvm/lldb/test/API/functionalities/postmortem/netbsd-core/2lwp_process_SIGSEGV
diff -up chromium-90.0.4430.93/third_party/llvm/lldb/test/API/functionalities/postmortem/netbsd-core/2lwp_t2_SIGSEGV.aarch64 chromium-90.0.4430.93/third_party/llvm/lldb/test/API/functionalities/postmortem/netbsd-core/2lwp_t2_SIGSEGV
diff -up chromium-90.0.4430.93/third_party/pdfium/third_party/libpng16/pngprefix.h.aarch64 chromium-90.0.4430.93/third_party/pdfium/third_party/libpng16/pngprefix.h
--- chromium-90.0.4430.93/third_party/pdfium/third_party/libpng16/pngprefix.h.aarch64 2021-05-03 14:08:47.184438786 -0400
+++ chromium-90.0.4430.93/third_party/pdfium/third_party/libpng16/pngprefix.h 2021-05-03 14:09:59.289797317 -0400
@@ -458,4 +458,11 @@
#define png_zlib_inflate PDFIUM_png_zlib_inflate
#define png_zstream_error PDFIUM_png_zstream_error
+#if PNG_ARM_NEON_IMPLEMENTATION == 1
+#define png_riffle_palette_neon PDFIUM_png_riffle_palette_neon
+#define png_do_expand_palette_rgba8_neon PDFIUM_png_do_expand_palette_rgba8_neon
+#define png_do_expand_palette_rgb8_neon PDFIUM_png_do_expand_palette_rgb8_neon
+#endif
+
+
#endif // PNGPREFIX_H

91
chromium-91-libyuv-aarch64.patch

@ -0,0 +1,91 @@
diff --git a/third_party/libyuv/source/row_neon64.cc b/third_party/libyuv/source/row_neon64.cc
index 350c964..2aab413 100644
--- a/third_party/libyuv/source/row_neon64.cc
+++ b/third_party/libyuv/source/row_neon64.cc
@@ -1835,7 +1835,7 @@ void ARGBToAB64Row_NEON(const uint8_t* src_argb,
: "+r"(src_argb), // %0
"+r"(dst_ab64), // %1
"+r"(width) // %2
- : "m"(kShuffleARGBToABGR) // %3
+ : "Q"(kShuffleARGBToABGR) // %3
: "cc", "memory", "v0", "v1", "v2", "v3", "v4");
}
@@ -1859,7 +1859,7 @@ void AR64ToARGBRow_NEON(const uint16_t* src_ar64,
: "+r"(src_ar64), // %0
"+r"(dst_argb), // %1
"+r"(width) // %2
- : "m"(kShuffleAR64ToARGB) // %3
+ : "Q"(kShuffleAR64ToARGB) // %3
: "cc", "memory", "v0", "v1", "v2", "v3", "v4");
}
@@ -1883,7 +1883,7 @@ void AB64ToARGBRow_NEON(const uint16_t* src_ab64,
: "+r"(src_ab64), // %0
"+r"(dst_argb), // %1
"+r"(width) // %2
- : "m"(kShuffleAB64ToARGB) // %3
+ : "Q"(kShuffleAB64ToARGB) // %3
: "cc", "memory", "v0", "v1", "v2", "v3", "v4");
}
diff --git a/third_party/libyuv/source/scale_neon64.cc b/third_party/libyuv/source/scale_neon64.cc
index 8656fec..9f9636e 100644
--- a/third_party/libyuv/source/scale_neon64.cc
+++ b/third_party/libyuv/source/scale_neon64.cc
@@ -601,8 +601,8 @@ void ScaleRowUp2_Bilinear_NEON(const uint8_t* src_ptr,
"umlal v4.8h, v1.8b, v31.8b \n" // 3*near+far (2, odd)
"umlal v5.8h, v0.8b, v31.8b \n" // 3*near+far (2, even)
- "mov v0.8h, v4.8h \n"
- "mov v1.8h, v5.8h \n"
+ "mov v0.16b, v4.16b \n"
+ "mov v1.16b, v5.16b \n"
"mla v4.8h, v2.8h, v30.8h \n" // 9 3 3 1 (1, odd)
"mla v5.8h, v3.8h, v30.8h \n" // 9 3 3 1 (1, even)
"mla v2.8h, v0.8h, v30.8h \n" // 9 3 3 1 (2, odd)
@@ -642,7 +642,7 @@ void ScaleRowUp2_Linear_12_NEON(const uint16_t* src_ptr,
"ld1 {v1.8h}, [%1], #16 \n" // 12345678 (16b)
"prfm pldl1keep, [%0, 448] \n" // prefetch 7 lines ahead
- "mov v2.8h, v0.8h \n"
+ "mov v2.16b, v0.16b \n"
"mla v0.8h, v1.8h, v31.8h \n" // 3*near+far (odd)
"mla v1.8h, v2.8h, v31.8h \n" // 3*near+far (even)
@@ -679,7 +679,7 @@ void ScaleRowUp2_Bilinear_12_NEON(const uint16_t* src_ptr,
"ld1 {v3.8h}, [%2], #16 \n" // 12345678 (16b)
"prfm pldl1keep, [%0, 448] \n" // prefetch 7 lines ahead
- "mov v0.8h, v2.8h \n"
+ "mov v0.16b, v2.16b \n"
"mla v2.8h, v3.8h, v31.8h \n" // 3*near+far (odd)
"mla v3.8h, v0.8h, v31.8h \n" // 3*near+far (even)
@@ -687,12 +687,12 @@ void ScaleRowUp2_Bilinear_12_NEON(const uint16_t* src_ptr,
"ld1 {v5.8h}, [%3], #16 \n" // 12345678 (16b)
"prfm pldl1keep, [%1, 448] \n" // prefetch 7 lines ahead
- "mov v0.8h, v4.8h \n"
+ "mov v0.16b, v4.16b \n"
"mla v4.8h, v5.8h, v31.8h \n" // 3*near+far (odd)
"mla v5.8h, v0.8h, v31.8h \n" // 3*near+far (even)
- "mov v0.8h, v4.8h \n"
- "mov v1.8h, v5.8h \n"
+ "mov v0.16b, v4.16b \n"
+ "mov v1.16b, v5.16b \n"
"mla v4.8h, v2.8h, v31.8h \n" // 9 3 3 1 (1, odd)
"mla v5.8h, v3.8h, v31.8h \n" // 9 3 3 1 (1, even)
"mla v2.8h, v0.8h, v31.8h \n" // 9 3 3 1 (2, odd)
@@ -887,8 +887,8 @@ void ScaleUVRowUp2_Bilinear_NEON(const uint8_t* src_ptr,
"umlal v4.8h, v1.8b, v31.8b \n" // 3*near+far (2, odd)
"umlal v5.8h, v0.8b, v31.8b \n" // 3*near+far (2, even)
- "mov v0.8h, v4.8h \n"
- "mov v1.8h, v5.8h \n"
+ "mov v0.16b, v4.16b \n"
+ "mov v1.16b, v5.16b \n"
"mla v4.8h, v2.8h, v30.8h \n" // 9 3 3 1 (1, odd)
"mla v5.8h, v3.8h, v30.8h \n" // 9 3 3 1 (1, even)
"mla v2.8h, v0.8h, v30.8h \n" // 9 3 3 1 (2, odd)

47
chromium-91-pcscan-vector-types.patch

@ -0,0 +1,47 @@
From 429e6f78a88473208e96689afa2f6e91f07a4f8c Mon Sep 17 00:00:00 2001
From: Stephan Hartmann <[email protected]>
Date: Sat, 10 Apr 2021 17:02:49 +0000
Subject: [PATCH] GCC: fix vector types in pcscan
* _mm_cmpeq_epi64 result is __m128i
* maybe_ptrs is __m128i already and doesn't require cast
Bug: 819294
Change-Id: I3f8c6cc327191827838e80aea1431ac09315fe88
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2817544
Reviewed-by: Anton Bikineev <[email protected]>
Commit-Queue: Stephan Hartmann <[email protected]>
Cr-Commit-Position: refs/heads/[email protected]{#871265}
---
diff --git a/base/allocator/partition_allocator/starscan/pcscan.cc b/base/allocator/partition_allocator/starscan/pcscan.cc
index c7854ff..d5c0aea 100644
--- a/base/allocator/partition_allocator/starscan/pcscan.cc
+++ b/base/allocator/partition_allocator/starscan/pcscan.cc
@@ -1143,7 +1143,7 @@
const __m128i maybe_ptrs =
_mm_loadu_si128(reinterpret_cast<__m128i*>(payload));
const __m128i vand = _mm_and_si128(maybe_ptrs, cage_mask);
- const __m128d vcmp = _mm_cmpeq_epi64(vand, vbase);
+ const __m128i vcmp = _mm_cmpeq_epi64(vand, vbase);
const int mask = _mm_movemask_pd(_mm_castsi128_pd(vcmp));
if (LIKELY(!mask))
continue;
@@ -1153,15 +1153,14 @@
if (mask & 0b01) {
quarantine_size +=
pcscan_task_.TryMarkObjectInNormalBuckets<GigaCageLookupPolicy>(
- _mm_cvtsi128_si64(_mm_castpd_si128(maybe_ptrs)));
+ _mm_cvtsi128_si64(maybe_ptrs));
}
if (mask & 0b10) {
// Extraction intrinsics for qwords are only supported in SSE4.1, so
// instead we reshuffle dwords with pshufd. The mask is used to move the
// 4th and 3rd dwords into the second and first position.
static constexpr int kSecondWordMask = (3 << 2) | (2 << 0);
- const __m128i shuffled =
- _mm_shuffle_epi32(_mm_castpd_si128(maybe_ptrs), kSecondWordMask);
+ const __m128i shuffled = _mm_shuffle_epi32(maybe_ptrs, kSecondWordMask);
quarantine_size +=
pcscan_task_.TryMarkObjectInNormalBuckets<GigaCageLookupPolicy>(
_mm_cvtsi128_si64(shuffled));

14
chromium-91.0.4472.77-aarch64-cxxflags-addition.patch

@ -0,0 +1,14 @@
diff -up chromium-91.0.4472.77/build/config/compiler/BUILD.gn.aarch-cxxflags chromium-91.0.4472.77/build/config/compiler/BUILD.gn
--- chromium-91.0.4472.77/build/config/compiler/BUILD.gn.aarch-cxxflags 2021-06-02 12:58:21.998750145 -0400
+++ chromium-91.0.4472.77/build/config/compiler/BUILD.gn 2021-06-02 12:59:29.762092189 -0400
@@ -1511,6 +1511,10 @@ config("default_warnings") {
cflags += [ "-Wno-psabi" ]
}
+ if (current_cpu == "arm64" && !is_clang) {
+ cflags_cc += [ "-flax-vector-conversions" ]
+ }
+
if (!is_clang) {
cflags_cc += [
# See comment for -Wno-c++11-narrowing.

13
chromium-91.0.4472.77-disable-fontconfig-cache-magic.patch

@ -0,0 +1,13 @@
diff -up chromium-91.0.4472.77/base/test/BUILD.gn.nofontconfigcache chromium-91.0.4472.77/base/test/BUILD.gn
--- chromium-91.0.4472.77/base/test/BUILD.gn.nofontconfigcache 2021-06-01 16:41:40.094756454 -0400
+++ chromium-91.0.4472.77/base/test/BUILD.gn 2021-06-01 16:42:47.736100516 -0400
@@ -198,9 +198,6 @@ static_library("test_support") {
sources += [ "test_file_util_linux.cc" ]
public_deps += [ ":fontconfig_util_linux" ]
data_deps += [ "//third_party/test_fonts" ]
- if (current_toolchain == host_toolchain) {
- data_deps += [ ":do_generate_fontconfig_caches" ]
- }
}
if (is_mac) {

15
chromium-91.0.4472.77-initial_prefs-etc-path.patch

@ -0,0 +1,15 @@
diff -up chromium-91.0.4472.77/chrome/browser/first_run/first_run_internal_linux.cc.etc chromium-91.0.4472.77/chrome/browser/first_run/first_run_internal_linux.cc
--- chromium-91.0.4472.77/chrome/browser/first_run/first_run_internal_linux.cc.etc 2021-06-01 16:37:39.182531036 -0400
+++ chromium-91.0.4472.77/chrome/browser/first_run/first_run_internal_linux.cc 2021-06-01 16:39:31.590102809 -0400
@@ -20,9 +20,9 @@ bool IsOrganicFirstRun() {
base::FilePath InitialPrefsPath() {
// The standard location of the initial prefs is next to the chrome binary.
+ // ...but we patch it to use /etc/chromium
base::FilePath initial_prefs;
- if (!base::PathService::Get(base::DIR_EXE, &initial_prefs))
- return base::FilePath();
+ initial_prefs = base::FilePath("/etc/chromium");
base::FilePath new_path = initial_prefs.AppendASCII(installer::kInitialPrefs);
if (base::PathIsReadable(new_path))

13
chromium-91.0.4472.77-java-only-allowed-in-android-builds.patch

@ -0,0 +1,13 @@
diff -up chromium-91.0.4472.77/third_party/closure_compiler/compiler.py.java-allowed chromium-91.0.4472.77/third_party/closure_compiler/compiler.py
--- chromium-91.0.4472.77/third_party/closure_compiler/compiler.py.java-allowed 2021-06-02 17:14:48.445064647 +0000
+++ chromium-91.0.4472.77/third_party/closure_compiler/compiler.py 2021-06-02 17:15:12.994836949 +0000
@@ -13,8 +13,7 @@ import subprocess
_CURRENT_DIR = os.path.join(os.path.dirname(__file__))
-_JAVA_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
-assert os.path.isfile(_JAVA_PATH), "java only allowed in android builds"
+_JAVA_PATH = "java"
class Compiler(object):
"""Runs the Closure compiler on given source files to typecheck them

12203
chromium-91.0.4472.77-update-highway-0.12.2.patch

File diff suppressed because it is too large

2
clean_ffmpeg.sh

@ -127,6 +127,7 @@ header_files=" libavcodec/x86/inline_asm.h \
libavcodec/pixblockdsp.h \
libavcodec/pixels.h \
libavcodec/png.h \
libavcodec/pngdsp.h \
libavcodec/put_bits.h \
libavcodec/qpeldsp.h \
libavcodec/ratecontrol.h \
@ -297,7 +298,6 @@ mp3_files=" libavcodec/aarch64/aacpsdsp_init_aarch64.c \
libavcodec/sbrdsp.c \
libavcodec/sbrdsp_template.c \
libavcodec/sinewin.c \
libavcodec/sinewin_fixed.c \
libavcodec/x86/dct_init.c \
libavcodec/x86/dct32.asm \
libavcodec/x86/imdct36.asm \

4
sources

@ -19,5 +19,5 @@ SHA256 (NotoSansSymbols2-Regular.ttf) = 5004b78d8f657a575a6aa25a8cd51932e82afed1
SHA256 (NotoSansTibetan-Regular.ttf) = 5a45f430812ef981952553ef6dd6fa04c7849e97880cdfecc7bf572a58efed93
SHA256 (node-v10.15.3-linux-x64.tar.gz) = 6c35b85a7cd4188ab7578354277b2b2ca43eacc864a2a16b3669753ec2369d52
SHA256 (xcb-proto-1.14.tar.xz) = 186a3ceb26f9b4a015f5a44dcc814c93033a5fc39684f36f1ecc79834416a605
SHA256 (chromium-90.0.4430.212.tar.xz) = abe11d0cb1ff21278aad2eec1a1e279d59176b15331804d7df1807446786d59e
SHA256 (ungoogled-chromium-90.0.4430.212-1.tar.gz) = b49f989e756bdaa66785905a59779005e9f168c39a235f605bd45df301c44788
SHA256 (chromium-91.0.4472.77.tar.xz) = 45d5a43ef798d20313c78fa8a075be0c22055e39c8481eb53eabda81df901b31
SHA256 (ungoogled-chromium-91.0.4472.77-1.tar.gz) = f93021dab9fd8496beb57a3defc90233258e7128c3141a1a9d9a0c45f29967e1

21
ungoogled-chromium-fix.patch

@ -1,21 +0,0 @@
--- a/chrome/services/machine_learning/BUILD.gn
+++ b/chrome/services/machine_learning/BUILD.gn
@@ -30,7 +30,6 @@ source_set("machine_learning") {
]
deps += [
- ":tflite_simple_test",
"//components/optimization_guide/core:machine_learning",
]
@@ -80,10 +79,3 @@ source_set("unit_tests") {
"//testing/gtest",
]
}
-
-if (build_with_tflite_lib) {
- copy("tflite_simple_test") {
- sources = [ "//components/test/data/optimization_guide/simple_test.tflite" ]
- outputs = [ "$root_out_dir/test_data/simple_test.tflite" ]
- }
-}

66
ungoogled-chromium.spec

@ -169,18 +169,18 @@ BuildRequires: libicu-devel >= 5.4
#Build with debugging symbols
%global debug_pkg 0
%global majorversion 90
%global majorversion 91
%global revision 1
# Depot tools revision
%global depot_tools_revision 7d690053cbb9914e0c014ec10fe181bfcd6ec2dc
%global depot_tools_revision 1cabb17575917b73ec2e270d4187656c20b1ab0c
%if %{freeworld}
Name: ungoogled-chromium%{nsuffix}
%else
Name: ungoogled-chromium
%endif
Version: %{majorversion}.0.4430.212
Version: %{majorversion}.0.4472.77
Release: 1%{?dist}.%{revision}
%if %{?freeworld}
# chromium-freeworld
@ -193,7 +193,7 @@ License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and Open
### Chromium Fedora Patches ###
# Use /etc/chromium for initial_prefs
Patch1: chromium-89.0.4389.72-initial_prefs-etc-path.patch
Patch1: chromium-91.0.4472.77-initial_prefs-etc-path.patch
# Use gn system files
Patch2: chromium-67.0.3396.62-gn-system.patch
# Do not prefix libpng functions
@ -208,7 +208,7 @@ Patch6: chromium-89.0.4389.72-norar.patch
# https://gitweb.gentoo.org/repo/gentoo.git/tree/www-client/chromium/files/chromium-widevine-r3.patch
Patch7: chromium-71.0.3578.98-widevine-r3.patch
# Disable fontconfig cache magic that breaks remoting
Patch8: chromium-83.0.4103.61-disable-fontconfig-cache-magic.patch
Patch8: chromium-91.0.4472.77-disable-fontconfig-cache-magic.patch
# drop rsp clobber, which breaks gcc9 (thanks to Jeff Law)
Patch9: chromium-78.0.3904.70-gcc9-drop-rsp-clobber.patch
# Try to load widevine from other places
@ -231,16 +231,20 @@ Patch57: chromium-89.0.4389.72-missing-cstring-header.patch
# prepare for using system ffmpeg (clean)
# http://svnweb.mageia.org/packages/cauldron/chromium-browser-stable/current/SOURCES/chromium-53-ffmpeg-no-deprecation-errors.patch?view=markup
Patch58: chromium-53-ffmpeg-no-deprecation-errors.patch
# https://github.com/stha09/chromium-patches/blob/master/chromium-90-angle-constexpr.patch
Patch59: chromium-90-angle-constexpr.patch
# https://github.com/stha09/chromium-patches/blob/master/chromium-90-CrossThreadCopier-qualification.patch
Patch60: chromium-90-CrossThreadCopier-qualification.patch
# https://github.com/stha09/chromium-patches/blob/master/chromium-90-quantization_utils-include.patch
Patch61: chromium-90-quantization_utils-include.patch
# https://github.com/stha09/chromium-patches/blob/master/chromium-91-pcscan-vector-types.patch
Patch59: chromium-91-pcscan-vector-types.patch
# https://github.com/stha09/chromium-patches/blob/master/chromium-91-libyuv-aarch64.patch
Patch60: chromium-91-libyuv-aarch64.patch
# Update third_party/highway to 0.12.2
# this is needed for sane arm/aarch64
Patch61: chromium-91.0.4472.77-update-highway-0.12.2.patch
# https://github.com/stha09/chromium-patches/blob/master/chromium-90-ruy-include.patch
Patch62: chromium-90-ruy-include.patch
# https://github.com/stha09/chromium-patches/blob/master/chromium-90-TokenizedOutput-include.patch
Patch63: chromium-90-TokenizedOutput-include.patch
# Extra CXXFLAGS for aarch64
Patch63: chromium-91.0.4472.77-aarch64-cxxflags-addition.patch
# Fix issue where closure_compiler thinks java is only allowed in android builds
# https://bugs.chromium.org/p/chromium/issues/detail?id=1192875
Patch64: chromium-91.0.4472.77-java-only-allowed-in-android-builds.patch
# Silence GCC warnings during gn compile
Patch65: chromium-84.0.4147.105-gn-gcc-cleanup.patch
@ -257,9 +261,6 @@ Patch75: chromium-90.0.4430.72-fstatfix.patch
Patch76: chromium-88.0.4324.182-rawhide-gcc-std-max-fix.patch
# Fix symbol visibility with gcc on swiftshader's libEGL
Patch77: chromium-88.0.4324.182-gcc-fix-swiftshader-libEGL-visibility.patch
# Include support for futex_time64 (64bit time on 32bit platforms)
# https://chromium.googlesource.com/chromium/src/+/955a586c63c4f99fb734e44221db63f5b2ca25a9%5E%21/#F0
Patch78: chromium-89.0.4389.82-support-futex_time64.patch
# Do not download proprietary widevine module in the background (thanks Debian)
Patch79: chromium-90.0.4430.72-widevine-no-download.patch
# Fix crashes with components/cast_*
@ -289,6 +290,10 @@ Patch108: chromium-85.0.4183.83-el7-old-libdrm.patch
# 33 | property_name.erase(property_name.cbegin(), cur);
# Not sure how this EVER worked anywhere, but it only seems to fail on EPEL-7.
Patch109: chromium-90.0.4430.93-epel7-erase-fix.patch
# Again, not sure how epel8 is the only one to hit this...
# AARCH64 neon symbols need to be prefixed too to prevent multiple definition issue at linktime
Patch110: chromium-90.0.4430.93-epel8-aarch64-libpng16-symbol-prefixes.patch
# VAAPI
# Upstream turned VAAPI on in Linux in 86
@ -310,7 +315,6 @@ Patch600: chromium-default-user-data-dir.patch
# Additional patches:
Patch700: chromium-missing-std-vector.patch
Patch701: ungoogled-chromium-fix.patch
# Use chromium-latest.py to generate clean tarball from released build tarballs, found here:
# http://build.chromium.org/buildbot/official/
@ -353,7 +357,7 @@ Source20: https://www.x.org/releases/individual/proto/xcb-proto-1.14.tar.xz
Source21: %{name}.appdata.xml
# ungoogled-chromium source
%global ungoogled_chromium_revision 90.0.4430.212-1
%global ungoogled_chromium_revision 91.0.4472.77-1
Source300: https://github.com/Eloston/ungoogled-chromium/archive/%{ungoogled_chromium_revision}/ungoogled-chromium-%{ungoogled_chromium_revision}.tar.gz
# We can assume gcc and binutils.
@ -378,6 +382,7 @@ BuildRequires: harfbuzz-devel >= 2.4.0
%endif
BuildRequires: libatomic
BuildRequires: libcap-devel
BuildRequires: libcurl-devel
%if 0%{?bundlelibdrm}
#nothing
%else
@ -700,12 +705,12 @@ ln -s depot_tools-%{depot_tools_revision} ../depot_tools
%patch56 -p1 -b .missing-cstdint
%patch57 -p1 -b .missing-cstring
%patch58 -p1 -b .ffmpeg-deprecations
%patch59 -p1 -b .angle-constexpr
%patch60 -p1 -b .CrossThreadCopier-qualification
%patch61 -p1 -b .quantization_utils-include
%patch59 -p1 -b .pcscan-vector-types
%patch60 -p1 -b .libyuv-aarch64
%patch61 -p1 -b .update-highway-0.12.2
%patch62 -p1 -b .ruy-include
%patch63 -p1 -b .TokenizedOutput
%patch63 -p1 -b .aarch64-cxxflags-addition
%patch64 -p1 -b .java-only-allowed
%patch65 -p1 -b .gn-gcc-cleanup
%patch66 -p1 -b .remoting-cstring
%patch67 -p1 -b .i686-textrels
@ -715,7 +720,6 @@ ln -s depot_tools-%{depot_tools_revision} ../depot_tools
%patch76 -p1 -b .sigstkszfix
%endif
%patch77 -p1 -b .gcc-swiftshader-visibility
%patch78 -p1 -b .futex-time64
%patch79 -p1 -b .widevine-no-download
%patch80 -p1 -b .EnumTable-crash
@ -732,6 +736,7 @@ ln -s depot_tools-%{depot_tools_revision} ../depot_tools
%if 0%{?rhel} == 8
# %%patch107 -p1 -b .el8-arm-incompatible-ints
%patch110 -p1 -b .el8-aarch64-libpng16-symbol-prefixes
%endif
# Feature specific patches
@ -756,7 +761,6 @@ ln -s depot_tools-%{depot_tools_revision} ../depot_tools
# Additional patches:
%patch700 -p1 -b .missing-std-vector
%patch701 -p1 -b .ungoogled-chromium-fix
# Change shebang in all relevant files in this directory and all subdirectories
# See `man find` for how the `-exec command {} +` syntax works
@ -962,6 +966,7 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/cros_system_api' \
'third_party/dav1d' \
'third_party/dawn' \
'third_party/dawn/third_party/khronos' \
'third_party/depot_tools' \
'third_party/devscripts' \
'third_party/devtools-frontend' \
@ -1000,6 +1005,7 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/googletest' \
'third_party/grpc' \
'third_party/harfbuzz-ng' \
'third_party/highway' \
'third_party/hunspell' \
'third_party/iccjpeg' \
'third_party/icu' \
@ -1021,6 +1027,7 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/libgifcodec' \
'third_party/libjingle' \
'third_party/libjpeg_turbo' \
'third_party/libjxl' \
'third_party/libphonenumber' \
'third_party/libpng' \
'third_party/libsecret' \
@ -1094,7 +1101,6 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/rnnoise' \
'third_party/ruy' \
'third_party/s2cellid' \
'third_party/schema_org' \
'third_party/securemessage' \
'third_party/shell-encryption' \
'third_party/simplejson' \
@ -1131,6 +1137,7 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/wayland' \
'third_party/web-animations-js' \
'third_party/webdriver' \
'third_party/webgpu-cts' \
'third_party/webrtc' \
'third_party/webrtc/common_audio/third_party/ooura' \
'third_party/webrtc/common_audio/third_party/spl_sqrt_floor' \
@ -1521,6 +1528,10 @@ fi
%lang(vi) %{chromium_path}/locales/vi.pak*
%lang(zh_CN) %{chromium_path}/locales/zh-CN.pak*
%lang(zh_TW) %{chromium_path}/locales/zh-TW.pak*
# These are psuedolocales, not real ones.
# So we just include them always.
%{chromium_path}/locales/ar-XB.pak*
%{chromium_path}/locales/en-XA.pak*
%{_bindir}/chromedriver
%{chromium_path}/chromedriver
@ -1528,6 +1539,9 @@ fi
%endif
%changelog
* Sun Jun 6 2021 wchen342 <[email protected]> - 91.0.4472.77-1
- update Chromium to 91.0.4472.77
* Thu May 13 2021 wchen342 <[email protected]> - 90.0.4430.212-1
- update Chromium to 90.0.4430.212

Loading…
Cancel
Save