Hi,
Am 28.01.26 um 20:10 schrieb Emilio Pozuelo Monfort:
I'd like to upload this with the above LibreOffice release on Thursday
(2026-02-05).
That's fine. Let us know when you do that so that we can binNMU labplot.
OK, at jobs in place :) Will tell when it's uploaded and built.
[1] builds and passes the tests, fwiw, but as said I would like to not do it ;-)
Regards,
Rene
[1]
diff --git a/changelog b/changelog
index 4cbe1b7a0..11aee2200 100644
--- a/changelog
+++ b/changelog
@@ -1,7 +1,9 @@
libreoffice (4:25.8.4-2) UNRELEASED; urgency=medium
+ * debian/patches/orcus-0.21.diff: use orcus 0.21
+
* debian/rules:
- - allow libmdds-dev 3.2
+ - allow libmdds-dev 3.2 and use liborcus 0.21 (exclusively)
- add loong64 to OOO_NOGUI_ARCHS to build -nogui variant there, fast
enough for the double build
- (temporarily) disable zxing on loong64 (and qt6-multimedia on m68k while
we
diff --git a/control b/control
index 524fa9184..eaaf2ec6b 100644
--- a/control
+++ b/control
@@ -101,8 +101,8 @@ Build-Depends: autoconf,
libnumbertext-dev,
libodfgen-dev (<< 0.2~),
libodfgen-dev (>= 0.1),
- liborcus-dev (<< 0.21~),
- liborcus-dev (>= 0.20),
+ liborcus-dev (<< 0.22~),
+ liborcus-dev (>= 0.21),
libpagemaker-dev,
libpagemaker-dev (<< 0.1~),
libpentaho-reporting-flow-engine-java [!armel !armhf !hppa
!kfreebsd-amd64 !kfreebsd-i386 !mips64 !powerpcspe !ppc64el !s390x !sparc]
<!nojava>,
@@ -222,7 +222,6 @@ Build-Depends-Arch: at-spi2-core [!alpha !armel !armhf
!hppa !i386 !ia64 !kfreeb
libmariadb-dev,
libnumbertext-data (>= 1.0.11) <!nocheck>,
libopenjp2-7-dev [alpha amd64 arm64 armel armhf hppa i386
ia64 kfreebsd-amd64 kfreebsd-i386 loong64 m68k mips mipsel mips64 mips64el
powerpc powerpcspe ppc64 ppc64el riscv64 s390x sparc sparc64],
- liborcus-dev (>= 0.20.0-2) <!nocheck>,
libpq-dev,
libxcb1-dev,
libxml2-dev (>= 2.14.3+dfsg-0exp3) <!nocheck>,
diff --git a/patches/orcus-0.21.diff b/patches/orcus-0.21.diff
new file mode 100644
index 000000000..09007613b
--- /dev/null
+++ b/patches/orcus-0.21.diff
@@ -0,0 +1,163 @@
+From d48fddcd2014c1366766b3785f8b533f8cb545c7 Mon Sep 17 00:00:00 2001
+From: Kohei Yoshida <[email protected]>
+Date: Mon, 15 Sep 2025 22:28:20 -0400
+Subject: 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]>
+---
+ 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(-)
+ delete mode 100644 external/liborcus/orcus-xml-finalize.patch.1
+
+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
+@@ -11456,7 +11456,7 @@
+ dnl ===================================================================
+ dnl Orcus
+ dnl ===================================================================
+-libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.20 >= 0.20.0])
++libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.21 >= 0.21.0])
+ if test "$with_system_orcus" != "yes"; then
+ if test "$SYSTEM_BOOST" = "TRUE"; then
+ dnl Link with Boost.System
+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 :=
ec27f30e8445a2a3f307f7e829fc446fd48193150b7f8f23bb5bfb25ec6e4e27
+-ORCUS_TARBALL := liborcus-0.20.1.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)
+From cd347097f726eae68fa819fe244d0bedf13832e9 Mon Sep 17 00:00:00 2001
+From: Kohei Yoshida <[email protected]>
+Date: Thu, 21 Aug 2025 21:24:37 -0400
+Subject: Automatically map generic JSON and XML documents to Calc
+
+This includes one bug fix where orcus_xml did not call
+import_factory's finalize() interface method per interface
+contract. With it properly fixed in liborcus itself, it
+is no longer necessary to manually call it at the end of
+ScOrcusXMLContextImpl::importXML().
+
+Also moving up the type detection order for the generic
+HTML type to be before the generic XML type since something
+like
+
+<html><body>some text</body></html>
+
+can be detected as a valid XML if it is checked first.
+A (well-formed) HTML can be considered a speciazlied XML,
+so it should come before XML.
+
+Change-Id: I20f24706421104181ad3dc8250d93f78d6b611e9
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190042
+Tested-by: Jenkins
+Reviewed-by: Kohei Yoshida <[email protected]>
+---
+ external/liborcus/UnpackedTarball_liborcus.mk | 4 +---
+ external/liborcus/orcus-xml-finalize.patch.1 | 13 +++++++++++++
+ filter/Configuration_filter.mk | 4 ++++
+ filter/source/config/cache/typedetection.cxx | 14 ++++++++++----
+ .../config/fragments/filters/calc_json_Orcus.xcu | 19 +++++++++++++++++++
+ .../config/fragments/filters/calc_xml_Orcus.xcu | 19 +++++++++++++++++++
+ filter/source/config/fragments/types/generic_JSON.xcu | 18 ++++++++++++++++++
+ filter/source/config/fragments/types/generic_XML.xcu | 18 ++++++++++++++++++
+ sc/source/filter/orcus/filterdetect.cxx | 4 ++++
+ sc/source/filter/orcus/orcusfiltersimpl.cxx | 2 ++
+ sc/source/filter/orcus/xmlcontext.cxx | 2 --
+ 11 files changed, 108 insertions(+), 9 deletions(-)
+ create mode 100644 external/liborcus/orcus-xml-finalize.patch.1
+ create mode 100644 filter/source/config/fragments/filters/calc_json_Orcus.xcu
+ create mode 100644 filter/source/config/fragments/filters/calc_xml_Orcus.xcu
+ create mode 100644 filter/source/config/fragments/types/generic_JSON.xcu
+ create mode 100644 filter/source/config/fragments/types/generic_XML.xcu
+
+diff --git a/sc/source/filter/orcus/xmlcontext.cxx
b/sc/source/filter/orcus/xmlcontext.cxx
+index cda6546de0fc..c563cac4eba9 100644
+--- a/sc/source/filter/orcus/xmlcontext.cxx
++++ b/sc/source/filter/orcus/xmlcontext.cxx
+@@ -266,8 +266,6 @@
+
+ orcus::file_content content(path);
+ filter.read_stream(content.str());
+-
+- aFactory.finalize();
+ }
+ catch (const std::exception&)
+ {
diff --git a/patches/series b/patches/series
index 07ab6434c..6cad35bb2 100644
--- a/patches/series
+++ b/patches/series
@@ -53,3 +53,4 @@ apparmor-allow-local-override.diff
apparmor-thunderbird.diff
lpsolve-fPIC.diff
remove-JITC_PROCESSOR_TYPE-setting.diff
+orcus-0.21.diff
diff --git a/rules b/rules
index 1dca159d5..00ff462b5 100755
--- a/rules
+++ b/rules
@@ -1467,8 +1467,7 @@ ifneq (,$(filter mdds, $(SYSTEM_STUFF)))
endif
ifneq (,$(filter orcus, $(SYSTEM_STUFF)))
- BUILD_DEPS += , liborcus-dev (>= 0.20), liborcus-dev (<< 0.21~)
- BUILD_DEPS_ARCH += , liborcus-dev (>= 0.20.0-2) <!nocheck>
+ BUILD_DEPS += , liborcus-dev (>= 0.21), liborcus-dev (<< 0.22~)
endif
ifeq "$(ENABLE_XMLHELP)" "y"
diff --git a/shlibs.override.orcus b/shlibs.override.orcus
index f3852d50d..b1b6eaac5 100644
--- a/shlibs.override.orcus
+++ b/shlibs.override.orcus
@@ -1,2 +1,2 @@
-liborcus-0.20 0
-liborcus-parser-0.20 0
+liborcus-0.21 0
+liborcus-parser-0.21 0
