From 2c07ba74acc7d54cf2cf4b9e693244c2ed3ec8d6 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Sun, 7 Nov 2021 10:15:03 -0500
Subject: [PATCH] =?UTF-8?q?Drop=20=E2=80=9Cgcc=20cleanup=E2=80=9D=20patch?=
 =?UTF-8?q?=20(finally=20upstreamed)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gn-39a87c0b-gcc-cleanup.patch | 45 -----------------------------------
 gn.spec                       |  9 +------
 2 files changed, 1 insertion(+), 53 deletions(-)
 delete mode 100644 gn-39a87c0b-gcc-cleanup.patch

diff --git a/gn-39a87c0b-gcc-cleanup.patch b/gn-39a87c0b-gcc-cleanup.patch
deleted file mode 100644
index 6bba655..0000000
--- a/gn-39a87c0b-gcc-cleanup.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Naur gn-39a87c0b-original/src/gn/err.h gn-39a87c0b/src/gn/err.h
---- gn-39a87c0b-original/src/gn/err.h	2021-05-11 06:58:33.000000000 -0400
-+++ gn-39a87c0b/src/gn/err.h	2021-05-11 08:33:58.379386372 -0400
-@@ -56,7 +56,7 @@
-       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 -Naur gn-39a87c0b-original/src/gn/label_pattern.h gn-39a87c0b/src/gn/label_pattern.h
---- gn-39a87c0b-original/src/gn/label_pattern.h	2021-05-11 06:58:33.000000000 -0400
-+++ gn-39a87c0b/src/gn/label_pattern.h	2021-05-11 08:34:19.399513188 -0400
-@@ -33,6 +33,7 @@
-                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 -Naur gn-39a87c0b-original/src/gn/substitution_list.h gn-39a87c0b/src/gn/substitution_list.h
---- gn-39a87c0b-original/src/gn/substitution_list.h	2021-05-11 06:58:33.000000000 -0400
-+++ gn-39a87c0b/src/gn/substitution_list.h	2021-05-11 08:34:42.355651684 -0400
-@@ -15,6 +15,7 @@
-  public:
-   SubstitutionList();
-   SubstitutionList(const SubstitutionList& other);
-+  SubstitutionList& operator=(const SubstitutionList& other) = default;
-   ~SubstitutionList();
- 
-   bool Parse(const Value& value, Err* err);
-diff -Naur gn-39a87c0b-original/src/gn/substitution_pattern.h gn-39a87c0b/src/gn/substitution_pattern.h
---- gn-39a87c0b-original/src/gn/substitution_pattern.h	2021-05-11 06:58:33.000000000 -0400
-+++ gn-39a87c0b/src/gn/substitution_pattern.h	2021-05-11 08:34:50.294699582 -0400
-@@ -35,6 +35,7 @@
- 
-   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/gn.spec b/gn.spec
index 48d9130..2fd7c4f 100644
--- a/gn.spec
+++ b/gn.spec
@@ -45,15 +45,8 @@ Source0:        %{url}/+archive/%{commit}.tar.gz#/gn-%{shortcommit}.tar.gz
 Source1:        last_commit_position.h
 Source2:        update-version
 
-# Clean up compiler warnings on gcc/g++. This patch is a rebased version of
-# chromium-84.0.4147.105-gn-gcc-cleanup.patch from the chromium RPM; see:
-#
-#   https://src.fedoraproject.org/rpms/chromium/raw/
-#     ce30313f5e4af121140c037bf026453355534f24/f/
-#     chromium-84.0.4147.105-gn-gcc-cleanup.patch
-Patch0:         gn-39a87c0b-gcc-cleanup.patch
 # Stop overriding optimization flags
-Patch1:         gn-0153d369-no-O3.patch
+Patch0:         gn-0153d369-no-O3.patch
 
 BuildRequires:  python3
 BuildRequires:  python3-devel