diff options
Diffstat (limited to 'dev-libs/liborcus/files')
4 files changed, 132 insertions, 0 deletions
diff --git a/dev-libs/liborcus/files/liborcus-0.17.0-test-fix.patch b/dev-libs/liborcus/files/liborcus-0.17.0-test-fix.patch new file mode 100644 index 00000000..1de33a7e --- /dev/null +++ b/dev-libs/liborcus/files/liborcus-0.17.0-test-fix.patch @@ -0,0 +1,51 @@ +# https://bugs.gentoo.org/713586 + +[PATCH] Build orcus-env-dump unconditionally + +The rule for `orcus-env-dump.o` is guarded by `if WITH_TOOLS` however, +the rule for the executable `orcus-env-dump` is not. This leads to +linking errors when running the test suite without tools. + +Move the rule for `orcus-env-dump.o` out of the if WITH_TOOLS block to +always build it. +--- + src/Makefile.am | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -25,6 +25,16 @@ orcus_test_xml_LDADD = \ + + orcus_test_xml_CPPFLAGS = -I$(top_builddir)/lib/liborcus/liborcus.la $(AM_CPPFLAGS) -DSRCDIR=\""$(top_srcdir)"\" + ++#---------------------------------------------------------------------------- ++ ++# orcus-env-dump ++ ++orcus_env_dump_SOURCES = orcus_env_dump.cpp ++orcus_env_dump_LDADD = \ ++ parser/liborcus-parser-@ORCUS_API_VERSION@.la \ ++ liborcus/liborcus-@ORCUS_API_VERSION@.la ++orcus_env_dump_CPPFLAGS = -I$(top_builddir)/lib/liborcus/liborcus.la $(AM_CPPFLAGS) ++ + + TESTS = \ + orcus-test-xml \ +@@ -136,16 +146,6 @@ orcus_detect_CPPFLAGS = -I$(top_builddir)/lib/liborcus/liborcus.la $(AM_CPPFLAGS + + #---------------------------------------------------------------------------- + +-# orcus-env-dump +- +-orcus_env_dump_SOURCES = orcus_env_dump.cpp +-orcus_env_dump_LDADD = \ +- parser/liborcus-parser-@ORCUS_API_VERSION@.la \ +- liborcus/liborcus-@ORCUS_API_VERSION@.la +-orcus_env_dump_CPPFLAGS = -I$(top_builddir)/lib/liborcus/liborcus.la $(AM_CPPFLAGS) +- +-#---------------------------------------------------------------------------- +- + if BUILD_SPREADSHEET_MODEL + + orcus_json_LDADD += \ diff --git a/dev-libs/liborcus/files/liborcus-0.17.2-clang.patch b/dev-libs/liborcus/files/liborcus-0.17.2-clang.patch new file mode 100644 index 00000000..62950cfc --- /dev/null +++ b/dev-libs/liborcus/files/liborcus-0.17.2-clang.patch @@ -0,0 +1,26 @@ +https://gitlab.com/orcus/orcus/-/commit/469aca3c76965b9031947506a15d940cbcd11cdb + +From: Tom Stellard <tstellar@redhat.com> +Date: Mon, 16 May 2022 22:12:30 +0000 +Subject: [PATCH] Fix error when compiling with clang + +csv.cpp:83:29: error: non-constant-expression cannot be narrowed from type 'Py_ssize_t' (aka 'long') to 'std::basic_string_view::size_type' (aka 'unsigned long') in initializer list [-Wc++11-narrowing] + app.read_stream({p, n}); + ^ +csv.cpp:83:29: note: insert an explicit cast to silence this issue + app.read_stream({p, n}); + ^ + static_cast<size_type>( ) +1 error generated. +--- a/src/python/csv.cpp ++++ b/src/python/csv.cpp +@@ -80,7 +80,7 @@ PyObject* csv_read(PyObject* /*module*/, PyObject* args, PyObject* kwargs) + + Py_ssize_t n = 0; + const char* p = PyUnicode_AsUTF8AndSize(str.get(), &n); +- app.read_stream({p, n}); ++ app.read_stream({p, static_cast<std::string_view::size_type>(n)}); + + return create_document(std::move(doc)); + } +GitLab diff --git a/dev-libs/liborcus/files/liborcus-0.17.2-gcc-13.patch b/dev-libs/liborcus/files/liborcus-0.17.2-gcc-13.patch new file mode 100644 index 00000000..fa489205 --- /dev/null +++ b/dev-libs/liborcus/files/liborcus-0.17.2-gcc-13.patch @@ -0,0 +1,29 @@ +https://gitlab.com/orcus/orcus/-/commit/fa68d6a76778df26e41108e3400f4a907e351203 +https://gitlab.com/orcus/orcus/-/merge_requests/136 + +From fa68d6a76778df26e41108e3400f4a907e351203 Mon Sep 17 00:00:00 2001 +From: Kohei Yoshida <kohei.yoshida@gmail.com> +Date: Tue, 19 Jul 2022 21:11:16 -0400 +Subject: [PATCH] Explicitly include <cstdint> header with GCC 13 (#162) + +c.f. https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes +--- a/include/orcus/base64.hpp ++++ b/include/orcus/base64.hpp +@@ -9,6 +9,7 @@ + #define __ORCUS_BASE64_HPP__ + + #include "env.hpp" ++#include <cstdint> + #include <vector> + #include <string> + +--- a/include/orcus/types.hpp ++++ b/include/orcus/types.hpp +@@ -8,6 +8,7 @@ + #ifndef INCLUDED_ORCUS_TYPES_HPP + #define INCLUDED_ORCUS_TYPES_HPP + ++#include <cstdint> + #include <cstdlib> + #include <vector> + #include <string> diff --git a/dev-libs/liborcus/files/liborcus-0.17.2-python-optional.patch b/dev-libs/liborcus/files/liborcus-0.17.2-python-optional.patch new file mode 100644 index 00000000..9473958c --- /dev/null +++ b/dev-libs/liborcus/files/liborcus-0.17.2-python-optional.patch @@ -0,0 +1,26 @@ +From 14d15bf331b5cc3ca2c1cdb8097dfe918173cba1 Mon Sep 17 00:00:00 2001 +From: matoro <11910244-matoro3@users.noreply.gitlab.com> +Date: Wed, 24 Aug 2022 13:42:27 -0400 +Subject: [PATCH] Only recurse into src/python when BUILD_PYTHON is set + +--- + src/Makefile.am | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index d586299c..7e44aed8 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -1,4 +1,8 @@ +-SUBDIRS = include test parser mso liborcus spreadsheet python ++SUBDIRS = include test parser mso liborcus spreadsheet ++ ++if BUILD_PYTHON ++SUBDIRS += python ++endif + + AM_CPPFLAGS = \ + -I$(top_srcdir)/include \ +-- +GitLab + |