The package rpms/chromium.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/chromium.git/commit/?id=1ef42a21d...
https://src.fedoraproject.org/cgit/rpms/chromium.git/commit/?id=5a0168685....
Change:
-%ifarch x86_64
+%ifarch %{ix86}
Thanks.
Full change:
============
commit 0f0792f310ed8f54ca8bf6b73f6c020253dc5f54
Author: Tomas Popela <tpopela(a)redhat.com>
Date: Mon Sep 23 17:25:20 2019 +0200
Fix the icon
Remove quite a few of downstream patches
Fix the crashes by backporting an upstream bug
Resolves: rhbz#1754179
diff --git a/chromium-77.0.3865.90-linked-hash-set.patch
b/chromium-77.0.3865.90-linked-hash-set.patch
new file mode 100644
index 0000000..f921f1a
--- /dev/null
+++ b/chromium-77.0.3865.90-linked-hash-set.patch
@@ -0,0 +1,130 @@
+From 74138b9febd37eac0fc26b8efb110014a83a52c6 Mon Sep 17 00:00:00 2001
+From: Jeremy Roman <jbroman(a)chromium.org>
+Date: Wed, 07 Aug 2019 13:26:48 +0000
+Subject: [PATCH] WTF: Make LinkedHashSet understand values for which memset
initialization would be bad.
+
+Includes a unit test which fails before, and uses this to fix FontCacheKeyTraits.
+
+Bug: 980025
+Change-Id: If41f97444c7fd37b9b95d6dadaf3da5689079e9e
+Reviewed-on:
https://chromium-review.googlesource.com/c/chromium/src/+/1739948
+Reviewed-by: Kentaro Hara <haraken(a)chromium.org>
+Reviewed-by: Yutaka Hirano <yhirano(a)chromium.org>
+Commit-Queue: Jeremy Roman <jbroman(a)chromium.org>
+Cr-Commit-Position: refs/heads/master@{#684731}
+---
+
+diff --git a/third_party/blink/renderer/platform/fonts/font_cache_key.h
b/third_party/blink/renderer/platform/fonts/font_cache_key.h
+index 0efc8fb..90063cb 100644
+--- a/third_party/blink/renderer/platform/fonts/font_cache_key.h
++++ b/third_party/blink/renderer/platform/fonts/font_cache_key.h
+@@ -133,6 +133,10 @@
+
+ struct FontCacheKeyTraits : WTF::SimpleClassHashTraits<FontCacheKey> {
+ STATIC_ONLY(FontCacheKeyTraits);
++
++ // std::string's empty state need not be zero in all implementations,
++ // and it is held within FontFaceCreationParams.
++ static const bool kEmptyValueIsZero = false;
+ };
+
+ } // namespace blink
+diff --git a/third_party/blink/renderer/platform/wtf/linked_hash_set.h
b/third_party/blink/renderer/platform/wtf/linked_hash_set.h
+index b35b6e9..77e524c 100644
+--- a/third_party/blink/renderer/platform/wtf/linked_hash_set.h
++++ b/third_party/blink/renderer/platform/wtf/linked_hash_set.h
+@@ -146,6 +146,11 @@
+ LinkedHashSetNodeBase* next)
+ : LinkedHashSetNodeBase(prev, next), value_(value) {}
+
++ LinkedHashSetNode(ValueArg&& value,
++ LinkedHashSetNodeBase* prev,
++ LinkedHashSetNodeBase* next)
++ : LinkedHashSetNodeBase(prev, next), value_(std::move(value)) {}
++
+ LinkedHashSetNode(LinkedHashSetNode&& other)
+ : LinkedHashSetNodeBase(std::move(other)),
+ value_(std::move(other.value_)) {}
+@@ -445,10 +450,13 @@
+
+ // The slot is empty when the next_ field is zero so it's safe to zero
+ // the backing.
+- static const bool kEmptyValueIsZero = true;
++ static const bool kEmptyValueIsZero = ValueTraits::kEmptyValueIsZero;
+
+ static const bool kHasIsEmptyValueFunction = true;
+ static bool IsEmptyValue(const Node& node) { return !node.next_; }
++ static Node EmptyValue() {
++ return Node(ValueTraits::EmptyValue(), nullptr, nullptr);
++ }
+
+ static const int kDeletedValue = -1;
+
+diff --git a/third_party/blink/renderer/platform/wtf/list_hash_set_test.cc
b/third_party/blink/renderer/platform/wtf/list_hash_set_test.cc
+index 4c3f899..cd1be00 100644
+--- a/third_party/blink/renderer/platform/wtf/list_hash_set_test.cc
++++ b/third_party/blink/renderer/platform/wtf/list_hash_set_test.cc
+@@ -487,6 +487,7 @@
+ };
+
+ struct Complicated {
++ Complicated() : Complicated(0) {}
+ Complicated(int value) : simple_(value) { objects_constructed_++; }
+
+ Complicated(const Complicated& other) : simple_(other.simple_) {
+@@ -495,9 +496,6 @@
+
+ Simple simple_;
+ static int objects_constructed_;
+-
+- private:
+- Complicated() = delete;
+ };
+
+ int Complicated::objects_constructed_ = 0;
+@@ -731,4 +729,45 @@
+
+ } // anonymous namespace
+
++// A unit type which objects to its state being initialized wrong.
++struct InvalidZeroValue {
++ InvalidZeroValue() = default;
++ InvalidZeroValue(WTF::HashTableDeletedValueType) : deleted_(true) {}
++ ~InvalidZeroValue() { CHECK(ok_); }
++ bool IsHashTableDeletedValue() const { return deleted_; }
++
++ bool ok_ = true;
++ bool deleted_ = false;
++};
++
++template <>
++struct HashTraits<InvalidZeroValue> :
SimpleClassHashTraits<InvalidZeroValue> {
++ static const bool kEmptyValueIsZero = false;
++};
++
++template <>
++struct DefaultHash<InvalidZeroValue> {
++ struct Hash {
++ static unsigned GetHash(const InvalidZeroValue&) { return 0; }
++ static bool Equal(const InvalidZeroValue&, const InvalidZeroValue&) {
++ return true;
++ }
++ };
++};
++
++template <typename Set>
++class ListOrLinkedHashSetInvalidZeroTest : public testing::Test {};
++
++using InvalidZeroValueSetTypes =
++ testing::Types<ListHashSet<InvalidZeroValue>,
++ ListHashSet<InvalidZeroValue, 1>,
++ LinkedHashSet<InvalidZeroValue>>;
++TYPED_TEST_SUITE(ListOrLinkedHashSetInvalidZeroTest, InvalidZeroValueSetTypes);
++
++TYPED_TEST(ListOrLinkedHashSetInvalidZeroTest, InvalidZeroValue) {
++ using Set = TypeParam;
++ Set set;
++ set.insert(InvalidZeroValue());
++}
++
+ } // namespace WTF
diff --git a/chromium.spec b/chromium.spec
index a37d653..1542845 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -162,7 +162,7 @@ Name: chromium%{chromium_channel}%{?freeworld:-freeworld}
Name: chromium%{chromium_channel}
%endif
Version: %{majorversion}.0.3865.90
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A WebKit (Blink) powered web browser
Url:
http://www.chromium.org/Home
License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and
(MPLv1.1 or GPLv2 or LGPLv2)
@@ -222,6 +222,8 @@ Patch58: chromium-77.0.3865.75-harfbuzz-subset.patch
Patch59: chromium-77.0.3865.75-gcc-abstract-class.patch
#
https://chromium.googlesource.com/chromium/src/+/5baf7df7f4c5971dab552897...
Patch60: chromium-77.0.3865.75-missing-limits.patch
+#
https://chromium.googlesource.com/chromium/src/+/74138b9febd37eac0fc26b8e...
+Patch61: chromium-77.0.3865.90-linked-hash-set.patch
# Use lstdc++ on EPEL7 only
Patch101: chromium-75.0.3770.100-epel7-stdc++.patch
@@ -739,6 +741,7 @@ udev.
%patch58 -p1 -b .harfbuzz-subset
%patch59 -p1 -b .gcc-abstract-class
%patch60 -p1 -b .missing-limits
+%patch61 -p1 -b .linked-hash-set
# Fedora branded user agent
%if 0%{?fedora}
@@ -1643,6 +1646,12 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r
chrome-remote-deskt
%changelog
+* Mon Sep 23 2019 Tomas Popela <tpopela(a)redhat.com> - 77.0.3865.90-2
+- Fix the icon
+- Remove quite a few of downstream patches
+- Fix the crashes by backporting an upstream bug
+- Resolves: rhbz#1754179
+
* Thu Sep 19 2019 Tomas Popela <tpopela(a)redhat.com> - 77.0.3865.90-1
- Update to 77.0.3865.90
commit 6aa7bda96ed4de25260acb5a9e907d5ff1fa1368
Author: Tomas Popela <tpopela(a)redhat.com>
Date: Mon Sep 23 17:21:06 2019 +0200
Fix the icon
So the monochromatic icon is being shown even in the GNOME's overview
and it's ugly (as it's upscaled from 22x22). Remove it.
diff --git a/chromium.spec b/chromium.spec
index e426495..a37d653 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -1399,8 +1399,6 @@ mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
cp -a chrome/app/theme/chromium/product_logo_48.png
%{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{chromium_browser_channel}.png
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/24x24/apps
cp -a chrome/app/theme/chromium/product_logo_24.png
%{buildroot}%{_datadir}/icons/hicolor/24x24/apps/%{chromium_browser_channel}.png
-mkdir -p %{buildroot}%{_datadir}/icons/hicolor/symbolic/apps
-cp -a chrome/app/theme/chromium/product_logo_22_mono.png
%{buildroot}%{_datadir}/icons/hicolor/symbolic/apps/%{chromium_browser_channel}.png
# Install the master_preferences file
mkdir -p %{buildroot}%{_sysconfdir}/%{name}
commit 5a0168685de2184cd3ce9b36a80febe22a738e54
Author: Tomas Popela <tpopela(a)redhat.com>
Date: Fri Sep 20 09:57:18 2019 +0200
Remove the unused patches or patches that are not needed anymore
Also replace some patches with changes in the SPEC file.
diff --git a/chromium-45.0.2454.101-linux-path-max.patch
b/chromium-45.0.2454.101-linux-path-max.patch
deleted file mode 100644
index 3146349..0000000
--- a/chromium-45.0.2454.101-linux-path-max.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -up chromium-45.0.2454.101/native_client_sdk/src/libraries/nacl_io/path.h.pathmax
chromium-45.0.2454.101/native_client_sdk/src/libraries/nacl_io/path.h
----
chromium-45.0.2454.101/native_client_sdk/src/libraries/nacl_io/path.h.pathmax 2015-10-07
11:26:11.813477839 -0400
-+++ chromium-45.0.2454.101/native_client_sdk/src/libraries/nacl_io/path.h 2015-10-07
11:26:40.845845054 -0400
-@@ -12,6 +12,11 @@
-
- #include "sdk_util/macros.h"
-
-+/* Needed for PATH_MAX */
-+#ifndef PATH_MAX
-+#define PATH_MAX 4096
-+#endif
-+
- namespace nacl_io {
-
- class Path {
-diff -up chromium-45.0.2454.101/native_client/src/untrusted/nacl/getcwd.c.pathmax
chromium-45.0.2454.101/native_client/src/untrusted/nacl/getcwd.c
---- chromium-45.0.2454.101/native_client/src/untrusted/nacl/getcwd.c.pathmax 2015-08-22
15:02:08.000000000 -0400
-+++ chromium-45.0.2454.101/native_client/src/untrusted/nacl/getcwd.c 2015-10-07
10:58:56.172018783 -0400
-@@ -11,6 +11,10 @@
-
- #include <errno.h>
- #include <limits.h>
-+/* Needed for PATH_MAX */
-+#ifndef PATH_MAX
-+#define PATH_MAX 4096
-+#endif
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
-diff -up
chromium-45.0.2454.101/native_client_sdk/src/libraries/nacl_io/syscalls/realpath.c.pathmax
chromium-45.0.2454.101/native_client_sdk/src/libraries/nacl_io/syscalls/realpath.c
----
chromium-45.0.2454.101/native_client_sdk/src/libraries/nacl_io/syscalls/realpath.c.pathmax 2015-10-09
10:57:38.424348662 -0400
-+++
chromium-45.0.2454.101/native_client_sdk/src/libraries/nacl_io/syscalls/realpath.c 2015-10-09
10:57:51.541059938 -0400
-@@ -13,6 +13,11 @@
-
- #include "sdk_util/macros.h"
-
-+/* Needed for PATH_MAX */
-+#ifndef PATH_MAX
-+#define PATH_MAX 4096
-+#endif
-+
- EXTERN_C_BEGIN
-
- #if defined(__native_client__)
diff --git a/chromium-53.0.2785.92-boringssl-time-fix.patch
b/chromium-53.0.2785.92-boringssl-time-fix.patch
deleted file mode 100644
index 8d67957..0000000
--- a/chromium-53.0.2785.92-boringssl-time-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up chromium-53.0.2785.92/third_party/boringssl/src/crypto/x509/by_dir.c.timefix
chromium-53.0.2785.92/third_party/boringssl/src/crypto/x509/by_dir.c
----
chromium-53.0.2785.92/third_party/boringssl/src/crypto/x509/by_dir.c.timefix 2016-09-06
15:20:06.094396255 -0400
-+++ chromium-53.0.2785.92/third_party/boringssl/src/crypto/x509/by_dir.c 2016-09-06
15:20:16.893187930 -0400
-@@ -56,6 +56,7 @@
- * [including the GNU Public Licence.] */
-
- #include <string.h>
-+#include <time.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-
diff --git a/chromium-54.0.2840.59-jpeg-include-dir.patch
b/chromium-54.0.2840.59-jpeg-include-dir.patch
deleted file mode 100644
index f96a56c..0000000
--- a/chromium-54.0.2840.59-jpeg-include-dir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up chromium-54.0.2840.59/third_party/BUILD.gn.jpegfix
chromium-54.0.2840.59/third_party/BUILD.gn
---- chromium-54.0.2840.59/third_party/BUILD.gn.jpegfix 2016-10-17 11:45:44.995340495
-0400
-+++ chromium-54.0.2840.59/third_party/BUILD.gn 2016-10-17 11:46:35.254289872 -0400
-@@ -20,6 +20,7 @@ declare_args() {
- config("system_libjpeg_config") {
- libs = [ "jpeg" ]
- defines = [ "USE_SYSTEM_LIBJPEG" ]
-+ include_dirs = [ "/usr/include/" ]
- }
-
- config("libjpeg_turbo_config") {
diff --git a/chromium-55.0.2883.75-addrfix.patch b/chromium-55.0.2883.75-addrfix.patch
deleted file mode 100644
index 00c214c..0000000
--- a/chromium-55.0.2883.75-addrfix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up chromium-55.0.2883.75/third_party/boringssl/BUILD.gn.addrfix
chromium-55.0.2883.75/third_party/boringssl/BUILD.gn
---- chromium-55.0.2883.75/third_party/boringssl/BUILD.gn.addrfix 2016-12-12
15:30:27.727834891 -0500
-+++ chromium-55.0.2883.75/third_party/boringssl/BUILD.gn 2016-12-12 15:30:53.095709352
-0500
-@@ -24,6 +24,7 @@ config("internal_config") {
- "BORINGSSL_IMPLEMENTATION",
- "BORINGSSL_NO_STATIC_INITIALIZER",
- "OPENSSL_SMALL",
-+ "_POSIX_C_SOURCE=200112L",
- ]
- configs = [
- # TODO(davidben): Fix size_t truncations in BoringSSL.
diff --git a/chromium-59.0.3071.86-i686-ld-memory-tricks.patch
b/chromium-59.0.3071.86-i686-ld-memory-tricks.patch
deleted file mode 100644
index 9dde4c5..0000000
--- a/chromium-59.0.3071.86-i686-ld-memory-tricks.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up chromium-59.0.3071.86/build/toolchain/linux/BUILD.gn.ldmemory
chromium-59.0.3071.86/build/toolchain/linux/BUILD.gn
---- chromium-59.0.3071.86/build/toolchain/linux/BUILD.gn.ldmemory 2017-06-07
15:37:09.436616113 -0400
-+++ chromium-59.0.3071.86/build/toolchain/linux/BUILD.gn 2017-06-07 15:38:04.508519102
-0400
-@@ -93,7 +93,7 @@ gcc_toolchain("x86") {
- nm = "nm"
- ar = "ar"
- ld = cxx
-- extra_cppflags = "-fno-delete-null-pointer-checks"
-+ extra_cppflags = "-fno-delete-null-pointer-checks -g1"
-
- # Output linker map files for binary size analysis.
- enable_linker_map = true
diff --git a/chromium-60.0.3112.113-libavutil-timer-include-path-fix.patch
b/chromium-60.0.3112.113-libavutil-timer-include-path-fix.patch
deleted file mode 100644
index 7248825..0000000
--- a/chromium-60.0.3112.113-libavutil-timer-include-path-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up chromium-60.0.3112.113/third_party/ffmpeg/libavutil/timer.h.pathfix
chromium-60.0.3112.113/third_party/ffmpeg/libavutil/timer.h
---- chromium-60.0.3112.113/third_party/ffmpeg/libavutil/timer.h.pathfix 2017-08-25
15:29:12.143242471 -0400
-+++ chromium-60.0.3112.113/third_party/ffmpeg/libavutil/timer.h 2017-08-25
15:29:36.941835865 -0400
-@@ -39,13 +39,13 @@
- #include "log.h"
-
- #if ARCH_AARCH64
--# include "aarch64/timer.h"
-+# include "libavutil/aarch64/timer.h"
- #elif ARCH_ARM
--# include "arm/timer.h"
-+# include "libavutil/arm/timer.h"
- #elif ARCH_PPC
--# include "ppc/timer.h"
-+# include "libavutil/ppc/timer.h"
- #elif ARCH_X86
--# include "x86/timer.h"
-+# include "libavutil/x86/timer.h"
- #endif
-
- #if !defined(AV_READ_TIME)
diff --git a/chromium-62.0.3202.62-kmaxskip-constexpr.patch
b/chromium-62.0.3202.62-kmaxskip-constexpr.patch
deleted file mode 100644
index d4f8250..0000000
--- a/chromium-62.0.3202.62-kmaxskip-constexpr.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up chromium-62.0.3202.62/cc/paint/paint_op_buffer.cc.kmaxskip
chromium-62.0.3202.62/cc/paint/paint_op_buffer.cc
---- chromium-62.0.3202.62/cc/paint/paint_op_buffer.cc.kmaxskip 2017-10-18
10:00:28.503714392 -0400
-+++ chromium-62.0.3202.62/cc/paint/paint_op_buffer.cc 2017-10-18 10:00:43.153430212
-0400
-@@ -336,7 +336,7 @@ TYPES(M);
- #undef TYPES
-
- const SkRect PaintOp::kUnsetRect = {SK_ScalarInfinity, 0, 0, 0};
--const size_t PaintOp::kMaxSkip;
-+constexpr size_t PaintOp::kMaxSkip;
-
- std::string PaintOpTypeToString(PaintOpType type) {
- switch (type) {
diff --git a/chromium-63.0.3289.84-nullfix.patch b/chromium-63.0.3289.84-nullfix.patch
deleted file mode 100644
index c66aff1..0000000
--- a/chromium-63.0.3289.84-nullfix.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -up chromium-63.0.3239.84/build/toolchain/linux/BUILD.gn.nullfix
chromium-63.0.3239.84/build/toolchain/linux/BUILD.gn
---- chromium-63.0.3239.84/build/toolchain/linux/BUILD.gn.nullfix 2017-12-06
15:05:21.000000000 -0500
-+++ chromium-63.0.3239.84/build/toolchain/linux/BUILD.gn 2017-12-07 10:44:34.507207080
-0500
-@@ -31,6 +31,7 @@ gcc_toolchain("arm64") {
- ld = cxx
- readelf = "${toolprefix}readelf"
- nm = "${toolprefix}nm"
-+ extra_cppflags = "-fno-delete-null-pointer-checks"
-
- toolchain_args = {
- current_cpu = "arm64"
-@@ -49,6 +50,7 @@ gcc_toolchain("arm") {
- ld = cxx
- readelf = "${toolprefix}readelf"
- nm = "${toolprefix}nm"
-+ extra_cppflags = "-fno-delete-null-pointer-checks"
-
- toolchain_args = {
- current_cpu = "arm"
-@@ -99,6 +101,7 @@ gcc_toolchain("x86") {
- nm = "nm"
- ar = "ar"
- ld = cxx
-+ extra_cppflags = "-fno-delete-null-pointer-checks"
-
- # Output linker map files for binary size analysis.
- enable_linker_map = true
-@@ -152,6 +155,7 @@ gcc_toolchain("x64") {
- nm = "nm"
- ar = "ar"
- ld = cxx
-+ extra_cppflags = "-fno-delete-null-pointer-checks"
-
- # Output linker map files for binary size analysis.
- enable_linker_map = true
-@@ -186,6 +190,7 @@ gcc_toolchain("mipsel") {
- ld = cxx
- readelf = "${toolprefix}readelf"
- nm = "${toolprefix}nm"
-+ extra_cppflags = "-fno-delete-null-pointer-checks"
-
- toolchain_args = {
- cc_wrapper = ""
diff --git a/chromium-64.0.3282.119-ffmpeg-stdatomic.patch
b/chromium-64.0.3282.119-ffmpeg-stdatomic.patch
deleted file mode 100644
index 64c5f26..0000000
--- a/chromium-64.0.3282.119-ffmpeg-stdatomic.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -up chromium-64.0.3282.119/third_party/ffmpeg/libavutil/cpu.c.ffmpeg-stdatomic
chromium-64.0.3282.119/third_party/ffmpeg/libavutil/cpu.c
---- chromium-64.0.3282.119/third_party/ffmpeg/libavutil/cpu.c.ffmpeg-stdatomic 2018-01-25
11:55:57.880936815 -0500
-+++ chromium-64.0.3282.119/third_party/ffmpeg/libavutil/cpu.c 2018-01-25
11:57:18.456787888 -0500
-@@ -18,7 +18,13 @@
-
- #include <stddef.h>
- #include <stdint.h>
-+// GCC 4.8 didn't have stdatomic, but was advertising it.
-+//
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58016
-+#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ == 4 ||
(__GNUC__ == 4 && (__GNUC_MINOR__ == 8)))
-+#include <compat/atomics/gcc/stdatomic.h>
-+#else
- #include <stdatomic.h>
-+#endif
-
- #include "attributes.h"
- #include "cpu.h"
diff --git a/chromium-65.0.3325.146-gcc-round-fix.patch
b/chromium-65.0.3325.146-gcc-round-fix.patch
deleted file mode 100644
index a29779d..0000000
--- a/chromium-65.0.3325.146-gcc-round-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up chromium-65.0.3325.146/third_party/webrtc/p2p/base/port.cc.gcc-round-fix
chromium-65.0.3325.146/third_party/webrtc/p2p/base/port.cc
---- chromium-65.0.3325.146/third_party/webrtc/p2p/base/port.cc.gcc-round-fix 2018-03-07
10:57:11.284376048 -0500
-+++ chromium-65.0.3325.146/third_party/webrtc/p2p/base/port.cc 2018-03-07
10:58:16.590742636 -0500
-@@ -10,7 +10,7 @@
-
- #include "p2p/base/port.h"
-
--#include <math.h>
-+#include <cmath>
-
- #include <algorithm>
- #include <utility>
diff --git a/chromium-65.0.3325.146-memcpy-fix.patch
b/chromium-65.0.3325.146-memcpy-fix.patch
deleted file mode 100644
index b2b2cd4..0000000
--- a/chromium-65.0.3325.146-memcpy-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up chromium-65.0.3325.146/cc/paint/raw_memory_transfer_cache_entry.cc.memcpyfix
chromium-65.0.3325.146/cc/paint/raw_memory_transfer_cache_entry.cc
----
chromium-65.0.3325.146/cc/paint/raw_memory_transfer_cache_entry.cc.memcpyfix 2018-03-07
11:04:14.690379817 -0500
-+++ chromium-65.0.3325.146/cc/paint/raw_memory_transfer_cache_entry.cc 2018-03-07
11:06:04.339878069 -0500
-@@ -3,7 +3,7 @@
- // found in the LICENSE file.
-
- #include "cc/paint/raw_memory_transfer_cache_entry.h"
--
-+#include <memory.h>
- #include <string.h>
-
- namespace cc {
diff --git a/chromium-66.0.3359.117-GCC-fully-declare-ConfigurationPolicyProvider.patch
b/chromium-66.0.3359.117-GCC-fully-declare-ConfigurationPolicyProvider.patch
deleted file mode 100644
index d5b19cf..0000000
--- a/chromium-66.0.3359.117-GCC-fully-declare-ConfigurationPolicyProvider.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -up
chromium-66.0.3359.117/components/policy/core/browser/browser_policy_connector_base.h.gcc-cpolicyprovider
chromium-66.0.3359.117/components/policy/core/browser/browser_policy_connector_base.h
----
chromium-66.0.3359.117/components/policy/core/browser/browser_policy_connector_base.h.gcc-cpolicyprovider 2018-04-25
16:33:40.872222779 -0400
-+++
chromium-66.0.3359.117/components/policy/core/browser/browser_policy_connector_base.h 2018-04-25
16:37:23.175883637 -0400
-@@ -11,13 +11,13 @@
- #include "base/callback_forward.h"
- #include "base/macros.h"
- #include "components/policy/core/browser/configuration_policy_handler_list.h"
-+#include "components/policy/core/common/configuration_policy_provider.h"
- #include "components/policy/core/common/schema.h"
- #include "components/policy/core/common/schema_registry.h"
- #include "components/policy/policy_export.h"
-
- namespace policy {
-
--class ConfigurationPolicyProvider;
- class PolicyService;
- class PolicyServiceImpl;
-
diff --git a/chromium-66.0.3359.117-system-clang.patch
b/chromium-66.0.3359.117-system-clang.patch
deleted file mode 100644
index e90dc58..0000000
--- a/chromium-66.0.3359.117-system-clang.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up chromium-66.0.3359.117/build/config/clang/clang.gni.system-clang
chromium-66.0.3359.117/build/config/clang/clang.gni
---- chromium-66.0.3359.117/build/config/clang/clang.gni.system-clang 2018-04-18
12:08:45.658190297 -0400
-+++ chromium-66.0.3359.117/build/config/clang/clang.gni 2018-04-18 12:09:37.612032982
-0400
-@@ -4,7 +4,7 @@
-
- import("//build/toolchain/toolchain.gni")
-
--default_clang_base_path = "//third_party/llvm-build/Release+Asserts"
-+default_clang_base_path = "/usr"
-
- declare_args() {
- # Indicates if the build should use the Chrome-specific plugins for enforcing
diff --git a/chromium-67.0.3396.62-gcc5.patch b/chromium-67.0.3396.62-gcc5.patch
deleted file mode 100644
index ceef85d..0000000
--- a/chromium-67.0.3396.62-gcc5.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up chromium-67.0.3396.62/third_party/webgl/src/specs/latest/2.0/webgl2.idl.gcc5
chromium-67.0.3396.62/third_party/webgl/src/specs/latest/2.0/webgl2.idl
----
chromium-67.0.3396.62/third_party/webgl/src/specs/latest/2.0/webgl2.idl.gcc5 2018-05-30
04:44:33.000000000 -0400
-+++ chromium-67.0.3396.62/third_party/webgl/src/specs/latest/2.0/webgl2.idl 2018-05-30
11:59:26.218625660 -0400
-@@ -262,7 +262,7 @@ interface mixin WebGL2RenderingContextBa
- const GLenum UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES = 0x8A43;
- const GLenum UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER = 0x8A44;
- const GLenum UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER = 0x8A46;
-- const GLenum INVALID_INDEX = 0xFFFFFFFF;
-+ const GLenum INVALID_INDEX = 256;
- const GLenum MAX_VERTEX_OUTPUT_COMPONENTS = 0x9122;
- const GLenum MAX_FRAGMENT_INPUT_COMPONENTS = 0x9125;
- const GLenum MAX_SERVER_WAIT_TIMEOUT = 0x9111;
diff --git a/chromium-68.0.3440.106-fix-default-on-redeclaration.patch
b/chromium-68.0.3440.106-fix-default-on-redeclaration.patch
deleted file mode 100644
index 4a92fba..0000000
--- a/chromium-68.0.3440.106-fix-default-on-redeclaration.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -up chromium-68.0.3440.106/components/search_provider_logos/logo_common.cc.122692c
chromium-68.0.3440.106/components/search_provider_logos/logo_common.cc
----
chromium-68.0.3440.106/components/search_provider_logos/logo_common.cc.122692c 2018-08-17
14:54:30.587338865 -0400
-+++ chromium-68.0.3440.106/components/search_provider_logos/logo_common.cc 2018-08-17
14:55:20.461184298 -0400
-@@ -14,22 +14,22 @@ LogoMetadata::LogoMetadata() = default;
- LogoMetadata::LogoMetadata(const LogoMetadata&) = default;
- LogoMetadata::LogoMetadata(LogoMetadata&&) noexcept = default;
- LogoMetadata& LogoMetadata::operator=(const LogoMetadata&) = default;
--LogoMetadata& LogoMetadata::operator=(LogoMetadata&&) noexcept = default;
-+LogoMetadata& LogoMetadata::operator=(LogoMetadata&&) = default;
- LogoMetadata::~LogoMetadata() = default;
-
- EncodedLogo::EncodedLogo() = default;
- EncodedLogo::EncodedLogo(const EncodedLogo&) = default;
- EncodedLogo::EncodedLogo(EncodedLogo&&) noexcept = default;
- EncodedLogo& EncodedLogo::operator=(const EncodedLogo&) = default;
--EncodedLogo& EncodedLogo::operator=(EncodedLogo&&) noexcept = default;
-+EncodedLogo& EncodedLogo::operator=(EncodedLogo&&) = default;
- EncodedLogo::~EncodedLogo() = default;
-
- Logo::Logo() = default;
- Logo::~Logo() = default;
-
- LogoCallbacks::LogoCallbacks() = default;
--LogoCallbacks::LogoCallbacks(LogoCallbacks&&) noexcept = default;
--LogoCallbacks& LogoCallbacks::operator=(LogoCallbacks&&) noexcept =
default;
-+LogoCallbacks::LogoCallbacks(LogoCallbacks&&) = default;
-+LogoCallbacks& LogoCallbacks::operator=(LogoCallbacks&&) = default;
- LogoCallbacks::~LogoCallbacks() = default;
-
- } // namespace search_provider_logos
diff --git a/chromium-69.0.3497.81-build-sanely-please.patch
b/chromium-69.0.3497.81-build-sanely-please.patch
deleted file mode 100644
index 6241a97..0000000
--- a/chromium-69.0.3497.81-build-sanely-please.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -up chromium-69.0.3497.81/build/config/BUILD.gn.fyoursysroot
chromium-69.0.3497.81/build/config/BUILD.gn
---- chromium-69.0.3497.81/build/config/BUILD.gn.fyoursysroot 2018-09-06
13:43:44.863375238 -0400
-+++ chromium-69.0.3497.81/build/config/BUILD.gn 2018-09-06 13:43:58.377083290 -0400
-@@ -284,9 +284,9 @@ group("executable_and_loadable_module_an
- public_deps += [ "//build/config/sanitizers:deps" ]
- }
-
-- if (use_custom_libcxx) {
-- public_deps += [ "//buildtools/third_party/libc++" ]
-- }
-+ # if (use_custom_libcxx) {
-+ # public_deps += [ "//buildtools/third_party/libc++" ]
-+ # }
-
- if (use_afl) {
- public_deps += [ "//third_party/afl" ]
-diff -up chromium-69.0.3497.81/build/config/sysroot.gni.fyoursysroot
chromium-69.0.3497.81/build/config/sysroot.gni
---- chromium-69.0.3497.81/build/config/sysroot.gni.fyoursysroot 2018-09-06
13:40:46.212232232 -0400
-+++ chromium-69.0.3497.81/build/config/sysroot.gni 2018-09-06 13:41:02.421882529 -0400
-@@ -15,9 +15,10 @@ declare_args() {
- # The absolute path to directory containing linux sysroot images
- target_sysroot_dir = "//build/linux"
-
-- use_sysroot = current_cpu == "x86" || current_cpu == "x64" ||
-- current_cpu == "arm" || current_cpu == "arm64" ||
-- current_cpu == "mipsel" || current_cpu ==
"mips64el"
-+ use_sysroot = false
-+ # use_sysroot = current_cpu == "x86" || current_cpu == "x64" ||
-+ # current_cpu == "arm" || current_cpu == "arm64" ||
-+ # current_cpu == "mipsel" || current_cpu ==
"mips64el"
- }
-
- if (current_os == target_os && current_cpu == target_cpu &&
diff --git a/chromium-70.0.3538.77-aarch64-arch-want-new-stat.patch
b/chromium-70.0.3538.77-aarch64-arch-want-new-stat.patch
deleted file mode 100644
index ccecfcb..0000000
--- a/chromium-70.0.3538.77-aarch64-arch-want-new-stat.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up
chromium-70.0.3538.77/sandbox/linux/system_headers/arm64_linux_syscalls.h.aarch64-new-stat
chromium-70.0.3538.77/sandbox/linux/system_headers/arm64_linux_syscalls.h
----
chromium-70.0.3538.77/sandbox/linux/system_headers/arm64_linux_syscalls.h.aarch64-new-stat 2018-11-06
13:27:05.118766581 -0500
-+++ chromium-70.0.3538.77/sandbox/linux/system_headers/arm64_linux_syscalls.h 2018-11-06
13:27:34.575204504 -0500
-@@ -5,6 +5,8 @@
- #ifndef SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_
- #define SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_
-
-+#define __ARCH_WANT_NEW_STAT
-+
- #include <asm-generic/unistd.h>
-
- #if !defined(__NR_io_setup)
diff --git a/chromium-71.0.3578.98-skia-aarch64-buildfix.patch
b/chromium-71.0.3578.98-skia-aarch64-buildfix.patch
deleted file mode 100644
index 5da1674..0000000
--- a/chromium-71.0.3578.98-skia-aarch64-buildfix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up
chromium-71.0.3578.98/third_party/skia/src/opts/SkRasterPipeline_opts.h.aarch64fix
chromium-71.0.3578.98/third_party/skia/src/opts/SkRasterPipeline_opts.h
----
chromium-71.0.3578.98/third_party/skia/src/opts/SkRasterPipeline_opts.h.aarch64fix 2018-12-14
11:17:43.249121756 -0500
-+++ chromium-71.0.3578.98/third_party/skia/src/opts/SkRasterPipeline_opts.h 2018-12-14
11:20:07.770030234 -0500
-@@ -658,7 +658,7 @@ SI F approx_powf(F x, F y) {
- }
-
- SI F from_half(U16 h) {
--#if defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary
workaround for some Google3 builds.
-+#if defined(JUMPER_IS_NEON) && defined(__aarch64__) &&
!defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
- return vcvt_f32_f16(h);
-
- #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
-@@ -678,7 +678,7 @@ SI F from_half(U16 h) {
- }
-
- SI U16 to_half(F f) {
--#if defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary
workaround for some Google3 builds.
-+#if defined(JUMPER_IS_NEON) && defined(__aarch64__) &&
!defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
- return vcvt_f16_f32(f);
-
- #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
diff --git a/chromium-72.0.3626.121-notest.patch b/chromium-72.0.3626.121-notest.patch
deleted file mode 100644
index e8b7bf4..0000000
--- a/chromium-72.0.3626.121-notest.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up chromium-72.0.3626.121/chrome/test/data/webui_test_resources.grd.notest
chromium-72.0.3626.121/chrome/test/data/webui_test_resources.grd
---- chromium-72.0.3626.121/chrome/test/data/webui_test_resources.grd.notest 2019-03-10
13:54:17.843583876 -0400
-+++ chromium-72.0.3626.121/chrome/test/data/webui_test_resources.grd 2019-03-10
14:03:29.302063637 -0400
-@@ -8,7 +8,6 @@
- </outputs>
- <release seq="1">
- <includes>
-- <include name="IDR_WEBUI_TEST_I18N_PROCESS_CSS_TEST"
file="webui/i18n_process_css_test.html" flattenhtml="true"
allowexternalscript="true" type="BINDATA" />
- <include name="IDR_WEB_UI_TEST_MOJO_JS"
file="${root_gen_dir}/chrome/test/data/webui/web_ui_test.mojom.js"
use_base_dir="false" type="BINDATA"/>
- <include name="IDR_WEB_UI_TEST_MOJO_LITE_JS"
file="${root_gen_dir}/chrome/test/data/webui/web_ui_test.mojom-lite.js"
use_base_dir="false" type="BINDATA"/>
- </includes>
diff --git a/chromium-73.0.3683.75-disable-fno-delete-null-pointer-checks.patch
b/chromium-73.0.3683.75-disable-fno-delete-null-pointer-checks.patch
deleted file mode 100644
index f8abb52..0000000
--- a/chromium-73.0.3683.75-disable-fno-delete-null-pointer-checks.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -up chromium-73.0.3683.75/build/toolchain/linux/BUILD.gn.disable-ndnpc
chromium-73.0.3683.75/build/toolchain/linux/BUILD.gn
---- chromium-73.0.3683.75/build/toolchain/linux/BUILD.gn.disable-ndnpc 2019-03-13
10:29:00.331009643 -0400
-+++ chromium-73.0.3683.75/build/toolchain/linux/BUILD.gn 2019-03-13 10:29:28.344458746
-0400
-@@ -31,7 +31,7 @@ gcc_toolchain("arm64") {
- ld = cxx
- readelf = "${toolprefix}readelf"
- nm = "${toolprefix}nm"
-- extra_cppflags = "-fno-delete-null-pointer-checks"
-+ extra_cppflags = ""
-
- toolchain_args = {
- current_cpu = "arm64"
-@@ -50,7 +50,7 @@ gcc_toolchain("arm") {
- ld = cxx
- readelf = "${toolprefix}readelf"
- nm = "${toolprefix}nm"
-- extra_cppflags = "-fno-delete-null-pointer-checks"
-+ extra_cppflags = ""
-
- toolchain_args = {
- current_cpu = "arm"
-@@ -101,7 +101,7 @@ gcc_toolchain("x86") {
- nm = "nm"
- ar = "ar"
- ld = cxx
-- extra_cppflags = "-fno-delete-null-pointer-checks -g1"
-+ extra_cppflags = "-g1"
-
- # Output linker map files for binary size analysis.
- enable_linker_map = true
-@@ -155,7 +155,7 @@ gcc_toolchain("x64") {
- nm = "nm"
- ar = "ar"
- ld = cxx
-- extra_cppflags = "-fno-delete-null-pointer-checks"
-+ extra_cppflags = ""
-
- # Output linker map files for binary size analysis.
- enable_linker_map = true
-@@ -190,7 +190,7 @@ gcc_toolchain("mipsel") {
- ld = cxx
- readelf = "${toolprefix}readelf"
- nm = "${toolprefix}nm"
-- extra_cppflags = "-fno-delete-null-pointer-checks"
-+ extra_cppflags = ""
-
- toolchain_args = {
- cc_wrapper = ""
diff --git a/chromium-75.0.3770.100-git00281713.patch
b/chromium-75.0.3770.100-git00281713.patch
deleted file mode 100644
index 4356435..0000000
--- a/chromium-75.0.3770.100-git00281713.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -up
chromium-75.0.3770.100/chrome/browser/performance_manager/chrome_content_browser_client_performance_manager_part.cc.git00281713
chromium-75.0.3770.100/chrome/browser/performance_manager/chrome_content_browser_client_performance_manager_part.cc
----
chromium-75.0.3770.100/chrome/browser/performance_manager/chrome_content_browser_client_performance_manager_part.cc.git00281713 2019-07-02
09:10:38.951369854 -0400
-+++
chromium-75.0.3770.100/chrome/browser/performance_manager/chrome_content_browser_client_performance_manager_part.cc 2019-07-02
09:11:59.864642942 -0400
-@@ -12,13 +12,19 @@
- #include "chrome/browser/performance_manager/graph/process_node_impl.h"
- #include "chrome/browser/performance_manager/performance_manager.h"
- #include "chrome/browser/performance_manager/render_process_user_data.h"
-+#include "content/public/browser/render_process_host.h"
- #include
"services/resource_coordinator/public/mojom/coordination_unit.mojom.h"
-
- namespace {
-
- void BindProcessNode(
-- content::RenderProcessHost* render_process_host,
-+ int render_process_host_id,
- resource_coordinator::mojom::ProcessCoordinationUnitRequest request) {
-+ content::RenderProcessHost* render_process_host =
-+ content::RenderProcessHost::FromID(render_process_host_id);
-+ if (!render_process_host)
-+ return;
-+
- performance_manager::RenderProcessUserData* user_data =
- performance_manager::RenderProcessUserData::GetForRenderProcessHost(
- render_process_host);
-@@ -47,8 +53,7 @@ void ChromeContentBrowserClientPerforman
- blink::AssociatedInterfaceRegistry* associated_registry,
- content::RenderProcessHost* render_process_host) {
- registry->AddInterface(
-- base::BindRepeating(&BindProcessNode,
-- base::Unretained(render_process_host)),
-+ base::BindRepeating(&BindProcessNode, render_process_host->GetID()),
- base::SequencedTaskRunnerHandle::Get());
-
- // Ideally this would strictly be a "CreateForRenderProcess", but when a
diff --git a/chromium-75.0.3770.80-SIOCGSTAMP.patch
b/chromium-75.0.3770.80-SIOCGSTAMP.patch
deleted file mode 100644
index 0ef1e7f..0000000
--- a/chromium-75.0.3770.80-SIOCGSTAMP.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up
chromium-75.0.3770.80/third_party/webrtc/rtc_base/physical_socket_server.h.SIOCGSTAMP
chromium-75.0.3770.80/third_party/webrtc/rtc_base/physical_socket_server.h
----
chromium-75.0.3770.80/third_party/webrtc/rtc_base/physical_socket_server.h.SIOCGSTAMP 2019-06-06
10:04:57.050403639 -0400
-+++ chromium-75.0.3770.80/third_party/webrtc/rtc_base/physical_socket_server.h 2019-06-06
10:06:03.975121688 -0400
-@@ -16,6 +16,11 @@
- #define WEBRTC_USE_EPOLL 1
- #endif
-
-+// for SIOCGSTAMP in Linux 5.2
-+#if defined(WEBRTC_LINUX)
-+#include <linux/sockios.h>
-+#endif
-+
- #include <memory>
- #include <set>
- #include <vector>
diff --git a/chromium-75.0.3770.80-aeed4d-gcc-dcheck_ne-fix.patch
b/chromium-75.0.3770.80-aeed4d-gcc-dcheck_ne-fix.patch
deleted file mode 100644
index 2a8ac2f..0000000
--- a/chromium-75.0.3770.80-aeed4d-gcc-dcheck_ne-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up
chromium-75.0.3770.80/cc/scheduler/compositor_frame_reporting_controller.cc.gcc-dcheck_ne-fix
chromium-75.0.3770.80/cc/scheduler/compositor_frame_reporting_controller.cc
----
chromium-75.0.3770.80/cc/scheduler/compositor_frame_reporting_controller.cc.gcc-dcheck_ne-fix 2019-06-06
12:42:27.431575032 -0400
-+++
chromium-75.0.3770.80/cc/scheduler/compositor_frame_reporting_controller.cc 2019-06-06
12:43:05.692848409 -0400
-@@ -31,8 +31,8 @@ void CompositorFrameReportingController:
-
- void CompositorFrameReportingController::WillBeginMainFrame() {
- DCHECK(reporters_[PipelineStage::kBeginImplFrame]);
-- DCHECK_NE(reporters_[PipelineStage::kBeginMainFrame],
-- reporters_[PipelineStage::kBeginImplFrame]);
-+ DCHECK(reporters_[PipelineStage::kBeginMainFrame] !=
-+ reporters_[PipelineStage::kBeginImplFrame]);
- reporters_[PipelineStage::kBeginImplFrame]->StartStage(
- "SendBeginMainFrameToCommit");
- AdvanceReporterStage(PipelineStage::kBeginImplFrame,
diff --git a/chromium-75.0.3770.80-gcc-no-assume.patch
b/chromium-75.0.3770.80-gcc-no-assume.patch
deleted file mode 100644
index 0bbb08f..0000000
--- a/chromium-75.0.3770.80-gcc-no-assume.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up chromium-75.0.3770.80/third_party/angle/src/common/debug.h.gcc-assume
chromium-75.0.3770.80/third_party/angle/src/common/debug.h
---- chromium-75.0.3770.80/third_party/angle/src/common/debug.h.gcc-assume 2019-06-06
17:38:01.876631704 -0400
-+++ chromium-75.0.3770.80/third_party/angle/src/common/debug.h 2019-06-07
09:30:06.205446547 -0400
-@@ -248,7 +248,7 @@ std::ostream &FmtHex(std::ostream &os, T
- # define EVENT(message, ...) (void(0))
- #endif
-
--#if defined(COMPILER_GCC) || defined(__clang__)
-+#if defined(__GNUC__)
- # define ANGLE_CRASH() __builtin_trap()
- #else
- # define ANGLE_CRASH() ((void)(*(volatile char *)0 = 0)), __assume(0)
-@@ -336,7 +336,7 @@ std::ostream &FmtHex(std::ostream &os, T
- # define ANGLE_ENABLE_STRUCT_PADDING_WARNINGS \
- _Pragma("clang diagnostic push") _Pragma("clang diagnostic error
\"-Wpadded\"")
- # define ANGLE_DISABLE_STRUCT_PADDING_WARNINGS _Pragma("clang diagnostic
pop")
--#elif defined(COMPILER_GCC)
-+#elif defined(__GNUC__)
- # define ANGLE_ENABLE_STRUCT_PADDING_WARNINGS \
- _Pragma("GCC diagnostic push") _Pragma("GCC diagnostic error
\"-Wpadded\"")
- # define ANGLE_DISABLE_STRUCT_PADDING_WARNINGS _Pragma("GCC diagnostic
pop")
diff --git a/chromium-75.0.3770.80-revert-daff6b.patch
b/chromium-75.0.3770.80-revert-daff6b.patch
deleted file mode 100644
index f996898..0000000
--- a/chromium-75.0.3770.80-revert-daff6b.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up
chromium-75.0.3770.80/components/omnibox/browser/autocomplete_match.cc.revert-daff6b
chromium-75.0.3770.80/components/omnibox/browser/autocomplete_match.cc
----
chromium-75.0.3770.80/components/omnibox/browser/autocomplete_match.cc.revert-daff6b 2019-06-06
14:54:13.819190586 -0400
-+++ chromium-75.0.3770.80/components/omnibox/browser/autocomplete_match.cc 2019-06-06
14:54:31.892839991 -0400
-@@ -154,8 +154,7 @@ AutocompleteMatch::AutocompleteMatch(con
- additional_info(match.additional_info),
- duplicate_matches(match.duplicate_matches) {}
-
--AutocompleteMatch::AutocompleteMatch(AutocompleteMatch&& match) noexcept =
-- default;
-+AutocompleteMatch::AutocompleteMatch(AutocompleteMatch&& match) = default;
-
- AutocompleteMatch::~AutocompleteMatch() {
- }
diff --git a/chromium-76.0.3809.100-libusb_interrupt_event_handler.patch
b/chromium-76.0.3809.100-libusb_interrupt_event_handler.patch
deleted file mode 100644
index 690f0f9..0000000
--- a/chromium-76.0.3809.100-libusb_interrupt_event_handler.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up chromium-76.0.3809.100/services/device/usb/usb_context.cc.modern-libusbx
chromium-76.0.3809.100/services/device/usb/usb_context.cc
---- chromium-76.0.3809.100/services/device/usb/usb_context.cc.modern-libusbx 2019-08-12
15:40:49.034170484 +0200
-+++ chromium-76.0.3809.100/services/device/usb/usb_context.cc 2019-08-12
15:41:23.775558867 +0200
-@@ -58,7 +58,11 @@ void UsbContext::UsbEventHandler::Run()
-
- void UsbContext::UsbEventHandler::Stop() {
- base::subtle::Release_Store(&running_, 0);
-+#ifdef LIBUSB_API_VERSION >= 0x01000105
-+ libusb_interrupt_event_handler(context_);
-+#else
- libusb_interrupt_handle_event(context_);
-+#endif
- }
-
- UsbContext::UsbContext(PlatformUsbContext context) : context_(context) {
diff --git a/chromium-77.0.3865.75-boolfix.patch b/chromium-77.0.3865.75-boolfix.patch
deleted file mode 100644
index c836214..0000000
--- a/chromium-77.0.3865.75-boolfix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up
chromium-77.0.3865.75/mojo/public/cpp/bindings/associated_interface_ptr_info.h.boolfix
chromium-77.0.3865.75/mojo/public/cpp/bindings/associated_interface_ptr_info.h
----
chromium-77.0.3865.75/mojo/public/cpp/bindings/associated_interface_ptr_info.h.boolfix 2019-09-09
23:55:20.000000000 +0200
-+++
chromium-77.0.3865.75/mojo/public/cpp/bindings/associated_interface_ptr_info.h 2019-09-12
15:43:30.025360946 +0200
-@@ -45,7 +45,7 @@ class AssociatedInterfacePtrInfo {
-
- bool is_valid() const { return handle_.is_valid(); }
-
-- explicit operator bool() const { return handle_.is_valid(); }
-+ explicit operator bool() const { return (bool) handle_.is_valid(); }
-
- ScopedInterfaceEndpointHandle PassHandle() {
- return std::move(handle_);
-diff -up
chromium-77.0.3865.75/mojo/public/cpp/bindings/associated_interface_request.h.boolfix
chromium-77.0.3865.75/mojo/public/cpp/bindings/associated_interface_request.h
----
chromium-77.0.3865.75/mojo/public/cpp/bindings/associated_interface_request.h.boolfix 2019-09-09
23:55:20.000000000 +0200
-+++
chromium-77.0.3865.75/mojo/public/cpp/bindings/associated_interface_request.h 2019-09-12
15:43:30.025360946 +0200
-@@ -51,7 +51,7 @@ class AssociatedInterfaceRequest {
- // handle.
- bool is_pending() const { return handle_.is_valid(); }
-
-- explicit operator bool() const { return handle_.is_valid(); }
-+ explicit operator bool() const { return (bool) handle_.is_valid(); }
-
- ScopedInterfaceEndpointHandle PassHandle() { return std::move(handle_); }
-
diff --git a/chromium-77.0.3865.75-gcc-no-opt-safe-math.patch
b/chromium-77.0.3865.75-gcc-no-opt-safe-math.patch
deleted file mode 100644
index 920a53e..0000000
--- a/chromium-77.0.3865.75-gcc-no-opt-safe-math.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up chromium-77.0.3865.75/base/numerics/safe_math_shared_impl.h.nogccoptmath
chromium-77.0.3865.75/base/numerics/safe_math_shared_impl.h
---- chromium-77.0.3865.75/base/numerics/safe_math_shared_impl.h.nogccoptmath 2019-09-13
14:17:22.726738088 +0200
-+++ chromium-77.0.3865.75/base/numerics/safe_math_shared_impl.h 2019-09-13
14:31:37.686898493 +0200
-@@ -23,9 +23,8 @@
- // Where available use builtin math overflow support on Clang and GCC.
- #elif !defined(__native_client__) && \
- ((defined(__clang__) && \
-- ((__clang_major__ > 3) || \
-- (__clang_major__ == 3 && __clang_minor__ >= 4))) || \
-- (defined(__GNUC__) && __GNUC__ >= 5))
-+ (__clang_major__ > 3) || \
-+ (__clang_major__ == 3 && __clang_minor__ >= 4)))
- #include "base/numerics/safe_math_clang_gcc_impl.h"
- #define BASE_HAS_OPTIMIZED_SAFE_MATH (1)
- #else
diff --git a/chromium-77.0.3865.75-gcc5-r3.patch b/chromium-77.0.3865.75-gcc5-r3.patch
deleted file mode 100644
index 34b858a..0000000
--- a/chromium-77.0.3865.75-gcc5-r3.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -up chromium-77.0.3865.75/gpu/ipc/common/mailbox_struct_traits.h.gcc5-r3
chromium-77.0.3865.75/gpu/ipc/common/mailbox_struct_traits.h
---- chromium-77.0.3865.75/gpu/ipc/common/mailbox_struct_traits.h.gcc5-r3 2019-09-09
23:55:18.000000000 +0200
-+++ chromium-77.0.3865.75/gpu/ipc/common/mailbox_struct_traits.h 2019-09-12
10:13:16.710206500 +0200
-@@ -15,7 +15,7 @@ namespace mojo {
- template <>
- struct StructTraits<gpu::mojom::MailboxDataView, gpu::Mailbox> {
- static base::span<const int8_t> name(const gpu::Mailbox& mailbox) {
-- return mailbox.name;
-+ return base::make_span(mailbox.name);
- }
- static bool Read(gpu::mojom::MailboxDataView data, gpu::Mailbox* out);
- };
-diff -up
chromium-77.0.3865.75/services/viz/public/cpp/compositing/quads_struct_traits.h.gcc5-r3
chromium-77.0.3865.75/services/viz/public/cpp/compositing/quads_struct_traits.h
----
chromium-77.0.3865.75/services/viz/public/cpp/compositing/quads_struct_traits.h.gcc5-r3 2019-09-09
23:55:23.000000000 +0200
-+++
chromium-77.0.3865.75/services/viz/public/cpp/compositing/quads_struct_traits.h 2019-09-12
10:13:16.710206500 +0200
-@@ -391,7 +391,7 @@ struct StructTraits<viz::mojom::TextureQ
- static base::span<const float> vertex_opacity(const viz::DrawQuad& input) {
- const viz::TextureDrawQuad* quad =
- viz::TextureDrawQuad::MaterialCast(&input);
-- return quad->vertex_opacity;
-+ return base::make_span(quad->vertex_opacity);
- }
-
- static bool y_flipped(const viz::DrawQuad& input) {
-diff -up
chromium-77.0.3865.75/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.gcc5-r3
chromium-77.0.3865.75/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc
----
chromium-77.0.3865.75/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.gcc5-r3 2019-09-12
10:13:16.711206509 +0200
-+++
chromium-77.0.3865.75/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2019-09-12
15:41:15.300158849 +0200
-@@ -10,7 +10,7 @@
-
- #include "modules/audio_processing/aec3/aec_state.h"
-
--#include <math.h>
-+#include <cmath>
-
- #include <algorithm>
- #include <numeric>
diff --git a/chromium.spec b/chromium.spec
index 4fa3d44..e426495 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -168,114 +168,61 @@ Url:
http://www.chromium.org/Home
License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and
(MPLv1.1 or GPLv2 or LGPLv2)
### Chromium Fedora Patches ###
-Patch0: chromium-67.0.3396.62-gcc5.patch
-Patch1: chromium-45.0.2454.101-linux-path-max.patch
-Patch2: chromium-55.0.2883.75-addrfix.patch
-Patch3: chromium-72.0.3626.121-notest.patch
-# Use libusb_interrupt_event_handler from current libusbx (1.0.21-0.1.git448584a)
-Patch4: chromium-76.0.3809.100-libusb_interrupt_event_handler.patch
-# Use PIE in the Linux sandbox (from openSUSE via Russian Fedora)
-Patch6: chromium-70.0.3538.67-sandbox-pie.patch
+Patch0: chromium-70.0.3538.67-sandbox-pie.patch
# Use /etc/chromium for master_prefs
-Patch7: chromium-68.0.3440.106-master-prefs-path.patch
+Patch1: chromium-68.0.3440.106-master-prefs-path.patch
# Use gn system files
-Patch8: chromium-67.0.3396.62-gn-system.patch
-# Fix issue where timespec is not defined when sys/stat.h is included.
-Patch9: chromium-53.0.2785.92-boringssl-time-fix.patch
-# I wouldn't have to do this if there was a standard way to append extra compiler
flags
-Patch10: chromium-63.0.3289.84-nullfix.patch
-# Add explicit includedir for jpeglib.h
-Patch11: chromium-54.0.2840.59-jpeg-include-dir.patch
-# On i686, pass --no-keep-memory --reduce-memory-overheads to ld.
-Patch12: chromium-59.0.3071.86-i686-ld-memory-tricks.patch
+Patch2: chromium-67.0.3396.62-gn-system.patch
# Revert
https://chromium.googlesource.com/chromium/src/+/b794998819088f76b4cf44c8...
#
https://bugs.chromium.org/p/chromium/issues/detail?id=712737
#
https://bugzilla.redhat.com/show_bug.cgi?id=1446851
-Patch13: chromium-58.0.3029.96-revert-b794998819088f76b4cf44c8db6940240c563cf4.patch
-# Correctly compile the stdatomic.h in ffmpeg with gcc 4.8
-Patch14: chromium-64.0.3282.119-ffmpeg-stdatomic.patch
-# Nacl can't die soon enough
-Patch15: chromium-66.0.3359.117-system-clang.patch
+Patch3: chromium-58.0.3029.96-revert-b794998819088f76b4cf44c8db6940240c563cf4.patch
# Do not prefix libpng functions
-Patch16: chromium-60.0.3112.78-no-libpng-prefix.patch
+Patch4: chromium-60.0.3112.78-no-libpng-prefix.patch
# Do not mangle libjpeg
-Patch17: chromium-60.0.3112.78-jpeg-nomangle.patch
+Patch5: chromium-60.0.3112.78-jpeg-nomangle.patch
# Do not mangle zlib
-Patch18: chromium-77.0.3865.75-no-zlib-mangle.patch
-# Fix libavutil include pathing to find arch specific timer.h
-# For some reason, this only fails on aarch64. No idea why.
-Patch19: chromium-60.0.3112.113-libavutil-timer-include-path-fix.patch
-# from gentoo
-Patch20: chromium-77.0.3865.75-gcc-no-opt-safe-math.patch
-# From gentoo
-Patch21: chromium-77.0.3865.75-gcc5-r3.patch
-# To use round with gcc, you need to #include <cmath>
-Patch22: chromium-65.0.3325.146-gcc-round-fix.patch
-# Include proper headers to invoke memcpy()
-Patch23: chromium-65.0.3325.146-memcpy-fix.patch
-# ../../mojo/public/cpp/bindings/associated_interface_ptr_info.h:48:43: error: cannot
convert 'const mojo::ScopedInterfaceEndpointHandle' to 'bool' in return
-Patch24: chromium-77.0.3865.75-boolfix.patch
-# From Debian
-Patch25: chromium-71.0.3578.98-skia-aarch64-buildfix.patch
+Patch6: chromium-77.0.3865.75-no-zlib-mangle.patch
# Do not use unrar code, it is non-free
-Patch27: chromium-73.0.3683.75-norar.patch
-# Upstream GCC fixes
-Patch28: chromium-66.0.3359.117-GCC-fully-declare-ConfigurationPolicyProvider.patch
-# Add "Fedora" to the user agent string
-Patch29: chromium-77.0.3865.75-fedora-user-agent.patch
-# Try to fix version.py for Rawhide
-Patch30: chromium-71.0.3578.98-py2-bootstrap.patch
-# Fix default on redeclaration error
-#
https://chromium.googlesource.com/chromium/src/+/122692ccee62223f266a988c...
-Patch31: chromium-68.0.3440.106-fix-default-on-redeclaration.patch
+Patch7: chromium-73.0.3683.75-norar.patch
# Use Gentoo's Widevine hack
#
https://gitweb.gentoo.org/repo/gentoo.git/tree/www-client/chromium/files/...
-Patch32: chromium-71.0.3578.98-widevine-r3.patch
-# Do not require sysroot
-# Forget about trying to make libc++
-# BUILD SANELY PLEASE
-Patch33: chromium-69.0.3497.81-build-sanely-please.patch
+Patch8: chromium-71.0.3578.98-widevine-r3.patch
# Disable fontconfig cache magic that breaks remoting
-Patch34: chromium-70.0.3538.67-disable-fontconfig-cache-magic.patch
-# Fix aarch64 build against latest linux kernel headers
-Patch35: chromium-70.0.3538.77-aarch64-arch-want-new-stat.patch
+Patch9: chromium-70.0.3538.67-disable-fontconfig-cache-magic.patch
# drop rsp clobber, which breaks gcc9 (thanks to Jeff Law)
-Patch36: chromium-71.0.3578.98-gcc9-drop-rsp-clobber.patch
+Patch10: chromium-71.0.3578.98-gcc9-drop-rsp-clobber.patch
# Try to load widevine from other places
-Patch37: chromium-widevine-other-locations.patch
-# Disable -fno-delete-null-pointer-checks
-Patch38: chromium-73.0.3683.75-disable-fno-delete-null-pointer-checks.patch
-# Linux 5.2 defines SIOCGSTAMP in a slightly different way, so we need to teach chromium
where to find it
-Patch41: chromium-75.0.3770.80-SIOCGSTAMP.patch
-# Revert
https://chromium.googlesource.com/chromium/src/+/daff6b66faae53a0cefb8898...
-# It might make clang happy but it breaks gcc. F*** clang.
-Patch43: chromium-75.0.3770.80-revert-daff6b.patch
+Patch11: chromium-widevine-other-locations.patch
+# Try to fix version.py for Rawhide
+Patch12: chromium-71.0.3578.98-py2-bootstrap.patch
+# Add "Fedora" to the user agent string
+Patch13: chromium-77.0.3865.75-fedora-user-agent.patch
+
# rename function to avoid conflict with rawhide glibc "gettid()"
-Patch45: chromium-75.0.3770.80-grpc-gettid-fix.patch
+Patch50: chromium-75.0.3770.80-grpc-gettid-fix.patch
# In GCC one can't use alignas() for exported classes
#
https://chromium.googlesource.com/chromium/src.git/+/8148fd96ae04a1150a9c...
-Patch61: chromium-76.0.3809.100-gcc-no-alignas-and-export.patch
+Patch51: chromium-76.0.3809.100-gcc-no-alignas-and-export.patch
# Needs to be submitted..
-Patch62: chromium-76.0.3809.100-gcc-remoting-constexpr.patch
+Patch52: chromium-76.0.3809.100-gcc-remoting-constexpr.patch
# Needs to be submitted.. (ugly hack, needs to be added properly to GN files)
-Patch63: chromium-76.0.3809.100-vtable-symbol-undefined.patch
+Patch53: chromium-76.0.3809.100-vtable-symbol-undefined.patch
#
https://chromium.googlesource.com/chromium/src.git/+/3c9720245e440c4b7222...
-Patch64: chromium-77.0.3865.75-certificate-transparency.patch
+Patch54: chromium-77.0.3865.75-certificate-transparency.patch
#
https://gitweb.gentoo.org/repo/gentoo.git/tree/www-client/chromium/files/...
-Patch65: chromium-77.0.3865.75-unbundle-zlib.patch
+Patch55: chromium-77.0.3865.75-unbundle-zlib.patch
# Needs to be submitted..
-Patch66: chromium-77.0.3865.75-gcc-include-memory.patch
-# Needs to be submitted..
-Patch67: chromium-77.0.3865.75-base-gcc-no-alignas.patch
+Patch56: chromium-77.0.3865.75-gcc-include-memory.patch
+#
https://chromium.googlesource.com/chromium/src/+/6b633c4b14850df376d5cec5...
+Patch57: chromium-77.0.3865.75-base-gcc-no-alignas.patch
#
https://chromium.googlesource.com/chromium/src/+/27e25336b8316ff3ec4e4640...
-Patch68: chromium-77.0.3865.75-harfbuzz-subset.patch
+Patch58: chromium-77.0.3865.75-harfbuzz-subset.patch
#
https://chromium.googlesource.com/chromium/src.git/+/f08cb0022527081c078e...
-Patch69: chromium-77.0.3865.75-gcc-abstract-class.patch
+Patch59: chromium-77.0.3865.75-gcc-abstract-class.patch
#
https://chromium.googlesource.com/chromium/src/+/5baf7df7f4c5971dab552897...
-Patch70: chromium-77.0.3865.75-missing-limits.patch
+Patch60: chromium-77.0.3865.75-missing-limits.patch
-# Apply these changes to work around EPEL7 compiler issues
-Patch100: chromium-62.0.3202.62-kmaxskip-constexpr.patch
# Use lstdc++ on EPEL7 only
Patch101: chromium-75.0.3770.100-epel7-stdc++.patch
# el7 only patch
@@ -766,60 +713,40 @@ udev.
%setup -q -n chromium-%{version}
### Chromium Fedora Patches ###
-%patch0 -p1 -b .gcc5
-%patch1 -p1 -b .pathmax
-%patch2 -p1 -b .addrfix
-%patch3 -p1 -b .notest
-%patch4 -p1 -b .modern-libusbx
-%patch6 -p1 -b .sandboxpie
-%patch7 -p1 -b .etc
-%patch8 -p1 -b .gnsystem
-%patch9 -p1 -b .timefix
-%patch10 -p1 -b .nullfix
-%patch11 -p1 -b .jpegfix
-%patch12 -p1 -b .ldmemory
-%patch13 -p1 -b .revert
-%patch14 -p1 -b .ffmpeg-stdatomic
-%patch15 -p1 -b .system-clang
-%patch16 -p1 -b .noprefix
-%patch17 -p1 -b .nomangle
-%patch18 -p1 -b .nozmangle
-%patch19 -p1 -b .pathfix
-%patch20 -p1 -b .nogccoptmath
-%patch21 -p1 -b .gcc5-r3
-%patch22 -p1 -b .gcc-round-fix
-%patch23 -p1 -b .memcpyfix
-%patch24 -p1 -b .boolfix
-#%patch25 -p1 -b .aarch64fix
-%patch27 -p1 -b .nounrar
-%patch28 -p1 -b .gcc-cpolicyprovider
-%patch29 -p1 -b .fedora-user-agent
-%patch30 -p1 -b .py2
-%patch31 -p1 -b .fix-default-redeclaration
-%patch32 -p1 -b .wvhack
-%patch33 -p1 -b .sanebuild
-%patch34 -p1 -b .nofc
-%patch35 -p1 -b .aarch64-new-stat
-%patch36 -p1 -b .gcc9
-%patch37 -p1 -b .widevine-other-locations
-%patch38 -p1 -b .disable-ndnpc
-%patch41 -p1 -b .SIOCGSTAMP
-%patch43 -p1 -b .revert-daff6b
-%patch45 -p1 -b .gettid-fix
-%patch61 -p1 -b .gcc-no-alignas-and-export
-%patch62 -p1 -b .gcc-remoting-constexpr
-%patch63 -p1 -b .vtable-symbol-undefined
-%patch64 -p1 -b .certificate-transparency
-%patch65 -p1 -b .unbundle-zlib
-%patch66 -p1 -b .gcc-include-memory
-%patch67 -p1 -b .base-gcc-no-alignas
-%patch68 -p1 -b .harfbuzz-subset
-%patch69 -p1 -b .gcc-abstract-class
-%patch70 -p1 -b .missing-limits
+%patch0 -p1 -b .sandboxpie
+%patch1 -p1 -b .etc
+%patch2 -p1 -b .gnsystem
+%patch3 -p1 -b .revert
+%patch4 -p1 -b .nolibpngprefix
+%patch5 -p1 -b .nolibjpegmangle
+%patch6 -p1 -b .nozlibmangle
+%patch7 -p1 -b .nounrar
+%patch8 -p1 -b .widevine-hack
+%patch9 -p1 -b .nofontconfigcache
+%patch10 -p1 -b .gcc9
+%patch11 -p1 -b .widevine-other-locations
+%patch12 -p1 -b .py2
+
+# Short term fixes (usually gcc and backports)
+%patch50 -p1 -b .gettid-fix
+%patch51 -p1 -b .gcc-no-alignas-and-export
+%patch52 -p1 -b .gcc-remoting-constexpr
+%patch53 -p1 -b .vtable-symbol-undefined
+%patch54 -p1 -b .certificate-transparency
+%patch55 -p1 -b .unbundle-zlib
+%patch56 -p1 -b .gcc-include-memory
+%patch57 -p1 -b .base-gcc-no-alignas
+%patch58 -p1 -b .harfbuzz-subset
+%patch59 -p1 -b .gcc-abstract-class
+%patch60 -p1 -b .missing-limits
+
+# Fedora branded user agent
+%if 0%{?fedora}
+%patch13 -p1 -b .fedora-user-agent
+%endif
# EPEL specific patches
%if 0%{?rhel} == 7
-%patch100 -p1 -b .kmaxskip
%patch101 -p1 -b .epel7
%patch102 -p1 -b .el7-noexcept
%endif
@@ -1298,6 +1225,11 @@ sed -i.orig -e
's/getenv("CHROME_VERSION_EXTRA")/"Fedora Project"/' $FILE
. /opt/rh/devtoolset-%{dts_version}/enable
%endif
+# Decrease the debuginfo verbosity, so it compiles in koji
+%ifarch %{ix86}
+%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
+%endif
+
echo
# Now do the full browser
%if 0%{freeworld}
commit d8b8fc10a9d2bc16fbdc802ba975b68bc5f4d97b
Author: Tomas Popela <tpopela(a)redhat.com>
Date: Fri Sep 20 09:45:43 2019 +0200
Fix how the arguments are passed to GN's bootstrap.py
I don't know why, but previously it was failing only on aarch64.
diff --git a/chromium.spec b/chromium.spec
index 25eb383..4fa3d44 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -1267,7 +1267,7 @@ if python2 -c 'import google ; print google.__path__' 2>
/dev/null ; then \
exit 1 ; \
fi
-tools/gn/bootstrap/bootstrap.py -v "$CHROMIUM_CORE_GN_DEFINES
$CHROMIUM_BROWSER_GN_DEFINES"
+tools/gn/bootstrap/bootstrap.py -v --no-clean
--gn-gen-args="$CHROMIUM_CORE_GN_DEFINES $CHROMIUM_BROWSER_GN_DEFINES"
%{builddir}/gn --script-executable=/usr/bin/python2 gen
--args="$CHROMIUM_CORE_GN_DEFINES $CHROMIUM_BROWSER_GN_DEFINES" %{builddir}
%if %{freeworld}
commit 1ef42a21dcf51442af1b6830c71b060258844ef5
Author: Tomas Popela <tpopela(a)redhat.com>
Date: Fri Sep 20 09:37:33 2019 +0200
Remove support for (p)NaCL
We don't build it for quite some time and will by killed by Google in
Spring 2020. Let's drop the support for it from the SPEC file. We can
revert this patch if needed.
diff --git a/chromium-47.0.2526.80-nacl-ignore-broken-fd-counter.patch
b/chromium-47.0.2526.80-nacl-ignore-broken-fd-counter.patch
deleted file mode 100644
index c422957..0000000
--- a/chromium-47.0.2526.80-nacl-ignore-broken-fd-counter.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -up
chromium-47.0.2526.80/components/nacl/loader/sandbox_linux/nacl_sandbox_linux.cc.ignore-fd-count
chromium-47.0.2526.80/components/nacl/loader/sandbox_linux/nacl_sandbox_linux.cc
----
chromium-47.0.2526.80/components/nacl/loader/sandbox_linux/nacl_sandbox_linux.cc.ignore-fd-count 2015-12-15
14:48:07.119011866 -0500
-+++
chromium-47.0.2526.80/components/nacl/loader/sandbox_linux/nacl_sandbox_linux.cc 2015-12-15
14:48:14.151850055 -0500
-@@ -153,6 +153,14 @@ void NaClSandbox::InitializeLayerOneSand
- }
-
- void NaClSandbox::CheckForExpectedNumberOfOpenFds() {
-+ // Whatever logic this code is using is wrong more often than it is right.
-+ // If you set expected_num_fds to 6, it finds 7.
-+ // If you set expected_num_fds to 7, it finds 6.
-+ // Code like this makes a packager drink. And not the good stuff either.
-+ // Instead, we're just going to smile and tell it to never care about the
-+ // number of FDs open. Stupid code. We hates it.
-+
-+#if 0
- // We expect to have the following FDs open:
- // 1-3) stdin, stdout, stderr.
- // 4) The /dev/urandom FD used by base::GetUrandomFD().
-@@ -171,6 +179,8 @@ void NaClSandbox::CheckForExpectedNumber
- }
-
- CHECK_EQ(expected_num_fds, sandbox::ProcUtil::CountOpenFds(proc_fd_.get()));
-+#endif
-+
- }
-
- void NaClSandbox::InitializeLayerTwoSandbox(bool uses_nonsfi_mode) {
diff --git a/chromium-47.0.2526.80-pnacl-fgnu-inline-asm.patch
b/chromium-47.0.2526.80-pnacl-fgnu-inline-asm.patch
deleted file mode 100644
index bfe0422..0000000
--- a/chromium-47.0.2526.80-pnacl-fgnu-inline-asm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up chromium-47.0.2526.80/native_client/build/untrusted.gypi.fixme
chromium-47.0.2526.80/native_client/build/untrusted.gypi
---- chromium-47.0.2526.80/native_client/build/untrusted.gypi.fixme 2015-12-09
11:54:27.584962337 -0500
-+++ chromium-47.0.2526.80/native_client/build/untrusted.gypi 2015-12-09
11:54:45.033571750 -0500
-@@ -1564,6 +1564,7 @@
- '-Wno-char-subscripts',
- '-Wno-unused-function',
- '-std=gnu++11',
-+ '-fgnu-inline-asm',
- ],
- 'native_irt_compile_flags': [
- # IRT compile/link flags to make the binary smaller.
diff --git a/chromium.spec b/chromium.spec
index a2538f0..25eb383 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -70,32 +70,11 @@
# If we build with shared on, then chrome-remote-desktop depends on chromium libs.
# If we build with shared off, then users cannot swap out libffmpeg (and i686 gets a lot
harder to build)
%global shared 1
-# We should not need to turn this on. The app in the webstore _should_ work.
-%global build_remoting_app 0
# AddressSanitizer mode
#
https://www.chromium.org/developers/testing/addresssanitizer
%global asan 0
-# nacl/pnacl are soon to be dead. We're just killing them off early.
-%global killnacl 1
-
-%if 0%{?killnacl}
- %global nacl 0
- %global nonacl 1
-%else
-# TODO: Try arm (nacl disabled)
-%if 0%{?fedora}
- %ifarch i686
- %global nacl 0
- %global nonacl 1
- %else
- %global nacl 1
- %global nonacl 0
- %endif
-%endif
-%endif
-
%if 0
# Chromium's fork of ICU is now something we can't unbundle.
# This is left here to ease the change if that ever switches.
@@ -302,16 +281,6 @@ Patch101: chromium-75.0.3770.100-epel7-stdc++.patch
# el7 only patch
Patch102: chromium-77.0.3865.75-el7-noexcept.patch
-# In file included from ../linux/directory.c:21:
-# In file included from ../../../../native_client/src/nonsfi/linux/abi_conversion.h:20:
-# ../../../../native_client/src/nonsfi/linux/linux_syscall_structs.h:44:13: error:
GNU-style inline assembly is disabled
-# __asm__ __volatile__("mov %%gs, %0" : "=r"(gs));
-# ^
-# 1 error generated.
-Patch200: chromium-47.0.2526.80-pnacl-fgnu-inline-asm.patch
-# Ignore broken nacl open fd counter
-Patch201: chromium-47.0.2526.80-nacl-ignore-broken-fd-counter.patch
-
# Enable VAAPI support on Linux
# NOTE: This patch will never land upstream
Patch202: enable-vaapi.patch
@@ -419,24 +388,6 @@ BuildRequires: libappstream-glib
# gn needs these
BuildRequires: libstdc++-static
BuildRequires: libstdc++-devel, openssl-devel
-%if 0%{?nacl}
-BuildRequires: nacl-gcc, nacl-binutils, nacl-newlib
-BuildRequires: nacl-arm-gcc, nacl-arm-binutils, nacl-arm-newlib
-# pNaCl needs this monster
-# It's possible that someday this dep will stabilize, but
-# right now, it needs to be updated everytime chromium bumps
-# a major version.
-BuildRequires: chromium-native_client >= 52.0.2743.82
-BuildRequires: clang
-BuildRequires: llvm
-%ifarch x86_64
-# Really, this is what we want:
-# BuildRequires: glibc-devel(x86-32) libgcc(x86-32)
-# But, koji only offers glibc32. Maybe that's enough.
-# This BR will pull in either glibc.i686 or glibc32.
-BuildRequires: /lib/libc.so.6 /usr/lib/libc.so
-%endif
-%endif
# Fedora tries to use system libs whenever it can.
BuildRequires: bzip2-devel
BuildRequires: dbus-glib-devel
@@ -874,11 +825,6 @@ udev.
%endif
# Feature specific patches
-%if ! 0%{?killnacl}
-%patch200 -p1 -b .gnu-inline
-%patch201 -p1 -b .ignore-fd-count
-%endif
-
%if %{use_vaapi}
%patch202 -p1 -b .vaapi
%ifarch i686
@@ -907,101 +853,6 @@ export RANLIB="ranlib"
rm -rf buildtools/third_party/libc++/BUILD.gn
-%if 0%{?nacl}
-# prep the nacl tree
-mkdir -p out/Release/gen/sdk/linux_x86/nacl_x86_newlib
-cp -a --no-preserve=context /usr/%{_arch}-nacl/*
out/Release/gen/sdk/linux_x86/nacl_x86_newlib
-
-mkdir -p out/Release/gen/sdk/linux_x86/nacl_arm_newlib
-cp -a --no-preserve=context /usr/arm-nacl/*
out/Release/gen/sdk/linux_x86/nacl_arm_newlib
-
-# Not sure if we need this or not, but better safe than sorry.
-pushd out/Release/gen/sdk/linux_x86
-ln -s nacl_x86_newlib nacl_x86_newlib_raw
-ln -s nacl_arm_newlib nacl_arm_newlib_raw
-popd
-
-mkdir -p out/Release/gen/sdk/linux_x86/nacl_x86_newlib/bin
-pushd out/Release/gen/sdk/linux_x86/nacl_x86_newlib/bin
-ln -s /usr/bin/x86_64-nacl-gcc gcc
-ln -s /usr/bin/x86_64-nacl-gcc x86_64-nacl-gcc
-ln -s /usr/bin/x86_64-nacl-g++ g++
-ln -s /usr/bin/x86_64-nacl-g++ x86_64-nacl-g++
-# ln -s /usr/bin/x86_64-nacl-ar ar
-ln -s /usr/bin/x86_64-nacl-ar x86_64-nacl-ar
-# ln -s /usr/bin/x86_64-nacl-as as
-ln -s /usr/bin/x86_64-nacl-as x86_64-nacl-as
-# ln -s /usr/bin/x86_64-nacl-ranlib ranlib
-ln -s /usr/bin/x86_64-nacl-ranlib x86_64-nacl-ranlib
-# Cleanups
-rm addr2line
-ln -s /usr/bin/x86_64-nacl-addr2line addr2line
-rm c++filt
-ln -s /usr/bin/x86_64-nacl-c++filt c++filt
-rm gprof
-ln -s /usr/bin/x86_64-nacl-gprof gprof
-rm readelf
-ln -s /usr/bin/x86_64-nacl-readelf readelf
-rm size
-ln -s /usr/bin/x86_64-nacl-size size
-rm strings
-ln -s /usr/bin/x86_64-nacl-strings strings
-popd
-
-mkdir -p out/Release/gen/sdk/linux_x86/nacl_arm_newlib/bin
-pushd out/Release/gen/sdk/linux_x86/nacl_arm_newlib/bin
-ln -s /usr/bin/arm-nacl-gcc gcc
-ln -s /usr/bin/arm-nacl-gcc arm-nacl-gcc
-ln -s /usr/bin/arm-nacl-g++ g++
-ln -s /usr/bin/arm-nacl-g++ arm-nacl-g++
-ln -s /usr/bin/arm-nacl-ar arm-nacl-ar
-ln -s /usr/bin/arm-nacl-as arm-nacl-as
-ln -s /usr/bin/arm-nacl-ranlib arm-nacl-ranlib
-popd
-
-touch out/Release/gen/sdk/linux_x86/nacl_x86_newlib/stamp.untar
out/Release/gen/sdk/linux_x86/nacl_x86_newlib/stamp.prep
-touch out/Release/gen/sdk/linux_x86/nacl_x86_newlib/nacl_x86_newlib.json
-touch out/Release/gen/sdk/linux_x86/nacl_arm_newlib/stamp.untar
out/Release/gen/sdk/linux_x86/nacl_arm_newlib/stamp.prep
-touch out/Release/gen/sdk/linux_x86/nacl_arm_newlib/nacl_arm_newlib.json
-
-pushd out/Release/gen/sdk/linux_x86/
-mkdir -p pnacl_newlib pnacl_translator
-# Might be able to do symlinks here, but eh.
-cp -a --no-preserve=context /usr/pnacl_newlib/* pnacl_newlib/
-cp -a --no-preserve=context /usr/pnacl_translator/* pnacl_translator/
-for i in lib/libc.a lib/libc++.a lib/libg.a lib/libm.a; do
- /usr/pnacl_newlib/bin/pnacl-ranlib pnacl_newlib/x86_64_bc-nacl/$i
- /usr/pnacl_newlib/bin/pnacl-ranlib pnacl_newlib/i686_bc-nacl/$i
- /usr/pnacl_newlib/bin/pnacl-ranlib pnacl_newlib/le32-nacl/$i
-done
-
-for i in lib/libpthread.a lib/libnacl.a; do
- /usr/pnacl_newlib/bin/pnacl-ranlib pnacl_newlib/le32-nacl/$i
-done
-
-for i in lib/clang/3.7.0/lib/x86_64_bc-nacl/libpnaclmm.a
lib/clang/3.7.0/lib/i686_bc-nacl/libpnaclmm.a; do
- /usr/pnacl_newlib/bin/pnacl-ranlib pnacl_newlib/$i
-done
-
-for i in lib/clang/3.7.0/lib/le32-nacl/libpnaclmm.a
lib/clang/3.7.0/lib/le32-nacl/libgcc.a; do
- /usr/pnacl_newlib/bin/pnacl-ranlib pnacl_newlib/$i
-done
-
-popd
-
-mkdir -p native_client/toolchain/.tars/linux_x86
-touch native_client/toolchain/.tars/linux_x86/pnacl_translator.json
-
-pushd native_client/toolchain
-ln -s ../../out/Release/gen/sdk/linux_x86 linux_x86
-popd
-
-mkdir -p third_party/llvm-build/Release+Asserts/bin
-pushd third_party/llvm-build/Release+Asserts/bin
-ln -s /usr/bin/clang clang
-popd
-%endif
-
# Unpack fonts
%if %{freeworld}
# no font fun needed.
@@ -1072,9 +923,7 @@ export CHROMIUM_CORE_GN_DEFINES
CHROMIUM_BROWSER_GN_DEFINES=""
CHROMIUM_BROWSER_GN_DEFINES+=' use_gio=true use_pulseaudio=true
icu_use_data_file=true'
-%if 0%{?nonacl}
CHROMIUM_BROWSER_GN_DEFINES+=' enable_nacl=false'
-%endif
%if 0%{?shared}
CHROMIUM_BROWSER_GN_DEFINES+=' is_component_ffmpeg=true is_component_build=true'
%else
@@ -1236,9 +1085,6 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/libwebm' \
'third_party/libwebp' \
'third_party/libyuv' \
-%if 0%{?nacl}
- 'third_party/llvm-build' \
-%endif
'third_party/lss' \
'third_party/lzma_sdk' \
%if 0%{?bundlepylibs}
@@ -1471,20 +1317,8 @@ echo
# remote client
# ../../depot_tools/ninja -C ../%{builddir} -vvv remoting_me2me_host remoting_start_host
remoting_it2me_native_messaging_host remoting_me2me_native_messaging_host
remoting_native_messaging_manifests remoting_resources
%build_target %{remotingbuilddir} remoting_all
-%if 0%{?build_remoting_app}
-%if 0%{?nacl}
-export GOOGLE_CLIENT_ID_REMOTING_IDENTITY_API=%{chromoting_client_id}
-%build_target %{builddir} remoting_webapp
-%endif
-%endif
-
%endif
-# Nuke nacl/pnacl bits at the end of the build
-rm -rf %{builddir}/gen/sdk
-rm -rf native_client/toolchain
-rm -rf third_party/llvm-build/*
-
%install
rm -rf %{buildroot}
@@ -1522,10 +1356,6 @@ mkdir -p %{buildroot}%{_mandir}/man1/
pushd %{builddir}
cp -a *.pak locales resources icudtl.dat %{buildroot}%{chromium_path}
-%if 0%{?nacl}
-cp -a nacl_helper* *.nexe pnacl tls_edit %{buildroot}%{chromium_path}
-chmod -x %{buildroot}%{chromium_path}/nacl_helper_bootstrap* *.nexe
-%endif
# Reasonably sure we don't need this anymore. Chrome doesn't include it.
%if 0
cp -a protoc pyproto %{buildroot}%{chromium_path}
@@ -1607,12 +1437,6 @@ pushd %{buildroot}%{_sysconfdir}/pam.d/
ln -s system-auth chrome-remote-desktop
popd
-%if 0%{?build_remoting_app}
-%if 0%{?nacl}
-cp -a remoting_client_plugin_newlib.* %{buildroot}%{chromium_path}
-%endif
-%endif
-
%if %{build_headless}
pushd %{headlessbuilddir}
cp -a headless_lib.pak headless_shell %{buildroot}%{chromium_path}
@@ -1753,12 +1577,6 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r
chrome-remote-deskt
%ifarch x86_64 i686 aarch64
%{chromium_path}/swiftshader/
%endif
-%if 0%{?nacl}
-%{chromium_path}/nacl_helper*
-%{chromium_path}/*.nexe
-%{chromium_path}/pnacl/
-%{chromium_path}/tls_edit
-%endif
%dir %{chromium_path}/PepperFlash/
%if 0
%{chromium_path}/protoc
@@ -1872,11 +1690,6 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r
chrome-remote-deskt
%{crd_path}/user-session
%{_unitdir}/chrome-remote-desktop@.service
/var/lib/chrome-remote-desktop/
-%if 0%{?build_remoting_app}
-%if 0%{?nacl}
-%{chromium_path}/remoting_client_plugin_newlib.*
-%endif
-%endif
%files -n chromedriver
%doc AUTHORS
commit a2942aa1bba73adf0d336548aea65e3830f172ef
Author: Tomas Popela <tpopela(a)redhat.com>
Date: Sun Sep 15 13:36:44 2019 +0200
Don't try to revert a previously removed patch
diff --git a/chromium.spec b/chromium.spec
index 7a0d711..a2538f0 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -871,8 +871,6 @@ udev.
%patch100 -p1 -b .kmaxskip
%patch101 -p1 -b .epel7
%patch102 -p1 -b .el7-noexcept
-# Revert patch58 because it's breaking the build on el7
-%patch58 -R -p1
%endif
# Feature specific patches