diff --git a/gn-5e19d2fb166f-redundant-move.patch b/gn-5e19d2fb166f-redundant-move.patch deleted file mode 100644 index 8251181..0000000 --- a/gn-5e19d2fb166f-redundant-move.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 66e78f979c8826bb193c00a4ba744e3ce8774a8e Mon Sep 17 00:00:00 2001 -From: "Benjamin A. Beasley" -Date: Thu, 19 Jan 2023 09:24:27 -0500 -Subject: [PATCH] =?UTF-8?q?Remove=20std::move=E2=80=99s=20reported=20as=20?= - =?UTF-8?q?redundant=20by=20GCC=2013?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - ---- - src/gn/desc_builder.cc | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/gn/desc_builder.cc b/src/gn/desc_builder.cc -index 444a5e02..3ef170c3 100644 ---- a/src/gn/desc_builder.cc -+++ b/src/gn/desc_builder.cc -@@ -167,7 +167,7 @@ class BaseDescBuilder { - base::ListValue res; - for (const auto& v : vector) - res.GetList().emplace_back(ToBaseValue(v)); -- return std::move(res); -+ return res; - } - - base::Value ToBaseValue(const Scope* scope) { -@@ -176,7 +176,7 @@ class BaseDescBuilder { - scope->GetCurrentScopeValues(&map); - for (const auto& v : map) - res.SetKey(v.first, ToBaseValue(v.second)); -- return std::move(res); -+ return res; - } - - base::Value ToBaseValue(const Value& val) { --- -2.39.0 - diff --git a/gn.spec b/gn.spec index 09894af..e20c7bd 100644 --- a/gn.spec +++ b/gn.spec @@ -51,12 +51,6 @@ Source2: update-version # Stop overriding optimization flags; not sent upstream because this is # intentional on their part Patch: gn-0153d369-no-O3.patch -# Error: redundant move in return statement (GCC 13) -# https://bugs.chromium.org/p/gn/issues/detail?id=318 -# Apparently, removing the std::move causes an error (error: use of deleted -# function 'base::Value::Value(const base::Value&)) on compiler versions before -# GCC 13. Maybe this is a GCC bug? -Patch: gn-5e19d2fb166f-redundant-move.patch # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval ExcludeArch: %{ix86}