From aed21ef623820b36d4ced1fda5c20e2d0fa683a7 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 7 Oct 2020 22:29:46 +0200 Subject: external/liborcus: Missing includes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ...as seen with recent GCC 11 trunk libstdc++: > orcus_xlsx.cpp: In function ‘size_t orcus::{anonymous}::get_schema_rank(orcus::schema_t)’: > orcus_xlsx.cpp:313:59: error: incomplete type ‘std::numeric_limits’ used in nested name specifier > 313 | return it == rank_map.end() ? numeric_limits::max() : it->second; > | ^~~ etc. Change-Id: If92cfb565ed9344b2ec1403793d7aeff8bd019ad Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104074 Tested-by: Jenkins Reviewed-by: Stephan Bergmann (cherry picked from commit a9976a958b2857e308c6598532151878615bfd9f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114997 Reviewed-by: Michael Stahl (cherry picked from commit eaa9f84465eb330aa4c68711e8c8ec609503c5d3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115500 Tested-by: Thorsten Behrens Reviewed-by: Thorsten Behrens --- external/liborcus/UnpackedTarball_liborcus.mk | 1 + external/liborcus/include.patch.0 | 30 +++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 external/liborcus/include.patch.0 diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk index e5e33b0b1249..113e8e25818d 100644 --- a/external/liborcus/UnpackedTarball_liborcus.mk +++ b/external/liborcus/UnpackedTarball_liborcus.mk @@ -20,6 +20,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\ external/liborcus/gcc9.patch.0 \ external/liborcus/libtool.patch.0 \ external/liborcus/fix-pch.patch.0 \ + external/liborcus/include.patch.0 \ )) ifeq ($(OS),WNT) diff --git a/external/liborcus/include.patch.0 b/external/liborcus/include.patch.0 new file mode 100644 index 000000000000..9555dd534b3e --- /dev/null +++ b/external/liborcus/include.patch.0 @@ -0,0 +1,30 @@ +--- src/liborcus/orcus_xlsx.cpp ++++ src/liborcus/orcus_xlsx.cpp +@@ -32,6 +32,7 @@ + + #include + #include ++#include + #include + #include + #include +--- src/liborcus/xls_xml_context.cpp ++++ src/liborcus/xls_xml_context.cpp +@@ -16,6 +16,7 @@ + #include + + #include ++#include + + using namespace std; + +--- src/liborcus/xlsx_revision_context.cpp ++++ src/liborcus/xlsx_revision_context.cpp +@@ -16,6 +16,7 @@ + #include "orcus/global.hpp" + + #include ++#include + + using namespace std; + -- cgit