[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - external/liborcus

[Stephan Bergmann (via logerrit)]

 external/liborcus/UnpackedTarball_liborcus.mk |    1 
 external/liborcus/include.patch.0             |   30 ++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)

New commits:
commit 49610a417f8deee8790b33c3bbdc44b31adad2ab
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Oct 7 22:29:46 2020 +0200
Commit:     Michael Stahl <michael.stahl at allotropia.de>
CommitDate: Tue Jun 1 11:11:37 2021 +0200

    external/liborcus: Missing includes
    
    ...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<long unsigned int>’ used in nested name specifier
    >   313 |     return it == rank_map.end() ? numeric_limits<size_t>::max() : it->second;
    >       |                                                           ^~~
    
    etc.
    
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104074
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    (cherry picked from commit a9976a958b2857e308c6598532151878615bfd9f)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114997
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>
    (cherry picked from commit eaa9f84465eb330aa4c68711e8c8ec609503c5d3)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115500
    Tested-by: Thorsten Behrens <thorsten.behrens at allotropia.de>
    Reviewed-by: Thorsten Behrens <thorsten.behrens at allotropia.de>
    (cherry picked from commit aed21ef623820b36d4ced1fda5c20e2d0fa683a7)
    
    Change-Id: If92cfb565ed9344b2ec1403793d7aeff8bd019ad
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115974
    Tested-by: Michael Stahl <michael.stahl at allotropia.de>
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>

diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk
index 3ab387e734be..779ec8d4fba1 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_update_autoconf_configs,liborcus))
 $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
 	external/liborcus/0001-workaround-a-linking-problem-on-windows.patch \
 	external/liborcus/rpath.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 <cstdlib>
+ #include <iostream>
++#include <limits>
+ #include <string>
+ #include <cstring>
+ #include <sstream>
+--- src/liborcus/xls_xml_context.cpp
++++ src/liborcus/xls_xml_context.cpp
+@@ -16,6 +16,7 @@
+ #include <mdds/sorted_string_map.hpp>
+ 
+ #include <iostream>
++#include <limits>
+ 
+ using namespace std;
+ 
+--- src/liborcus/xlsx_revision_context.cpp
++++ src/liborcus/xlsx_revision_context.cpp
+@@ -16,6 +16,7 @@
+ #include "orcus/global.hpp"
+ 
+ #include <iostream>
++#include <limits>
+ 
+ using namespace std;
+