Backport patch: to fix gcc 10, global variable without extern

This commit is contained in:
Aleš Matěj 2020-01-31 10:08:47 +01:00
parent a1b9a433ec
commit 591a5f729d
2 changed files with 35 additions and 1 deletions

View File

@ -14,13 +14,14 @@
Name: libcomps
Version: 0.1.14
Release: 3%{?dist}
Release: 4%{?dist}
Summary: Comps XML file manipulation library
License: GPLv2+
URL: https://github.com/rpm-software-management/libcomps
Source0: %{url}/archive/%{name}-%{version}/%{name}-%{version}.tar.gz
Patch0: gcc10.patch
Patch1: remove-unused-global-variable-missing-extern.patch
BuildRequires: gcc-c++
BuildRequires: cmake
@ -193,6 +194,9 @@ popd
%endif
%changelog
* Fri Jan 31 2020 Ales Matej <amatej@redhat.com> - 0.1.14-4
- Fix global header variable defined without extern for gcc-10
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.14-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

View File

@ -0,0 +1,30 @@
From 3237f44ba7e4712653b64b36cc58b74d2d56d14f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= <amatej@redhat.com>
Date: Wed, 29 Jan 2020 09:08:34 +0100
Subject: [PATCH] Remove unused global variable UnfoObjListIt (RhBug:1793424)
This global header file variable wasn't declared using extern keyword
which was causing problems with gcc 10 (gcc 10 no longer ignores this
error).
https://bugzilla.redhat.com/show_bug.cgi?id=1793424
---
libcomps/src/comps_objlist.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libcomps/src/comps_objlist.h b/libcomps/src/comps_objlist.h
index 0fcd48b..1d19167 100644
--- a/libcomps/src/comps_objlist.h
+++ b/libcomps/src/comps_objlist.h
@@ -34,7 +34,7 @@ typedef struct COMPS_ObjListIt COMPS_ObjListIt;
struct COMPS_ObjListIt {
COMPS_Object *comps_obj;
COMPS_ObjListIt *next;
-} UnfoObjListIt;
+};
/** COMPS_Object derivate representing category element in comps.xml structure*/
--
2.25.0