Browse Source

Update to 92.0.4515.131-1

master 92.0.4515.131-1
wchen342 1 year ago
parent
commit
2391b3f99c
Signed by: wchen342 GPG Key ID: 9C19365D69B04CEC
  1. 33
      chromium-71.0.3578.98-py2-bootstrap.patch
  2. 45
      chromium-84.0.4147.105-gn-gcc-cleanup.patch
  3. 24
      chromium-88.0.4324.182-rawhide-gcc-std-max-fix.patch
  4. 10
      chromium-89.0.4389.82-rhel8-force-disable-use_gnome_keyring.patch
  5. 10
      chromium-90.0.4430.93-epel7-erase-fix.patch
  6. 47
      chromium-91-pcscan-vector-types.patch
  7. 12203
      chromium-91.0.4472.77-update-highway-0.12.2.patch
  8. 17
      chromium-92-v8-constexpr.patch
  9. 13
      chromium-92.0.4515.107-EnumTable-crash.patch
  10. 45
      chromium-92.0.4515.107-gn-gcc-cleanup.patch
  11. 40
      chromium-92.0.4515.107-norar.patch
  12. 24
      chromium-92.0.4515.107-py2-bootstrap.patch
  13. 24
      chromium-92.0.4515.107-py3-bootstrap.patch
  14. 17
      chromium-92.0.4515.107-py3-fixes.patch
  15. 13
      chromium-92.0.4515.107-rawhide-gcc-std-max-fix.patch
  16. 12
      chromium-92.0.4515.107-rhel8-force-disable-use_gnome_keyring.patch
  17. 4199
      chromium-92.0.4515.107-update-highway-0.12.2.patch
  18. 12
      chromium-92.0.4515.107-widevine-other-locations.patch
  19. 50
      chromium-freetype-2.11.patch
  20. 10
      chromium-missing-std-vector.patch
  21. 4
      sources
  22. 165
      ungoogled-chromium.spec

33
chromium-71.0.3578.98-py2-bootstrap.patch

@ -1,33 +0,0 @@
diff -up chromium-71.0.3578.98/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py.py2 chromium-71.0.3578.98/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py
--- chromium-71.0.3578.98/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py.py2 2018-12-12 17:02:58.000000000 -0500
+++ chromium-71.0.3578.98/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py 2018-12-14 11:48:22.150229631 -0500
@@ -58,7 +58,7 @@ def _MinifyJS(input_js):
with tempfile.NamedTemporaryFile() as _:
args = [
- 'python',
+ 'python2',
rjsmin_path
]
p = subprocess.Popen(args,
@@ -177,7 +177,7 @@ def _MinifyCSS(css_text):
os.path.join(py_vulcanize_path, 'third_party', 'rcssmin', 'rcssmin.py'))
with tempfile.NamedTemporaryFile() as _:
- rcssmin_args = ['python', rcssmin_path]
+ rcssmin_args = ['python2', rcssmin_path]
p = subprocess.Popen(rcssmin_args,
stdin=subprocess.PIPE,
stdout=subprocess.PIPE,
diff -up chromium-71.0.3578.98/tools/gn/bootstrap/bootstrap.py.py2 chromium-71.0.3578.98/tools/gn/bootstrap/bootstrap.py
--- chromium-71.0.3578.98/tools/gn/bootstrap/bootstrap.py.py2 2018-12-14 11:48:22.155229522 -0500
+++ chromium-71.0.3578.98/tools/gn/bootstrap/bootstrap.py 2018-12-14 11:49:31.043728244 -0500
@@ -93,7 +93,7 @@ def main(argv):
if not options.debug:
gn_gen_args += ' is_debug=false'
subprocess.check_call([
- gn_path, 'gen', out_dir,
+ gn_path, 'gen', out_dir, ' --script-executable=/usr/bin/python2',
'--args=%s' % gn_gen_args, "--root=" + SRC_ROOT
])

45
chromium-84.0.4147.105-gn-gcc-cleanup.patch

@ -1,45 +0,0 @@
diff -up chromium-84.0.4147.105/tools/gn/src/gn/err.h.gn-gcc-cleanup chromium-84.0.4147.105/tools/gn/src/gn/err.h
--- chromium-84.0.4147.105/tools/gn/src/gn/err.h.gn-gcc-cleanup 2020-08-01 10:04:57.354719575 -0400
+++ chromium-84.0.4147.105/tools/gn/src/gn/err.h 2020-08-01 10:04:51.653974728 -0400
@@ -55,7 +55,7 @@ class Err {
const std::string& help_text = std::string());
Err(const Err& other);
-
+ Err& operator=(const Err& other) = default;
~Err();
bool has_error() const { return has_error_; }
diff -up chromium-84.0.4147.105/tools/gn/src/gn/label_pattern.h.gn-gcc-cleanup chromium-84.0.4147.105/tools/gn/src/gn/label_pattern.h
--- chromium-84.0.4147.105/tools/gn/src/gn/label_pattern.h.gn-gcc-cleanup 2020-08-01 10:24:18.405934036 -0400
+++ chromium-84.0.4147.105/tools/gn/src/gn/label_pattern.h 2020-08-01 10:24:56.664265755 -0400
@@ -33,6 +33,7 @@ class LabelPattern {
const std::string_view& name,
const Label& toolchain_label);
LabelPattern(const LabelPattern& other);
+ LabelPattern& operator=(const LabelPattern& other) = default;
~LabelPattern();
// Converts the given input string to a pattern. This does special stuff
diff -up chromium-84.0.4147.105/tools/gn/src/gn/substitution_list.h.gn-gcc-cleanup chromium-84.0.4147.105/tools/gn/src/gn/substitution_list.h
--- chromium-84.0.4147.105/tools/gn/src/gn/substitution_list.h.gn-gcc-cleanup 2020-08-01 10:04:51.721971684 -0400
+++ chromium-84.0.4147.105/tools/gn/src/gn/substitution_list.h 2020-08-01 10:04:51.765969715 -0400
@@ -15,6 +15,7 @@ class SubstitutionList {
public:
SubstitutionList();
SubstitutionList(const SubstitutionList& other);
+ SubstitutionList& operator=(const SubstitutionList& other) = default;
~SubstitutionList();
bool Parse(const Value& value, Err* err);
diff -up chromium-84.0.4147.105/tools/gn/src/gn/substitution_pattern.h.gn-gcc-cleanup chromium-84.0.4147.105/tools/gn/src/gn/substitution_pattern.h
--- chromium-84.0.4147.105/tools/gn/src/gn/substitution_pattern.h.gn-gcc-cleanup 2020-08-01 10:04:51.637975444 -0400
+++ chromium-84.0.4147.105/tools/gn/src/gn/substitution_pattern.h 2020-08-01 10:04:57.305721767 -0400
@@ -35,6 +35,7 @@ class SubstitutionPattern {
SubstitutionPattern();
SubstitutionPattern(const SubstitutionPattern& other);
+ SubstitutionPattern& operator=(const SubstitutionPattern& other) = default;
~SubstitutionPattern();
// Parses the given string and fills in the pattern. The pattern must only

24
chromium-88.0.4324.182-rawhide-gcc-std-max-fix.patch

@ -1,24 +0,0 @@
diff -up chromium-88.0.4324.182/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc.stdmaxfix chromium-88.0.4324.182/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc
--- chromium-88.0.4324.182/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc.stdmaxfix 2021-02-17 13:16:27.120283969 -0500
+++ chromium-88.0.4324.182/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc 2021-02-17 13:17:37.951617295 -0500
@@ -135,7 +135,7 @@ static bool SetupAlternateStackOnce() {
#else
const size_t page_mask = sysconf(_SC_PAGESIZE) - 1;
#endif
- size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask;
+ size_t stack_size = (std::max(SIGSTKSZ, static_cast<long>(65536)) + page_mask) & ~page_mask;
#if defined(ABSL_HAVE_ADDRESS_SANITIZER) || \
defined(ABSL_HAVE_MEMORY_SANITIZER) || defined(ABSL_HAVE_THREAD_SANITIZER)
// Account for sanitizer instrumentation requiring additional stack space.
diff -up chromium-88.0.4324.182/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc.stdmaxfix chromium-88.0.4324.182/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
--- chromium-88.0.4324.182/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc.stdmaxfix 2021-02-17 14:39:04.556382532 -0500
+++ chromium-88.0.4324.182/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc 2021-02-17 14:39:34.002519173 -0500
@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() {
// SIGSTKSZ may be too small to prevent the signal handlers from overrunning
// the alternative stack. Ensure that the size of the alternative stack is
// large enough.
- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
+ static const unsigned kSigStackSize = std::max(static_cast<long>(16384), SIGSTKSZ);
// Only set an alternative stack if there isn't already one, or if the current
// one is too small.

10
chromium-89.0.4389.82-rhel8-force-disable-use_gnome_keyring.patch

@ -1,10 +0,0 @@
diff -up chromium-76.0.3809.132/components/os_crypt/features.gni.rhel8 chromium-76.0.3809.132/components/os_crypt/features.gni
--- chromium-76.0.3809.132/components/os_crypt/features.gni.rhel8 2019-09-06 17:08:01.242314126 -0400
+++ chromium-76.0.3809.132/components/os_crypt/features.gni 2019-09-06 17:08:10.139134707 -0400
@@ -7,5 +7,5 @@ import("//build/config/ui.gni")
declare_args() {
# Whether to use libgnome-keyring (deprecated by libsecret).
# See http://crbug.com/466975 and http://crbug.com/355223.
- use_gnome_keyring = (is_linux || is_chromeos_lacros) && use_glib
+ use_gnome_keyring = false
}

10
chromium-91.0.4472.114-epel7-erase-fix.patch → chromium-90.0.4430.93-epel7-erase-fix.patch

@ -1,7 +1,7 @@
diff -up chromium-91.0.4472.114/components/ui_devtools/views/view_element.cc.erase-fix chromium-91.0.4472.114/components/ui_devtools/views/view_element.cc
--- chromium-91.0.4472.114/components/ui_devtools/views/view_element.cc.erase-fix 2021-06-28 13:47:06.751802159 -0400
+++ chromium-91.0.4472.114/components/ui_devtools/views/view_element.cc 2021-06-28 13:47:20.097876929 -0400
@@ -24,14 +24,14 @@ namespace {
diff -up chromium-90.0.4430.93/components/ui_devtools/views/view_element.cc.erase-fix chromium-90.0.4430.93/components/ui_devtools/views/view_element.cc
--- chromium-90.0.4430.93/components/ui_devtools/views/view_element.cc.erase-fix 2021-04-29 14:00:38.779932160 -0400
+++ chromium-90.0.4430.93/components/ui_devtools/views/view_element.cc 2021-04-29 14:00:54.684194321 -0400
@@ -23,14 +23,14 @@ namespace {
// Remove any custom editor "prefixes" from the property name. The prefixes must
// not be valid identifier characters.
void StripPrefix(std::string& property_name) {
@ -17,4 +17,4 @@ diff -up chromium-91.0.4472.114/components/ui_devtools/views/view_element.cc.era
+ property_name.erase(property_name.begin(), cur);
}
ui::EventType GetMouseEventType(const std::string& type) {
} // namespace

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

@ -1,47 +0,0 @@
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));

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

File diff suppressed because it is too large

17
chromium-92-v8-constexpr.patch

@ -0,0 +1,17 @@
GCC: make VRegister::from_code() constexpr on aarch64
LiftoffRegister::gp() and LiftoffRegister::fp() are constexpr.
Therefore, VRegister::from_code() needs to be constexpr as well.
diff --git a/v8/src/codegen/arm64/register-arm64.h b/v8/src/codegen/arm64/register-arm64.h
index 1150daf..21007a5 100644
--- a/v8/src/codegen/arm64/register-arm64.h
+++ b/v8/src/codegen/arm64/register-arm64.h
@@ -413,7 +413,7 @@ class VRegister : public CPURegister {
static constexpr int kMaxNumRegisters = kNumberOfVRegisters;
STATIC_ASSERT(kMaxNumRegisters == kDoubleAfterLast);
- static VRegister from_code(int code) {
+ static constexpr VRegister from_code(int code) {
// Always return a D register.
return VRegister::Create(code, kDRegSizeInBits);
}

13
chromium-89-EnumTable-crash.patch → chromium-92.0.4515.107-EnumTable-crash.patch

@ -1,7 +1,6 @@
diff --git a/components/cast_channel/enum_table.h b/components/cast_channel/enum_table.h
index e3130c7..2ad16ea 100644
--- a/components/cast_channel/enum_table.h
+++ b/components/cast_channel/enum_table.h
diff -up chromium-92.0.4515.107/components/cast_channel/enum_table.h.EnumTable-crash chromium-92.0.4515.107/components/cast_channel/enum_table.h
--- chromium-92.0.4515.107/components/cast_channel/enum_table.h.EnumTable-crash 2021-07-19 14:45:12.000000000 -0400
+++ chromium-92.0.4515.107/components/cast_channel/enum_table.h 2021-07-26 17:41:21.987375385 -0400
@@ -212,7 +212,7 @@ class
template <typename E>
@ -30,7 +29,7 @@ index e3130c7..2ad16ea 100644
if (ANALYZER_ASSUME_TRUE(entry.has_str()))
return entry.str();
}
return base::nullopt;
return absl::nullopt;
}
return GenericEnumTableEntry::FindByValue(
- reinterpret_cast<const GenericEnumTableEntry*>(data_.begin()),
@ -41,12 +40,12 @@ index e3130c7..2ad16ea 100644
// This overload of GetString is designed for cases where the argument is a
@@ -342,8 +340,7 @@ class EnumTable {
// enum value directly.
base::Optional<E> GetEnum(base::StringPiece str) const {
absl::optional<E> GetEnum(base::StringPiece str) const {
auto* entry = GenericEnumTableEntry::FindByString(
- reinterpret_cast<const GenericEnumTableEntry*>(data_.begin()),
- data_.size(), str);
+ &data_[0], data_.size(), str);
return entry ? static_cast<E>(entry->value) : base::Optional<E>();
return entry ? static_cast<E>(entry->value) : absl::optional<E>();
}
@@ -358,7 +355,7 @@ class EnumTable {

45
chromium-92.0.4515.107-gn-gcc-cleanup.patch

@ -0,0 +1,45 @@
diff -up chromium-92.0.4515.107/tools/gn/src/gn/err.h.gn-gcc-cleanup chromium-92.0.4515.107/tools/gn/src/gn/err.h
--- chromium-92.0.4515.107/tools/gn/src/gn/err.h.gn-gcc-cleanup 2021-07-19 14:54:04.000000000 -0400
+++ chromium-92.0.4515.107/tools/gn/src/gn/err.h 2021-07-26 17:23:54.477420431 -0400
@@ -56,7 +56,7 @@ class Err {
const std::string& help_text = std::string());
Err(const Err& other);
-
+ Err& operator=(const Err& other) = default;
~Err();
bool has_error() const { return has_error_; }
diff -up chromium-92.0.4515.107/tools/gn/src/gn/label_pattern.h.gn-gcc-cleanup chromium-92.0.4515.107/tools/gn/src/gn/label_pattern.h
--- chromium-92.0.4515.107/tools/gn/src/gn/label_pattern.h.gn-gcc-cleanup 2021-07-26 17:23:54.478420447 -0400
+++ chromium-92.0.4515.107/tools/gn/src/gn/label_pattern.h 2021-07-26 17:26:36.904894419 -0400
@@ -33,6 +33,7 @@ class LabelPattern {
std::string_view name,
const Label& toolchain_label);
LabelPattern(const LabelPattern& other);
+ LabelPattern& operator=(const LabelPattern& other) = default;
~LabelPattern();
// Converts the given input string to a pattern. This does special stuff
diff -up chromium-92.0.4515.107/tools/gn/src/gn/substitution_list.h.gn-gcc-cleanup chromium-92.0.4515.107/tools/gn/src/gn/substitution_list.h
--- chromium-92.0.4515.107/tools/gn/src/gn/substitution_list.h.gn-gcc-cleanup 2021-07-19 14:54:04.000000000 -0400
+++ chromium-92.0.4515.107/tools/gn/src/gn/substitution_list.h 2021-07-26 17:23:54.478420447 -0400
@@ -15,6 +15,7 @@ class SubstitutionList {
public:
SubstitutionList();
SubstitutionList(const SubstitutionList& other);
+ SubstitutionList& operator=(const SubstitutionList& other) = default;
~SubstitutionList();
bool Parse(const Value& value, Err* err);
diff -up chromium-92.0.4515.107/tools/gn/src/gn/substitution_pattern.h.gn-gcc-cleanup chromium-92.0.4515.107/tools/gn/src/gn/substitution_pattern.h
--- chromium-92.0.4515.107/tools/gn/src/gn/substitution_pattern.h.gn-gcc-cleanup 2021-07-19 14:54:04.000000000 -0400
+++ chromium-92.0.4515.107/tools/gn/src/gn/substitution_pattern.h 2021-07-26 17:23:54.478420447 -0400
@@ -35,6 +35,7 @@ class SubstitutionPattern {
SubstitutionPattern();
SubstitutionPattern(const SubstitutionPattern& other);
+ SubstitutionPattern& operator=(const SubstitutionPattern& other) = default;
~SubstitutionPattern();
// Parses the given string and fills in the pattern. The pattern must only

40
chromium-89.0.4389.72-norar.patch → chromium-92.0.4515.107-norar.patch

@ -1,6 +1,6 @@
diff -up chromium-89.0.4389.72/chrome/common/safe_browsing/BUILD.gn.nounrar chromium-89.0.4389.72/chrome/common/safe_browsing/BUILD.gn
--- chromium-89.0.4389.72/chrome/common/safe_browsing/BUILD.gn.nounrar 2021-03-02 12:45:06.000000000 -0500
+++ chromium-89.0.4389.72/chrome/common/safe_browsing/BUILD.gn 2021-03-04 11:56:21.676563769 -0500
diff -up chromium-92.0.4515.107/chrome/common/safe_browsing/BUILD.gn.nounrar chromium-92.0.4515.107/chrome/common/safe_browsing/BUILD.gn
--- chromium-92.0.4515.107/chrome/common/safe_browsing/BUILD.gn.nounrar 2021-07-19 14:45:10.000000000 -0400
+++ chromium-92.0.4515.107/chrome/common/safe_browsing/BUILD.gn 2021-07-26 16:44:53.670761825 -0400
@@ -43,39 +43,6 @@ if (safe_browsing_mode == 1) {
public_deps = [ "//components/safe_browsing/core:csd_proto" ]
}
@ -49,9 +49,9 @@ diff -up chromium-89.0.4389.72/chrome/common/safe_browsing/BUILD.gn.nounrar chro
"//components/safe_browsing/core:features",
]
diff -up chromium-89.0.4389.72/chrome/common/safe_browsing/DEPS.nounrar chromium-89.0.4389.72/chrome/common/safe_browsing/DEPS
--- chromium-89.0.4389.72/chrome/common/safe_browsing/DEPS.nounrar 2021-03-02 12:45:06.000000000 -0500
+++ chromium-89.0.4389.72/chrome/common/safe_browsing/DEPS 2021-03-04 11:56:21.676563769 -0500
diff -up chromium-92.0.4515.107/chrome/common/safe_browsing/DEPS.nounrar chromium-92.0.4515.107/chrome/common/safe_browsing/DEPS
--- chromium-92.0.4515.107/chrome/common/safe_browsing/DEPS.nounrar 2021-07-19 14:45:10.000000000 -0400
+++ chromium-92.0.4515.107/chrome/common/safe_browsing/DEPS 2021-07-26 16:44:53.670761825 -0400
@@ -1,6 +1,5 @@
include_rules = [
"+components/safe_browsing",
@ -59,20 +59,20 @@ diff -up chromium-89.0.4389.72/chrome/common/safe_browsing/DEPS.nounrar chromium
- "+third_party/unrar",
"+third_party/zlib",
]
diff -up chromium-89.0.4389.72/chrome/services/file_util/BUILD.gn.nounrar chromium-89.0.4389.72/chrome/services/file_util/BUILD.gn
--- chromium-89.0.4389.72/chrome/services/file_util/BUILD.gn.nounrar 2021-03-04 11:56:21.676563769 -0500
+++ chromium-89.0.4389.72/chrome/services/file_util/BUILD.gn 2021-03-04 11:57:38.583933453 -0500
@@ -17,7 +17,6 @@ source_set("file_util") {
"//build:chromeos_buildflags",
"//chrome/common/safe_browsing",
"//chrome/common/safe_browsing:archive_analyzer_results",
- "//chrome/common/safe_browsing:rar_analyzer",
"//components/safe_browsing:buildflags",
"//mojo/public/cpp/bindings",
]
diff -up chromium-89.0.4389.72/chrome/services/file_util/safe_archive_analyzer.cc.nounrar chromium-89.0.4389.72/chrome/services/file_util/safe_archive_analyzer.cc
--- chromium-89.0.4389.72/chrome/services/file_util/safe_archive_analyzer.cc.nounrar 2021-03-02 12:45:06.000000000 -0500
+++ chromium-89.0.4389.72/chrome/services/file_util/safe_archive_analyzer.cc 2021-03-04 11:56:21.677563774 -0500
diff -up chromium-92.0.4515.107/chrome/services/file_util/BUILD.gn.nounrar chromium-92.0.4515.107/chrome/services/file_util/BUILD.gn
--- chromium-92.0.4515.107/chrome/services/file_util/BUILD.gn.nounrar 2021-07-26 16:44:53.670761825 -0400
+++ chromium-92.0.4515.107/chrome/services/file_util/BUILD.gn 2021-07-26 16:48:21.283924750 -0400
@@ -50,7 +50,6 @@ source_set("file_util") {
deps += [
"//chrome/common/safe_browsing",
"//chrome/common/safe_browsing:archive_analyzer_results",
- "//chrome/common/safe_browsing:rar_analyzer",
]
}
diff -up chromium-92.0.4515.107/chrome/services/file_util/safe_archive_analyzer.cc.nounrar chromium-92.0.4515.107/chrome/services/file_util/safe_archive_analyzer.cc
--- chromium-92.0.4515.107/chrome/services/file_util/safe_archive_analyzer.cc.nounrar 2021-07-19 14:45:11.000000000 -0400
+++ chromium-92.0.4515.107/chrome/services/file_util/safe_archive_analyzer.cc 2021-07-26 16:44:53.670761825 -0400
@@ -45,10 +45,14 @@ void SafeArchiveAnalyzer::AnalyzeDmgFile
void SafeArchiveAnalyzer::AnalyzeRarFile(base::File rar_file,
base::File temporary_file,

24
chromium-92.0.4515.107-py2-bootstrap.patch

@ -0,0 +1,24 @@
diff -up chromium-92.0.4515.107/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py.py2 chromium-92.0.4515.107/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py
--- chromium-92.0.4515.107/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py.py2 2021-07-19 14:47:19.000000000 -0400
+++ chromium-92.0.4515.107/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py 2021-07-26 17:02:23.160750472 -0400
@@ -83,7 +83,7 @@ def _MinifyJS(input_js):
with tempfile.NamedTemporaryFile() as _:
args = [
- 'python',
+ 'python2',
rjsmin_path
]
p = subprocess.Popen(args,
diff -up chromium-92.0.4515.107/tools/gn/bootstrap/bootstrap.py.py2 chromium-92.0.4515.107/tools/gn/bootstrap/bootstrap.py
--- chromium-92.0.4515.107/tools/gn/bootstrap/bootstrap.py.py2 2021-07-19 14:45:43.000000000 -0400
+++ chromium-92.0.4515.107/tools/gn/bootstrap/bootstrap.py 2021-07-26 17:02:23.160750472 -0400
@@ -130,7 +130,7 @@ def main(argv):
if not options.debug:
gn_gen_args += ' is_debug=false'
subprocess.check_call([
- gn_path, 'gen', out_dir,
+ gn_path, 'gen', out_dir, ' --script-executable=/usr/bin/python2',
'--args=%s' % gn_gen_args, "--root=" + SRC_ROOT
])

24
chromium-92.0.4515.107-py3-bootstrap.patch

@ -0,0 +1,24 @@
diff -up chromium-92.0.4515.107/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py.py2 chromium-92.0.4515.107/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py
--- chromium-92.0.4515.107/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py.py2 2021-07-19 14:47:19.000000000 -0400
+++ chromium-92.0.4515.107/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py 2021-07-26 17:02:23.160750472 -0400
@@ -83,7 +83,7 @@ def _MinifyJS(input_js):
with tempfile.NamedTemporaryFile() as _:
args = [
- 'python',
+ 'python3',
rjsmin_path
]
p = subprocess.Popen(args,
diff -up chromium-92.0.4515.107/tools/gn/bootstrap/bootstrap.py.py2 chromium-92.0.4515.107/tools/gn/bootstrap/bootstrap.py
--- chromium-92.0.4515.107/tools/gn/bootstrap/bootstrap.py.py2 2021-07-19 14:45:43.000000000 -0400
+++ chromium-92.0.4515.107/tools/gn/bootstrap/bootstrap.py 2021-07-26 17:02:23.160750472 -0400
@@ -130,7 +130,7 @@ def main(argv):
if not options.debug:
gn_gen_args += ' is_debug=false'
subprocess.check_call([
- gn_path, 'gen', out_dir,
+ gn_path, 'gen', out_dir, ' --script-executable=/usr/bin/python3',
'--args=%s' % gn_gen_args, "--root=" + SRC_ROOT
])

17
chromium-92.0.4515.107-py3-fixes.patch

@ -0,0 +1,17 @@
diff -up chromium-92.0.4515.107/third_party/jinja2/tests.py.py3 chromium-92.0.4515.107/third_party/jinja2/tests.py
--- chromium-92.0.4515.107/third_party/jinja2/tests.py.py3 2021-07-28 15:53:45.670961029 -0400
+++ chromium-92.0.4515.107/third_party/jinja2/tests.py 2021-07-28 15:55:56.637013096 -0400
@@ -10,7 +10,12 @@
"""
import operator
import re
-from collections import Mapping
+import sys
+if sys.version_info[:2] >= (3, 8): # pragma: no cover
+ from collections.abc import Mapping
+else: # pragma: no cover
+ from collections import Mapping
+
from jinja2.runtime import Undefined
from jinja2._compat import text_type, string_types, integer_types
import decimal

13
chromium-92.0.4515.107-rawhide-gcc-std-max-fix.patch

@ -0,0 +1,13 @@
diff -up chromium-92.0.4515.107/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc.sigstkszfix chromium-92.0.4515.107/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc
diff -up chromium-92.0.4515.107/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc.sigstkszfix chromium-92.0.4515.107/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
--- chromium-92.0.4515.107/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc.sigstkszfix 2021-07-19 14:47:20.000000000 -0400
+++ chromium-92.0.4515.107/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc 2021-07-26 17:28:50.155924005 -0400
@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() {
// SIGSTKSZ may be too small to prevent the signal handlers from overrunning
// the alternative stack. Ensure that the size of the alternative stack is
// large enough.
- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
+ static const unsigned kSigStackSize = std::max(static_cast<long>(16384), SIGSTKSZ);
// Only set an alternative stack if there isn't already one, or if the current
// one is too small.

12
chromium-92.0.4515.107-rhel8-force-disable-use_gnome_keyring.patch

@ -0,0 +1,12 @@
diff -up chromium-92.0.4515.107/components/os_crypt/features.gni.disblegnomekeyring chromium-92.0.4515.107/components/os_crypt/features.gni
--- chromium-92.0.4515.107/components/os_crypt/features.gni.disblegnomekeyring 2021-07-26 22:31:54.887207201 -0400
+++ chromium-92.0.4515.107/components/os_crypt/features.gni 2021-07-26 22:35:00.879013268 -0400
@@ -8,7 +8,7 @@ import("//build/config/ui.gni")
declare_args() {
# Whether to use libgnome-keyring (deprecated by libsecret).
# See http://crbug.com/466975 and http://crbug.com/355223.
- use_gnome_keyring = (is_linux || is_chromeos_lacros) && use_glib
+ use_gnome_keyring = false
# Whether to make account and service names for the crypto key storage
# configurable at runtime for embedders.

4199
chromium-92.0.4515.107-update-highway-0.12.2.patch

File diff suppressed because it is too large

12
chromium-89.0.4389.72-widevine-other-locations.patch → chromium-92.0.4515.107-widevine-other-locations.patch

@ -1,9 +1,9 @@
diff -up chromium-89.0.4389.72/chrome/common/chrome_paths.cc.widevine-other-locations chromium-89.0.4389.72/chrome/common/chrome_paths.cc
--- chromium-89.0.4389.72/chrome/common/chrome_paths.cc.widevine-other-locations 2021-03-04 12:04:50.005010200 -0500
+++ chromium-89.0.4389.72/chrome/common/chrome_paths.cc 2021-03-04 12:38:54.650855614 -0500
@@ -339,6 +339,16 @@ bool PathProvider(int key, base::FilePat
#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && \
BUILDFLAG(BUNDLE_WIDEVINE_CDM)
diff -up chromium-92.0.4515.107/chrome/common/chrome_paths.cc.widevine-other-locations chromium-92.0.4515.107/chrome/common/chrome_paths.cc
--- chromium-92.0.4515.107/chrome/common/chrome_paths.cc.widevine-other-locations 2021-07-26 16:50:41.815065696 -0400
+++ chromium-92.0.4515.107/chrome/common/chrome_paths.cc 2021-07-26 16:58:08.334868284 -0400
@@ -313,6 +313,16 @@ bool PathProvider(int key, base::FilePat
#if BUILDFLAG(ENABLE_WIDEVINE)
case chrome::DIR_BUNDLED_WIDEVINE_CDM:
+ base::PathService::Get(base::DIR_HOME, &cur);
+ cur = cur.Append(FILE_PATH_LITERAL(".local/lib/libwidevinecdm.so"));

50
chromium-freetype-2.11.patch

@ -0,0 +1,50 @@
--- a/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp
+++ b/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp
@@ -712,7 +712,11 @@ void colrv1_draw_paint(SkCanvas* canvas,
canvas->drawPaint(colrPaint);
break;
}
+#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11
+ case FT_COLR_PAINTFORMAT_TRANSFORM:
+#else
case FT_COLR_PAINTFORMAT_TRANSFORMED:
+#endif
case FT_COLR_PAINTFORMAT_TRANSLATE:
case FT_COLR_PAINTFORMAT_ROTATE:
case FT_COLR_PAINTFORMAT_SKEW:
@@ -759,10 +763,17 @@ void colrv1_transform(SkCanvas* canvas, FT_Face face, FT_COLR_Paint colrv1_paint
SkMatrix transform;
switch (colrv1_paint.format) {
+#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11
+ case FT_COLR_PAINTFORMAT_TRANSFORM: {
+ transform = ToSkMatrix(colrv1_paint.u.transform.affine);
+ break;
+ }
+#else
case FT_COLR_PAINTFORMAT_TRANSFORMED: {
transform = ToSkMatrix(colrv1_paint.u.transformed.affine);
break;
}
+#endif
case FT_COLR_PAINTFORMAT_TRANSLATE: {
transform = SkMatrix::Translate(
SkFixedToScalar(colrv1_paint.u.translate.dx),
@@ -880,10 +891,17 @@ bool colrv1_traverse_paint(SkCanvas* canvas,
traverse_result = colrv1_start_glyph(canvas, palette, face, paint.u.colr_glyph.glyphID,
FT_COLOR_NO_ROOT_TRANSFORM);
break;
+#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11
+ case FT_COLR_PAINTFORMAT_TRANSFORM:
+ colrv1_transform(canvas, face, paint);
+ traverse_result = colrv1_traverse_paint(canvas, palette, face,
+ paint.u.transform.paint, visited_set);
+#else
case FT_COLR_PAINTFORMAT_TRANSFORMED:
colrv1_transform(canvas, face, paint);
traverse_result = colrv1_traverse_paint(canvas, palette, face,
paint.u.transformed.paint, visited_set);
+#endif
break;
case FT_COLR_PAINTFORMAT_TRANSLATE:
colrv1_transform(canvas, face, paint);

10
chromium-missing-std-vector.patch

@ -1,10 +0,0 @@
--- a/components/autofill/core/browser/pattern_provider/pattern_provider.h
+++ b/components/autofill/core/browser/pattern_provider/pattern_provider.h
@@ -6,6 +6,7 @@
#define COMPONENTS_AUTOFILL_CORE_BROWSER_PATTERN_PROVIDER_PATTERN_PROVIDER_H_
#include <string>
+#include <vector>
#include "base/gtest_prod_util.h"
#include "base/macros.h"

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-91.0.4472.164.tar.xz) = 84e56fa2ad96d910cab429c513eeaca7bfa94096fef057bd024be826ce8426bd
SHA256 (ungoogled-chromium-91.0.4472.114-1.tar.gz) = 318b890f0d422c573f285a33b6f74ce8446c7aa16677a2236250827defca66e5
SHA256 (chromium-92.0.4515.131.tar.xz) = b6ac840ed5390de69f962e922649bf1df895ff0f5db8e5f656b5191e0cf4ce3a
SHA256 (ungoogled-chromium-92.0.4515.131-1.tar.gz) = 417ed82d81895d3cd2773e9a44406dc676810e1faf09947be3084c53afcdaee4

165
ungoogled-chromium.spec

@ -3,6 +3,11 @@
%define _lto_cflags %{nil}
%global numjobs 8
%ifarch aarch64
%global numjobs 4
%endif
# This flag is so I can build things very fast on a giant system.
# Do not enable in Koji builds.
%global use_all_cpus 0
@ -11,11 +16,6 @@
%global numjobs %{_smp_build_ncpus}
%endif
%global numjobs 8
%ifarch aarch64
%global numjobs 4
%endif
# Fancy build status, so we at least know, where we are..
# %1 where
# %2 what
@ -29,6 +29,22 @@
../depot_tools/ninja -j %{numjobs} -C '%1' '%2'
%endif
# Define __python2 and __python3 for OBS
%if %{obs}
%global __python2 /usr/bin/python2
%global __python3 /usr/bin/python3
%endif
# This will probably be truely possible with Chromium 93
# Right now, we fake it a bit and pull in both python2 and python3 stacks. sorry.
%global build_with_python3 1
%if 0%{?build_with_python3}
%global chromium_pybin %{__python3}
%else
%global chromium_pybin %{__python2}
%endif
# We'd like to always have this on...
# ... but the libva in EL7 (and EL8) is too old.
%if 0%{?rhel} == 7 || 0%{?rhel} == 8
@ -95,11 +111,7 @@ BuildRequires: libicu-devel >= 5.4
%global bundleicu 1
%endif
%if 0%{?rhel} == 7
%global bundlere2 1
%else
%global bundlere2 0
%endif
# The libxml_utils code depends on the specific bundled libxml checkout
# which is not compatible with the current code in the Fedora package as of
@ -122,11 +134,7 @@ BuildRequires: libicu-devel >= 5.4
%global gtk3 1
%if 0%{?rhel} == 7 || 0%{?rhel} == 8
%if 0%{?rhel} == 7
%global dts_version 10
%else
%global dts_version 9
%endif
%global bundleopus 1
%global bundlelibusbx 1
@ -168,18 +176,18 @@ BuildRequires: libicu-devel >= 5.4
#Build with debugging symbols
%global debug_pkg 0
%global majorversion 91
%global revision 2
%global majorversion 92
%global revision 1
# Depot tools revision
%global depot_tools_revision 1cabb17575917b73ec2e270d4187656c20b1ab0c
%global depot_tools_revision db5261ff1b9eaff1afd559e57e96330fb12ca0c3
%if %{freeworld}
Name: ungoogled-chromium%{nsuffix}
%else
Name: ungoogled-chromium
%endif
Version: %{majorversion}.0.4472.164
Version: %{majorversion}.0.4515.131
Release: 1%{?dist}.%{revision}
%if %{?freeworld}
# chromium-freeworld
@ -202,18 +210,22 @@ Patch4: chromium-60.0.3112.78-jpeg-nomangle.patch
# Do not mangle zlib
Patch5: chromium-77.0.3865.75-no-zlib-mangle.patch
# Do not use unrar code, it is non-free
Patch6: chromium-89.0.4389.72-norar.patch
Patch6: chromium-92.0.4515.107-norar.patch
# Use Gentoo's Widevine hack
# 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-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
Patch9: chromium-78.0.3904.70-gcc9-drop-rsp-clobber.patch
# Try to load widevine from other places
Patch10: chromium-89.0.4389.72-widevine-other-locations.patch
Patch10: chromium-92.0.4515.107-widevine-other-locations.patch
# Try to fix version.py for Rawhide
Patch11: chromium-71.0.3578.98-py2-bootstrap.patch
%if 0%{?build_with_python3}
Patch11: chromium-92.0.4515.107-py3-bootstrap.patch
%else
Patch11: chromium-92.0.4515.107-py2-bootstrap.patch
%endif
# Needs to be submitted..
Patch51: chromium-76.0.3809.100-gcc-remoting-constexpr.patch
@ -230,13 +242,11 @@ 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-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
Patch61: chromium-92.0.4515.107-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
# Extra CXXFLAGS for aarch64
@ -246,7 +256,7 @@ Patch63: chromium-91.0.4472.77-aarch64-cxxflags-addition.patch
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
Patch65: chromium-92.0.4515.107-gn-gcc-cleanup.patch
# Fix missing cstring in remoting code
Patch66: chromium-84.0.4147.125-remoting-cstring.patch
# Apply fix_textrels hack for i686 (even without lld)
@ -257,15 +267,20 @@ Patch68: chromium-84.0.4147.125-aarch64-clearkeycdm-binutils-workaround.patch
# Thanks to Kevin Kofler for the fix.
Patch75: chromium-90.0.4430.72-fstatfix.patch
# Rawhide (f35) glibc defines SIGSTKSZ as a long instead of a constant
Patch76: chromium-88.0.4324.182-rawhide-gcc-std-max-fix.patch
Patch76: chromium-92.0.4515.107-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
# 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_*
# Thanks to Gentoo
Patch80: chromium-89-EnumTable-crash.patch
Patch80: chromium-92.0.4515.107-EnumTable-crash.patch
# https://github.com/stha09/chromium-patches/blob/master/chromium-92-v8-constexpr.patch
Patch82: chromium-92-v8-constexpr.patch
# Fixes for python3
Patch83: chromium-92.0.4515.107-py3-fixes.patch
# Fix build with Freetype 2.11
Patch84: chromium-freetype-2.11.patch
# Use lstdc++ on EPEL7 only
Patch101: chromium-75.0.3770.100-epel7-stdc++.patch
@ -288,7 +303,7 @@ Patch108: chromium-85.0.4183.83-el7-old-libdrm.patch
# error: no matching function for call to 'std::basic_string<char>::erase(std::basic_string<char>::const_iterator, __gnu_cxx::__normal_iterator<const char*, std::basic_string<char> >&)'
# 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-91.0.4472.114-epel7-erase-fix.patch
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
@ -301,7 +316,7 @@ Patch203: chromium-86.0.4240.75-vaapi-i686-fpermissive.patch
Patch205: chromium-86.0.4240.75-fix-vaapi-on-intel.patch
# Apply these patches to work around EPEL8 issues
Patch300: chromium-89.0.4389.82-rhel8-force-disable-use_gnome_keyring.patch
Patch300: chromium-92.0.4515.107-rhel8-force-disable-use_gnome_keyring.patch
# And fixes for new compilers
Patch400: chromium-gcc11.patch
@ -312,9 +327,6 @@ Patch503: chromium-manpage.patch
# RPM Fusion patches [free/chromium-browser-privacy]:
Patch600: chromium-default-user-data-dir.patch
# Additional patches:
Patch700: chromium-missing-std-vector.patch
# Use chromium-latest.py to generate clean tarball from released build tarballs, found here:
# http://build.chromium.org/buildbot/official/
# For Chromium Fedora use chromium-latest.py --stable --ffmpegclean --ffmpegarm
@ -356,7 +368,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 91.0.4472.114-1
%global ungoogled_chromium_revision 92.0.4515.131-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.
@ -498,22 +510,28 @@ BuildRequires: pkgconfig(gtk+-3.0)
%else
BuildRequires: pkgconfig(gtk+-2.0)
%endif
BuildRequires: python3
# BuildRequires: %{chromium_pybin}
# %%if ! %%{build_with_python3}
%if 0%{?fedora} >= 32
BuildRequires: python2.7
%else
BuildRequires: python2
BuildRequires: python2-devel
%endif
# %%else
BuildRequires: python3
BuildRequires: python3-devel
# %%endif
# %%if 0%{?build_with_python3}
%if 0%{?bundlepylibs}
# Using bundled bits, do nothing.
%else
%if 0%{?fedora}
BuildRequires: python2-beautifulsoup4
BuildRequires: python2-beautifulsoup
BuildRequires: python2-html5lib
BuildRequires: python2-markupsafe
BuildRequires: python2-ply
BuildRequires: python3-beautifulsoup4
BuildRequires: python3-html5lib
BuildRequires: python3-markupsafe
BuildRequires: python3-ply
%else
BuildRequires: python-beautifulsoup4
BuildRequires: python-BeautifulSoup
@ -521,8 +539,30 @@ BuildRequires: python-html5lib
BuildRequires: python-markupsafe
BuildRequires: python-ply
%endif
BuildRequires: python2-simplejson
BuildRequires: python3-simplejson
%endif
#%%else
%if 0%{?bundlepylibs}
# Using bundled bits, do nothing.
%else
%if 0%{?fedora}
BuildRequires: python2-beautifulsoup4
BuildRequires: python2-beautifulsoup
BuildRequires: python2-html5lib
BuildRequires: python2-markupsafe
BuildRequires: python2-ply
%else
BuildRequires: python-beautifulsoup4
BuildRequires: python-BeautifulSoup
BuildRequires: python-html5lib
BuildRequires: python-markupsafe
BuildRequires: python-ply
%endif
BuildRequires: python2-simplejson
%endif
# %%endif
%if 0%{?bundlere2}
# Using bundled bits, do nothing.
%else
@ -692,7 +732,9 @@ ln -s depot_tools-%{depot_tools_revision} ../depot_tools
%patch8 -p1 -b .nofontconfigcache
%patch9 -p1 -b .gcc9
%patch10 -p1 -b .widevine-other-locations
%patch11 -p1 -b .py2
%if 0%{?build_with_python3}
%patch11 -p1 -b .py3
%endif
# Short term fixes (usually gcc and backports)
%patch51 -p1 -b .gcc-remoting-constexpr
@ -704,7 +746,6 @@ 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 .pcscan-vector-types
%patch60 -p1 -b .libyuv-aarch64
%patch61 -p1 -b .update-highway-0.12.2
%patch62 -p1 -b .ruy-include
@ -721,6 +762,10 @@ ln -s depot_tools-%{depot_tools_revision} ../depot_tools
%patch77 -p1 -b .gcc-swiftshader-visibility
%patch79 -p1 -b .widevine-no-download
%patch80 -p1 -b .EnumTable-crash
%patch82 -p1 -b .v8-constexpr
%patch83 -p1 -b .py3fixes
%patch84 -p1 -b .freetype-2.11
# EPEL specific patches
%if 0%{?rhel} == 7
@ -757,12 +802,13 @@ ln -s depot_tools-%{depot_tools_revision} ../depot_tools
# RPM Fusion patches [free/chromium-browser-privacy]:
%patch600 -p1 -b .default-user-dir
# Additional patches:
%patch700 -p1 -b .missing-std-vector
# Change shebang in all relevant files in this directory and all subdirectories
# See `man find` for how the `-exec command {} +` syntax works
%if 0%{?build_with_python3}
find -type f -exec sed -iE '1s=^#! */usr/bin/\(python\|env python\)[23]\?=#!%{__python3}=' {} +
%else
find -type f -exec sed -iE '1s=^#! */usr/bin/\(python\|env python\)[23]\?=#!%{__python2}=' {} +
%endif
export CC="gcc"
export CXX="g++"
@ -882,6 +928,10 @@ UNGOOGLED_CHROMIUM_GN_DEFINES+=' use_vaapi=false'
%if 0%{?fedora}
UNGOOGLED_CHROMIUM_GN_DEFINES+=' rtc_use_pipewire=true rtc_link_pipewire=true'
%endif
# CentOS kernel header doesn't have uffdio_writeprotect, needs more info
%if 0%{?rhel} >= 7
UNGOOGLED_CHROMIUM_GN_DEFINES+=' use_partition_alloc=false'
%endif
UNGOOGLED_CHROMIUM_GN_DEFINES+=' chrome_pgo_phase=0 enable_js_type_check=false enable_mse_mpeg2ts_stream_parser=true enable_nacl_nonsfi=false enable_one_click_signin=false enable_reading_list=false enable_remoting=false enable_reporting=false enable_service_discovery=false safe_browsing_mode=0'
export UNGOOGLED_CHROMIUM_GN_DEFINES
@ -913,6 +963,7 @@ build/linux/unbundle/remove_bundled_libraries.py \
'base/third_party/valgrind' \
'base/third_party/xdg_mime' \
'base/third_party/xdg_user_dirs' \
'buildtools/third_party/eu-strip' \
'buildtools/third_party/libc++' \
'buildtools/third_party/libc++abi' \
'chrome/third_party/mozilla_security_manager' \
@ -973,7 +1024,7 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/devtools-frontend/src/front_end/third_party/axe-core' \
'third_party/devtools-frontend/src/front_end/third_party/chromium' \
'third_party/devtools-frontend/src/front_end/third_party/codemirror' \
'third_party/devtools-frontend/src/front_end/third_party/fabricjs' \
'third_party/devtools-frontend/src/front_end/third_party/diff' \
'third_party/devtools-frontend/src/front_end/third_party/i18n' \
'third_party/devtools-frontend/src/front_end/third_party/intl-messageformat' \
'third_party/devtools-frontend/src/front_end/third_party/lighthouse' \
@ -1126,7 +1177,6 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/tflite/src/third_party/eigen3' \
'third_party/tflite/src/third_party/fft2d' \
'third_party/tflite-support' \
'third_party/tint' \
'third_party/ukey2' \
'third_party/usb_ids' \
'third_party/usrsctp' \
@ -1166,8 +1216,12 @@ build/linux/unbundle/remove_bundled_libraries.py \
%if ! 0%{?bundlepylibs}
# Look, I don't know. This package is spit and chewing gum. Sorry.
rm -rf third_party/markupsafe
%if 0%{?build_with_python3}
ln -s %{python3_sitearch}/markupsafe third_party/markupsafe
%else
ln -s %{python2_sitearch}/markupsafe third_party/markupsafe
# We should look on removing other python2 packages as well i.e. ply
%endif
# We should look on removing other python packages as well i.e. ply
%endif
export PATH=$PATH:%{_builddir}/depot_tools
@ -1250,8 +1304,13 @@ sed -i 's|exec "${THIS_DIR}/ninja-linux${LONG_BIT}"|exec "/usr/bin/ninja-build"|
%endif
# Check that there is no system 'google' module, shadowing bundled ones:
%if 0%{?build_with_python3}
if python3 -c 'import google ; print google.__path__' 2> /dev/null ; then \
echo "Python 3 'google' module is defined, this will shadow modules of this build"; \
%else
if python2 -c 'import google ; print google.__path__' 2> /dev/null ; then \
echo "Python 2 'google' module is defined, this will shadow modules of this build"; \
%endif
exit 1 ; \
fi
@ -1268,7 +1327,7 @@ python3 -B %{ungoogled_chromium_root}/utils/domain_substitution.py apply . \
%endif
tools/gn/bootstrap/bootstrap.py --gn-gen-args="$UNGOOGLED_CHROMIUM_GN_DEFINES"
%{builddir}/gn --script-executable=%{__python2} gen --args="$UNGOOGLED_CHROMIUM_GN_DEFINES" %{builddir}
%{builddir}/gn --script-executable=%{chromium_pybin} gen --args="$UNGOOGLED_CHROMIUM_GN_DEFINES" %{builddir}
%if %{bundlelibusbx}
# no hackity hack hack
@ -1298,7 +1357,8 @@ tar xf %{SOURCE20}
. /opt/rh/gcc-toolset-%{dts_version}/enable
%endif
export PYTHONPATH="../../third_party/pyjson5/src:../../third_party/catapult/third_party/google-endpoints:../../xcb-proto-1.14"
# export PYTHONPATH="../../third_party/pyjson5/src:../../third_party/catapult/third_party/google-endpoints:../../xcb-proto-1.14"
export PYTHONPATH="../../third_party/pyjson5/src:../../xcb-proto-1.14"
echo
# Now do the full browser
@ -1537,6 +1597,9 @@ fi
%endif
%changelog
* Mon Aug 9 2021 wchen342 <[email protected]> - 92.0.4515.131-1
- update Chromium to 92.0.4515.131
* Fri Jul 16 2021 wchen342 <[email protected]> - 91.0.4472.164-1
- update Chromium to 91.0.4472.164

Loading…
Cancel
Save