Architecture specific change in rpms/prusa-slicer.git
by githook-noreply@fedoraproject.org
The package rpms/prusa-slicer.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/prusa-slicer.git/commit/?id=3bb90...
https://src.fedoraproject.org/cgit/rpms/prusa-slicer.git/commit/?id=e732c...
https://src.fedoraproject.org/cgit/rpms/prusa-slicer.git/commit/?id=c26d5...
https://src.fedoraproject.org/cgit/rpms/prusa-slicer.git/commit/?id=22253...
https://src.fedoraproject.org/cgit/rpms/prusa-slicer.git/commit/?id=e5cf3...
https://src.fedoraproject.org/cgit/rpms/prusa-slicer.git/commit/?id=a00aa....
Change:
-%ifarch s390x aarch64
+ExcludeArch: s390x
-ExcludeArch: s390x
-ExcludeArch: s390x
+ExcludeArch: s390x
+%ifarch ppc64le
Thanks.
Full change:
============
commit c26d5e70efcfc38216b93f116b03671140e63723
Author: Jason Tibbitts <j(a)tib.bs>
Date: Mon Sep 23 12:15:44 2019 -0500
Add patches to fix s390x build issues.
diff --git a/94212fa2a92b5d01be5da8235f02423249dd7b2a.patch b/94212fa2a92b5d01be5da8235f02423249dd7b2a.patch
new file mode 100644
index 0000000..b75ad9d
--- /dev/null
+++ b/94212fa2a92b5d01be5da8235f02423249dd7b2a.patch
@@ -0,0 +1,25 @@
+From 94212fa2a92b5d01be5da8235f02423249dd7b2a Mon Sep 17 00:00:00 2001
+From: bubnikv <bubnikv(a)gmail.com>
+Date: Thu, 19 Sep 2019 08:56:47 +0200
+Subject: [PATCH] Another fix of admesh on big endian architectures, fixes
+ #2879
+
+---
+ src/admesh/stl_io.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/admesh/stl_io.cpp b/src/admesh/stl_io.cpp
+index af9bb4f98..ddf377c78 100644
+--- a/src/admesh/stl_io.cpp
++++ b/src/admesh/stl_io.cpp
+@@ -151,8 +151,8 @@ bool stl_write_binary(stl_file *stl, const char *file, const char *label)
+ memcpy(buffer, &stl->stats.number_of_facets, 4);
+ stl_internal_reverse_quads(buffer, 4);
+ fwrite(buffer, 4, 1, fp);
+- for (size_t i = 0; i < stl->stats.number_of_facets; ++ i) {
+- memcpy(buffer, stl->facet_start + i, 50);
++ for (const stl_facet &facet : stl->facet_start) {
++ memcpy(buffer, &facet, 50);
+ // Convert to little endian.
+ stl_internal_reverse_quads(buffer, 48);
+ fwrite(buffer, SIZEOF_STL_FACET, 1, fp);
diff --git a/patch-endianness b/patch-endianness
new file mode 100644
index 0000000..9dc6432
--- /dev/null
+++ b/patch-endianness
@@ -0,0 +1,26 @@
+diff --git a/src/admesh/stlinit.cpp b/src/admesh/stlinit.cpp
+index 693aad0..390fe56 100644
+--- a/src/admesh/stlinit.cpp
++++ b/src/admesh/stlinit.cpp
+@@ -36,6 +36,10 @@
+ #error "SEEK_SET not defined"
+ #endif
+
++#ifndef BOOST_LITTLE_ENDIAN
++extern void stl_internal_reverse_quads(char *buf, size_t cnt);
++#endif /* BOOST_LITTLE_ENDIAN */
++
+ static FILE* stl_open_count_facets(stl_file *stl, const char *file)
+ {
+ // Open the file in binary mode first.
+@@ -238,10 +242,6 @@ bool stl_open(stl_file *stl, const char *file)
+ return result;
+ }
+
+-#ifndef BOOST_LITTLE_ENDIAN
+-extern void stl_internal_reverse_quads(char *buf, size_t cnt);
+-#endif /* BOOST_LITTLE_ENDIAN */
+-
+ void stl_allocate(stl_file *stl)
+ {
+ // Allocate memory for the entire .STL file.
diff --git a/prusa-slicer.spec b/prusa-slicer.spec
index 4c4f62e..125082c 100644
--- a/prusa-slicer.spec
+++ b/prusa-slicer.spec
@@ -3,7 +3,7 @@
Name: prusa-slicer
Version: 2.1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: 3D printing slicer optimized for Prusa printers
# The main PrusaSlicer code and resources are AGPLv3, with small parts as
@@ -20,9 +20,14 @@ Source0: https://github.com/prusa3d/PrusaSlicer/archive/version_%version.
Source1: %name.desktop
Source2: %name.appdata.xml
-# The source fails to build on s390x, so disable it temporarily; see
+# Fix building on s390x
# https://github.com/prusa3d/PrusaSlicer/issues/2879
-ExcludeArch: s390x
+Patch0: https://github.com/prusa3d/PrusaSlicer/commit/94212fa2a92b5d01be5da8235f0...
+
+# Try to fix more endian-related compilation errors
+# https://github.com/prusa3d/PrusaSlicer/issues/2879
+# https://github.com/prusa3d/PrusaSlicer/pull/2981
+Patch1: patch-endianness
# Highly-parallel uild can run out of memory on PPC64le
%ifarch ppc64le
@@ -395,6 +400,9 @@ make test ARGS=-V
%changelog
+* Mon Sep 23 2019 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 2.1.0-2
+- Fix the s390x build and re-enable it.
+
* Fri Sep 13 2019 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 2.1.0-1
- Update to 2.1.0.
commit a00aa925db869ac22a709302548cd6775fc1554b
Author: Jason Tibbitts <j(a)tib.bs>
Date: Mon Sep 16 12:19:01 2019 -0500
Reduce build parallelism on ppc64le.
diff --git a/prusa-slicer.spec b/prusa-slicer.spec
index efe34b0..4c4f62e 100644
--- a/prusa-slicer.spec
+++ b/prusa-slicer.spec
@@ -24,6 +24,11 @@ Source2: %name.appdata.xml
# https://github.com/prusa3d/PrusaSlicer/issues/2879
ExcludeArch: s390x
+# Highly-parallel uild can run out of memory on PPC64le
+%ifarch ppc64le
+%global _smp_ncpus_max 8
+%endif
+
BuildRequires: boost-devel
BuildRequires: cmake
BuildRequires: cereal-devel
commit e732c3905b637aba1799da2943c8b7b64a24273d
Author: Jason Tibbitts <j(a)tib.bs>
Date: Fri Sep 13 12:16:21 2019 -0500
Still broken on s390x.
diff --git a/prusa-slicer.spec b/prusa-slicer.spec
index 3e77327..efe34b0 100644
--- a/prusa-slicer.spec
+++ b/prusa-slicer.spec
@@ -20,6 +20,10 @@ Source0: https://github.com/prusa3d/PrusaSlicer/archive/version_%version.
Source1: %name.desktop
Source2: %name.appdata.xml
+# The source fails to build on s390x, so disable it temporarily; see
+# https://github.com/prusa3d/PrusaSlicer/issues/2879
+ExcludeArch: s390x
+
BuildRequires: boost-devel
BuildRequires: cmake
BuildRequires: cereal-devel
commit 222530aa310d2b9c0126f28277aab0d58a62b9a3
Author: Jason Tibbitts <j(a)tib.bs>
Date: Fri Sep 13 12:00:30 2019 -0500
Update to 2.1.0.
diff --git a/prusa-slicer.spec b/prusa-slicer.spec
index cd46556..3e77327 100644
--- a/prusa-slicer.spec
+++ b/prusa-slicer.spec
@@ -2,8 +2,8 @@
%bcond_without perltests
Name: prusa-slicer
-Version: 2.1.0~rc0
-Release: 2%{?dist}
+Version: 2.1.0
+Release: 1%{?dist}
Summary: 3D printing slicer optimized for Prusa printers
# The main PrusaSlicer code and resources are AGPLv3, with small parts as
@@ -16,14 +16,10 @@ Summary: 3D printing slicer optimized for Prusa printers
# that here.
License: AGPLv3
URL: https://github.com/prusa3d/PrusaSlicer/
-Source0: https://github.com/prusa3d/PrusaSlicer/archive/version_2.1.0-rc.tar.gz
+Source0: https://github.com/prusa3d/PrusaSlicer/archive/version_%version.tar.gz
Source1: %name.desktop
Source2: %name.appdata.xml
-# The source fails to build on s390x, so disable it temporarily; see
-# https://github.com/prusa3d/PrusaSlicer/issues/2879
-ExcludeArch: s390x
-
BuildRequires: boost-devel
BuildRequires: cmake
BuildRequires: cereal-devel
@@ -216,7 +212,7 @@ community.
%prep
-%autosetup -S git -n PrusaSlicer-version_2.1.0-rc
+%autosetup -S git -n PrusaSlicer-version_%version
commit () { git commit -q -a -m "$1" --author "%{__scm_author}"; }
@@ -390,6 +386,9 @@ make test ARGS=-V
%changelog
+* Fri Sep 13 2019 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 2.1.0-1
+- Update to 2.1.0.
+
* Fri Sep 06 2019 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 2.1.0~rc0-2
- Temporarily disable build on s390x because of a new bug in the code upstream:
https://github.com/prusa3d/PrusaSlicer/issues/2879
diff --git a/sources b/sources
index d364c49..67873b3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (version_2.1.0-rc.tar.gz) = d116059983cb9055efe6cb10591fd5c168dc4335c5ec0ca5a0bcd113d45b7f071dc1a92ba177f59adffb0945d52b88d8ba1cb4c55c3c76bc550757a431444df4
+SHA512 (version_2.1.0.tar.gz) = 28e8203e52194cb489282a565473a17b460aaf288522b847533f35d991a326fa8910a5e281fa3d1d920532f209221e95ddc6c7b68d6013f2ccd17271529d82cf
commit e5cf3b2bd8f5a9dcab93e3b9ec4ac4511900fc95
Author: Jason Tibbitts <j(a)tib.bs>
Date: Fri Sep 6 13:23:24 2019 -0500
Temporarily disable s390x build.
diff --git a/prusa-slicer.spec b/prusa-slicer.spec
index f803d66..cd46556 100644
--- a/prusa-slicer.spec
+++ b/prusa-slicer.spec
@@ -3,7 +3,7 @@
Name: prusa-slicer
Version: 2.1.0~rc0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: 3D printing slicer optimized for Prusa printers
# The main PrusaSlicer code and resources are AGPLv3, with small parts as
@@ -20,6 +20,10 @@ Source0: https://github.com/prusa3d/PrusaSlicer/archive/version_2.1.0-rc.
Source1: %name.desktop
Source2: %name.appdata.xml
+# The source fails to build on s390x, so disable it temporarily; see
+# https://github.com/prusa3d/PrusaSlicer/issues/2879
+ExcludeArch: s390x
+
BuildRequires: boost-devel
BuildRequires: cmake
BuildRequires: cereal-devel
@@ -386,6 +390,10 @@ make test ARGS=-V
%changelog
+* Fri Sep 06 2019 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 2.1.0~rc0-2
+- Temporarily disable build on s390x because of a new bug in the code upstream:
+ https://github.com/prusa3d/PrusaSlicer/issues/2879
+
* Wed Sep 04 2019 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 2.1.0~rc0-1
- Update to rc0.
- Drop tests which are known to fail.
commit 626ee093ec0032a531f60e3bbd862d72bb67ca1a
Author: Jason Tibbitts <j(a)tib.bs>
Date: Fri Sep 6 10:19:32 2019 -0500
Remove an unused patch/source file.
diff --git a/patch-testsuite-epsilon b/patch-testsuite-epsilon
deleted file mode 100644
index 3a7d8d0..0000000
--- a/patch-testsuite-epsilon
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/xs/t/03_point.t b/xs/t/03_point.t
-index cb71f68..0cc58e1 100644
---- a/xs/t/03_point.t
-+++ b/xs/t/03_point.t
-@@ -44,7 +44,7 @@ ok !$point->coincides_with($point2), 'coincides_with';
-
- {
- my $line = Slic3r::Line->new([50,50], [125,-25]);
-- is +Slic3r::Point->new(100,0)->distance_to_line($line), 0, 'distance_to_line()';
-+ cmp_ok(abs(Slic3r::Point->new(100,0)->distance_to_line($line)), '<=', 4e-15, 'distance_to_line()');
- }
-
- {
diff --git a/prusa-slicer.spec b/prusa-slicer.spec
index 128ed66..f803d66 100644
--- a/prusa-slicer.spec
+++ b/prusa-slicer.spec
@@ -20,13 +20,6 @@ Source0: https://github.com/prusa3d/PrusaSlicer/archive/version_2.1.0-rc.
Source1: %name.desktop
Source2: %name.appdata.xml
-# A single test suite fails, but only on aarch64 and s390x, due to floating
-# point rouding issues. This patch adds small epsilon (4e-15) to one
-# comparison to work around this.
-# We will conditionally apply this so it's a source file, not a patch.
-# https://github.com/prusa3d/PrusaSlicer/issues/2461
-Source10: patch-testsuite-epsilon
-
BuildRequires: boost-devel
BuildRequires: cmake
BuildRequires: cereal-devel
commit 3bb902b4a28f7033a6b44f1c5f22515c76b944cb
Author: Jason Tibbitts <j(a)tib.bs>
Date: Wed Sep 4 19:06:30 2019 -0500
No need to patch the testsuite for aarch64 and s390x.
diff --git a/prusa-slicer.spec b/prusa-slicer.spec
index 9849c03..128ed66 100644
--- a/prusa-slicer.spec
+++ b/prusa-slicer.spec
@@ -272,14 +272,6 @@ unbundle miniz
#commit "Fix miniz includes"
%endif
-# A single test fails on these architectures due to a difference in floating
-# point rounding causing a tiny value instead of an expected zero.
-# XXX probably not needed now
-%ifarch s390x aarch64
-git apply %SOURCE10
-commit "Testsuite fix"
-%endif
-
# These tests were fixed but the fixes were undone upsteam with commit ac6969c
# https://github.com/prusa3d/PrusaSlicer/issues/2288
# Just remove them for now
commit 42d48f00cadd559bb593a2354e8dea211525a587
Author: Jason Tibbitts <j(a)tib.bs>
Date: Wed Sep 4 17:46:24 2019 -0500
Update to rc0.
diff --git a/handle-wx-assert-with-boost.patch b/handle-wx-assert-with-boost.patch
deleted file mode 100644
index 78a54c9..0000000
--- a/handle-wx-assert-with-boost.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
-index 3880f1d79..907231b76 100644
---- a/src/slic3r/GUI/GUI_App.cpp
-+++ b/src/slic3r/GUI/GUI_App.cpp
-@@ -142,6 +142,16 @@ GUI_App::GUI_App()
-
- bool GUI_App::OnInit()
- {
-+ wxSetAssertHandler([](const wxString &file,
-+ int line,
-+ const wxString &func,
-+ const wxString &cond,
-+ const wxString &msg)
-+ {
-+ BOOST_LOG_TRIVIAL(debug) << file << " line: " << line << ":\n" << func
-+ << " " << cond << " " << msg;
-+ });
-+
- try {
- return on_init_inner();
- } catch (...) {
diff --git a/prusa-slicer.spec b/prusa-slicer.spec
index f783694..9849c03 100644
--- a/prusa-slicer.spec
+++ b/prusa-slicer.spec
@@ -2,7 +2,7 @@
%bcond_without perltests
Name: prusa-slicer
-Version: 2.1.0~alpha1
+Version: 2.1.0~rc0
Release: 1%{?dist}
Summary: 3D printing slicer optimized for Prusa printers
@@ -16,7 +16,7 @@ Summary: 3D printing slicer optimized for Prusa printers
# that here.
License: AGPLv3
URL: https://github.com/prusa3d/PrusaSlicer/
-Source0: https://github.com/prusa3d/PrusaSlicer/archive/version_2.1.0-alpha1.tar.gz
+Source0: https://github.com/prusa3d/PrusaSlicer/archive/version_2.1.0-rc.tar.gz
Source1: %name.desktop
Source2: %name.appdata.xml
@@ -27,15 +27,6 @@ Source2: %name.appdata.xml
# https://github.com/prusa3d/PrusaSlicer/issues/2461
Source10: patch-testsuite-epsilon
-# Fix a failure due to -Werror=format-security
-# https://github.com/prusa3d/PrusaSlicer/pull/2757
-Patch1: patch-format-security
-
-# This patch is pulled from upstream's Debian packaging.
-# I (JT) have not personally seen related bugs these fix but upstream asked
-# that this be included.
-Patch10: https://raw.githubusercontent.com/prusa3d/PrusaSlicer/debian/debian/patch...
-
BuildRequires: boost-devel
BuildRequires: cmake
BuildRequires: cereal-devel
@@ -226,8 +217,9 @@ with Mach3, LinuxCNC and Machinekit controllers.
PrusaSlicer is based on Slic3r by Alessandro Ranelucci and the RepRap
community.
+
%prep
-%autosetup -S git -n PrusaSlicer-version_2.1.0-alpha1
+%autosetup -S git -n PrusaSlicer-version_2.1.0-rc
commit () { git commit -q -a -m "$1" --author "%{__scm_author}"; }
@@ -274,20 +266,26 @@ unbundle poly2tri
# and this will be fixed upstream in the next release.
%if %{?fedora} >= 31
unbundle miniz
-sed -i 's/^#include.*miniz.*/#include <miniz.h>/' \
- src/libslic3r/Format/{3mf.cpp,AMF.cpp,PRUS.cpp} \
- src/libslic3r/Rasterizer/Rasterizer.cpp \
- src/libslic3r/Zipper.cpp
-commit "Fix miniz includes"
+#sed -i 's/^#include.*miniz.*/#include <miniz.h>/' \
+# src/libslic3r/Format/{3mf.cpp,AMF.cpp,PRUS.cpp} \
+# src/libslic3r/Zipper.cpp
+#commit "Fix miniz includes"
%endif
# A single test fails on these architectures due to a difference in floating
# point rounding causing a tiny value instead of an expected zero.
+# XXX probably not needed now
%ifarch s390x aarch64
git apply %SOURCE10
commit "Testsuite fix"
%endif
+# These tests were fixed but the fixes were undone upsteam with commit ac6969c
+# https://github.com/prusa3d/PrusaSlicer/issues/2288
+# Just remove them for now
+rm -f t/combineinfill.t t/custom_gcode.t t/fill.t t/multi.t t/retraction.t t/skirt_brim.t
+commit "Remove xfail tests."
+
%build
mkdir Build
@@ -403,6 +401,10 @@ make test ARGS=-V
%changelog
+* Wed Sep 04 2019 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 2.1.0~rc0-1
+- Update to rc0.
+- Drop tests which are known to fail.
+
* Tue Aug 13 2019 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 2.1.0~alpha1-1
- Update to the current alpha.
- Drop several upstreamed patches.
diff --git a/sources b/sources
index 17ad027..d364c49 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (version_2.0.0.tar.gz) = 31f51f4b0d54f9061e6556631297e5a2c3bbe7f867a891b5ec8e8c6ed4f4d973c38c8897e7b4b9d8935843aafd4a44556d9779865ebf35a75822036d8fae20f3
+SHA512 (version_2.1.0-rc.tar.gz) = d116059983cb9055efe6cb10591fd5c168dc4335c5ec0ca5a0bcd113d45b7f071dc1a92ba177f59adffb0945d52b88d8ba1cb4c55c3c76bc550757a431444df4
commit 50b1a6136012eacb39637d29d05ab3dab37fc8a3
Author: Jason Tibbitts <j(a)tib.bs>
Date: Wed Sep 4 17:45:48 2019 -0500
Blanket ignore the source archives.
diff --git a/.gitignore b/.gitignore
index f9690d6..c10c0c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
/PrusaSlicer*/
/results_*/
/*.src.rpm
-/version_2.0.0.tar.gz
+/version_*.tar.gz
commit beb29b6a107e6c15f5e552fbfea995b59d0255ef
Author: Jason Tibbitts <j(a)tib.bs>
Date: Tue Aug 13 14:32:51 2019 -0500
Initial attempt to update to 2.1.0 alpha1.
Signed-off-by: Jason Tibbitts <j(a)tib.bs>
diff --git a/07282eb24d027817b4279f59ebbf0d80bac5f950.patch b/07282eb24d027817b4279f59ebbf0d80bac5f950.patch
deleted file mode 100644
index 3602a20..0000000
--- a/07282eb24d027817b4279f59ebbf0d80bac5f950.patch
+++ /dev/null
@@ -1,254 +0,0 @@
-From 07282eb24d027817b4279f59ebbf0d80bac5f950 Mon Sep 17 00:00:00 2001
-From: Lukas Matena <lukasmatena(a)seznam.cz>
-Date: Wed, 22 May 2019 16:43:14 +0200
-Subject: [PATCH] Fixed unit tests when run with range checks on std::vector
-
-There was a bug in unit tests that led to generating the wipe tower with non-normalized preset.
-This caused out-of-bounds access into max_layer_height vector in fill_wipe_tower_partitions.
-The problem surfaced in https://github.com/prusa3d/PrusaSlicer/issues/2288.
-I quickly patched additional normalization of the preset to prevent this from happening.
-
-Also, an assert in the same function turned out to trip on one of the tests.
-This one was commented out for now and will (hopefully) be looked into later.
-
-Function Print::apply_config was renamed to apply_config_perl_tests_only so everyone
-sees its current purpose and does not mistake it for the more important Print::apply.
----
- lib/Slic3r/Print/Simple.pm | 2 +-
- lib/Slic3r/Test.pm | 8 ++++----
- src/libslic3r/GCode/ToolOrdering.cpp | 5 ++++-
- src/libslic3r/Print.cpp | 28 +++++++++++++++++++++++++---
- src/libslic3r/Print.hpp | 2 +-
- src/libslic3r/PrintBase.hpp | 2 +-
- src/libslic3r/PrintObject.cpp | 2 +-
- src/libslic3r/SLAPrint.cpp | 2 +-
- t/combineinfill.t | 2 +-
- t/print.t | 2 +-
- t/skirt_brim.t | 2 +-
- xs/xsp/Print.xsp | 4 ++--
- 12 files changed, 43 insertions(+), 18 deletions(-)
-
-diff --git a/lib/Slic3r/Print/Simple.pm b/lib/Slic3r/Print/Simple.pm
-index b5b749f12..2ab68f4d3 100644
---- a/lib/Slic3r/Print/Simple.pm
-+++ b/lib/Slic3r/Print/Simple.pm
-@@ -13,7 +13,7 @@ use Slic3r::Geometry qw(X Y);
- has '_print' => (
- is => 'ro',
- default => sub { Slic3r::Print->new },
-- handles => [qw(apply_config extruders output_filepath
-+ handles => [qw(apply_config_perl_tests_only extruders output_filepath
- total_used_filament total_extruded_volume
- placeholder_parser process)],
- );
-diff --git a/lib/Slic3r/Test.pm b/lib/Slic3r/Test.pm
-index b767ca593..d1b99e48c 100644
---- a/lib/Slic3r/Test.pm
-+++ b/lib/Slic3r/Test.pm
-@@ -176,7 +176,7 @@ sub init_print {
- $config->set('gcode_comments', 1) if $ENV{SLIC3R_TESTS_GCODE};
-
- my $print = Slic3r::Print->new;
-- $print->apply_config($config);
-+ $print->apply_config_perl_tests_only($config);
-
- $models = [$models] if ref($models) ne 'ARRAY';
- $models = [ map { ref($_) ? $_ : model($_, %params) } @$models ];
-@@ -192,8 +192,8 @@ sub init_print {
- $print->add_model_object($model_object);
- }
- }
-- # Call apply_config one more time, so that the layer height profiles are updated over all PrintObjects.
-- $print->apply_config($config);
-+ # Call apply_config_perl_tests_only one more time, so that the layer height profiles are updated over all PrintObjects.
-+ $print->apply_config_perl_tests_only($config);
- $print->validate;
-
- # We return a proxy object in order to keep $models alive as required by the Print API.
-@@ -250,7 +250,7 @@ sub add_facet {
- package Slic3r::Test::Print;
- use Moo;
-
--has 'print' => (is => 'ro', required => 1, handles => [qw(process apply_config)]);
-+has 'print' => (is => 'ro', required => 1, handles => [qw(process apply_config_perl_tests_only)]);
- has 'models' => (is => 'ro', required => 1);
-
- 1;
-diff --git a/src/libslic3r/GCode/ToolOrdering.cpp b/src/libslic3r/GCode/ToolOrdering.cpp
-index e800cd53f..e25ad91fe 100644
---- a/src/libslic3r/GCode/ToolOrdering.cpp
-+++ b/src/libslic3r/GCode/ToolOrdering.cpp
-@@ -327,7 +327,10 @@ void ToolOrdering::fill_wipe_tower_partitions(const PrintConfig &config, coordf_
- LayerTools <_prev = m_layer_tools[j - 1];
- LayerTools <_next = m_layer_tools[j + 1];
- assert(! lt_prev.extruders.empty() && ! lt_next.extruders.empty());
-- assert(lt_prev.extruders.back() == lt_next.extruders.front());
-+ // FIXME: Following assert tripped when running combine_infill.t. I decided to comment it out for now.
-+ // If it is a bug, it's likely not critical, because this code is unchanged for a long time. It might
-+ // still be worth looking into it more and decide if it is a bug or an obsolete assert.
-+ //assert(lt_prev.extruders.back() == lt_next.extruders.front());
- lt_extra.has_wipe_tower = true;
- lt_extra.extruders.push_back(lt_next.extruders.front());
- lt_extra.wipe_tower_partitions = lt_next.wipe_tower_partitions;
-diff --git a/src/libslic3r/Print.cpp b/src/libslic3r/Print.cpp
-index 29bbb49fe..f9129f15a 100644
---- a/src/libslic3r/Print.cpp
-+++ b/src/libslic3r/Print.cpp
-@@ -51,7 +51,7 @@ void Print::reload_object(size_t /* idx */)
- this->invalidate_all_steps();
- /* TODO: this method should check whether the per-object config and per-material configs
- have changed in such a way that regions need to be rearranged or we can just apply
-- the diff and invalidate something. Same logic as apply_config()
-+ the diff and invalidate something. Same logic as apply()
- For now we just re-add all objects since we haven't implemented this incremental logic yet.
- This should also check whether object volumes (parts) have changed. */
- // collect all current model objects
-@@ -83,7 +83,7 @@ PrintRegion* Print::add_region(const PrintRegionConfig &config)
- return m_regions.back();
- }
-
--// Called by Print::apply_config().
-+// Called by Print::apply().
- // This method only accepts PrintConfig option keys.
- bool Print::invalidate_state_by_config_options(const std::vector<t_config_option_key> &opt_keys)
- {
-@@ -422,10 +422,32 @@ void Print::add_model_object(ModelObject* model_object, int idx)
- }
- }
-
--bool Print::apply_config(DynamicPrintConfig config)
-+// This function is only called through the Perl-C++ binding from the unit tests, should be
-+// removed when unit tests are rewritten to C++.
-+bool Print::apply_config_perl_tests_only(DynamicPrintConfig config)
- {
- tbb::mutex::scoped_lock lock(this->state_mutex());
-
-+
-+ // Perl unit tests were failing in case the preset was not normalized (e.g. https://github.com/prusa3d/PrusaSlicer/issues/2288 was caused
-+ // by too short max_layer_height vector. Calling the necessary function Preset::normalize(...) is not currently possible because there is no
-+ // access to preset. This should be solved when the unit tests are rewritten to C++. For now we just copy-pasted code from Preset.cpp
-+ // to make sure the unit tests pass (functions set_num_extruders and nozzle_options()).
-+ auto *nozzle_diameter = dynamic_cast<const ConfigOptionFloats*>(config.option("nozzle_diameter", true));
-+ assert(nozzle_diameter != nullptr);
-+ const auto &defaults = FullPrintConfig::defaults();
-+ for (const std::string &key : { "nozzle_diameter", "min_layer_height", "max_layer_height", "extruder_offset",
-+ "retract_length", "retract_lift", "retract_lift_above", "retract_lift_below", "retract_speed", "deretract_speed",
-+ "retract_before_wipe", "retract_restart_extra", "retract_before_travel", "wipe",
-+ "retract_layer_change", "retract_length_toolchange", "retract_restart_extra_toolchange", "extruder_colour" })
-+ {
-+ auto *opt = config.option(key, true);
-+ assert(opt != nullptr);
-+ assert(opt->is_vector());
-+ unsigned int num_extruders = (unsigned int)nozzle_diameter->values.size();
-+ static_cast<ConfigOptionVectorBase*>(opt)->resize(num_extruders, defaults.option(key));
-+ }
-+
- // we get a copy of the config object so we can modify it safely
- config.normalize();
-
-diff --git a/src/libslic3r/Print.hpp b/src/libslic3r/Print.hpp
-index be2a9a3bd..53d6d692d 100644
---- a/src/libslic3r/Print.hpp
-+++ b/src/libslic3r/Print.hpp
-@@ -294,7 +294,7 @@ class Print : public PrintBaseWithState<PrintStep, psCount>
- // The following three methods are used by the Perl tests only. Get rid of them!
- void reload_object(size_t idx);
- void add_model_object(ModelObject* model_object, int idx = -1);
-- bool apply_config(DynamicPrintConfig config);
-+ bool apply_config_perl_tests_only(DynamicPrintConfig config);
-
- void process() override;
- // Exports G-code into a file name based on the path_template, returns the file path of the generated G-code file.
-diff --git a/src/libslic3r/PrintBase.hpp b/src/libslic3r/PrintBase.hpp
-index a4ef67117..d4c39499c 100644
---- a/src/libslic3r/PrintBase.hpp
-+++ b/src/libslic3r/PrintBase.hpp
-@@ -84,7 +84,7 @@ class PrintState : public PrintStateBase
-
- // Set the step as started. Block on mutex while the Print / PrintObject / PrintRegion objects are being
- // modified by the UI thread.
-- // This is necessary to block until the Print::apply_config() updates its state, which may
-+ // This is necessary to block until the Print::apply() updates its state, which may
- // influence the processing step being entered.
- template<typename ThrowIfCanceled>
- bool set_started(StepType step, tbb::mutex &mtx, ThrowIfCanceled throw_if_canceled) {
-diff --git a/src/libslic3r/PrintObject.cpp b/src/libslic3r/PrintObject.cpp
-index bcc61e0bf..660a2d939 100644
---- a/src/libslic3r/PrintObject.cpp
-+++ b/src/libslic3r/PrintObject.cpp
-@@ -435,7 +435,7 @@ SupportLayerPtrs::const_iterator PrintObject::insert_support_layer(SupportLayerP
- return m_support_layers.insert(pos, new SupportLayer(id, this, height, print_z, slice_z));
- }
-
--// Called by Print::apply_config().
-+// Called by Print::apply().
- // This method only accepts PrintObjectConfig and PrintRegionConfig option keys.
- bool PrintObject::invalidate_state_by_config_options(const std::vector<t_config_option_key> &opt_keys)
- {
-diff --git a/src/libslic3r/SLAPrint.cpp b/src/libslic3r/SLAPrint.cpp
-index 457be23ba..f0dfddda0 100644
---- a/src/libslic3r/SLAPrint.cpp
-+++ b/src/libslic3r/SLAPrint.cpp
-@@ -1552,7 +1552,7 @@ SLAPrintObject::SLAPrintObject(SLAPrint *print, ModelObject *model_object):
-
- SLAPrintObject::~SLAPrintObject() {}
-
--// Called by SLAPrint::apply_config().
-+// Called by SLAPrint::apply().
- // This method only accepts SLAPrintObjectConfig option keys.
- bool SLAPrintObject::invalidate_state_by_config_options(const std::vector<t_config_option_key> &opt_keys)
- {
-diff --git a/t/combineinfill.t b/t/combineinfill.t
-index 563ecb9c1..8aa0ff5e3 100644
---- a/t/combineinfill.t
-+++ b/t/combineinfill.t
-@@ -89,7 +89,7 @@ plan tests => 8;
-
- # we disable combination after infill has been generated
- $config->set('infill_every_layers', 1);
-- $print->apply_config($config);
-+ $print->apply_config_perl_tests_only($config);
- $print->process;
-
- ok !(defined first { @{$_->get_region(0)->fill_surfaces} == 0 }
-diff --git a/t/print.t b/t/print.t
-index 6939d5f15..be2db3431 100644
---- a/t/print.t
-+++ b/t/print.t
-@@ -44,7 +44,7 @@ use Slic3r::Test;
- is $print->print->regions->[0]->config->fill_density, 100, 'region config inherits model object config';
-
- # user exports G-code, thus the default config is reapplied
-- $print->print->apply_config($config);
-+ $print->print->apply_config_perl_tests_only($config);
-
- is $print->print->regions->[0]->config->fill_density, 100, 'apply_config() does not override per-object settings';
-
-diff --git a/t/skirt_brim.t b/t/skirt_brim.t
-index 225b0a92f..b05435784 100644
---- a/t/skirt_brim.t
-+++ b/t/skirt_brim.t
-@@ -106,7 +106,7 @@ use Slic3r::Test;
-
- # we enable support material after skirt has been generated
- $config->set('support_material', 1);
-- $print->apply_config($config);
-+ $print->apply_config_perl_tests_only($config);
-
- my $skirt_length = 0;
- my @extrusion_points = ();
-diff --git a/xs/xsp/Print.xsp b/xs/xsp/Print.xsp
-index f4c04577d..c35f967f8 100644
---- a/xs/xsp/Print.xsp
-+++ b/xs/xsp/Print.xsp
-@@ -142,8 +142,8 @@ _constant()
- %};
-
- void add_model_object(ModelObject* model_object, int idx = -1);
-- bool apply_config(DynamicPrintConfig* config)
-- %code%{ RETVAL = THIS->apply_config(*config); %};
-+ bool apply_config_perl_tests_only(DynamicPrintConfig* config)
-+ %code%{ RETVAL = THIS->apply_config_perl_tests_only(*config); %};
- bool has_infinite_skirt();
- std::vector<unsigned int> extruders() const;
- int validate() %code%{
diff --git a/fix-gizmo-icon-size.patch b/fix-gizmo-icon-size.patch
deleted file mode 100644
index 31cba7c..0000000
--- a/fix-gizmo-icon-size.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp
-index 1280fa6d9..ff2295cd7 100644
---- a/src/slic3r/GUI/GLCanvas3D.cpp
-+++ b/src/slic3r/GUI/GLCanvas3D.cpp
-@@ -4098,8 +4098,8 @@ void GLCanvas3D::_render_gizmos_overlay() const
- #if ENABLE_RETINA_GL
- m_gizmos.set_overlay_scale(m_retina_helper->get_scale_factor());
- #else
--// m_gizmos.set_overlay_scale(m_canvas->GetContentScaleFactor());
-- m_gizmos.set_overlay_scale(wxGetApp().em_unit()*0.1f);//! #ys_FIXME_experiment
-+ const float size = int(GLGizmosManager::Default_Icons_Size*wxGetApp().toolbar_icon_scale());
-+ m_gizmos.set_overlay_icon_size(size);
- #endif /* __WXMSW__ */
-
- m_gizmos.render_overlay(*this, m_selection);
-diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
-index 472abd6dc..6773dbd30 100644
---- a/src/slic3r/GUI/GUI_App.cpp
-+++ b/src/slic3r/GUI/GUI_App.cpp
-@@ -390,6 +390,27 @@ void GUI_App::set_label_clr_sys(const wxColour& clr) {
- app_config->save();
- }
-
-+float GUI_App::toolbar_icon_scale(const bool is_limited/* = false*/) const
-+{
-+#ifdef __APPLE__
-+ const float icon_sc = 1.0f; // for Retina display will be used its own scale
-+#else
-+ const float icon_sc = m_em_unit*0.1f;
-+#endif // __APPLE__
-+
-+ const std::string& use_val = app_config->get("use_custom_toolbar_size");
-+ const std::string& val = app_config->get("custom_toolbar_size");
-+
-+ if (val.empty() || use_val.empty() || use_val == "0")
-+ return icon_sc;
-+
-+ int int_val = atoi(val.c_str());
-+ if (is_limited && int_val < 50)
-+ int_val = 50;
-+
-+ return 0.01f * int_val * icon_sc;
-+}
-+
- void GUI_App::recreate_GUI()
- {
- // Weird things happen as the Paint messages are floating around the windows being destructed.
-diff --git a/src/slic3r/GUI/GUI_App.hpp b/src/slic3r/GUI/GUI_App.hpp
-index 1c9a462c6..b70f0dc16 100644
---- a/src/slic3r/GUI/GUI_App.hpp
-+++ b/src/slic3r/GUI/GUI_App.hpp
-@@ -115,6 +115,7 @@ public:
- const wxFont& normal_font() { return m_normal_font; }
- size_t em_unit() const { return m_em_unit; }
- void set_em_unit(const size_t em_unit) { m_em_unit = em_unit; }
-+ float toolbar_icon_scale(const bool is_limited = false) const;
-
- void recreate_GUI();
- void system_info();
diff --git a/mode-switching-fix.patch b/mode-switching-fix.patch
deleted file mode 100644
index 80241af..0000000
--- a/mode-switching-fix.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
-index 472abd6dc..74a574fe3 100644
---- a/src/slic3r/GUI/GUI_App.cpp
-+++ b/src/slic3r/GUI/GUI_App.cpp
-@@ -707,7 +707,7 @@ void GUI_App::update_mode()
- void GUI_App::add_config_menu(wxMenuBar *menu)
- {
- auto local_menu = new wxMenu();
-- wxWindowID config_id_base = wxWindow::NewControlId((int)ConfigMenuCnt);
-+ wxWindowID config_id_base = wxWindow::NewControlId(int(ConfigMenuCnt));
-
- const auto config_wizard_name = _(ConfigWizard::name(true).wx_str());
- const auto config_wizard_tooltip = wxString::Format(_(L("Run %s")), config_wizard_name);
-@@ -729,9 +729,9 @@ void GUI_App::add_config_menu(wxMenuBar *menu)
- mode_menu->AppendRadioItem(config_id_base + ConfigMenuModeSimple, _(L("Simple")), _(L("Simple View Mode")));
- mode_menu->AppendRadioItem(config_id_base + ConfigMenuModeAdvanced, _(L("Advanced")), _(L("Advanced View Mode")));
- mode_menu->AppendRadioItem(config_id_base + ConfigMenuModeExpert, _(L("Expert")), _(L("Expert View Mode")));
-- Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { evt.Check(get_mode() == comSimple); }, config_id_base + ConfigMenuModeSimple);
-- Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { evt.Check(get_mode() == comAdvanced); }, config_id_base + ConfigMenuModeAdvanced);
-- Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { evt.Check(get_mode() == comExpert); }, config_id_base + ConfigMenuModeExpert);
-+ Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { if(get_mode() == comSimple) evt.Check(true); }, config_id_base + ConfigMenuModeSimple);
-+ Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { if(get_mode() == comAdvanced) evt.Check(true); }, config_id_base + ConfigMenuModeAdvanced);
-+ Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { if(get_mode() == comExpert) evt.Check(true); }, config_id_base + ConfigMenuModeExpert);
-
- local_menu->AppendSubMenu(mode_menu, _(L("Mode")), wxString::Format(_(L("%s View Mode")), SLIC3R_APP_NAME));
- local_menu->AppendSeparator();
-@@ -810,10 +810,14 @@ void GUI_App::add_config_menu(wxMenuBar *menu)
- break;
- }
- });
-- mode_menu->Bind(wxEVT_MENU, [this, config_id_base](wxEvent& event) {
-- int id_mode = event.GetId() - config_id_base;
-- save_mode(id_mode - ConfigMenuModeSimple);
-- });
-+
-+ using std::placeholders::_1;
-+
-+ auto modfn = [this](int mode, wxCommandEvent&) { if(get_mode() != mode) save_mode(mode); };
-+ mode_menu->Bind(wxEVT_MENU, std::bind(modfn, comSimple, _1), config_id_base + ConfigMenuModeSimple);
-+ mode_menu->Bind(wxEVT_MENU, std::bind(modfn, comAdvanced, _1), config_id_base + ConfigMenuModeAdvanced);
-+ mode_menu->Bind(wxEVT_MENU, std::bind(modfn, comExpert, _1), config_id_base + ConfigMenuModeExpert);
-+
- menu->Append(local_menu, _(L("&Configuration")));
- }
-
-diff --git a/src/slic3r/GUI/wxExtensions.cpp b/src/slic3r/GUI/wxExtensions.cpp
-index 103a9ecf0..76ba853dc 100644
---- a/src/slic3r/GUI/wxExtensions.cpp
-+++ b/src/slic3r/GUI/wxExtensions.cpp
-@@ -2557,6 +2557,11 @@ ModeSizer::ModeSizer(wxWindow *parent, int hgap/* = 10*/) :
- {_(L("Expert")), "mode_expert_sq.png"}
- };
-
-+ auto modebtnfn = [](wxCommandEvent &event, int mode_id) {
-+ Slic3r::GUI::wxGetApp().save_mode(mode_id);
-+ event.Skip();
-+ };
-+
- m_mode_btns.reserve(3);
- for (const auto& button : buttons) {
- #ifdef __WXOSX__
-@@ -2567,37 +2572,22 @@ ModeSizer::ModeSizer(wxWindow *parent, int hgap/* = 10*/) :
- #else
- m_mode_btns.push_back(new ModeButton(parent, wxID_ANY, button.second, button.first));;
- #endif // __WXOSX__
-+
-+ m_mode_btns.back()->Bind(wxEVT_BUTTON, std::bind(modebtnfn, std::placeholders::_1, m_mode_btns.size() - 1));
-+ Add(m_mode_btns.back());
- }
--
-- for (auto btn : m_mode_btns)
-- {
-- btn->Bind(wxEVT_BUTTON, [btn, this](wxCommandEvent &event) {
-- event.Skip();
-- int mode_id = 0;
-- for (auto cur_btn : m_mode_btns) {
-- if (cur_btn == btn)
-- break;
-- else
-- mode_id++;
-- }
-- Slic3r::GUI::wxGetApp().save_mode(mode_id);
-- });
--
-- Add(btn);
-- }
--
- }
-
- void ModeSizer::SetMode(const int mode)
- {
-- for (int m = 0; m < m_mode_btns.size(); m++)
-- m_mode_btns[m]->SetState(m == mode);
-+ for (size_t m = 0; m < m_mode_btns.size(); m++)
-+ m_mode_btns[m]->SetState(int(m) == mode);
- }
-
-
- void ModeSizer::msw_rescale()
- {
-- for (int m = 0; m < m_mode_btns.size(); m++)
-+ for (size_t m = 0; m < m_mode_btns.size(); m++)
- m_mode_btns[m]->msw_rescale();
- }
-
diff --git a/patch-expat-includes b/patch-expat-includes
deleted file mode 100644
index 2e0cb4c..0000000
--- a/patch-expat-includes
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/libslic3r/Format/AMF.cpp b/src/libslic3r/Format/AMF.cpp
-index ff1da37..a3f92e4 100644
---- a/src/libslic3r/Format/AMF.cpp
-+++ b/src/libslic3r/Format/AMF.cpp
-@@ -2,7 +2,7 @@
- #include <string.h>
- #include <map>
- #include <string>
--#include <expat/expat.h>
-+#include <expat.h>
-
- #include <boost/nowide/cstdio.hpp>
-
diff --git a/patch-miniz-includes b/patch-miniz-includes
deleted file mode 100644
index 5efbca7..0000000
--- a/patch-miniz-includes
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/src/libslic3r/Format/3mf.cpp b/src/libslic3r/Format/3mf.cpp
-index 5a16a6e..2023259 100644
---- a/src/libslic3r/Format/3mf.cpp
-+++ b/src/libslic3r/Format/3mf.cpp
-@@ -16,7 +16,7 @@
-
- #include <expat.h>
- #include <Eigen/Dense>
--#include <miniz/miniz_zip.h>
-+#include <miniz.h>
-
- // VERSION NUMBERS
- // 0 : .3mf, files saved by older slic3r or other applications. No version definition in them.
-diff --git a/src/libslic3r/Format/AMF.cpp b/src/libslic3r/Format/AMF.cpp
-index a3f92e4..f85c6d6 100644
---- a/src/libslic3r/Format/AMF.cpp
-+++ b/src/libslic3r/Format/AMF.cpp
-@@ -16,7 +16,7 @@
- #include <boost/filesystem/operations.hpp>
- #include <boost/algorithm/string.hpp>
- #include <boost/nowide/fstream.hpp>
--#include <miniz/miniz_zip.h>
-+#include <miniz.h>
-
- #if 0
- // Enable debugging and assert in this file.
-diff --git a/src/libslic3r/Format/PRUS.cpp b/src/libslic3r/Format/PRUS.cpp
-index 80aae75..04cedc0 100644
---- a/src/libslic3r/Format/PRUS.cpp
-+++ b/src/libslic3r/Format/PRUS.cpp
-@@ -4,7 +4,7 @@
- #include <boost/algorithm/string.hpp>
- #include <boost/nowide/convert.hpp>
-
--#include <miniz/miniz_zip.h>
-+#include <miniz.h>
-
- #include <Eigen/Geometry>
-
-diff --git a/src/libslic3r/Rasterizer/Rasterizer.cpp b/src/libslic3r/Rasterizer/Rasterizer.cpp
-index 6384a24..e121355 100644
---- a/src/libslic3r/Rasterizer/Rasterizer.cpp
-+++ b/src/libslic3r/Rasterizer/Rasterizer.cpp
-@@ -15,7 +15,7 @@
- #include <agg/agg_path_storage.h>
-
- // Experimental minz image write:
--#include <miniz/miniz_tdef.h>
-+#include <miniz.h>
-
- namespace Slic3r {
-
-diff --git a/src/libslic3r/Zipper.cpp b/src/libslic3r/Zipper.cpp
-index 4466f1b..16f4f5b 100644
---- a/src/libslic3r/Zipper.cpp
-+++ b/src/libslic3r/Zipper.cpp
-@@ -3,7 +3,7 @@
- #include <iostream>
-
- #include "Zipper.hpp"
--#include "miniz/miniz_zip.h"
-+#include <miniz.h>
- #include <boost/log/trivial.hpp>
-
- #include "I18N.hpp"
diff --git a/patch-qhull-includes b/patch-qhull-includes
deleted file mode 100644
index ffe2b83..0000000
--- a/patch-qhull-includes
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/libslic3r/TriangleMesh.cpp b/src/libslic3r/TriangleMesh.cpp
-index 20c9a9c..4d35cab 100644
---- a/src/libslic3r/TriangleMesh.cpp
-+++ b/src/libslic3r/TriangleMesh.cpp
-@@ -2,9 +2,9 @@
- #include "ClipperUtils.hpp"
- #include "Geometry.hpp"
- #include "Tesselate.hpp"
--#include "qhull/src/libqhullcpp/Qhull.h"
--#include "qhull/src/libqhullcpp/QhullFacetList.h"
--#include "qhull/src/libqhullcpp/QhullVertexSet.h"
-+#include <libqhullcpp/Qhull.h>
-+#include <libqhullcpp/QhullFacetList.h>
-+#include <libqhullcpp/QhullVertexSet.h>
- #include <cmath>
- #include <deque>
- #include <queue>
diff --git a/prusa-slicer.spec b/prusa-slicer.spec
index e51d5c8..f783694 100644
--- a/prusa-slicer.spec
+++ b/prusa-slicer.spec
@@ -2,8 +2,8 @@
%bcond_without perltests
Name: prusa-slicer
-Version: 2.0.0
-Release: 4%{?dist}
+Version: 2.1.0~alpha1
+Release: 1%{?dist}
Summary: 3D printing slicer optimized for Prusa printers
# The main PrusaSlicer code and resources are AGPLv3, with small parts as
@@ -16,8 +16,7 @@ Summary: 3D printing slicer optimized for Prusa printers
# that here.
License: AGPLv3
URL: https://github.com/prusa3d/PrusaSlicer/
-Source0: https://github.com/prusa3d/PrusaSlicer/archive/version_2.0.0.tar.gz
-
+Source0: https://github.com/prusa3d/PrusaSlicer/archive/version_2.1.0-alpha1.tar.gz
Source1: %name.desktop
Source2: %name.appdata.xml
@@ -28,26 +27,18 @@ Source2: %name.appdata.xml
# https://github.com/prusa3d/PrusaSlicer/issues/2461
Source10: patch-testsuite-epsilon
-# Fix an improper include of expat.h
-# https://github.com/prusa3d/PrusaSlicer/pull/2315
-Patch0: patch-expat-includes
-
-# Fix improper qhull include locations
-# https://github.com/prusa3d/PrusaSlicer/pull/2319
-Patch1: patch-qhull-includes
-
-# Fix a number of failing unit tests
-# https://github.com/prusa3d/PrusaSlicer/issues/2288
-Patch10: https://github.com/prusa3d/PrusaSlicer/commit/07282eb24d027817b4279f59ebb...
+# Fix a failure due to -Werror=format-security
+# https://github.com/prusa3d/PrusaSlicer/pull/2757
+Patch1: patch-format-security
-# These patches are pulled from upstream's Debian packaging, and were cherry picked from post-release commits.
-# I (JT) have not personally seen the bugs these fix but upstream asked that they be included.
-Patch20: https://raw.githubusercontent.com/prusa3d/PrusaSlicer/debian/debian/patch...
-Patch21: https://raw.githubusercontent.com/prusa3d/PrusaSlicer/debian/debian/patch...
-Patch22: https://raw.githubusercontent.com/prusa3d/PrusaSlicer/debian/debian/patch...
+# This patch is pulled from upstream's Debian packaging.
+# I (JT) have not personally seen related bugs these fix but upstream asked
+# that this be included.
+Patch10: https://raw.githubusercontent.com/prusa3d/PrusaSlicer/debian/debian/patch...
BuildRequires: boost-devel
BuildRequires: cmake
+BuildRequires: cereal-devel
BuildRequires: curl-devel
BuildRequires: desktop-file-utils
BuildRequires: eigen3-devel
@@ -145,10 +136,6 @@ Provides: bundled(avrdude) = 6.3
# Upstream: https://github.com/artyom-beilis/nowide
Provides: bundled(boost-nowide)
-# License: MPLv2.0
-# Upstream: https://github.com/libigl/libigl
-Provides: bundled(igl)
-
# Not packaged in Fedora, but could be.
# License: MIT
# Upstream: https://github.com/ocornut/imgui
@@ -240,7 +227,7 @@ PrusaSlicer is based on Slic3r by Alessandro Ranelucci and the RepRap
community.
%prep
-%autosetup -S git -n PrusaSlicer-version_2.0.0
+%autosetup -S git -n PrusaSlicer-version_2.1.0-alpha1
commit () { git commit -q -a -m "$1" --author "%{__scm_author}"; }
@@ -278,10 +265,6 @@ unbundle eigen
unbundle expat
unbundle glew
-# This code doesn't seem to be used, so remove it to (potentially) simplify the
-# licensing issue.
-unbundle igl/copyleft
-
# Upstream says this is obsolete, but it's still needed for compilation.
# The Fedora version appears to work fine for that purpose so we'll use it.
unbundle poly2tri
@@ -420,6 +403,10 @@ make test ARGS=-V
%changelog
+* Tue Aug 13 2019 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 2.1.0~alpha1-1
+- Update to the current alpha.
+- Drop several upstreamed patches.
+
* Fri Jul 26 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.0.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
4 years, 7 months
Architecture specific change in rpms/prusa-slicer.git
by githook-noreply@fedoraproject.org
The package rpms/prusa-slicer.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/prusa-slicer.git/commit/?id=c26d5....
Change:
-ExcludeArch: s390x
Thanks.
Full change:
============
commit c26d5e70efcfc38216b93f116b03671140e63723
Author: Jason Tibbitts <j(a)tib.bs>
Date: Mon Sep 23 12:15:44 2019 -0500
Add patches to fix s390x build issues.
diff --git a/94212fa2a92b5d01be5da8235f02423249dd7b2a.patch b/94212fa2a92b5d01be5da8235f02423249dd7b2a.patch
new file mode 100644
index 0000000..b75ad9d
--- /dev/null
+++ b/94212fa2a92b5d01be5da8235f02423249dd7b2a.patch
@@ -0,0 +1,25 @@
+From 94212fa2a92b5d01be5da8235f02423249dd7b2a Mon Sep 17 00:00:00 2001
+From: bubnikv <bubnikv(a)gmail.com>
+Date: Thu, 19 Sep 2019 08:56:47 +0200
+Subject: [PATCH] Another fix of admesh on big endian architectures, fixes
+ #2879
+
+---
+ src/admesh/stl_io.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/admesh/stl_io.cpp b/src/admesh/stl_io.cpp
+index af9bb4f98..ddf377c78 100644
+--- a/src/admesh/stl_io.cpp
++++ b/src/admesh/stl_io.cpp
+@@ -151,8 +151,8 @@ bool stl_write_binary(stl_file *stl, const char *file, const char *label)
+ memcpy(buffer, &stl->stats.number_of_facets, 4);
+ stl_internal_reverse_quads(buffer, 4);
+ fwrite(buffer, 4, 1, fp);
+- for (size_t i = 0; i < stl->stats.number_of_facets; ++ i) {
+- memcpy(buffer, stl->facet_start + i, 50);
++ for (const stl_facet &facet : stl->facet_start) {
++ memcpy(buffer, &facet, 50);
+ // Convert to little endian.
+ stl_internal_reverse_quads(buffer, 48);
+ fwrite(buffer, SIZEOF_STL_FACET, 1, fp);
diff --git a/patch-endianness b/patch-endianness
new file mode 100644
index 0000000..9dc6432
--- /dev/null
+++ b/patch-endianness
@@ -0,0 +1,26 @@
+diff --git a/src/admesh/stlinit.cpp b/src/admesh/stlinit.cpp
+index 693aad0..390fe56 100644
+--- a/src/admesh/stlinit.cpp
++++ b/src/admesh/stlinit.cpp
+@@ -36,6 +36,10 @@
+ #error "SEEK_SET not defined"
+ #endif
+
++#ifndef BOOST_LITTLE_ENDIAN
++extern void stl_internal_reverse_quads(char *buf, size_t cnt);
++#endif /* BOOST_LITTLE_ENDIAN */
++
+ static FILE* stl_open_count_facets(stl_file *stl, const char *file)
+ {
+ // Open the file in binary mode first.
+@@ -238,10 +242,6 @@ bool stl_open(stl_file *stl, const char *file)
+ return result;
+ }
+
+-#ifndef BOOST_LITTLE_ENDIAN
+-extern void stl_internal_reverse_quads(char *buf, size_t cnt);
+-#endif /* BOOST_LITTLE_ENDIAN */
+-
+ void stl_allocate(stl_file *stl)
+ {
+ // Allocate memory for the entire .STL file.
diff --git a/prusa-slicer.spec b/prusa-slicer.spec
index 4c4f62e..125082c 100644
--- a/prusa-slicer.spec
+++ b/prusa-slicer.spec
@@ -3,7 +3,7 @@
Name: prusa-slicer
Version: 2.1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: 3D printing slicer optimized for Prusa printers
# The main PrusaSlicer code and resources are AGPLv3, with small parts as
@@ -20,9 +20,14 @@ Source0: https://github.com/prusa3d/PrusaSlicer/archive/version_%version.
Source1: %name.desktop
Source2: %name.appdata.xml
-# The source fails to build on s390x, so disable it temporarily; see
+# Fix building on s390x
# https://github.com/prusa3d/PrusaSlicer/issues/2879
-ExcludeArch: s390x
+Patch0: https://github.com/prusa3d/PrusaSlicer/commit/94212fa2a92b5d01be5da8235f0...
+
+# Try to fix more endian-related compilation errors
+# https://github.com/prusa3d/PrusaSlicer/issues/2879
+# https://github.com/prusa3d/PrusaSlicer/pull/2981
+Patch1: patch-endianness
# Highly-parallel uild can run out of memory on PPC64le
%ifarch ppc64le
@@ -395,6 +400,9 @@ make test ARGS=-V
%changelog
+* Mon Sep 23 2019 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 2.1.0-2
+- Fix the s390x build and re-enable it.
+
* Fri Sep 13 2019 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 2.1.0-1
- Update to 2.1.0.
4 years, 7 months
Architecture specific change in rpms/gnome-hexgl.git
by githook-noreply@fedoraproject.org
The package rpms/gnome-hexgl.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/gnome-hexgl.git/commit/?id=cf3f09....
Change:
+ExcludeArch: armv7hl i686
Thanks.
Full change:
============
commit cf3f09342fc2e2cf05869ed3615a859a8e0e1470
Author: Artem Polishchuk <ego.cordatus(a)gmail.com>
Date: Mon Sep 23 19:07:04 2019 +0300
Initial import (#1750567).
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..40dc54e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/gnome-hexgl-0.2.0.tar.gz
diff --git a/gnome-hexgl.spec b/gnome-hexgl.spec
new file mode 100644
index 0000000..cacd990
--- /dev/null
+++ b/gnome-hexgl.spec
@@ -0,0 +1,77 @@
+# Enable LTO
+%global optflags %{optflags} -flto
+%global build_ldflags %{build_ldflags} -flto
+
+%global uuid org.gnome.HexGL
+
+Name: gnome-hexgl
+Version: 0.2.0
+Release: 2%{?dist}
+Summary: Gthree port of HexGL
+
+# The entire source code is GPLv3+ except sounds which is CC-BY
+License: MIT and CC-BY
+URL: https://github.com/alexlarsson/gnome-hexgl
+Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
+# https://github.com/alexlarsson/gthree/issues/66
+ExcludeArch: armv7hl i686
+
+BuildRequires: desktop-file-utils
+BuildRequires: gcc
+BuildRequires: libappstream-glib
+BuildRequires: meson >= 0.48.0
+BuildRequires: pkgconfig(gsound)
+BuildRequires: pkgconfig(gthree-1.0) >= 0.2.0
+BuildRequires: pkgconfig(gtk+-3.0)
+Requires: hicolor-icon-theme
+Requires: %{name}-data = %{version}-%{release}
+
+%description
+%{summary}.
+
+
+%package data
+BuildArch: noarch
+
+Summary: Data files for %{name}
+Requires: %{name} = %{version}-%{release}
+
+%description data
+Data files for %{name}.
+
+
+%prep
+%autosetup
+
+
+%build
+%meson
+%meson_build
+
+
+%install
+%meson_install
+
+
+%check
+appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{uuid}.appdata.xml
+desktop-file-validate %{buildroot}%{_datadir}/applications/%{uuid}.desktop
+
+
+%files
+%license COPYING sounds/LICENSE
+%{_bindir}/%{name}
+%{_datadir}/applications/*.desktop
+%{_datadir}/icons/hicolor/*/*/*.png
+%{_metainfodir}/*.xml
+
+%files data
+%{_datadir}/%{name}
+
+
+%changelog
+* Mon Sep 09 2019 Artem Polishchuk <ego.cordatus(a)gmail.com> - 0.2.0-2
+- Update to 0.2.0
+
+* Fri Mar 29 2019 Artem Polishchuk <ego.cordatus(a)gmail.com>
+- Initial package
diff --git a/sources b/sources
new file mode 100644
index 0000000..73d7d54
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (gnome-hexgl-0.2.0.tar.gz) = 83cd201e4cbbb2a12e0c73ebd5a1f5bd7d24a5288400c182d7449dae1e446817f6555a12235f4c4017e7e9bd24c4fe4c75e264362f58d020130619503b3c2599
4 years, 7 months
Architecture specific change in rpms/gnome-hexgl.git
by githook-noreply@fedoraproject.org
The package rpms/gnome-hexgl.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/gnome-hexgl.git/commit/?id=cf3f09....
Change:
+ExcludeArch: armv7hl i686
Thanks.
Full change:
============
commit cf3f09342fc2e2cf05869ed3615a859a8e0e1470
Author: Artem Polishchuk <ego.cordatus(a)gmail.com>
Date: Mon Sep 23 19:07:04 2019 +0300
Initial import (#1750567).
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..40dc54e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/gnome-hexgl-0.2.0.tar.gz
diff --git a/gnome-hexgl.spec b/gnome-hexgl.spec
new file mode 100644
index 0000000..cacd990
--- /dev/null
+++ b/gnome-hexgl.spec
@@ -0,0 +1,77 @@
+# Enable LTO
+%global optflags %{optflags} -flto
+%global build_ldflags %{build_ldflags} -flto
+
+%global uuid org.gnome.HexGL
+
+Name: gnome-hexgl
+Version: 0.2.0
+Release: 2%{?dist}
+Summary: Gthree port of HexGL
+
+# The entire source code is GPLv3+ except sounds which is CC-BY
+License: MIT and CC-BY
+URL: https://github.com/alexlarsson/gnome-hexgl
+Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
+# https://github.com/alexlarsson/gthree/issues/66
+ExcludeArch: armv7hl i686
+
+BuildRequires: desktop-file-utils
+BuildRequires: gcc
+BuildRequires: libappstream-glib
+BuildRequires: meson >= 0.48.0
+BuildRequires: pkgconfig(gsound)
+BuildRequires: pkgconfig(gthree-1.0) >= 0.2.0
+BuildRequires: pkgconfig(gtk+-3.0)
+Requires: hicolor-icon-theme
+Requires: %{name}-data = %{version}-%{release}
+
+%description
+%{summary}.
+
+
+%package data
+BuildArch: noarch
+
+Summary: Data files for %{name}
+Requires: %{name} = %{version}-%{release}
+
+%description data
+Data files for %{name}.
+
+
+%prep
+%autosetup
+
+
+%build
+%meson
+%meson_build
+
+
+%install
+%meson_install
+
+
+%check
+appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{uuid}.appdata.xml
+desktop-file-validate %{buildroot}%{_datadir}/applications/%{uuid}.desktop
+
+
+%files
+%license COPYING sounds/LICENSE
+%{_bindir}/%{name}
+%{_datadir}/applications/*.desktop
+%{_datadir}/icons/hicolor/*/*/*.png
+%{_metainfodir}/*.xml
+
+%files data
+%{_datadir}/%{name}
+
+
+%changelog
+* Mon Sep 09 2019 Artem Polishchuk <ego.cordatus(a)gmail.com> - 0.2.0-2
+- Update to 0.2.0
+
+* Fri Mar 29 2019 Artem Polishchuk <ego.cordatus(a)gmail.com>
+- Initial package
diff --git a/sources b/sources
new file mode 100644
index 0000000..73d7d54
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (gnome-hexgl-0.2.0.tar.gz) = 83cd201e4cbbb2a12e0c73ebd5a1f5bd7d24a5288400c182d7449dae1e446817f6555a12235f4c4017e7e9bd24c4fe4c75e264362f58d020130619503b3c2599
4 years, 7 months
Architecture specific change in rpms/gnome-hexgl.git
by githook-noreply@fedoraproject.org
The package rpms/gnome-hexgl.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/gnome-hexgl.git/commit/?id=cf3f09....
Change:
+ExcludeArch: armv7hl i686
Thanks.
Full change:
============
commit cf3f09342fc2e2cf05869ed3615a859a8e0e1470
Author: Artem Polishchuk <ego.cordatus(a)gmail.com>
Date: Mon Sep 23 19:07:04 2019 +0300
Initial import (#1750567).
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..40dc54e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/gnome-hexgl-0.2.0.tar.gz
diff --git a/gnome-hexgl.spec b/gnome-hexgl.spec
new file mode 100644
index 0000000..cacd990
--- /dev/null
+++ b/gnome-hexgl.spec
@@ -0,0 +1,77 @@
+# Enable LTO
+%global optflags %{optflags} -flto
+%global build_ldflags %{build_ldflags} -flto
+
+%global uuid org.gnome.HexGL
+
+Name: gnome-hexgl
+Version: 0.2.0
+Release: 2%{?dist}
+Summary: Gthree port of HexGL
+
+# The entire source code is GPLv3+ except sounds which is CC-BY
+License: MIT and CC-BY
+URL: https://github.com/alexlarsson/gnome-hexgl
+Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
+# https://github.com/alexlarsson/gthree/issues/66
+ExcludeArch: armv7hl i686
+
+BuildRequires: desktop-file-utils
+BuildRequires: gcc
+BuildRequires: libappstream-glib
+BuildRequires: meson >= 0.48.0
+BuildRequires: pkgconfig(gsound)
+BuildRequires: pkgconfig(gthree-1.0) >= 0.2.0
+BuildRequires: pkgconfig(gtk+-3.0)
+Requires: hicolor-icon-theme
+Requires: %{name}-data = %{version}-%{release}
+
+%description
+%{summary}.
+
+
+%package data
+BuildArch: noarch
+
+Summary: Data files for %{name}
+Requires: %{name} = %{version}-%{release}
+
+%description data
+Data files for %{name}.
+
+
+%prep
+%autosetup
+
+
+%build
+%meson
+%meson_build
+
+
+%install
+%meson_install
+
+
+%check
+appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{uuid}.appdata.xml
+desktop-file-validate %{buildroot}%{_datadir}/applications/%{uuid}.desktop
+
+
+%files
+%license COPYING sounds/LICENSE
+%{_bindir}/%{name}
+%{_datadir}/applications/*.desktop
+%{_datadir}/icons/hicolor/*/*/*.png
+%{_metainfodir}/*.xml
+
+%files data
+%{_datadir}/%{name}
+
+
+%changelog
+* Mon Sep 09 2019 Artem Polishchuk <ego.cordatus(a)gmail.com> - 0.2.0-2
+- Update to 0.2.0
+
+* Fri Mar 29 2019 Artem Polishchuk <ego.cordatus(a)gmail.com>
+- Initial package
diff --git a/sources b/sources
new file mode 100644
index 0000000..73d7d54
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (gnome-hexgl-0.2.0.tar.gz) = 83cd201e4cbbb2a12e0c73ebd5a1f5bd7d24a5288400c182d7449dae1e446817f6555a12235f4c4017e7e9bd24c4fe4c75e264362f58d020130619503b3c2599
4 years, 7 months
Architecture specific change in rpms/chromium.git
by githook-noreply@fedoraproject.org
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=a472406f7...
https://src.fedoraproject.org/cgit/rpms/chromium.git/commit/?id=20eba058d....
Change:
+%ifarch %{ix86}
-%ifarch x86_64
Thanks.
Full change:
============
commit 64608c7b853bd7fda974d4b6013159e6df15cdf9
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 930b750..ff76b24 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -158,7 +158,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)
@@ -218,6 +218,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
@@ -730,6 +732,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}
@@ -1632,6 +1635,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 b5420298f462ec8637355b087d0d9bf5141f692c
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 e6a6f88..930b750 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -1388,8 +1388,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 a472406f7f0e3316065738abf4a1f0d7d56a5d56
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 c41439f..e6a6f88 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -164,114 +164,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
@@ -757,60 +704,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
@@ -1287,6 +1214,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 94ec5c2f5bdd33d4ab71b6fc0d7e2a9b7d1fa55e
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 7fe074d..c41439f 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -1256,7 +1256,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 20eba058de554633ffb2d407e25fa2a0190f050b
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 38d8c20..7fe074d 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.
@@ -298,16 +277,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
@@ -415,24 +384,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
@@ -865,11 +816,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
@@ -898,101 +844,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.
@@ -1063,9 +914,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
@@ -1227,9 +1076,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
@@ -1460,20 +1306,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}
@@ -1511,10 +1345,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}
@@ -1596,12 +1426,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}
@@ -1742,12 +1566,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
@@ -1861,11 +1679,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 430c02ae6ec1d4dd86bfb77883f2448bafa73216
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 6b2691a..38d8c20 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -862,8 +862,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
4 years, 7 months
Architecture specific change in rpms/chromium.git
by githook-noreply@fedoraproject.org
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=35521ebaf...
https://src.fedoraproject.org/cgit/rpms/chromium.git/commit/?id=5e096a366....
Change:
+%ifarch %{ix86}
-%ifarch x86_64
Thanks.
Full change:
============
commit 3d796422d5a4839b4a085c5ff26b57e3d2fc531d
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 d9399c5..f962e02 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -158,7 +158,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)
@@ -218,6 +218,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
@@ -730,6 +732,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}
@@ -1632,6 +1635,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 6bae3df5bc0ae8a223b79879956160aebf252b8b
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 e32ff17..d9399c5 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -1388,8 +1388,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 35521ebaf47120dd5860f1810946ed48cbe28bab
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 f0af194..e32ff17 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -164,114 +164,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
@@ -757,60 +704,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
@@ -1287,6 +1214,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 1fb9b47fde081c17a41b77000d2b13167a6ef630
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 41a43d1..f0af194 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -1256,7 +1256,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 5e096a366bc3f459996bda46f118e8fa681496a0
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 838e4b8..41a43d1 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.
@@ -298,16 +277,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
@@ -415,24 +384,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
@@ -865,11 +816,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
@@ -898,101 +844,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.
@@ -1063,9 +914,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
@@ -1227,9 +1076,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
@@ -1460,20 +1306,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}
@@ -1511,10 +1345,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}
@@ -1596,12 +1426,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}
@@ -1742,12 +1566,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
@@ -1861,11 +1679,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 18d61f508bd415e9adebb31e5c76f67049d6e5dc
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 883277c..838e4b8 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -862,8 +862,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
4 years, 7 months
Architecture specific change in rpms/chromium.git
by githook-noreply@fedoraproject.org
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=51e320816...
https://src.fedoraproject.org/cgit/rpms/chromium.git/commit/?id=3c9581069....
Change:
-%ifarch x86_64
+%ifarch %{ix86}
Thanks.
Full change:
============
commit 58128e168f2cad680db52f8be0d98a2bbd85b556
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 930b750..ff76b24 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -158,7 +158,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)
@@ -218,6 +218,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
@@ -730,6 +732,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}
@@ -1632,6 +1635,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 67e04f35f09abe468100109658f02b424c59286c
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 e6a6f88..930b750 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -1388,8 +1388,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 3c95810693ba39059f8b50d3d59b713c0df0fd87
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 c41439f..e6a6f88 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -164,114 +164,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
@@ -757,60 +704,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
@@ -1287,6 +1214,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 3eaa3be79d851bec300e909dcb9093bd045f3964
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 7fe074d..c41439f 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -1256,7 +1256,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 51e320816fc4959c841fc78bb7ef205c79024064
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 38d8c20..7fe074d 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.
@@ -298,16 +277,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
@@ -415,24 +384,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
@@ -865,11 +816,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
@@ -898,101 +844,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.
@@ -1063,9 +914,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
@@ -1227,9 +1076,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
@@ -1460,20 +1306,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}
@@ -1511,10 +1345,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}
@@ -1596,12 +1426,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}
@@ -1742,12 +1566,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
@@ -1861,11 +1679,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 47afdc42ed500067d2e4cc5b3df8295c0e08eac6
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 6b2691a..38d8c20 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -862,8 +862,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
4 years, 7 months