Rebase chromium-84.0.4147.105-gn-gcc-cleanup.patch as gn-39a87c0b-gcc-cleanup.patch

epel8
Benjamin A. Beasley 4 years ago
parent 2b716e45a3
commit 70b288a124

@ -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

@ -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

@ -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
# Stop overriding optimization flags
Patch1: %{name}-0153d369-no-O3.patch
@ -86,9 +91,7 @@ The %{name}-doc package contains detailed documentation for GN.
%prep
%setup -c -n %{name}-%{commit} -q
%patch0 -p3
%patch1 -p1
%autosetup -c -n %{name}-%{commit} -p1
# Use pre-generated last_commit_position.h.
mkdir -p ./out

Loading…
Cancel
Save