download.lst | 4 +-
external/liborcus/UnpackedTarball_liborcus.mk | 3 -
external/liborcus/gnumeric-set-grammar.patch.1 | 17 --------
external/liborcus/liborcus_newline.patch.1 | 17 --------
external/liborcus/msvc-int-narrowing.patch.1 | 50 -------------------------
external/liborcus/windows-constants-hack.patch | 2 -
6 files changed, 3 insertions(+), 90 deletions(-)
New commits:
commit 77e15d0471e239ad94054d3aff403207ecac2764
Author: Kohei Yoshida <ko...@libreoffice.org>
AuthorDate: Thu Nov 9 20:26:47 2023 -0500
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Sat Dec 2 12:33:32 2023 +0100
Upgrade orcus to 0.19.2
Change-Id: I2cbf5f93c3b8b2235828affdef7309c3611b19b2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159258
Tested-by: Jenkins
Reviewed-by: Kohei Yoshida <ko...@libreoffice.org>
Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160231
diff --git a/download.lst b/download.lst
index 0c44c0247789..adadeabbbc24 100644
--- a/download.lst
+++ b/download.lst
@@ -428,8 +428,8 @@ OPENSSL_TARBALL := openssl-3.0.11.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-ORCUS_SHA256SUM :=
6c9a8c03e8187f2749a84f2786d86a88ae45c99ed3a2d5fea36ba556b40c342d
-ORCUS_TARBALL := liborcus-0.19.1.tar.xz
+ORCUS_SHA256SUM :=
69ed26a00d4aaa7688e62a6e003cbc81928521a45e96605e53365aa499719e39
+ORCUS_TARBALL := liborcus-0.19.2.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk
b/external/liborcus/UnpackedTarball_liborcus.mk
index 5968c7bb1845..3de24f0135d7 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -19,7 +19,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/rpath.patch.0 \
external/liborcus/gcc9.patch.0 \
external/liborcus/libtool.patch.0 \
- external/liborcus/liborcus_newline.patch.1 \
))
ifeq ($(OS),WNT)
diff --git a/external/liborcus/liborcus_newline.patch.1
b/external/liborcus/liborcus_newline.patch.1
deleted file mode 100644
index 5b2038d5cc12..000000000000
--- a/external/liborcus/liborcus_newline.patch.1
+++ /dev/null
@@ -1,17 +0,0 @@
-Add newline at end of KRHangulMapping.h
-
-without this, compiling output of GCC 11 -E -fdirectives-only fails with:
-
-ooxml_tokens.inl:3524:32: error: stray '#' in program
-
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100392
-
---- liborcus/src/liborcus/ooxml_tokens.inl.orig 2021-05-01
18:12:37.490131155 +0200
-+++ liborcus/src/liborcus/ooxml_tokens.inl 2021-05-01 18:12:50.994119453
+0200
-@@ -3521,4 +3521,4 @@
- "zoomToFit" // 3517
- };
-
--size_t token_name_count = 3518;
-\ No newline at end of file
-+size_t token_name_count = 3518;
diff --git a/external/liborcus/windows-constants-hack.patch
b/external/liborcus/windows-constants-hack.patch
index 68e57857826d..28cf0997a168 100644
--- a/external/liborcus/windows-constants-hack.patch
+++ b/external/liborcus/windows-constants-hack.patch
@@ -9,7 +9,7 @@ index ae571f5..539ce18 100644
-#include "constants.inl"
+#define ORCUS_MAJOR_VERSION 0
+#define ORCUS_MINOR_VERSION 19
-+#define ORCUS_MICRO_VERSION 0
++#define ORCUS_MICRO_VERSION 2
namespace orcus {
commit 9a9ba74f318c59f739033bdaeaacf1e3cc790638
Author: Kohei Yoshida <ko...@libreoffice.org>
AuthorDate: Tue Oct 24 18:31:52 2023 -0400
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Sat Dec 2 12:33:27 2023 +0100
Upgrade liborcus to 0.19.1
Change-Id: I2190419e88323bbf000602a7762e850a33b5dfdf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158409
Tested-by: Jenkins
Reviewed-by: Kohei Yoshida <ko...@libreoffice.org>
Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160230
diff --git a/download.lst b/download.lst
index ecb87c819ee1..0c44c0247789 100644
--- a/download.lst
+++ b/download.lst
@@ -428,8 +428,8 @@ OPENSSL_TARBALL := openssl-3.0.11.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-ORCUS_SHA256SUM :=
1b68f54bb08face4c3dc83c912d921373c44aed817b37d879b7a4e47f2f15e09
-ORCUS_TARBALL := liborcus-0.19.0.tar.xz
+ORCUS_SHA256SUM :=
6c9a8c03e8187f2749a84f2786d86a88ae45c99ed3a2d5fea36ba556b40c342d
+ORCUS_TARBALL := liborcus-0.19.1.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk
b/external/liborcus/UnpackedTarball_liborcus.mk
index 292435dfd00d..5968c7bb1845 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -20,8 +20,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/gcc9.patch.0 \
external/liborcus/libtool.patch.0 \
external/liborcus/liborcus_newline.patch.1 \
- external/liborcus/msvc-int-narrowing.patch.1 \
- external/liborcus/gnumeric-set-grammar.patch.1 \
))
ifeq ($(OS),WNT)
diff --git a/external/liborcus/gnumeric-set-grammar.patch.1
b/external/liborcus/gnumeric-set-grammar.patch.1
deleted file mode 100644
index 42bc46177737..000000000000
--- a/external/liborcus/gnumeric-set-grammar.patch.1
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/liborcus/orcus_gnumeric.cpp b/src/liborcus/orcus_gnumeric.cpp
-index 76c13682..849759ba 100644
---- a/src/liborcus/orcus_gnumeric.cpp
-+++ b/src/liborcus/orcus_gnumeric.cpp
-@@ -144,6 +144,12 @@ void orcus_gnumeric::read_stream(std::string_view stream)
- if (!decompress_gzip(stream.data(), stream.size(), file_content))
- return;
-
-+ if (auto* gs = mp_impl->mp_factory->get_global_settings(); gs)
-+ {
-+ gs->set_origin_date(1899, 12, 30);
-+
gs->set_default_formula_grammar(spreadsheet::formula_grammar_t::gnumeric);
-+ }
-+
- mp_impl->read_content_xml(file_content, get_config());
- mp_impl->mp_factory->finalize();
- }
diff --git a/external/liborcus/msvc-int-narrowing.patch.1
b/external/liborcus/msvc-int-narrowing.patch.1
deleted file mode 100644
index 1075cebfdef3..000000000000
--- a/external/liborcus/msvc-int-narrowing.patch.1
+++ /dev/null
@@ -1,50 +0,0 @@
-Fix
-
- error C2398: Element '2': conversion from 'int' to 'const
std::basic_string_view<char,std::char_traits<char>>::size_type'
- requires a narrowing conversion
-
-diff --git a/src/liborcus/gnumeric_value_format_parser.cpp
b/src/liborcus/gnumeric_value_format_parser.cpp
-index 822c1ba1..014068e9 100644
---- a/src/liborcus/gnumeric_value_format_parser.cpp
-+++ b/src/liborcus/gnumeric_value_format_parser.cpp
-@@ -12,6 +12,10 @@
- #include <cassert>
- #include <sstream>
-
-+#include <boost/numeric/conversion/cast.hpp>
-+
-+using boost::numeric_cast;
-+
- namespace orcus {
-
- std::size_t gnumeric_value_format_parser::get_pos() const
-@@ -41,7 +45,8 @@ void gnumeric_value_format_parser::segment()
- if (pos != 2)
- throw parse_error("value format segment is not formatted
properly", get_pos());
-
-- std::string_view s{p0, std::distance(p0, m_cur)};
-+ auto n = std::distance(p0, m_cur);
-+ std::string_view s{p0, numeric_cast<std::size_t>(n)};
- if (s.empty())
- throw parse_error("segment value is empty", get_pos());
-
-@@ -51,7 +56,8 @@ void gnumeric_value_format_parser::segment()
- }
- case '=':
- {
-- std::string_view s{p0, std::distance(p0, m_cur)};
-+ auto n = std::distance(p0, m_cur);
-+ std::string_view s{p0, numeric_cast<std::size_t>(n)};
- seg.type = to_gnumeric_value_format_type(s);
- if (seg.type == gnumeric_value_format_type::unknown)
- {
-@@ -65,7 +71,8 @@ void gnumeric_value_format_parser::segment()
- }
- case ':':
- {
-- std::string_view s{p0, std::distance(p0, m_cur)};
-+ auto n = std::distance(p0, m_cur);
-+ std::string_view s{p0, numeric_cast<std::size_t>(n)};
-
- switch (pos)
- {
