From dc005b09b6885cdcb96aa5ad75f7cc35d484b8c4 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 11 May 2021 08:40:36 -0400 Subject: [PATCH] Rebase chromium-84.0.4147.105-gn-gcc-cleanup.patch as gn-39a87c0b-gcc-cleanup.patch --- chromium-84.0.4147.105-gn-gcc-cleanup.patch | 45 --------------------- gn-39a87c0b-gcc-cleanup.patch | 45 +++++++++++++++++++++ gn.spec | 17 ++++++-- 3 files changed, 58 insertions(+), 49 deletions(-) delete mode 100644 chromium-84.0.4147.105-gn-gcc-cleanup.patch create mode 100644 gn-39a87c0b-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 deleted file mode 100644 index cc8ad7c..0000000 --- a/chromium-84.0.4147.105-gn-gcc-cleanup.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -up chromium-84.0.4147.105/tools/gn/src/gn/err.h.gn-gcc-cleanup chromium-84.0.4147.105/tools/gn/src/gn/err.h ---- chromium-84.0.4147.105/tools/gn/src/gn/err.h.gn-gcc-cleanup 2020-08-01 10:04:57.354719575 -0400 -+++ chromium-84.0.4147.105/tools/gn/src/gn/err.h 2020-08-01 10:04:51.653974728 -0400 -@@ -55,7 +55,7 @@ class Err { - const std::string& help_text = std::string()); - - Err(const Err& other); -- -+ Err& operator=(const Err& other) = default; - ~Err(); - - bool has_error() const { return has_error_; } -diff -up chromium-84.0.4147.105/tools/gn/src/gn/label_pattern.h.gn-gcc-cleanup chromium-84.0.4147.105/tools/gn/src/gn/label_pattern.h ---- chromium-84.0.4147.105/tools/gn/src/gn/label_pattern.h.gn-gcc-cleanup 2020-08-01 10:24:18.405934036 -0400 -+++ chromium-84.0.4147.105/tools/gn/src/gn/label_pattern.h 2020-08-01 10:24:56.664265755 -0400 -@@ -33,6 +33,7 @@ class LabelPattern { - const std::string_view& name, - const Label& toolchain_label); - LabelPattern(const LabelPattern& other); -+ LabelPattern& operator=(const LabelPattern& other) = default; - ~LabelPattern(); - - // Converts the given input string to a pattern. This does special stuff -diff -up chromium-84.0.4147.105/tools/gn/src/gn/substitution_list.h.gn-gcc-cleanup chromium-84.0.4147.105/tools/gn/src/gn/substitution_list.h ---- chromium-84.0.4147.105/tools/gn/src/gn/substitution_list.h.gn-gcc-cleanup 2020-08-01 10:04:51.721971684 -0400 -+++ chromium-84.0.4147.105/tools/gn/src/gn/substitution_list.h 2020-08-01 10:04:51.765969715 -0400 -@@ -15,6 +15,7 @@ class SubstitutionList { - public: - SubstitutionList(); - SubstitutionList(const SubstitutionList& other); -+ SubstitutionList& operator=(const SubstitutionList& other) = default; - ~SubstitutionList(); - - bool Parse(const Value& value, Err* err); -diff -up chromium-84.0.4147.105/tools/gn/src/gn/substitution_pattern.h.gn-gcc-cleanup chromium-84.0.4147.105/tools/gn/src/gn/substitution_pattern.h ---- chromium-84.0.4147.105/tools/gn/src/gn/substitution_pattern.h.gn-gcc-cleanup 2020-08-01 10:04:51.637975444 -0400 -+++ chromium-84.0.4147.105/tools/gn/src/gn/substitution_pattern.h 2020-08-01 10:04:57.305721767 -0400 -@@ -35,6 +35,7 @@ class SubstitutionPattern { - - SubstitutionPattern(); - SubstitutionPattern(const SubstitutionPattern& other); -+ SubstitutionPattern& operator=(const SubstitutionPattern& other) = default; - ~SubstitutionPattern(); - - // Parses the given string and fills in the pattern. The pattern must only diff --git a/gn-39a87c0b-gcc-cleanup.patch b/gn-39a87c0b-gcc-cleanup.patch new file mode 100644 index 0000000..6bba655 --- /dev/null +++ b/gn-39a87c0b-gcc-cleanup.patch @@ -0,0 +1,45 @@ +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 85f37fd..b819135 100644 --- a/gn.spec +++ b/gn.spec @@ -25,7 +25,7 @@ Name: gn %global access 20210511 %global shortcommit %(echo %{commit} | cut -b -8) Version: 1910 -Release: 1.%{access}git%{shortcommit}%{?dist} +Release: 2.%{access}git%{shortcommit}%{?dist} Summary: Meta-build system that generates build files for Ninja # BSD except for src/base/third_party/icu/, which is (Unicode and MIT); note @@ -43,8 +43,13 @@ Source0: %{url}/+archive/%{commit}.tar.gz#/%{name}-%{shortcommit}.tar.gz Source1: last_commit_position.h Source2: update-version -# Clean up compiler warnings on gcc/g++: -Patch0: https://src.fedoraproject.org/rpms/chromium/raw/ce30313f5e4af121140c037bf026453355534f24/f/chromium-84.0.4147.105-gn-gcc-cleanup.patch +# 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: %{name}-39a87c0b-gcc-cleanup.patch # The python3_pkgversion macro is required for EPEL; see # https://fedoraproject.org/wiki/PackagingDrafts:Python3EPEL. On Fedora (and @@ -84,7 +89,7 @@ The %{name}-doc package contains detailed documentation for GN. %prep -%autosetup -c -n %{name}-%{commit} -p3 +%autosetup -c -n %{name}-%{commit} -p1 # Use pre-generated last_commit_position.h. mkdir -p ./out @@ -193,6 +198,10 @@ grep -E '^#define[[:blank:]]+LAST_COMMIT_POSITION[[:blank:]]+'\ %changelog +* Tue May 11 2021 Benjamin A. Beasley - 1910-2.20210511git39a87c0b +- Rebase chromium-84.0.4147.105-gn-gcc-cleanup.patch as + gn-39a87c0b-gcc-cleanup.patch + * Tue May 11 2021 Benjamin A. Beasley - 1910-1.20210511git39a87c0b - Update to version 1910