download.lst | 4 +-
external/liborcus/UnpackedTarball_liborcus.mk | 3 -
external/liborcus/autofilter-crash.patch | 34 ------------------
external/liborcus/enum-labels.patch | 47 --------------------------
external/liborcus/styles-element-rules.patch | 42 -----------------------
5 files changed, 2 insertions(+), 128 deletions(-)
New commits:
commit 2ad7444110dad0869dcca711c4db9367fef85061
Author: Kohei Yoshida <ko...@libreoffice.org>
AuthorDate: Fri May 23 23:15:31 2025 -0400
Commit: Kohei Yoshida <ko...@libreoffice.org>
CommitDate: Sat May 24 23:44:31 2025 +0200
Upgrade liborcus to 0.20.1
Change-Id: I34edb1608eb9ada252646d528d56079f069013fe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185726
Reviewed-by: Kohei Yoshida <ko...@libreoffice.org>
Tested-by: Jenkins
diff --git a/download.lst b/download.lst
index f6e68ab8511d..00bd1f9ad3f5 100644
--- a/download.lst
+++ b/download.lst
@@ -553,8 +553,8 @@ OPENSSL_TARBALL := openssl-3.0.16.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-ORCUS_SHA256SUM :=
fb6438977a75e7f455b772acf80d861fbc787ab18d52f7997af44a212311a507
-ORCUS_TARBALL := liborcus-0.20.0.tar.xz
+ORCUS_SHA256SUM :=
ec27f30e8445a2a3f307f7e829fc446fd48193150b7f8f23bb5bfb25ec6e4e27
+ORCUS_TARBALL := liborcus-0.20.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 346ce67974f2..8bf355a1abed 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -16,9 +16,6 @@ $(eval $(call
gb_UnpackedTarball_update_autoconf_configs,liborcus))
$(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/rpath.patch.0 \
external/liborcus/libtool.patch.0 \
- external/liborcus/styles-element-rules.patch \
- external/liborcus/enum-labels.patch \
- external/liborcus/autofilter-crash.patch \
))
ifeq ($(OS),WNT)
diff --git a/external/liborcus/autofilter-crash.patch
b/external/liborcus/autofilter-crash.patch
deleted file mode 100644
index d434cc94356e..000000000000
--- a/external/liborcus/autofilter-crash.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 2ff46664c61f2cce545ac7ca972d6e9c6ffa270d Mon Sep 17 00:00:00 2001
-From: Kohei Yoshida <kohei.yosh...@gmail.com>
-Date: Thu, 27 Feb 2025 21:39:52 -0500
-Subject: [PATCH] Filter node stack may be empty when no filtering is applied
-
-But when the stack is not empty, then the assert condition still
-stands. This is related to #207.
----
- src/liborcus/xls_xml_auto_filter_context.cpp | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/src/liborcus/xls_xml_auto_filter_context.cpp
b/src/liborcus/xls_xml_auto_filter_context.cpp
-index 509c0b25..34a9210c 100644
---- a/src/liborcus/xls_xml_auto_filter_context.cpp
-+++ b/src/liborcus/xls_xml_auto_filter_context.cpp
-@@ -193,9 +193,12 @@ void xls_xml_auto_filter_context::end_auto_filter()
- if (!mp_auto_filter)
- return;
-
-- assert(m_filter_node_stack.size() == 1u); // root node
-- m_filter_node_stack.back()->commit();
-- m_filter_node_stack.pop_back();
-+ if (!m_filter_node_stack.empty())
-+ {
-+ assert(m_filter_node_stack.size() == 1u); // root node
-+ m_filter_node_stack.back()->commit();
-+ m_filter_node_stack.pop_back();
-+ }
- mp_auto_filter->commit();
- }
-
---
-2.34.1
-
diff --git a/external/liborcus/enum-labels.patch
b/external/liborcus/enum-labels.patch
deleted file mode 100644
index 10f169c62fa1..000000000000
--- a/external/liborcus/enum-labels.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 3b590cabb6f8296dcddb6588e3346a7604f97d51 Mon Sep 17 00:00:00 2001
-From: Kohei Yoshida <kohei.yosh...@gmail.com>
-Date: Fri, 7 Feb 2025 23:03:34 -0500
-Subject: [PATCH 2/2] Properly map enum types to their labels
-
----
- src/liborcus/spreadsheet_types.cpp | 10 ++++------
- 1 file changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/src/liborcus/spreadsheet_types.cpp
b/src/liborcus/spreadsheet_types.cpp
-index f3f51050..161e53ca 100644
---- a/src/liborcus/spreadsheet_types.cpp
-+++ b/src/liborcus/spreadsheet_types.cpp
-@@ -595,10 +595,7 @@ std::ostream& operator<< (std::ostream& os,
underline_style_t uline)
- {
- static constexpr std::string_view names[] = {
- "none",
-- "single-line",
-- "single-accounting",
-- "double-line",
-- "double-accounting",
-+ "solid",
- "dotted",
- "dash",
- "long-dash",
-@@ -633,6 +630,7 @@ std::ostream& operator<< (std::ostream& os,
underline_spacing_t ulmode)
- static constexpr std::string_view names[] = {
- "continuous",
- "skip-white-space",
-+ "continuous-over-field",
- };
-
- return write_name_for_pos(os, names, std::size(names), ulmode);
-@@ -642,8 +640,8 @@ std::ostream& operator<< (std::ostream& os,
underline_count_t ultype)
- {
- static constexpr std::string_view names[] = {
- "none",
-- "single-type",
-- "double-type",
-+ "single-count",
-+ "double-count",
- };
-
- return write_name_for_pos(os, names, std::size(names), ultype);
---
-2.34.1
-
diff --git a/external/liborcus/styles-element-rules.patch
b/external/liborcus/styles-element-rules.patch
deleted file mode 100644
index 61b42478ad8e..000000000000
--- a/external/liborcus/styles-element-rules.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From cfa3ec177d4dd44327cd42d018a0fb88888e19c9 Mon Sep 17 00:00:00 2001
-From: Kohei Yoshida <kohei.yosh...@gmail.com>
-Date: Fri, 7 Feb 2025 22:51:29 -0500
-Subject: [PATCH 1/2] Define missing element rules for immediate child elements
- of root
-
----
- src/liborcus/odf_styles_context.cpp | 18 ++++++++++++++++++
- 1 file changed, 18 insertions(+)
-
-diff --git a/src/liborcus/odf_styles_context.cpp
b/src/liborcus/odf_styles_context.cpp
-index a60e47da..0e45783e 100644
---- a/src/liborcus/odf_styles_context.cpp
-+++ b/src/liborcus/odf_styles_context.cpp
-@@ -67,6 +67,24 @@ styles_context::styles_context(
- // parent element -> child element
- { XMLNS_UNKNOWN_ID, XML_UNKNOWN_TOKEN, NS_odf_office,
XML_automatic_styles }, // root element
- { XMLNS_UNKNOWN_ID, XML_UNKNOWN_TOKEN, NS_odf_office, XML_styles },
// root element
-+ { NS_odf_office, XML_automatic_styles, NS_odf_number,
XML_boolean_style },
-+ { NS_odf_office, XML_automatic_styles, NS_odf_number,
XML_currency_style },
-+ { NS_odf_office, XML_automatic_styles, NS_odf_number, XML_date_style
},
-+ { NS_odf_office, XML_automatic_styles, NS_odf_number,
XML_number_style },
-+ { NS_odf_office, XML_automatic_styles, NS_odf_number,
XML_percentage_style },
-+ { NS_odf_office, XML_automatic_styles, NS_odf_number, XML_text_style
},
-+ { NS_odf_office, XML_automatic_styles, NS_odf_number, XML_time_style
},
-+ { NS_odf_office, XML_automatic_styles, NS_odf_style,
XML_default_style },
-+ { NS_odf_office, XML_automatic_styles, NS_odf_style, XML_style },
-+ { NS_odf_office, XML_styles, NS_odf_number, XML_boolean_style },
-+ { NS_odf_office, XML_styles, NS_odf_number, XML_currency_style },
-+ { NS_odf_office, XML_styles, NS_odf_number, XML_date_style },
-+ { NS_odf_office, XML_styles, NS_odf_number, XML_number_style },
-+ { NS_odf_office, XML_styles, NS_odf_number, XML_percentage_style },
-+ { NS_odf_office, XML_styles, NS_odf_number, XML_text_style },
-+ { NS_odf_office, XML_styles, NS_odf_number, XML_time_style },
-+ { NS_odf_office, XML_styles, NS_odf_style, XML_default_style },
-+ { NS_odf_office, XML_styles, NS_odf_style, XML_style },
- };
-
- init_element_validator(rules, std::size(rules));
---
-2.34.1
-
