RepositoryExternal.mk | 4 ++-- configure.ac | 2 +- download.lst | 4 ++-- external/liborcus/ExternalPackage_liborcus.mk | 8 ++++---- external/liborcus/ExternalProject_liborcus.mk | 4 ++-- external/liborcus/UnpackedTarball_liborcus.mk | 1 - external/liborcus/orcus-xml-finalize.patch.1 | 13 ------------- external/liborcus/windows-constants-hack.patch | 4 ++-- 8 files changed, 13 insertions(+), 27 deletions(-)
New commits: commit d48fddcd2014c1366766b3785f8b533f8cb545c7 Author: Kohei Yoshida <[email protected]> AuthorDate: Mon Sep 15 22:28:20 2025 -0400 Commit: Kohei Yoshida <[email protected]> CommitDate: Tue Sep 16 23:46:00 2025 +0200 Upgrade liborcus to 0.21.0 Change-Id: I39bd6d94d03ba7f7c4ce6a2bdd1fb12c1078b42e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191011 Tested-by: Jenkins Reviewed-by: Kohei Yoshida <[email protected]> diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 432a8ff16b3f..d820115f40de 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3399,7 +3399,7 @@ $(call gb_LinkTarget_set_include,$(1),\ ) $(call gb_LinkTarget_add_libs,$(1),\ - -L$(gb_UnpackedTarball_workdir)/liborcus/src/liborcus/.libs -lorcus-0.20 \ + -L$(gb_UnpackedTarball_workdir)/liborcus/src/liborcus/.libs -lorcus-0.21 \ ) $(if $(SYSTEM_BOOST), \ @@ -3418,7 +3418,7 @@ $(call gb_LinkTarget_set_include,$(1),\ ) $(call gb_LinkTarget_add_libs,$(1),\ - -L$(gb_UnpackedTarball_workdir)/liborcus/src/parser/.libs -lorcus-parser-0.20 \ + -L$(gb_UnpackedTarball_workdir)/liborcus/src/parser/.libs -lorcus-parser-0.21 \ ) endef diff --git a/configure.ac b/configure.ac index 5a0f0bf0d30b..d81afa10bef7 100644 --- a/configure.ac +++ b/configure.ac @@ -11603,7 +11603,7 @@ fi dnl =================================================================== dnl Orcus dnl =================================================================== -libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.20 >= 0.20.2]) +libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.21 >= 0.21.0]) dnl FIXME by renaming SYSTEM_LIBORCUS to SYSTEM_ORCUS in the build system world SYSTEM_LIBORCUS=$SYSTEM_ORCUS diff --git a/download.lst b/download.lst index 3aa5df693e98..9108f53ba721 100644 --- a/download.lst +++ b/download.lst @@ -554,8 +554,8 @@ OPENSSL_TARBALL := openssl-3.0.17.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -ORCUS_SHA256SUM := 85fb0af34042108f2b6aa8e7f3994fe972fd79efe3f1cd01dc7a49b0ffc5ca13 -ORCUS_TARBALL := liborcus-0.20.2.tar.xz +ORCUS_SHA256SUM := 1c6e473d6b8a63d61d0e6874a1762d6f0e0e78338d763e48ac93126ecde19b37 +ORCUS_TARBALL := liborcus-0.21.0.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/liborcus/ExternalPackage_liborcus.mk b/external/liborcus/ExternalPackage_liborcus.mk index b9be5fcac405..e4682fe1464b 100644 --- a/external/liborcus/ExternalPackage_liborcus.mk +++ b/external/liborcus/ExternalPackage_liborcus.mk @@ -12,11 +12,11 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,liborcus,liborcus)) $(eval $(call gb_ExternalPackage_use_external_project,liborcus,liborcus)) ifeq ($(OS),MACOSX) -$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.20.0.dylib,src/liborcus/.libs/liborcus-0.20.0.dylib)) -$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.20.0.dylib,src/parser/.libs/liborcus-parser-0.20.0.dylib)) +$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.21.0.dylib,src/liborcus/.libs/liborcus-0.21.0.dylib)) +$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.21.0.dylib,src/parser/.libs/liborcus-parser-0.21.0.dylib)) else ifeq ($(DISABLE_DYNLOADING),) -$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.20.so.0,src/liborcus/.libs/liborcus-0.20.so.0.0.0)) -$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.20.so.0,src/parser/.libs/liborcus-parser-0.20.so.0.0.0)) +$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.21.so.0,src/liborcus/.libs/liborcus-0.21.so.0.0.0)) +$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.21.so.0,src/parser/.libs/liborcus-parser-0.21.so.0.0.0)) endif # vim: set noet sw=4 ts=4: diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk index 83fd8dea505e..d9bd86da7e12 100644 --- a/external/liborcus/ExternalProject_liborcus.mk +++ b/external/liborcus/ExternalProject_liborcus.mk @@ -113,8 +113,8 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) : $(MAKE) \ $(if $(filter MACOSX,$(OS)),\ && $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ - $(EXTERNAL_WORKDIR)/src/liborcus/.libs/liborcus-0.20.0.dylib \ - $(EXTERNAL_WORKDIR)/src/parser/.libs/liborcus-parser-0.20.0.dylib \ + $(EXTERNAL_WORKDIR)/src/liborcus/.libs/liborcus-0.21.0.dylib \ + $(EXTERNAL_WORKDIR)/src/parser/.libs/liborcus-parser-0.21.0.dylib \ ) \ ) $(call gb_Trace_EndRange,liborcus,EXTERNAL) diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk index a4df2b30e51c..6c1b846f23a0 100644 --- a/external/liborcus/UnpackedTarball_liborcus.mk +++ b/external/liborcus/UnpackedTarball_liborcus.mk @@ -16,7 +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/orcus-xml-finalize.patch.1 \ )) ifeq ($(OS),WNT) diff --git a/external/liborcus/orcus-xml-finalize.patch.1 b/external/liborcus/orcus-xml-finalize.patch.1 deleted file mode 100644 index 5b5f2e8b97af..000000000000 --- a/external/liborcus/orcus-xml-finalize.patch.1 +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/liborcus/orcus_xml.cpp b/src/liborcus/orcus_xml.cpp -index 9c87a78e..f91538dd 100644 ---- a/src/liborcus/orcus_xml.cpp -+++ b/src/liborcus/orcus_xml.cpp -@@ -641,6 +641,8 @@ void orcus_xml::read_stream(std::string_view stream) - - sax_ns_parser<xml_data_sax_handler> parser(stream, ns_cxt, handler); - parser.parse(); -+ -+ mp_impl->im_factory->finalize(); - } - - #if ORCUS_DEBUG_XML diff --git a/external/liborcus/windows-constants-hack.patch b/external/liborcus/windows-constants-hack.patch index 7f79ae86c513..3f09633638d4 100644 --- a/external/liborcus/windows-constants-hack.patch +++ b/external/liborcus/windows-constants-hack.patch @@ -8,8 +8,8 @@ index ae571f5..539ce18 100644 -#include "constants.inl" +#define ORCUS_MAJOR_VERSION 0 -+#define ORCUS_MINOR_VERSION 20 -+#define ORCUS_MICRO_VERSION 2 ++#define ORCUS_MINOR_VERSION 21 ++#define ORCUS_MICRO_VERSION 0 namespace orcus {
