download.lst | 4
external/liborcus/ExternalProject_liborcus.mk | 2
external/liborcus/UnpackedTarball_liborcus.mk | 2
external/liborcus/bugfix-0.18.0-unset-border-colors.patch.1 | 236 ------------
external/liborcus/liborcus-no-benchmark.patch.1 | 19
5 files changed, 4 insertions(+), 259 deletions(-)
New commits:
commit 3c988ef450b809767ca7f897c59041758af53f4b
Author: Kohei Yoshida <ko...@libreoffice.org>
AuthorDate: Sat Feb 11 17:05:45 2023 -0500
Commit: Kohei Yoshida <ko...@libreoffice.org>
CommitDate: Sat Feb 11 23:04:29 2023 +0000
Update liborcus to 0.18.1
Change-Id: I0439640789e59e4dd6e92d7f2975538de2f42f53
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146826
Tested-by: Jenkins
Reviewed-by: Kohei Yoshida <ko...@libreoffice.org>
diff --git a/download.lst b/download.lst
index 0f42585bb7c8..4b8e212456e2 100644
--- a/download.lst
+++ b/download.lst
@@ -423,8 +423,8 @@ OPENSSL_TARBALL := openssl-3.0.8.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-ORCUS_SHA256SUM :=
0a8c55a227f13dbda08da8a1f6e18f27ba873da55a2cdd23bd0825989d1abff8
-ORCUS_TARBALL := liborcus-0.18.0.tar.xz
+ORCUS_SHA256SUM :=
6006b9f1576315e313df715a7e72a17f3e0b17d7b6bd119cfa8a0b608ce971eb
+ORCUS_TARBALL := liborcus-0.18.1.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts
diff --git a/external/liborcus/ExternalProject_liborcus.mk
b/external/liborcus/ExternalProject_liborcus.mk
index b07df31a34d0..7f2e5f24083f 100644
--- a/external/liborcus/ExternalProject_liborcus.mk
+++ b/external/liborcus/ExternalProject_liborcus.mk
@@ -99,6 +99,8 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
$(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
--disable-spreadsheet-model \
--without-tools \
+ --without-benchmark \
+ --without-doc-example \
--disable-python \
--disable-werror \
$(if $(filter
MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO)
\
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk
b/external/liborcus/UnpackedTarball_liborcus.mk
index 48b7fb4743e9..ca4a40acf4e5 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -21,8 +21,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/libtool.patch.0 \
external/liborcus/fix-pch.patch.0 \
external/liborcus/liborcus_newline.patch.1 \
- external/liborcus/liborcus-no-benchmark.patch.1 \
- external/liborcus/bugfix-0.18.0-unset-border-colors.patch.1 \
))
ifeq ($(OS),WNT)
diff --git a/external/liborcus/bugfix-0.18.0-unset-border-colors.patch.1
b/external/liborcus/bugfix-0.18.0-unset-border-colors.patch.1
deleted file mode 100644
index 5b8a04069e99..000000000000
--- a/external/liborcus/bugfix-0.18.0-unset-border-colors.patch.1
+++ /dev/null
@@ -1,236 +0,0 @@
-diff --git a/src/liborcus/xls_xml_context.cpp
b/src/liborcus/xls_xml_context.cpp
-index 85916fc7..739678ee 100644
---- a/src/liborcus/xls_xml_context.cpp
-+++ b/src/liborcus/xls_xml_context.cpp
-@@ -1292,7 +1292,7 @@ void xls_xml_context::start_element_border(const
xml_token_attrs_t& attrs)
- {
- ss::border_direction_t dir = ss::border_direction_t::unknown;
- ss::border_style_t style = ss::border_style_t::unknown;
-- ss::color_rgb_t color;
-+ std::optional<ss::color_rgb_t> color;
- long weight = 0;
-
- for (const xml_token_attr_t& attr : attrs)
-@@ -1950,8 +1950,14 @@ void xls_xml_context::commit_default_style()
- {
- for (const border_style_type& b : m_default_style->borders)
- {
-- border_style->set_style(b.dir, b.style);
-- border_style->set_color(b.dir, 255, b.color.red, b.color.green,
b.color.blue);
-+ if (b.dir == ss::border_direction_t::unknown)
-+ continue;
-+
-+ if (b.style != ss::border_style_t::unknown)
-+ border_style->set_style(b.dir, b.style);
-+
-+ if (b.color)
-+ border_style->set_color(b.dir, 255, b.color->red,
b.color->green, b.color->blue);
- }
- }
-
-@@ -2109,8 +2115,14 @@ void xls_xml_context::commit_styles()
-
- for (const border_style_type& b : style->borders)
- {
-- border_style->set_style(b.dir, b.style);
-- border_style->set_color(b.dir, 255, b.color.red,
b.color.green, b.color.blue);
-+ if (b.dir == ss::border_direction_t::unknown)
-+ continue;
-+
-+ if (b.style != ss::border_style_t::unknown)
-+ border_style->set_style(b.dir, b.style);
-+
-+ if (b.color)
-+ border_style->set_color(b.dir, 255, b.color->red,
b.color->green, b.color->blue);
- }
-
- size_t border_id = border_style->commit();
-diff --git a/src/liborcus/xls_xml_context.hpp
b/src/liborcus/xls_xml_context.hpp
-index 9f00bb07..d7377e42 100644
---- a/src/liborcus/xls_xml_context.hpp
-+++ b/src/liborcus/xls_xml_context.hpp
-@@ -127,7 +127,7 @@ class xls_xml_context : public xml_context_base
- {
- spreadsheet::border_direction_t dir =
spreadsheet::border_direction_t::unknown;
- spreadsheet::border_style_t style =
spreadsheet::border_style_t::unknown;
-- spreadsheet::color_rgb_t color;
-+ std::optional<spreadsheet::color_rgb_t> color;
- };
-
- struct font_style_type
-diff --git a/src/orcus_test_xls_xml.cpp b/src/orcus_test_xls_xml.cpp
-index 627c957d..f20603c6 100644
---- a/src/orcus_test_xls_xml.cpp
-+++ b/src/orcus_test_xls_xml.cpp
-@@ -756,73 +756,171 @@ void test_xls_xml_cell_borders_directions()
- case ss::border_direction_t::top:
- assert(border->top.style);
- assert(*border->top.style == ss::border_style_t::thin);
-+ assert(!border->top.border_color);
-+ assert(!border->top.border_width);
- assert(!border->bottom.style);
-+ assert(!border->bottom.border_color);
-+ assert(!border->bottom.border_width);
- assert(!border->left.style);
-+ assert(!border->left.border_color);
-+ assert(!border->left.border_width);
- assert(!border->right.style);
-+ assert(!border->right.border_color);
-+ assert(!border->right.border_width);
- assert(!border->diagonal.style);
-+ assert(!border->diagonal.border_color);
-+ assert(!border->diagonal.border_width);
- assert(!border->diagonal_bl_tr.style);
-+ assert(!border->diagonal_bl_tr.border_color);
-+ assert(!border->diagonal_bl_tr.border_width);
- assert(!border->diagonal_tl_br.style);
-+ assert(!border->diagonal_tl_br.border_color);
-+ assert(!border->diagonal_tl_br.border_width);
- break;
- case ss::border_direction_t::left:
- assert(!border->top.style);
-+ assert(!border->top.border_color);
-+ assert(!border->top.border_width);
- assert(!border->bottom.style);
-+ assert(!border->bottom.border_color);
-+ assert(!border->bottom.border_width);
- assert(border->left.style);
- assert(*border->left.style == ss::border_style_t::thin);
-+ assert(!border->left.border_color);
-+ assert(!border->left.border_width);
- assert(!border->right.style);
-+ assert(!border->right.border_color);
-+ assert(!border->right.border_width);
- assert(!border->diagonal.style);
-+ assert(!border->diagonal.border_color);
-+ assert(!border->diagonal.border_width);
- assert(!border->diagonal_bl_tr.style);
-+ assert(!border->diagonal_bl_tr.border_color);
-+ assert(!border->diagonal_bl_tr.border_width);
- assert(!border->diagonal_tl_br.style);
-+ assert(!border->diagonal_tl_br.border_color);
-+ assert(!border->diagonal_tl_br.border_width);
- break;
- case ss::border_direction_t::right:
- assert(!border->top.style);
-+ assert(!border->top.border_color);
-+ assert(!border->top.border_width);
- assert(!border->bottom.style);
-+ assert(!border->bottom.border_color);
-+ assert(!border->bottom.border_width);
- assert(!border->left.style);
-+ assert(!border->left.border_color);
-+ assert(!border->left.border_width);
- assert(border->right.style);
- assert(*border->right.style == ss::border_style_t::thin);
-+ assert(!border->right.border_color);
-+ assert(!border->right.border_width);
- assert(!border->diagonal.style);
-+ assert(!border->diagonal.border_color);
-+ assert(!border->diagonal.border_width);
- assert(!border->diagonal_bl_tr.style);
-+ assert(!border->diagonal_bl_tr.border_color);
-+ assert(!border->diagonal_bl_tr.border_width);
- assert(!border->diagonal_tl_br.style);
-+ assert(!border->diagonal_tl_br.border_color);
-+ assert(!border->diagonal_tl_br.border_width);
- break;
- case ss::border_direction_t::bottom:
- assert(!border->top.style);
-+ assert(!border->top.border_color);
-+ assert(!border->top.border_width);
- assert(border->bottom.style);
- assert(*border->bottom.style == ss::border_style_t::thin);
-+ assert(!border->bottom.border_color);
-+ assert(!border->bottom.border_width);
- assert(!border->left.style);
-+ assert(!border->left.border_color);
-+ assert(!border->left.border_width);
- assert(!border->right.style);
-+ assert(!border->right.border_color);
-+ assert(!border->right.border_width);
- assert(!border->diagonal.style);
-+ assert(!border->diagonal.border_color);
-+ assert(!border->diagonal.border_width);
- assert(!border->diagonal_bl_tr.style);
-+ assert(!border->diagonal_bl_tr.border_color);
-+ assert(!border->diagonal_bl_tr.border_width);
- assert(!border->diagonal_tl_br.style);
-+ assert(!border->diagonal_tl_br.border_color);
-+ assert(!border->diagonal_tl_br.border_width);
- break;
- case spreadsheet::border_direction_t::diagonal:
- assert(!border->top.style);
-+ assert(!border->top.border_color);
-+ assert(!border->top.border_width);
- assert(!border->bottom.style);
-+ assert(!border->bottom.border_color);
-+ assert(!border->bottom.border_width);
- assert(!border->left.style);
-+ assert(!border->left.border_color);
-+ assert(!border->left.border_width);
- assert(!border->right.style);
-+ assert(!border->right.border_color);
-+ assert(!border->right.border_width);
- assert(!border->diagonal.style);
-+ assert(!border->diagonal.border_color);
-+ assert(!border->diagonal.border_width);
- assert(border->diagonal_bl_tr.style);
- assert(*border->diagonal_bl_tr.style ==
ss::border_style_t::thin);
-+ assert(!border->diagonal_bl_tr.border_color);
-+ assert(!border->diagonal_bl_tr.border_width);
- assert(border->diagonal_tl_br.style);
- assert(*border->diagonal_tl_br.style ==
ss::border_style_t::thin);
-+ assert(!border->diagonal_tl_br.border_color);
-+ assert(!border->diagonal_tl_br.border_width);
- break;
- case spreadsheet::border_direction_t::diagonal_tl_br:
- assert(!border->top.style);
-+ assert(!border->top.border_color);
-+ assert(!border->top.border_width);
- assert(!border->bottom.style);
-+ assert(!border->bottom.border_color);
-+ assert(!border->bottom.border_width);
- assert(!border->left.style);
-+ assert(!border->left.border_color);
-+ assert(!border->left.border_width);
- assert(!border->right.style);
-+ assert(!border->right.border_color);
-+ assert(!border->right.border_width);
- assert(!border->diagonal.style);
-+ assert(!border->diagonal.border_color);
-+ assert(!border->diagonal.border_width);
- assert(!border->diagonal_bl_tr.style);
-+ assert(!border->diagonal_bl_tr.border_color);
-+ assert(!border->diagonal_bl_tr.border_width);
- assert(border->diagonal_tl_br.style);
- assert(*border->diagonal_tl_br.style ==
ss::border_style_t::thin);
-+ assert(!border->diagonal_tl_br.border_color);
-+ assert(!border->diagonal_tl_br.border_width);
- break;
- case spreadsheet::border_direction_t::diagonal_bl_tr:
- assert(!border->top.style);
-+ assert(!border->top.border_color);
-+ assert(!border->top.border_width);
- assert(!border->bottom.style);
-+ assert(!border->bottom.border_color);
-+ assert(!border->bottom.border_width);
- assert(!border->left.style);
-+ assert(!border->left.border_color);
-+ assert(!border->left.border_width);
- assert(!border->right.style);
-+ assert(!border->right.border_color);
-+ assert(!border->right.border_width);
- assert(!border->diagonal.style);
-+ assert(!border->diagonal.border_color);
-+ assert(!border->diagonal.border_width);
- assert(border->diagonal_bl_tr.style);
- assert(*border->diagonal_bl_tr.style ==
ss::border_style_t::thin);
-+ assert(!border->diagonal_bl_tr.border_color);
-+ assert(!border->diagonal_bl_tr.border_width);
- assert(!border->diagonal_tl_br.style);
-+ assert(!border->diagonal_tl_br.border_color);
-+ assert(!border->diagonal_tl_br.border_width);
- break;
- default:
- assert(!"unhandled direction!");
diff --git a/external/liborcus/liborcus-no-benchmark.patch.1
b/external/liborcus/liborcus-no-benchmark.patch.1
deleted file mode 100644
index bdac94d810d1..000000000000
--- a/external/liborcus/liborcus-no-benchmark.patch.1
+++ /dev/null
@@ -1,19 +0,0 @@
--*- Mode: Diff -*-
-
-Don't build the benchmark directory.
-
-We won't run those anyway, and on some platforms building executables
-here and there for random externals can be problematic. While at it,
-skip the doc_example subdirectory too.
-
---- liborcus/Makefile.in
-+++ liborcus/Makefile.in
-@@ -423,7 +423,7 @@
- top_srcdir = @top_srcdir@
- valgrind_enabled_tools = @valgrind_enabled_tools@
- valgrind_tools = @valgrind_tools@
--SUBDIRS = src include benchmark doc_example
-+SUBDIRS = src include
- ACLOCAL_AMFLAGS = -I m4
- pcfiles = liborcus-@ORCUS_API_VERSION@.pc $(am__append_1)
- pkgconfig_DATA = $(pcfiles)
