Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/liborcus.git#9edccf79665d1f2336130958a65693967f21962a
This commit is contained in:
DistroBaker 2020-10-27 21:15:43 +01:00 committed by Petr Šabata
parent 4908d5d6a1
commit 9fa2e1a6a4
2 changed files with 41 additions and 1 deletions

36
liborcus-gcc11.patch Normal file
View File

@ -0,0 +1,36 @@
diff --git a/src/liborcus/orcus_xlsx.cpp b/src/liborcus/orcus_xlsx.cpp
index d9e16ef..604b0f8 100644
--- a/src/liborcus/orcus_xlsx.cpp
+++ b/src/liborcus/orcus_xlsx.cpp
@@ -30,6 +30,7 @@
#include "ooxml_global.hpp"
#include "spreadsheet_iface_util.hpp"
+#include <limits>
#include <cstdlib>
#include <iostream>
#include <string>
diff --git a/src/liborcus/xls_xml_context.cpp b/src/liborcus/xls_xml_context.cpp
index 3ca72e5..7504b4c 100644
--- a/src/liborcus/xls_xml_context.cpp
+++ b/src/liborcus/xls_xml_context.cpp
@@ -16,6 +16,7 @@
#include <mdds/sorted_string_map.hpp>
#include <iostream>
+#include <limits>
using namespace std;
namespace ss = orcus::spreadsheet;
diff --git a/src/liborcus/xlsx_revision_context.cpp b/src/liborcus/xlsx_revision_context.cpp
index edfd9ee..0b6ec0a 100644
--- a/src/liborcus/xlsx_revision_context.cpp
+++ b/src/liborcus/xlsx_revision_context.cpp
@@ -16,6 +16,7 @@
#include "orcus/global.hpp"
#include <iostream>
+#include <limits>
using namespace std;

View File

@ -7,12 +7,13 @@
Name: liborcus
Version: 0.16.1
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Standalone file import filter library for spreadsheet documents
License: MPLv2.0
URL: https://gitlab.com/orcus/orcus
Source0: https://kohei.us/files/orcus/src/%{name}-%{version}.tar.xz
Patch0: %{name}-gcc11.patch
BuildRequires: boost-devel
BuildRequires: doxygen
@ -186,6 +187,9 @@ make check %{?_smp_mflags}
%doc doc/_doxygen/html
%changelog
* Mon Oct 19 2020 Jeff Law <law@redhat.com> - 0.16.1-2
- Fix missing headers for gcc-11
* Tue Sep 29 2020 Caolán McNamara <caolanm@redhat.com> - 0.16.1-1
- latest release