diff options
| author | CoprDistGit <infra@openeuler.org> | 2024-04-26 13:37:49 +0000 |
|---|---|---|
| committer | CoprDistGit <infra@openeuler.org> | 2024-04-26 13:37:49 +0000 |
| commit | bdffa2a17fefa2fbab3de67ff694195dbeee1259 (patch) | |
| tree | 41c519c5f400165f2b19e863da40bc0a6f74d11c | |
| parent | ff54175091b8636cc1274860e56b3606e8cde62b (diff) | |
automatic import of libreofficeopeneuler23.03openeuler22.09
| -rw-r--r-- | .gitignore | 5 | ||||
| -rw-r--r-- | 0001-Revert-java-9-changes.patch | 470 | ||||
| -rw-r--r-- | libreoffice-7.5.0.2.tar.xz | 3 | ||||
| -rw-r--r-- | libreoffice-7.5.0.2.tar.xz.asc | 19 | ||||
| -rw-r--r-- | libreoffice-help-7.5.0.2.tar.xz | 3 | ||||
| -rw-r--r-- | libreoffice-help-7.5.0.2.tar.xz.asc | 19 | ||||
| -rw-r--r-- | libreoffice-translations-7.5.0.2.tar.xz | 3 | ||||
| -rw-r--r-- | libreoffice-translations-7.5.0.2.tar.xz.asc | 19 | ||||
| -rw-r--r-- | libreoffice.spec | 18 | ||||
| -rw-r--r-- | pdfium-5408.tar.bz2 | 3 | ||||
| -rw-r--r-- | skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz | 3 | ||||
| -rw-r--r-- | sources | 5 | ||||
| -rw-r--r-- | system-libxml-icu74.patch | 316 |
13 files changed, 385 insertions, 501 deletions
@@ -18,3 +18,8 @@ /gpgme-1.18.0.tar.bz2 /libassuan-2.5.5.tar.bz2 /libgpg-error-1.43.tar.bz2 +/libreoffice-7.5.0.2.tar.xz +/libreoffice-help-7.5.0.2.tar.xz +/libreoffice-translations-7.5.0.2.tar.xz +/pdfium-5408.tar.bz2 +/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz diff --git a/0001-Revert-java-9-changes.patch b/0001-Revert-java-9-changes.patch deleted file mode 100644 index 67829aa..0000000 --- a/0001-Revert-java-9-changes.patch +++ /dev/null @@ -1,470 +0,0 @@ -From 702c015e4127de65a4d8ab8a665bf6af6518ef4a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch> -Date: Tue, 30 Mar 2021 16:43:17 +0200 -Subject: [PATCH 1/2] Revert java 9 changes - -Change-Id: I09f046f54b107b53c86f76a39553bd11ef03d9f6 ---- - configure.ac | 45 +++++-- - jvmfwk/CustomTarget_jreproperties.mk | 2 +- - ridljar/Jar_libreoffice.mk | 8 +- - ridljar/Jar_unoloader.mk | 11 +- - ridljar/source/libreoffice/module-info.java | 142 -------------------- - ridljar/source/unoloader/module-info.java | 12 -- - solenv/gbuild/Jar.mk | 14 +- - solenv/gbuild/JavaClassSet.mk | 39 +----- - solenv/gbuild/gbuild.mk | 2 - - 9 files changed, 43 insertions(+), 232 deletions(-) - delete mode 100644 ridljar/source/libreoffice/module-info.java - delete mode 100644 ridljar/source/unoloader/module-info.java - -diff --git a/configure.ac b/configure.ac -index f4850a8cb2dc..c2df878df1d7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2313,7 +2313,7 @@ AC_ARG_WITH(linker-hash-style, - - AC_ARG_WITH(jdk-home, - AS_HELP_STRING([--with-jdk-home=<absolute path to JDK home>], -- [If you have installed JDK 9 or later on your system please supply the -+ [If you have installed JDK 8 or later on your system please supply the - path here. Note that this is not the location of the java command but the - location of the entire distribution. In case of cross-compiling, this - is the JDK of the host os. Use --with-build-platform-configure-options -@@ -8089,7 +8097,24 @@ if test "$ENABLE_JAVA" != "" -a "$cross_compiling" != "yes"; then - elif test `$JAVAINTERPRETER -version 2>&1 | $AWK '{ print }' | $GREP -c "BEA"` -gt 0; then - AC_MSG_ERROR([No valid check available. Please check the block for your desired java in configure.ac]) - elif test `$JAVAINTERPRETER -version 2>&1 | $AWK '{ print }' | $GREP -c "IBM"` -gt 0; then -- AC_MSG_ERROR([No valid check available. Please check the block for your desired java in configure.ac]) -+ JDK=ibm -+ -+ dnl IBM JDK specific tests -+ _jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[[-A-Za-z]]*//` -+ _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'` -+ -+ if test "$_jdk_ver" -lt 10800; then -+ AC_MSG_ERROR([IBM JDK is too old, you need at least 8]) -+ fi -+ -+ AC_MSG_RESULT([found (IBM JDK $_jdk)]) -+ -+ if test "$with_jdk_home" = ""; then -+ AC_MSG_ERROR([In order to successfully build LibreOffice using the IBM JDK, -+you must use the "--with-jdk-home" configure option explicitly]) -+ fi -+ -+ JAVA_HOME=$with_jdk_home - else - JDK=sun - -@@ -8097,10 +8122,10 @@ if test "$ENABLE_JAVA" != "" -a "$cross_compiling" != "yes"; then - _jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED '/^$/d' | $SED s/[[-A-Za-z]]*//` - _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'` - -- if test "$_jdk_ver" -lt 10900; then -- AC_MSG_ERROR([JDK is too old, you need at least 9 ($_jdk_ver < 10900)]) -+ if test "$_jdk_ver" -lt 10800; then -+ AC_MSG_ERROR([JDK is too old, you need at least 8]) - fi -- if test "$_jdk_ver" -gt 10900; then -+ if test "$_jdk_ver" -gt 10800; then - JAVA_CLASSPATH_NOT_SET=TRUE - fi - -@@ -8116,7 +8141,7 @@ if test "$ENABLE_JAVA" != "" -a "$cross_compiling" != "yes"; then - JAVACFLAGS=-J-Xmx128M - fi - else -- AC_MSG_ERROR([Java not found. You need at least JDK 9]) -+ AC_MSG_ERROR([Java not found. You need at least JDK 8]) - fi - else - if test -z "$ENABLE_JAVA"; then -diff --git a/jvmfwk/CustomTarget_jreproperties.mk b/jvmfwk/CustomTarget_jreproperties.mk -index da509dbff5ac..ac8f7c053373 100644 ---- a/jvmfwk/CustomTarget_jreproperties.mk -+++ b/jvmfwk/CustomTarget_jreproperties.mk -@@ -17,7 +17,7 @@ $(call gb_CustomTarget_get_workdir,jvmfwk/jreproperties)/JREProperties.class : \ - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JCS,1) - $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),JCS) - $(call gb_Helper_abbreviate_dirs, \ -- cd $(dir $@) && $(call gb_JavaClassSet_JAVACCOMMAND,$(JAVA_TARGET_VER)) $(gb_JavaClassSet_JAVACDEBUG) -d $(dir $@) $^) -+ cd $(dir $@) && $(gb_JavaClassSet_JAVACCOMMAND) $(gb_JavaClassSet_JAVACDEBUG) -d $(dir $@) $^) - $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),JCS) - - # vim:set shiftwidth=4 tabstop=4 noexpandtab: -diff --git a/ridljar/Jar_libreoffice.mk b/ridljar/Jar_libreoffice.mk -index d34ae3f5ebda..4d0f5ef2545f 100644 ---- a/ridljar/Jar_libreoffice.mk -+++ b/ridljar/Jar_libreoffice.mk -@@ -7,7 +7,7 @@ - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - # - --$(eval $(call gb_Jar_Jar,libreoffice,org.libreoffice.uno)) -+$(eval $(call gb_Jar_Jar,libreoffice)) - - $(eval $(call gb_Jar_use_customtargets,libreoffice,\ - ridljar/javamaker \ -@@ -27,15 +27,9 @@ $(eval $(call gb_Jar_add_manifest_classpath,libreoffice, \ - $(if $(filter MACOSX,$(OS)),../../Frameworks/,../) \ - )) - --# ugly: the module-info.class is manually added here since it's not in "com" dir - $(eval $(call gb_Jar_add_packagedirs,libreoffice,\ - $(call gb_CustomTarget_get_workdir,ridljar/javamaker)/com \ - $(call gb_CustomTarget_get_workdir,unoil/javamaker)/com \ -- $(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,libreoffice))/module-info.class \ --)) -- --$(eval $(call gb_Jar_add_sourcefiles_java9,libreoffice,\ -- ridljar/source/libreoffice/module-info \ - )) - - $(eval $(call gb_Jar_add_sourcefiles,libreoffice,\ -diff --git a/ridljar/Jar_unoloader.mk b/ridljar/Jar_unoloader.mk -index 2acf20b5b289..50b32e8f0f88 100644 ---- a/ridljar/Jar_unoloader.mk -+++ b/ridljar/Jar_unoloader.mk -@@ -7,21 +7,12 @@ - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - # - --$(eval $(call gb_Jar_Jar,unoloader,org.libreoffice.unoloader)) -+$(eval $(call gb_Jar_Jar,unoloader)) - - $(eval $(call gb_Jar_set_packageroot,unoloader,com)) - - $(eval $(call gb_Jar_set_manifest,unoloader,$(SRCDIR)/ridljar/source/unoloader/com/sun/star/lib/unoloader/manifest)) - --# the module-info.class is manually added here since it's not in "com" dir --$(eval $(call gb_Jar_add_packagedirs,unoloader,\ -- $(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,unoloader))/module-info.class \ --)) -- --$(eval $(call gb_Jar_add_sourcefiles_java9,unoloader,\ -- ridljar/source/unoloader/module-info \ --)) -- - $(eval $(call gb_Jar_add_sourcefiles,unoloader,\ - ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoClassLoader \ - ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoLoader \ -diff --git a/ridljar/source/libreoffice/module-info.java b/ridljar/source/libreoffice/module-info.java -deleted file mode 100644 -index 8d24c7ccb13c..000000000000 ---- a/ridljar/source/libreoffice/module-info.java -+++ /dev/null -@@ -1,142 +0,0 @@ --/* -- * This file is part of the LibreOffice project. -- * -- * This Source Code Form is subject to the terms of the Mozilla Public -- * License, v. 2.0. If a copy of the MPL was not distributed with this -- * file, You can obtain one at http://mozilla.org/MPL/2.0/. -- */ -- --module org.libreoffice.uno --{ -- requires org.libreoffice.unoloader; -- -- exports com.sun.star.accessibility; -- exports com.sun.star.animations; -- exports com.sun.star.auth; -- exports com.sun.star.awt; -- exports com.sun.star.awt.grid; -- exports com.sun.star.awt.tab; -- exports com.sun.star.awt.tree; -- exports com.sun.star.beans; -- exports com.sun.star.bridge; -- exports com.sun.star.bridge.oleautomation; -- exports com.sun.star.chart; -- exports com.sun.star.chart2; -- exports com.sun.star.chart2.data; -- exports com.sun.star.comp.bridgefactory; -- exports com.sun.star.comp.connections; -- exports com.sun.star.comp.helper; -- exports com.sun.star.comp.loader; -- exports com.sun.star.comp.servicemanager; -- exports com.sun.star.comp.urlresolver; -- exports com.sun.star.configuration; -- exports com.sun.star.configuration.backend; -- exports com.sun.star.connection; -- exports com.sun.star.container; -- exports com.sun.star.cui; -- exports com.sun.star.datatransfer; -- exports com.sun.star.datatransfer.clipboard; -- exports com.sun.star.datatransfer.dnd; -- exports com.sun.star.deployment; -- exports com.sun.star.deployment.test; -- exports com.sun.star.deployment.ui; -- exports com.sun.star.document; -- exports com.sun.star.drawing; -- exports com.sun.star.drawing.framework; -- exports com.sun.star.embed; -- exports com.sun.star.form; -- exports com.sun.star.form.binding; -- exports com.sun.star.form.control; -- exports com.sun.star.form.runtime; -- exports com.sun.star.form.submission; -- exports com.sun.star.form.validation; -- exports com.sun.star.formula; -- exports com.sun.star.frame; -- exports com.sun.star.frame.status; -- exports com.sun.star.gallery; -- exports com.sun.star.geometry; -- exports com.sun.star.graphic; -- exports com.sun.star.i18n; -- exports com.sun.star.inspection; -- exports com.sun.star.io; -- exports com.sun.star.java; -- exports com.sun.star.lang; -- exports com.sun.star.ldap; -- exports com.sun.star.lib.connections.pipe; -- exports com.sun.star.lib.connections.socket; -- exports com.sun.star.lib.uno; -- exports com.sun.star.lib.uno.adapter; -- exports com.sun.star.lib.uno.bridges.java_remote; -- exports com.sun.star.lib.uno.environments.java; -- exports com.sun.star.lib.uno.environments.remote; -- exports com.sun.star.lib.uno.helper; -- exports com.sun.star.lib.uno.protocols.urp; -- exports com.sun.star.lib.uno.typedesc; -- exports com.sun.star.lib.uno.typeinfo; -- exports com.sun.star.lib.util; -- exports com.sun.star.linguistic2; -- exports com.sun.star.loader; -- exports com.sun.star.logging; -- exports com.sun.star.mail; -- exports com.sun.star.media; -- exports com.sun.star.mozilla; -- exports com.sun.star.office; -- exports com.sun.star.packages; -- exports com.sun.star.packages.manifest; -- exports com.sun.star.packages.zip; -- exports com.sun.star.presentation; -- exports com.sun.star.qa; -- exports com.sun.star.rdf; -- exports com.sun.star.reflection; -- exports com.sun.star.registry; -- exports com.sun.star.rendering; -- exports com.sun.star.report; -- exports com.sun.star.report.inspection; -- exports com.sun.star.report.meta; -- exports com.sun.star.resource; -- exports com.sun.star.scanner; -- exports com.sun.star.script; -- exports com.sun.star.script.browse; -- exports com.sun.star.script.provider; -- exports com.sun.star.script.vba; -- exports com.sun.star.sdb; -- exports com.sun.star.sdb.application; -- exports com.sun.star.sdb.tools; -- exports com.sun.star.sdbc; -- exports com.sun.star.sdbcx; -- exports com.sun.star.security; -- exports com.sun.star.setup; -- exports com.sun.star.sheet; -- exports com.sun.star.sheet.opencl; -- exports com.sun.star.smarttags; -- exports com.sun.star.style; -- exports com.sun.star.svg; -- exports com.sun.star.system; -- exports com.sun.star.table; -- exports com.sun.star.task; -- exports com.sun.star.text; -- exports com.sun.star.text.textfield; -- exports com.sun.star.tiledrendering; -- exports com.sun.star.ucb; -- exports com.sun.star.ui; -- exports com.sun.star.ui.dialogs; -- exports com.sun.star.ui.test; -- exports com.sun.star.uno; -- exports com.sun.star.uri; -- exports com.sun.star.util; -- exports com.sun.star.view; -- exports com.sun.star.xforms; -- exports com.sun.star.xml; -- exports com.sun.star.xml.crypto; -- exports com.sun.star.xml.crypto.sax; -- exports com.sun.star.xml.csax; -- exports com.sun.star.xml.dom; -- exports com.sun.star.xml.dom.events; -- exports com.sun.star.xml.dom.views; -- exports com.sun.star.xml.input; -- exports com.sun.star.xml.sax; -- exports com.sun.star.xml.wrapper; -- exports com.sun.star.xml.xpath; -- exports com.sun.star.xml.xslt; -- exports com.sun.star.xsd; --} -diff --git a/ridljar/source/unoloader/module-info.java b/ridljar/source/unoloader/module-info.java -deleted file mode 100644 -index 6eed39c96df4..000000000000 ---- a/ridljar/source/unoloader/module-info.java -+++ /dev/null -@@ -1,12 +0,0 @@ --/* -- * This file is part of the LibreOffice project. -- * -- * This Source Code Form is subject to the terms of the Mozilla Public -- * License, v. 2.0. If a copy of the MPL was not distributed with this -- * file, You can obtain one at http://mozilla.org/MPL/2.0/. -- */ -- --module org.libreoffice.unoloader --{ -- exports com.sun.star.lib.unoloader; --} -diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk -index 9592fbbad6a6..3fa40e03c754 100644 ---- a/solenv/gbuild/Jar.mk -+++ b/solenv/gbuild/Jar.mk -@@ -94,7 +94,6 @@ endef - # creates a class set and a dependency to it - # registers target and clean target - # adds jar files to DeliverLogTarget --# call gb_Jar_Jar,jarname,java9modulename - define gb_Jar_Jar - ifeq (,$$(findstring $(1),$$(gb_Jar_KNOWN))) - $$(eval $$(call gb_Output_info,Currently known jars are: $(sort $(gb_Jar_KNOWN)),ALL)) -@@ -107,7 +106,7 @@ $(call gb_Jar_get_target,$(1)) : PACKAGEDIRS := - $(call gb_Jar_get_target,$(1)) : PACKAGEFILES := - $(call gb_Jar_get_target,$(1)) : \ - $(call gb_JavaClassSet_get_target,$(call gb_Jar_get_classsetname,$(1))) --$(call gb_JavaClassSet_JavaClassSet,$(call gb_Jar_get_classsetname,$(1)),$(2)) -+$(call gb_JavaClassSet_JavaClassSet,$(call gb_Jar_get_classsetname,$(1))) - $(eval $(call gb_Module_register_target,$(call gb_Jar_get_target,$(1)),$(call gb_Jar_get_clean_target,$(1)))) - $(call gb_Helper_make_userfriendly_targets,$(1),Jar,$(call gb_Jar_get_target,$(1))) - -@@ -122,12 +121,6 @@ $(call gb_JavaClassSet_add_sourcefile,$(call gb_Jar_get_classsetname,$(1)),$(2)) - - endef - --define gb_Jar_add_sourcefile_java9 --$(call gb_JavaClassSet_add_sourcefile_java9,$(call gb_Jar_get_classsetname,$(1)),$(2)) -- --endef -- -- - # PACKAGEROOTS is the list of all root folders created by the JavaClassSet to pack into the jar (without META-INF as this is added automatically) - define gb_Jar_set_packageroot - $(call gb_Jar_get_target,$(1)) : PACKAGEROOTS := $(2) -@@ -166,11 +159,6 @@ $(foreach sourcefile,$(2),$(call gb_Jar_add_sourcefile,$(1),$(sourcefile))) - - endef - --define gb_Jar_add_sourcefiles_java9 --$(foreach sourcefile,$(2),$(call gb_Jar_add_sourcefile_java9,$(1),$(sourcefile))) -- --endef -- - define gb_Jar_add_generated_sourcefile - $(call gb_JavaClassSet_add_generated_sourcefile,$(call gb_Jar_get_classsetname,$(1)),$(2)) - -diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk -index 39887dee6e5b..dc7d02e8904a 100644 ---- a/solenv/gbuild/JavaClassSet.mk -+++ b/solenv/gbuild/JavaClassSet.mk -@@ -17,11 +17,10 @@ - # the License at http://www.apache.org/licenses/LICENSE-2.0 . - # - --gb_JavaClassSet_JAVACCOMMAND = $(ICECREAM_RUN) $(JAVACOMPILER) $(JAVACFLAGS) \ -+gb_JavaClassSet_JAVACCOMMAND := $(ICECREAM_RUN) $(JAVACOMPILER) $(JAVAFLAGS) \ - -encoding utf8 \ -- --release $(1) \ -+ -source $(JAVA_SOURCE_VER) -target $(JAVA_TARGET_VER) \ - $(if $(JAVA_CLASSPATH_NOT_SET),-Xlint:-options) -- - gb_JavaClassSet_JAVACDEBUG := - - # Enforces correct dependency order for possibly generated stuff: -@@ -32,35 +31,19 @@ ifneq ($(gb_DEBUGLEVEL),0) - gb_JavaClassSet_JAVACDEBUG := -g - endif - --# $(PACKAGEDIRS) inherited from Jar -- assumption is the last part of the path --# is top-level java package directory --# for Java 9 modules, invoke javac another time, with --patch-module so that --# it finds all the class files for whose packages the module-info contains a --# declaration - define gb_JavaClassSet__command - $(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) && \ - $(if $(filter-out $(JARDEPS),$(4)), \ - rm -rf $(call gb_JavaClassSet_get_classdir,$(2))/* && \ - RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,\ -- $(filter-out $(JARDEPS) $(T_JAVA9FILES),$(4))) && \ -- $(if $(3),$(call gb_JavaClassSet_JAVACCOMMAND,$(JAVA_TARGET_VER)) \ -+ $(filter-out $(JARDEPS),$(4))) && \ -+ $(if $(3),$(gb_JavaClassSet_JAVACCOMMAND) \ - $(gb_JavaClassSet_JAVACDEBUG) \ - -classpath "$(T_CP)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(2))" \ - -d $(call gb_JavaClassSet_get_classdir,$(2)) \ - @$$RESPONSEFILE &&) \ - rm -f $$RESPONSEFILE &&) \ -- $(if $(T_MODULENAME),\ -- RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,\ -- $(T_JAVA9FILES)) && \ -- $(if $(3),$(call gb_JavaClassSet_JAVACCOMMAND,9) \ -- $(gb_JavaClassSet_JAVACDEBUG) \ -- -classpath "$(T_CP)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(2))" \ -- --module-path "$(T_CP)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(2))" \ -- $(if $(T_MODULENAME),--patch-module $(T_MODULENAME)="$(subst $(WHITESPACE),$(gb_CLASSPATHSEP),$(strip $(dir $(PACKAGEDIRS))))") \ -- -d $(call gb_JavaClassSet_get_classdir,$(2)) \ -- @$$RESPONSEFILE &&) \ -- rm -f $$RESPONSEFILE &&) \ - touch $(1)) - - endef -@@ -81,7 +64,6 @@ $(call gb_JavaClassSet_get_preparation_target,%) : - mkdir -p $(dir $@) && touch $@ - - # depend on makefile to enforce a rebuild if files are removed from the classset --# call gb_JavaClassSet_JavaClassSet,csname,java9modulename - define gb_JavaClassSet_JavaClassSet - $(call gb_JavaClassSet_get_target,$(1)) : \ - $(gb_Module_CURRENTMAKEFILE) \ -@@ -89,8 +71,6 @@ $(call gb_JavaClassSet_get_target,$(1)) : \ - $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS := \ - $(gb_Module_CURRENTMAKEFILE) \ - $(call gb_JavaClassSet_get_preparation_target,$(1)) --$(call gb_JavaClassSet_get_target,$(1)) : T_MODULENAME := $(2) --$(call gb_JavaClassSet_get_target,$(1)) : T_JAVA9FILES := - - endef - -@@ -112,17 +92,6 @@ $(foreach sourcefile,$(2),$(call gb_JavaClassSet_add_sourcefile,$(1),$(sourcefil - - endef - --define gb_JavaClassSet_add_sourcefile_java9 --$(call gb_JavaClassSet_get_target,$(1)) : $(call gb_JavaClassSet__get_sourcefile,$(2)) --$(call gb_JavaClassSet_get_target,$(1)) : T_JAVA9FILES += $(call gb_JavaClassSet__get_sourcefile,$(2)) -- --endef -- --define gb_JavaClassSet_add_sourcefiles_java9 --$(foreach sourcefile,$(2),$(call gb_JavaClassSet_add_sourcefile_java9,$(1),$(sourcefile))) -- --endef -- - define gb_JavaClassSet_add_generated_sourcefile - $(call gb_JavaClassSet_get_target,$(1)) : $(call gb_JavaClassSet__get_generated_sourcefile,$(2)) - $(call gb_JavaClassSet__get_generated_sourcefile,$(2)) :| $(call gb_JavaClassSet_get_preparation_target,$(1)) -diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk -index 86ed3d32a376..da6a3d700864 100644 ---- a/solenv/gbuild/gbuild.mk -+++ b/solenv/gbuild/gbuild.mk -@@ -62,8 +62,6 @@ COMMA :=, - OPEN_PAREN :=( - CLOSE_PAREN :=) - --gb_SPACE:=$(gb_SPACE) $(gb_SPACE) -- - gb_VERBOSE := $(verbose) - - include $(GBUILDDIR)/Helper.mk --- -2.30.2 - diff --git a/libreoffice-7.5.0.2.tar.xz b/libreoffice-7.5.0.2.tar.xz deleted file mode 100644 index b7754c6..0000000 --- a/libreoffice-7.5.0.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:75587fa9052f171ab20fbd7a089bffaa066562cac8fe5de7a6d1f222c0dc1fce -size 266001548 diff --git a/libreoffice-7.5.0.2.tar.xz.asc b/libreoffice-7.5.0.2.tar.xz.asc index 9bdbcde..55f21cc 100644 --- a/libreoffice-7.5.0.2.tar.xz.asc +++ b/libreoffice-7.5.0.2.tar.xz.asc @@ -1,3 +1,16 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e393a4fdfced07b2cd3a5a33004e305b50c0806f28bee0338d6a870cd7e6995e -size 833 +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmPAep8ACgkQ9DSh76/u +rqNLSBAAlVAwNFECf0ru3cREo67j2v0iCynQiNckrPFOX9QdNDRQcpm5FDlLbFuS +VxcS6VE7XW4aZ8PPy3QYHLaHl1FLu9uJvsFDpBDHpaScF3VAPEsqsTdFE1I6nbgj +RTnfOTm5AJQeDySGNTxwZXHO5HrHLsRW4jYvaM1fvq7UGD8lAfUEI/9qg0Gp1+Oi +RqID9ym8CFX/j+IUnZGCYASYtLKeup0fWnwsPIcOxNisiKk1XfSPr4kQUgMcvwAb +cYxPfAvpycEBgvfBxf9K3N1sSwF28V8pnr57hcx16HZnFcMP7luLUgauFVhrdcLt +y8N+7PM2ICnw3na7Ko/hnMcKN9FntKGHSdtEppGZkjQqivG94Ivf6gS+zgHZy2l+ +8GaGE0EK2ZO+w/nDTFB+7SnOMcWuv2hnqzCqEtIMbc1PWLjEoNYVH4xBP9DVt/1U +S8peQKOuPhuh2nwE+vqyn0kmHVZp7l8u0DNzviEq0zg9D2+tOBFO9FnH9sqGNElc +Spp+QWeCxb0oKl8uXdWtb+j/X5zDUqRS6Xy1BzStjgXHaxloaZD3qL6Wm334/amP +Guf7onkAla9NLCs1mcx9j9X8XgsFWwY7jAvXDYJ/jiJKBThvDWuVYkSHfmARY9wF +px4Ky0JnP95gs99k4YILfrFWrDJrsQKaHyU6H5257kJC2FoP120= +=A+RV +-----END PGP SIGNATURE----- diff --git a/libreoffice-help-7.5.0.2.tar.xz b/libreoffice-help-7.5.0.2.tar.xz deleted file mode 100644 index 49bae9f..0000000 --- a/libreoffice-help-7.5.0.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:13a6a15fa6dd45108514a47b314400d148bc98ec4f767d908aec9ce360240367 -size 166236564 diff --git a/libreoffice-help-7.5.0.2.tar.xz.asc b/libreoffice-help-7.5.0.2.tar.xz.asc index a7924b7..a63cda5 100644 --- a/libreoffice-help-7.5.0.2.tar.xz.asc +++ b/libreoffice-help-7.5.0.2.tar.xz.asc @@ -1,3 +1,16 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a46cc1167c81b2a21b2fe3b18d52af353aeeea41ba2bca6ea82a7188cd847eee -size 833 +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmPAeqUACgkQ9DSh76/u +rqPKXBAAu8+dhyBhuY+aDR2VAiX753vzWzjwxvZfBW5YNWGhahF1xYo+ebGD94PX +ykto9cTczPRBJRcXlnr6/vpnBE9O2UpdrkerhRnJusHzIKjZ9GYjaVG5kbCBuiz7 +w1Oq8p03ZSOP02x3O/CD/Yo5jO8JbCCqXAivC2ZXV2+yiqBdWdl/e03BgZnkCJ9x +uaH0cLyLXXvfqpFAtVoKcM81W3SBiuN/2ci5vZkYwR/pc15FxokzpokHNTFh6/Rz +/tDfFS51lMKdGz9uxj+L06XY9kYzQtZQAt+u58GsqJcvQ+/+IfpaAPUWW/suShU4 +CYhA2agfsb0Lb7dQorcXTIsY4z8CoWKDGAn4uRPBIGNQ2C8agMfAh5ufQ6gY9cMr +J8J5ApGUv6gxO//bZAFnFMKQ+ZIvUpO/jloKrLVGhNfoUX/BjluwEb9xQjg8IYs4 +kwcMBzBaSriVbgM/24eNQ1VRymq7o6+7XfXUj1lua7i9cNzbUFk4g67XtHkmRU1C +VIosRbp0w+3waDYLXCRnONWFyUBwqtei37Wg1F/r/YIfOqzONNLj8PZJn4L+Rvvi +2aheQ1UxEsoepeBfskP1kjz/XjbdpgxJ6QZtEi+E6Eyx3UHyzfbAwyU6Xreg7owl +clwHsRayN8zCGhkgud+CeG7kbkKu/nyUZazfhYG+hYp4h7KCHgA= +=UcwR +-----END PGP SIGNATURE----- diff --git a/libreoffice-translations-7.5.0.2.tar.xz b/libreoffice-translations-7.5.0.2.tar.xz deleted file mode 100644 index ec0dab6..0000000 --- a/libreoffice-translations-7.5.0.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:11ce8d48a5151e649fe20425557239e011599962d06e32a11dcbe004fb9c7aa8 -size 203888364 diff --git a/libreoffice-translations-7.5.0.2.tar.xz.asc b/libreoffice-translations-7.5.0.2.tar.xz.asc index 8822000..c1a1e6d 100644 --- a/libreoffice-translations-7.5.0.2.tar.xz.asc +++ b/libreoffice-translations-7.5.0.2.tar.xz.asc @@ -1,3 +1,16 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c60f4fbff1d11a3a2eeb9731be82df6280bb104c4261bbf53d1631997945842c -size 833 +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmPAeqUACgkQ9DSh76/u +rqOPYBAArsizhewcPiyjnyT0Gbae78qdbHScrSxk2vVus5U3EQXdx3JjrELceIdS +21qusPbHxf9SsFlmNmUwDmH93tmbco2xsLP4/uZN2p20VnhnYizQd38oxLLXBiil +T9kRie5wR7KUzGl+Pw5ZoPN2k/QX6vuW1B6rRo+YohkMNq+lnvitI1woRv2Zb/Q+ +8xL0W4sqjGcKx+JDNCzCtBiR1VZp/30r5hpMLQvevRXlxo9TwChcD5oFwXz17QQ/ +olgZDYsA53htOzA007mYbP+fNvKdEP6eRcpv+aIAq1p49IVG/KtkRbXdam4RVU6y +wGhu5IBT4T7lZHy3dT1y1ybbuEewVYgXnaEycFEnOEvk/ekQNXg0zn960+peBZOm +x4p6HVk+uIAriCIYLM+2Xmou3dGUmvkITqu8KwXgURoT1KuUt8LaQg98xU845T+f +J1kyQtJ9FoKCeFGiaM6W6aebm0fk+G8+UjwCS23DyIdpaEbvlNVLq8oLyNGNyWHw +8CsNc9LEFcpx5aFA1K4l69CPbHUkQdY9SjxPDN3ioUWsT77GUAkNYoutW8/0Hz5q +ibADtAMRnByPYK4ejEnPwoxgdkp2LyvdTMtloXRhi5AA3pvZbpZslgcHaRIfOGAQ +u19o+cWfHUJN7mwgF8RAciXYr8nJbDijyquL9TXSDgrVO20M1bw= +=nj0V +-----END PGP SIGNATURE----- diff --git a/libreoffice.spec b/libreoffice.spec index 308aa33..730db1a 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -10,9 +10,9 @@ %bcond_with firebird Name: libreoffice Version: 7.5.0.2 -Release: 2 +Release: 3 Summary: A Free Office Suite (Framework) -License: LGPL-3.0-or-later AND MPL-2.0+ +License: LGPL-3.0-or-later AND MPL-2.0 Group: Productivity/Office/Suite URL: https://www.documentfoundation.org/ Source0: %{tarball_url}/libreoffice-%{version}.tar.xz @@ -56,11 +56,12 @@ Source2013: %{external_url}/dragonbox-1.1.3.tar.gz Patch2: nlpsolver-no-broken-help.diff Patch3: mediawiki-no-broken-help.diff # Build with java 8 -Patch101: 0001-Revert-java-9-changes.patch +#atch101: 0001-Revert-java-9-changes.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff # save time by relying on rpm check rather than doing stupid find+grep Patch991: libreoffice-no-destdircheck.patch +Patch996: system-libxml-icu74.patch BuildRequires: %{name}-share-linker BuildRequires: ant BuildRequires: autoconf @@ -822,6 +823,7 @@ Provides %{langname} translations and additional resources (help files, etc.) fo %patch3 %patch990 -p1 %patch991 -p1 +%patch996 -p1 # Disable some of the failing tests (some are random) # Following two tests are really flaky @@ -872,9 +874,9 @@ export OPENCOLLADA_LIBS='-lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOL # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys # Note: For your own distribution, please get your own set of keys. -google_api_key="AIzaSyD1hTe85_a14kr1Ks8T3Ce75rvbR1_Dx7Q" -google_default_client_id="4139804441.apps.googleusercontent.com" -google_default_client_secret="KDTRKEZk2jwT_7CDpcmMA--P" +google_api_key="" +google_default_client_id="" +google_default_client_secret="" # do not run configure in autogen but use macro later export NOCONFIGURE=yes @@ -967,7 +969,7 @@ make verbose=t build %check export LANG=C.UTF-8 # Run tests only on x86_64 and aarch64 as they are resource hogs -%ifarch x86_64 aarch64 +%ifarch %{java_arches} # safeguard jarfires that can get magically overriden by the make mkdir savejar cp %{buildroot}%{_libdir}/%{name}/program/classes/*.jar savejar/ @@ -1300,3 +1302,5 @@ exit 0 %files -f file-lists/branding_upstream.txt branding-upstream %changelog +* Fri Jan 5 2024 Eustace <eusteuc@outlook.com> - 7.5.0.2-3 +- Package init diff --git a/pdfium-5408.tar.bz2 b/pdfium-5408.tar.bz2 deleted file mode 100644 index 73dbe15..0000000 --- a/pdfium-5408.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7db59b1e91f2bc0ab4c5e19d1a4f881e6a47dbb0d3b7e980a7358225b12a0f35 -size 10077997 diff --git a/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz b/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz deleted file mode 100644 index 1ff2b05..0000000 --- a/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c094a6247e44104beaaa0d00c825beb6baf1a8e532dc22214747495317a65bd9 -size 11079112 @@ -13,4 +13,9 @@ b7cae45ad2c23551fd6ccb8ae2c1f59e b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0. 7194453152bb67e3d45da698762b5d6f libassuan-2.5.5.tar.bz2 3653bc54e1bcd17ae09a1a7086daa38b libcmis-0.5.2.tar.xz f1e09cfa536a6e6a264dbf2ccdc2e534 libgpg-error-1.43.tar.bz2 +8c733faaf863b33d0c7a1d01f7c5694f libreoffice-7.5.0.2.tar.xz +5938f502fc81eb325b745ecf7d5fa446 libreoffice-help-7.5.0.2.tar.xz +b0f025ff5bf8974e956b608b5c27a100 libreoffice-translations-7.5.0.2.tar.xz 80e162d2adfd99057d1e0c62c3883364 odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar +a8ae777e121a0fb63f4e8b6779d68ada pdfium-5408.tar.bz2 +0a0013856ea701b3023ca4b00f147c72 skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz diff --git a/system-libxml-icu74.patch b/system-libxml-icu74.patch new file mode 100644 index 0000000..5ee1ced --- /dev/null +++ b/system-libxml-icu74.patch @@ -0,0 +1,316 @@ +From 51b9b672287b3fb092bbd07af0f6becc4e70e423 Mon Sep 17 00:00:00 2001 +From: Miklos Vajna <vmiklos@collabora.com> +Date: Mon, 27 Nov 2023 08:02:59 +0100 +Subject: [PATCH] tdf#158302 fix build against system-libxml-2.12 + +Seen in a fedora:40 container, using --with-system-libcmis, +--with-system-liblangtag and --with-system-xmlsec. + +Change-Id: I9d748d3dc0b70dbfdfcb6b99c9ce8440bda6f326 +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159980 +Tested-by: Jenkins +Reviewed-by: Miklos Vajna <vmiklos@collabora.com> +--- + drawinglayer/source/tools/primitive2dxmldump.cxx | 1 + + filter/source/xsltfilter/LibXSLTTransformer.cxx | 2 +- + helpcompiler/source/HelpLinker.cxx | 4 ++++ + include/xmloff/xmltoken.hxx | 2 +- + sax/source/fastparser/fastparser.cxx | 2 +- + sc/source/core/tool/interpr7.cxx | 1 + + sc/source/filter/xml/XMLExportDataPilot.cxx | 2 +- + sc/source/filter/xml/XMLExportDatabaseRanges.cxx | 2 +- + sc/source/filter/xml/xmlfilti.cxx | 6 +++--- + unoxml/source/dom/attr.cxx | 1 + + unoxml/source/dom/document.cxx | 1 + + unoxml/source/dom/documentbuilder.cxx | 1 + + unoxml/source/dom/entity.cxx | 1 + + unoxml/source/xpath/xpathapi.cxx | 7 ++++++- + xmloff/source/core/xmltoken.cxx | 2 +- + xmloff/source/style/PageMasterStyleMap.cxx | 2 +- + xmlsecurity/inc/xmlsec-wrapper.h | 1 + + xmlsecurity/inc/xmlsec/saxhelper.hxx | 1 + + 18 files changed, 28 insertions(+), 11 deletions(-) + +diff --git a/drawinglayer/source/tools/primitive2dxmldump.cxx b/drawinglayer/source/tools/primitive2dxmldump.cxx +index 74e95836f..0bfd8794e 100644 +--- a/drawinglayer/source/tools/primitive2dxmldump.cxx ++++ b/drawinglayer/source/tools/primitive2dxmldump.cxx +@@ -15,6 +15,7 @@ + + #include <math.h> + #include <memory> ++#include <libxml/parser.h> + #include <sal/log.hxx> + + #include <drawinglayer/primitive2d/bitmapprimitive2d.hxx> +diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx b/filter/source/xsltfilter/LibXSLTTransformer.cxx +index 1a7c34805..5e9a7c4bc 100644 +--- a/filter/source/xsltfilter/LibXSLTTransformer.cxx ++++ b/filter/source/xsltfilter/LibXSLTTransformer.cxx +@@ -333,7 +333,7 @@ namespace XSLT + } + else + { +- xmlErrorPtr lastErr = xmlGetLastError(); ++ const xmlError* lastErr = xmlGetLastError(); + OUString msg; + if (lastErr) + msg = OStringToOUString(lastErr->message, RTL_TEXTENCODING_UTF8); +diff --git a/helpcompiler/source/HelpLinker.cxx b/helpcompiler/source/HelpLinker.cxx +index e95b9168b..beae12a18 100644 +--- a/helpcompiler/source/HelpLinker.cxx ++++ b/helpcompiler/source/HelpLinker.cxx +@@ -815,7 +815,11 @@ static const HelpProcessingException* GpXMLParsingException = nullptr; + + extern "C" { + ++#if LIBXML_VERSION >= 21200 ++static void StructuredXMLErrorFunction(SAL_UNUSED_PARAMETER void *, const xmlError* error) ++#else + static void StructuredXMLErrorFunction(SAL_UNUSED_PARAMETER void *, xmlErrorPtr error) ++#endif + { + std::string aErrorMsg = error->message; + std::string aXMLParsingFile; +diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx +index bd650daea..c69836bf8 100644 +--- a/include/xmloff/xmltoken.hxx ++++ b/include/xmloff/xmltoken.hxx +@@ -736,7 +736,7 @@ namespace xmloff::token { + XML_EMBEDDED_VISIBLE_AREA, + XML_EMBOSSED, + XML_EMISSIVE_COLOR, +- XML_EMPTY, ++ XML_TOKEN_EMPTY, + XML_EMPTY_LINE_REFRESH, + XML_ENABLE_NUMBERING, + XML_ENABLED, +diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx +index aae3c1162..93b6b0445 100644 +--- a/sax/source/fastparser/fastparser.cxx ++++ b/sax/source/fastparser/fastparser.cxx +@@ -579,7 +579,7 @@ Event& Entity::getEvent( CallbackType aType ) + OUString lclGetErrorMessage( xmlParserCtxtPtr ctxt, std::u16string_view sSystemId, sal_Int32 nLine ) + { + const char* pMessage; +- xmlErrorPtr error = xmlCtxtGetLastError( ctxt ); ++ const xmlError* error = xmlCtxtGetLastError( ctxt ); + if( error && error->message ) + pMessage = error->message; + else +diff --git a/sc/source/core/tool/interpr7.cxx b/sc/source/core/tool/interpr7.cxx +index 352c7cf70..ecb4ea346 100644 +--- a/sc/source/core/tool/interpr7.cxx ++++ b/sc/source/core/tool/interpr7.cxx +@@ -31,6 +31,7 @@ + #include <cstring> + #include <memory> + #include <string_view> ++#include <libxml/parser.h> + + using namespace com::sun::star; + +diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx +index da0c9c57e..b6c35baad 100644 +--- a/sc/source/filter/xml/XMLExportDataPilot.cxx ++++ b/sc/source/filter/xml/XMLExportDataPilot.cxx +@@ -123,7 +123,7 @@ void ScXMLExportDataPilot::WriteDPCondition(const ScQueryEntry& aQueryEntry, boo + + if (aQueryEntry.IsQueryByEmpty()) + { +- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_OPERATOR, GetXMLToken(XML_EMPTY)); ++ rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_OPERATOR, GetXMLToken(XML_TOKEN_EMPTY)); + } + else if (aQueryEntry.IsQueryByNonEmpty()) + { +diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx +index 61c01d236..9c78f60e8 100644 +--- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx ++++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx +@@ -376,7 +376,7 @@ private: + case SC_EQUAL: + { + if (rEntry.IsQueryByEmpty()) +- return GetXMLToken(XML_EMPTY); ++ return GetXMLToken(XML_TOKEN_EMPTY); + else if (rEntry.IsQueryByNonEmpty()) + return GetXMLToken(XML_NOEMPTY); + +diff --git a/sc/source/filter/xml/xmlfilti.cxx b/sc/source/filter/xml/xmlfilti.cxx +index 7585ce0c5..61f7cfe4a 100644 +--- a/sc/source/filter/xml/xmlfilti.cxx ++++ b/sc/source/filter/xml/xmlfilti.cxx +@@ -370,7 +370,7 @@ void ScXMLConditionContext::GetOperator( + rEntry.eOp = SC_BOTPERC; + else if (IsXMLToken(aOpStr, XML_BOTTOM_VALUES)) + rEntry.eOp = SC_BOTVAL; +- else if (IsXMLToken(aOpStr, XML_EMPTY)) ++ else if (IsXMLToken(aOpStr, XML_TOKEN_EMPTY)) + rEntry.SetQueryByEmpty(); + else if (aOpStr == u">") + rEntry.eOp = SC_GREATER; +@@ -422,7 +422,7 @@ void SAL_CALL ScXMLConditionContext::endFastElement( sal_Int32 /*nElement*/ ) + if (maQueryItems.empty()) + { + ScQueryEntry::Item& rItem = rEntry.GetQueryItem(); +- if (IsXMLToken(sOperator, XML_EMPTY)) ++ if (IsXMLToken(sOperator, XML_TOKEN_EMPTY)) + return; + if (IsXMLToken(sDataType, XML_NUMBER)) + { +@@ -753,7 +753,7 @@ void SAL_CALL ScXMLDPConditionContext::endFastElement( sal_Int32 /*nElement*/ ) + else + aFilterField.eConnect = SC_AND; + pFilterContext->SetIsCaseSensitive(bIsCaseSensitive); +- if (IsXMLToken(sOperator, XML_EMPTY)) ++ if (IsXMLToken(sOperator, XML_TOKEN_EMPTY)) + aFilterField.SetQueryByEmpty(); + else if (IsXMLToken(sOperator, XML_NOEMPTY)) + aFilterField.SetQueryByNonEmpty(); +diff --git a/unoxml/source/dom/attr.cxx b/unoxml/source/dom/attr.cxx +index 1a993e152..08c976baf 100644 +--- a/unoxml/source/dom/attr.cxx ++++ b/unoxml/source/dom/attr.cxx +@@ -22,6 +22,7 @@ + #include <string.h> + + #include <memory> ++#include <libxml/entities.h> + + #include <osl/diagnose.h> + #include <sal/log.hxx> +diff --git a/unoxml/source/dom/document.cxx b/unoxml/source/dom/document.cxx +index 49c524b5e..650072bbd 100644 +--- a/unoxml/source/dom/document.cxx ++++ b/unoxml/source/dom/document.cxx +@@ -41,6 +41,7 @@ + #include <eventdispatcher.hxx> + + #include <string.h> ++#include <libxml/xmlIO.h> + + #include <osl/diagnose.h> + +diff --git a/unoxml/source/dom/documentbuilder.cxx b/unoxml/source/dom/documentbuilder.cxx +index a7cc288ee..e8d5ef441 100644 +--- a/unoxml/source/dom/documentbuilder.cxx ++++ b/unoxml/source/dom/documentbuilder.cxx +@@ -22,6 +22,7 @@ + #include <string.h> + + #include <libxml/xmlerror.h> ++#include <libxml/parser.h> + + #include <memory> + +diff --git a/unoxml/source/dom/entity.cxx b/unoxml/source/dom/entity.cxx +index 74b1faaf7..0b8c384dd 100644 +--- a/unoxml/source/dom/entity.cxx ++++ b/unoxml/source/dom/entity.cxx +@@ -22,6 +22,7 @@ + #include <osl/diagnose.h> + + #include <string.h> ++#include <libxml/entities.h> + + using namespace css::uno; + using namespace css::xml::dom; +diff --git a/unoxml/source/xpath/xpathapi.cxx b/unoxml/source/xpath/xpathapi.cxx +index f1968c208..29450175e 100644 +--- a/unoxml/source/xpath/xpathapi.cxx ++++ b/unoxml/source/xpath/xpathapi.cxx +@@ -26,6 +26,7 @@ + #include <libxml/xmlerror.h> + #include <libxml/xpath.h> + #include <libxml/xpathInternals.h> ++#include <libxml/xmlIO.h> + + #include <com/sun/star/xml/xpath/XPathException.hpp> + +@@ -217,7 +218,7 @@ namespace XPath + return selectSingleNode(contextNode, expr); + } + +- static OUString make_error_message(xmlErrorPtr pError) ++ static OUString make_error_message(const xmlError* pError) + { + OUStringBuffer buf; + if (pError) { +@@ -263,7 +264,11 @@ namespace XPath + SAL_WARN("unoxml", "libxml2 error: " << str); + } + ++#if LIBXML_VERSION >= 21200 ++ static void structured_error_func(void *, const xmlError* error) ++#else + static void structured_error_func(void *, xmlErrorPtr error) ++#endif + { + SAL_WARN("unoxml", "libxml2 error: " << make_error_message(error)); + } +diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx +index 1dc56ced1..56a0d00a1 100644 +--- a/xmloff/source/core/xmltoken.cxx ++++ b/xmloff/source/core/xmltoken.cxx +@@ -748,7 +748,7 @@ namespace xmloff::token { + TOKEN( "embedded-visible-area", XML_EMBEDDED_VISIBLE_AREA ), + TOKEN( "embossed", XML_EMBOSSED ), + TOKEN( "emissive-color", XML_EMISSIVE_COLOR ), +- TOKEN( "empty", XML_EMPTY ), ++ TOKEN( "empty", XML_TOKEN_EMPTY ), + TOKEN( "empty-line-refresh", XML_EMPTY_LINE_REFRESH ), + TOKEN( "enable-numbering", XML_ENABLE_NUMBERING ), + TOKEN( "enabled", XML_ENABLED ), +diff --git a/xmloff/source/style/PageMasterStyleMap.cxx b/xmloff/source/style/PageMasterStyleMap.cxx +index 7b2cab475..6f6312896 100644 +--- a/xmloff/source/style/PageMasterStyleMap.cxx ++++ b/xmloff/source/style/PageMasterStyleMap.cxx +@@ -157,7 +157,7 @@ const XMLPropertyMapEntry aXMLPageMasterStyleMap[] = + PLMAP( PROP_FootnoteLineRelativeWidth, XML_NAMESPACE_STYLE, XML__EMPTY, XML_TYPE_PERCENT8|MID_FLAG_SPECIAL_ITEM, CTF_PM_FTN_LINE_WIDTH ), + PLMAP( PROP_FootnoteLineTextDistance, XML_NAMESPACE_STYLE, XML__EMPTY, XML_TYPE_MEASURE|MID_FLAG_SPECIAL_ITEM, CTF_PM_FTN_LINE_DISTANCE ), + PLMAP( PROP_FootnoteLineWeight, XML_NAMESPACE_STYLE, XML_FOOTNOTE_SEP, XML_TYPE_MEASURE16|MID_FLAG_ELEMENT_ITEM, CTF_PM_FTN_LINE_WEIGHT ), +- PLMAP( PROP_FootnoteLineStyle, XML_NAMESPACE_STYLE, XML_EMPTY, XML_TYPE_STRING|MID_FLAG_ELEMENT_ITEM, CTF_PM_FTN_LINE_STYLE ), ++ PLMAP( PROP_FootnoteLineStyle, XML_NAMESPACE_STYLE, XML_TOKEN_EMPTY, XML_TYPE_STRING|MID_FLAG_ELEMENT_ITEM, CTF_PM_FTN_LINE_STYLE ), + PLMAP_EXT(PROP_GutterMargin, XML_NAMESPACE_LO_EXT, XML_MARGIN_GUTTER, XML_TYPE_MEASURE, CTF_PM_MARGINGUTTER), + + ////////////////////////////////////////////////////////////////////////// +diff --git a/xmlsecurity/inc/xmlsec-wrapper.h b/xmlsecurity/inc/xmlsec-wrapper.h +index e4048de94..82792bae9 100644 +--- a/xmlsecurity/inc/xmlsec-wrapper.h ++++ b/xmlsecurity/inc/xmlsec-wrapper.h +@@ -22,6 +22,7 @@ + #include <sal/config.h> + + #include <sal/types.h> ++#include <libxml/parser.h> + + // Cf. xmlsec's configure.in: + #if SAL_TYPES_SIZEOFPOINTER != 4 && !defined SYSTEM_XMLSEC +diff --git a/xmlsecurity/inc/xmlsec/saxhelper.hxx b/xmlsecurity/inc/xmlsec/saxhelper.hxx +index a49ccef18..a5863ffd0 100644 +--- a/xmlsecurity/inc/xmlsec/saxhelper.hxx ++++ b/xmlsecurity/inc/xmlsec/saxhelper.hxx +@@ -23,6 +23,7 @@ + + #include <string_view> + ++#include <libxml/parser.h> + #include <libxml/tree.h> + + #include <rtl/ustring.hxx> +-- +2.44.0 + +diff --git a/i18npool/source/breakiterator/data/line.txt b/i18npool/source/breakiterator/data/line.txt +index 9521c833f..9fb7fc087 100644 +--- a/i18npool/source/breakiterator/data/line.txt ++++ b/i18npool/source/breakiterator/data/line.txt +@@ -14,7 +14,7 @@ + # + + !!chain; +-!!LBCMNoChain; ++#!!LBCMNoChain; + + + !!lookAheadHardBreak; |