From f94b6884356fa63ca8d53078d84d2ffcd3cbfdda Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Sat, 1 Aug 2020 10:26:51 -0400 Subject: [PATCH] silence some gcc warnings during gn compile to make it easier to see failures in the logs --- chromium-84.0.4147.105-gn-gcc-cleanup.patch | 45 +++++++++++++++++++++ chromium.spec | 3 ++ sources | 2 +- 3 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 chromium-84.0.4147.105-gn-gcc-cleanup.patch diff --git a/chromium-84.0.4147.105-gn-gcc-cleanup.patch b/chromium-84.0.4147.105-gn-gcc-cleanup.patch new file mode 100644 index 00000000..cc8ad7c1 --- /dev/null +++ b/chromium-84.0.4147.105-gn-gcc-cleanup.patch @@ -0,0 +1,45 @@ +diff -up chromium-84.0.4147.105/tools/gn/src/gn/err.h.gn-gcc-cleanup chromium-84.0.4147.105/tools/gn/src/gn/err.h +--- chromium-84.0.4147.105/tools/gn/src/gn/err.h.gn-gcc-cleanup 2020-08-01 10:04:57.354719575 -0400 ++++ chromium-84.0.4147.105/tools/gn/src/gn/err.h 2020-08-01 10:04:51.653974728 -0400 +@@ -55,7 +55,7 @@ class Err { + const std::string& help_text = std::string()); + + Err(const Err& other); +- ++ Err& operator=(const Err& other) = default; + ~Err(); + + bool has_error() const { return has_error_; } +diff -up chromium-84.0.4147.105/tools/gn/src/gn/label_pattern.h.gn-gcc-cleanup chromium-84.0.4147.105/tools/gn/src/gn/label_pattern.h +--- chromium-84.0.4147.105/tools/gn/src/gn/label_pattern.h.gn-gcc-cleanup 2020-08-01 10:24:18.405934036 -0400 ++++ chromium-84.0.4147.105/tools/gn/src/gn/label_pattern.h 2020-08-01 10:24:56.664265755 -0400 +@@ -33,6 +33,7 @@ class LabelPattern { + const std::string_view& name, + const Label& toolchain_label); + LabelPattern(const LabelPattern& other); ++ LabelPattern& operator=(const LabelPattern& other) = default; + ~LabelPattern(); + + // Converts the given input string to a pattern. This does special stuff +diff -up chromium-84.0.4147.105/tools/gn/src/gn/substitution_list.h.gn-gcc-cleanup chromium-84.0.4147.105/tools/gn/src/gn/substitution_list.h +--- chromium-84.0.4147.105/tools/gn/src/gn/substitution_list.h.gn-gcc-cleanup 2020-08-01 10:04:51.721971684 -0400 ++++ chromium-84.0.4147.105/tools/gn/src/gn/substitution_list.h 2020-08-01 10:04:51.765969715 -0400 +@@ -15,6 +15,7 @@ class SubstitutionList { + public: + SubstitutionList(); + SubstitutionList(const SubstitutionList& other); ++ SubstitutionList& operator=(const SubstitutionList& other) = default; + ~SubstitutionList(); + + bool Parse(const Value& value, Err* err); +diff -up chromium-84.0.4147.105/tools/gn/src/gn/substitution_pattern.h.gn-gcc-cleanup chromium-84.0.4147.105/tools/gn/src/gn/substitution_pattern.h +--- chromium-84.0.4147.105/tools/gn/src/gn/substitution_pattern.h.gn-gcc-cleanup 2020-08-01 10:04:51.637975444 -0400 ++++ chromium-84.0.4147.105/tools/gn/src/gn/substitution_pattern.h 2020-08-01 10:04:57.305721767 -0400 +@@ -35,6 +35,7 @@ class SubstitutionPattern { + + SubstitutionPattern(); + SubstitutionPattern(const SubstitutionPattern& other); ++ SubstitutionPattern& operator=(const SubstitutionPattern& other) = default; + ~SubstitutionPattern(); + + // Parses the given string and fills in the pattern. The pattern must only diff --git a/chromium.spec b/chromium.spec index f1fe04d8..c0ca7e06 100644 --- a/chromium.spec +++ b/chromium.spec @@ -287,6 +287,8 @@ Patch85: chromium-clang_lto_visibility_public.patch Patch86: chromium-fix-char_traits.patch # https://github.com/stha09/chromium-patches/blob/master/chromium-quiche-invalid-offsetof.patch Patch87: chromium-quiche-invalid-offsetof.patch +# Silence GCC warnings during gn compile +Patch88: chromium-84.0.4147.105-gn-gcc-cleanup.patch # Use lstdc++ on EPEL7 only Patch101: chromium-75.0.3770.100-epel7-stdc++.patch @@ -897,6 +899,7 @@ udev. %patch85 -p1 -b .clang_lto_visibility_public %patch86 -p1 -b .fix-char_traits %patch87 -p1 -b .quiche-invalid-offset +%patch88 -p1 -b .gn-gcc-cleanup # Fedora branded user agent %if 0%{?fedora} diff --git a/sources b/sources index c6b90f8e..e9d2c5a8 100644 --- a/sources +++ b/sources @@ -1,4 +1,3 @@ -SHA512 (depot_tools.git-master.tar.gz) = d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03 SHA512 (gelasio.zip) = 0a22def3eca8848161ee72453dc5f97cc52ed09ffe21834152f2535d3a71f404cdf1f6e1809564bacb86aae75278cbcb96cae52b537d3ccdc299b60d6d0bc53e SHA512 (MuktiNarrow-0.94.tar.bz2) = f7abd429e2591eaa047d1ac982d97fa67dc1480c42e55b2a97861abd90918704dce90b6bb27dec7b6d696f188017a74de54a7b7f45281f0515923b90300959d1 SHA512 (NotoSansCJKjp-hinted.zip) = e7bcbc53a10b8ec3679dcade5a8a94cea7e1f60875ab38f2193b4fa8e33968e1f0abc8184a3df1e5210f6f5c731f96c727c6aa8f519423a29707d2dee5ada193 @@ -19,3 +18,4 @@ SHA512 (Ahem.ttf) = aeb64b10ab9c87860714cb60b4900254b13dc52c51319256a1a3722c8820 SHA512 (node-v10.15.3-linux-x64.tar.gz) = 5eb544ef706562981340a82acc79e2162c6a3e4049b4a95f69ce353ee5b0f929c60b1fc457e8249b3fb0696f82fc28c5f543f5947db19fae4e9d5c21b906bb20 SHA512 (xcb-proto-1.14.tar.xz) = de66d568163b6da2be9d6c59984f3afa3acd119a781378638045fd68018665ef5c9af98f024e9962ba3eb7c7a4d85c27ba70ffafceb2324ccc6940f34de16690 SHA512 (chromium-84.0.4147.105-clean.tar.xz) = 03760da4df6b15092f4cf6fb383bd33e27720a7d97d24bb937b2ba6c38d7bc95ea19a32f8dbcf921010d4aa9ee15cbd4cd13a2dc7d88fe7beab6a59c86941786 +SHA512 (depot_tools.git-master.tar.gz) = dc323888812b66cc92c53a24a8a58ccf9e2961be67aa21852bd091b8b49569071f06ae9104cb58950e6253ac3a29f0db0663e9f35ef2b1ea28696efb38b42708