| author | Andreas Radke
<andyrtr@archlinux.org> 2024-02-22 19:01:46 UTC |
| committer | Andreas Radke
<andyrtr@archlinux.org> 2024-02-22 19:01:46 UTC |
| parent | a5c51e9c651811313f122374a462a4508c688969 |
| .SRCINFO | +11 | -13 |
| PKGBUILD | +6 | -11 |
| fix-build-against-system-libxml-2.12.diff | +0 | -303 |
diff --git a/.SRCINFO b/.SRCINFO index c547659..efebc10 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = libreoffice-still - pkgver = 7.6.4 - pkgrel = 2 + pkgver = 7.6.5 + pkgrel = 1 url = https://www.libreoffice.org/ arch = x86_64 license = MPL-2.0 @@ -115,12 +115,12 @@ pkgbase = libreoffice-still noextract = odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar noextract = f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf options = !lto - source = https://download.documentfoundation.org/libreoffice/src/7.6.4/libreoffice-7.6.4.1.tar.xz - source = https://download.documentfoundation.org/libreoffice/src/7.6.4/libreoffice-7.6.4.1.tar.xz.asc - source = https://download.documentfoundation.org/libreoffice/src/7.6.4/libreoffice-help-7.6.4.1.tar.xz - source = https://download.documentfoundation.org/libreoffice/src/7.6.4/libreoffice-help-7.6.4.1.tar.xz.asc - source = https://download.documentfoundation.org/libreoffice/src/7.6.4/libreoffice-translations-7.6.4.1.tar.xz - source = https://download.documentfoundation.org/libreoffice/src/7.6.4/libreoffice-translations-7.6.4.1.tar.xz.asc + source = https://download.documentfoundation.org/libreoffice/src/7.6.5/libreoffice-7.6.5.2.tar.xz + source = https://download.documentfoundation.org/libreoffice/src/7.6.5/libreoffice-7.6.5.2.tar.xz.asc + source = https://download.documentfoundation.org/libreoffice/src/7.6.5/libreoffice-help-7.6.5.2.tar.xz + source = https://download.documentfoundation.org/libreoffice/src/7.6.5/libreoffice-help-7.6.5.2.tar.xz.asc + source = https://download.documentfoundation.org/libreoffice/src/7.6.5/libreoffice-translations-7.6.5.2.tar.xz + source = https://download.documentfoundation.org/libreoffice/src/7.6.5/libreoffice-translations-7.6.5.2.tar.xz.asc source = https://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip source = https://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip source = https://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip @@ -142,17 +142,16 @@ pkgbase = libreoffice-still source = https://dev-www.libreoffice.org/extern/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf source = make-pyuno-work-with-system-wide-module-install.diff source = 623ea5c.diff - source = fix-build-against-system-libxml-2.12.diff source = libreoffice-7.5.8.2-icu-74-compatibility.patch source = soffice-template.desktop.in source = libreoffice-still.sh source = libreoffice-still.csh validpgpkeys = C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3 - sha256sums = 13fea7b8f24c776313b9e08628aa590390bea45064be73bc70ee7b1b70aa6a1e + sha256sums = 90e6b92f1b8d27bd998a03751c32b2add0afc19954da96ee3c0f4f8b6f5ccbcf sha256sums = SKIP - sha256sums = ed784c014096e0e7ff86294eba624bd92ecbe5be881b01950eecd69aed7d8678 + sha256sums = 1e4ca22647522952693375e319ebf390b493e1e590cad2d7695e74307153571a sha256sums = SKIP - sha256sums = 3a5a0dbe40abdc55cdd9994895f6577d7e547d26a36b20641f32f3640a3b7679 + sha256sums = 074f01bf7f2adadffd37351f6fd26f9f2709d47d03036094c1efc6a969ee8767 sha256sums = SKIP sha256sums = 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1 sha256sums = 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 @@ -175,7 +174,6 @@ pkgbase = libreoffice-still sha256sums = f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140 sha256sums = c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563 sha256sums = 440c9af5f3d1213d8ed7177282380f25cbc981cabc8b590dcb777aaae84178e5 - sha256sums = 793a52abff29b3db51a1db9686b561911b9b3de70bd6dd02bbc1d78fcd960648 sha256sums = d7b952a51e1e40d3faf2f465b68f46d56828d8c46948748fa82fe82a29af2599 sha256sums = d0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879 sha256sums = b43ed267643fc5ced803dca010427b12b1f10db485173ccb19efb3395e60c82e diff --git a/PKGBUILD b/PKGBUILD index 8c570bb..1f2d2d8 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -10,9 +10,9 @@ _google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4 pkgbase=libreoffice-still pkgname=('libreoffice-still-sdk' 'libreoffice-still') -_LOver=7.6.4.1 -pkgver=7.6.4 -pkgrel=2 +_LOver=7.6.5.2 +pkgver=7.6.5 +pkgrel=1 arch=('x86_64') license=('MPL-2.0' 'LGPL-3.0-or-later') url="https://www.libreoffice.org/" @@ -60,7 +60,6 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc} ${_additional_source_url2}/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf make-pyuno-work-with-system-wide-module-install.diff 623ea5c.diff - fix-build-against-system-libxml-2.12.diff libreoffice-7.5.8.2-icu-74-compatibility.patch soffice-template.desktop.in libreoffice-still.sh libreoffice-still.csh) @@ -85,11 +84,11 @@ noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf ) validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <build@documentfoundation.org> -sha256sums=('13fea7b8f24c776313b9e08628aa590390bea45064be73bc70ee7b1b70aa6a1e' +sha256sums=('90e6b92f1b8d27bd998a03751c32b2add0afc19954da96ee3c0f4f8b6f5ccbcf' 'SKIP' - 'ed784c014096e0e7ff86294eba624bd92ecbe5be881b01950eecd69aed7d8678' + '1e4ca22647522952693375e319ebf390b493e1e590cad2d7695e74307153571a' 'SKIP' - '3a5a0dbe40abdc55cdd9994895f6577d7e547d26a36b20641f32f3640a3b7679' + '074f01bf7f2adadffd37351f6fd26f9f2709d47d03036094c1efc6a969ee8767' 'SKIP' '64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1' '1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753' @@ -112,7 +111,6 @@ sha256sums=('13fea7b8f24c776313b9e08628aa590390bea45064be73bc70ee7b1b70aa6a1e' 'f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140' 'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563' '440c9af5f3d1213d8ed7177282380f25cbc981cabc8b590dcb777aaae84178e5' - '793a52abff29b3db51a1db9686b561911b9b3de70bd6dd02bbc1d78fcd960648' 'd7b952a51e1e40d3faf2f465b68f46d56828d8c46948748fa82fe82a29af2599' 'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879' 'b43ed267643fc5ced803dca010427b12b1f10db485173ccb19efb3395e60c82e' @@ -136,9 +134,6 @@ prepare() { # fix build - https://gerrit.libreoffice.org/c/core/+/145421 patch -Np1 -i "${srcdir}"/623ea5c.diff - # fix build with libxml2 2.12 - patch -Np1 -i "${srcdir}"/fix-build-against-system-libxml-2.12.diff - # fix build with icu 74 patch -Np1 -i "${srcdir}"/libreoffice-7.5.8.2-icu-74-compatibility.patch diff --git a/fix-build-against-system-libxml-2.12.diff b/fix-build-against-system-libxml-2.12.diff deleted file mode 100644 index bc7ae2a..0000000 --- a/fix-build-against-system-libxml-2.12.diff +++ /dev/null @@ -1,303 +0,0 @@ -From c8f7408db73d2f2ccacb25a2b4fef8dfebdfc6cb Mon Sep 17 00:00:00 2001 -From: Miklos Vajna <vmiklos@collabora.com> -Date: Mon, 27 Nov 2023 08:02:59 +0100 -Subject: 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 76aefec902ea..f3b9ef1bc919 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 1a7c34805f1b..5e9a7c4bcd35 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 3d52834dbe6b..898a8b26392a 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 4e6441841774..ba42fae4d035 100644 ---- a/include/xmloff/xmltoken.hxx -+++ b/include/xmloff/xmltoken.hxx -@@ -744,7 +744,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 ec8065016a12..e0338e053cf0 100644 ---- a/sax/source/fastparser/fastparser.cxx -+++ b/sax/source/fastparser/fastparser.cxx -@@ -578,7 +578,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 352c7cf70e45..ecb4ea346396 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 da65bec0dab7..bd5f16d828ff 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 6905e02d651b..e4307065bd92 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 7585ce0c50fa..61f7cfe4a349 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 dd974d910edb..d8d873cdf055 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 cb48bd1635f8..0825fc2cd7ed 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 c3cd7663d2fc..3898d58e4be4 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 ccc8a0872499..98909dfe8f12 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 a60083983882..c2b753783176 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) { -@@ -259,7 +260,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 6879f37db295..e11dc0d16111 100644 ---- a/xmloff/source/core/xmltoken.cxx -+++ b/xmloff/source/core/xmltoken.cxx -@@ -756,7 +756,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 7b2cab4751aa..6f631289672b 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 7c6d267e8b73..3ad705400c52 100644 ---- a/xmlsecurity/inc/xmlsec-wrapper.h -+++ b/xmlsecurity/inc/xmlsec-wrapper.h -@@ -23,6 +23,7 @@ - - #include <sal/types.h> - -+#include <libxml/parser.h> - #include <xmlsec/base64.h> - #include <xmlsec/bn.h> - #include <xmlsec/errors.h> -diff --git a/xmlsecurity/inc/xmlsec/saxhelper.hxx b/xmlsecurity/inc/xmlsec/saxhelper.hxx -index a49ccef1894c..a5863ffd0e2a 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> --- -cgit v1.2.1 -