From 593ee1b5076e8c1b0c2564b531106defec2c5be6 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Sat, 14 Dec 2019 14:08:24 -0700 Subject: [PATCH] Fix missing #include for gcc-10 --- gcc10.patch | 30 ++++++++++++++++++++++++++++++ rpm-ostree.spec | 6 +++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 gcc10.patch diff --git a/gcc10.patch b/gcc10.patch new file mode 100644 index 0000000..e4448cc --- /dev/null +++ b/gcc10.patch @@ -0,0 +1,30 @@ +diff -Nrup a/libdnf/libdnf/goal/Goal.hpp b/libdnf/libdnf/goal/Goal.hpp +--- a/libdnf/libdnf/goal/Goal.hpp 2019-04-26 09:44:27.000000000 -0600 ++++ b/libdnf/libdnf/goal/Goal.hpp 2019-10-16 08:11:52.507044805 -0600 +@@ -22,6 +22,7 @@ + #define __GOAL_HPP + + #include ++#include + + #include "../dnf-types.h" + #include "../hy-goal.h" +diff -Nrup a/libdnf/libdnf/repo/solvable/Dependency.cpp b/libdnf/libdnf/repo/solvable/Dependency.cpp +--- a/libdnf/libdnf/repo/solvable/Dependency.cpp 2019-04-26 09:44:27.000000000 -0600 ++++ b/libdnf/libdnf/repo/solvable/Dependency.cpp 2019-10-24 16:42:07.888017106 -0600 +@@ -28,6 +28,8 @@ extern "C" { + #include + } + ++#include ++ + namespace libdnf { + + static int transformToLibsolvComparisonType(int cmp_type) +@@ -106,4 +108,4 @@ Dependency::getReldepId(DnfSack *sack, c + } + } + +-} +\ No newline at end of file ++} diff --git a/rpm-ostree.spec b/rpm-ostree.spec index 59ecdbf..8fd953a 100644 --- a/rpm-ostree.spec +++ b/rpm-ostree.spec @@ -4,11 +4,12 @@ Summary: Hybrid image/package system Name: rpm-ostree Version: 2019.6.27.g3b8a1ec6 -Release: 1%{?dist} +Release: 2%{?dist} #VCS: https://github.com/cgwalters/rpm-ostree # This tarball is generated via "cd packaging && make -f Makefile.dist-packaging dist-snapshot" # in the upstream git. If rust is enabled, it contains vendored sources. Source0: rpm-ostree-%{version}.tar.xz +Patch0: gcc10.patch License: LGPLv2+ URL: https://github.com/projectatomic/rpm-ostree @@ -178,6 +179,9 @@ $PYTHON autofiles.py > files.devel \ %files devel -f files.devel %changelog +* Sat Dec 14 2019 Jeff Law - 2019.6.24.gfec61ce5-2 +- Fix missing #includes for gcc-10 + * Thu Oct 31 2019 Jonathan Lebon - 2019.6.27.g3b8a1ec6-1 - git master snapshot for dracut cpio cap_mknod fix: https://github.com/coreos/rpm-ostree/pull/1946