diff options
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/Manifest.gz | bin | 8078 -> 8081 bytes | |||
| -rw-r--r-- | app-office/libreoffice-l10n/Manifest | 2 | ||||
| -rw-r--r-- | app-office/libreoffice-l10n/libreoffice-l10n-7.5.9.2.ebuild | 2 | ||||
| -rw-r--r-- | app-office/libreoffice/Manifest | 3 | ||||
| -rw-r--r-- | app-office/libreoffice/files/libreoffice-7.5.9.2-libxml2-2.12.patch | 303 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-7.5.9.2.ebuild | 17 |
6 files changed, 317 insertions, 10 deletions
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz Binary files differindex 5a9380e00dbd..b7e89eceaa3e 100644 --- a/app-office/Manifest.gz +++ b/app-office/Manifest.gz diff --git a/app-office/libreoffice-l10n/Manifest b/app-office/libreoffice-l10n/Manifest index efbaccb6259e..28ef04fec958 100644 --- a/app-office/libreoffice-l10n/Manifest +++ b/app-office/libreoffice-l10n/Manifest @@ -550,5 +550,5 @@ DIST LibreOffice_7.5.9.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz 944428 BLAKE2B 2 DIST LibreOffice_7.5.9.2_Linux_x86-64_rpm_langpack_zu.tar.gz 258188 BLAKE2B 1ce8c739a9f0ec29ab0bc7cf4eb978a98736ed90cb282f0927afba30a212d8b0d85be40de66516736e06e4af104f4ee5de3f2a9677cf1e3afb7d193b501ead79 SHA512 496c24c8a9d5425495be636fb08b30b0556871d79aade7d1252ab8c1c26712b58214c73089dc8e66420172108dea3283bf3f372ea279a39e18e4782e04b3be41 EBUILD libreoffice-l10n-7.5.6.2.ebuild 3699 BLAKE2B b6d9538a31d1721322ac48de20a17fa1f9507c4cd0aebb918a0bacc2ce65e9ff8f60f4bb2ed9de0afddc4e5d2d1d228e4f87f5175e364c03e041efff980b43b5 SHA512 db56d9f5df0bb10c53e9c24f199109aa3b9b7ce9f4c561df68be52a2bd00df6cb38b36e60bba2637fc47b532958b82188de6e97d758b6d7f5f387281ccb061e8 EBUILD libreoffice-l10n-7.5.8.2.ebuild 3702 BLAKE2B ee412cd633edbd844be0f4ed74717e2e63c6b5d574a3f40f42ce479c40ac75454440430886b6d383057bd8b30c8b6b1efe13a8c5390470fb41bd112d69b63066 SHA512 31fdeffd5b5c744e7f5940e80f7a9368a1b2afc2723fdc2264602f66302905a695ed4cd44bfd90231e93c43254c1dae314dfa184ee414fbc782b544d97464eb2 -EBUILD libreoffice-l10n-7.5.9.2.ebuild 3704 BLAKE2B 00cc52a86bd38fc40c9da03e04d942f449ec0905a242b56c3db587fb1bd97d8c789b6ccf5f16ea8a36f56285701e13ab0c32c90985ed0daa5f44fd0448b6b3ed SHA512 edbfe02b94d3269dfbb23dce5c41783c90ca9a25d60d016190759c1a6cdbc1d295391549e3e3ca8f90c6cea3216d7b57c0f5ba7451b5a786021779c712061265 +EBUILD libreoffice-l10n-7.5.9.2.ebuild 3702 BLAKE2B ee412cd633edbd844be0f4ed74717e2e63c6b5d574a3f40f42ce479c40ac75454440430886b6d383057bd8b30c8b6b1efe13a8c5390470fb41bd112d69b63066 SHA512 31fdeffd5b5c744e7f5940e80f7a9368a1b2afc2723fdc2264602f66302905a695ed4cd44bfd90231e93c43254c1dae314dfa184ee414fbc782b544d97464eb2 MISC metadata.xml 370 BLAKE2B 19bdb15f0dd1c100e450d6bcbb07dd79b6debb6d278d0bf08cc668b916c3fdef1431256aaf184997c95556ecff6da5811d1a1cd89b6e4beeae7b55116c5739cf SHA512 e39c0062d9f3a4845d86539861c1b2caffb5c44c4334449b6bc97f23bf134df100c06d244a25a34f625db318f7607210ecf3c9d7ae3d3ce5444ad685717969a1 diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-7.5.9.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-7.5.9.2.ebuild index b5ea3c4e5e49..4415fe052950 100644 --- a/app-office/libreoffice-l10n/libreoffice-l10n-7.5.9.2.ebuild +++ b/app-office/libreoffice-l10n/libreoffice-l10n-7.5.9.2.ebuild @@ -17,7 +17,7 @@ BASE_SRC_URI_STABLE="https://download.documentfoundation.org/${PN/-l10n/}/stable LICENSE="|| ( LGPL-3 MPL-1.1 )" SLOT="0" -# KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux" IUSE="offlinehelp" # diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 0f828de516c3..c82344c9c039 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -5,6 +5,7 @@ AUX libreoffice-7.5.6.2-gcc-14.patch 2056 BLAKE2B 1bc549e8afcb2720f2c25b7df1facd AUX libreoffice-7.5.8.2-curl-8.3.0-mitigation.patch 11727 BLAKE2B a3c82b6802595b61ea6967b616820057ea6548626b6833e79c68345eb1e4317a7f8e26d3be737dc4cb37ed87e0add1aab5854fb761652f4d53fb406e66a521c1 SHA512 1a94ddfee57e2e1bd9794164682de11347cb4134b46da54748871d3684c0b2b63f2025eeeca5d74c6883f0b18a5393371d162cbbd27de38733c136c607215660 AUX libreoffice-7.5.8.2-icu-74-compatibility.patch 5299 BLAKE2B b1c12af133c48ef3e586c41f2fa1cd4b7b6c4d7e93d783ada5c3670a30eb7e2bf3039df242d2f186270810b479621b38f4e91cde6428ee6453170eaffe326a56 SHA512 d64618c007d35ea873d25c7e40058fdc50de29ce1fe2c573aa8b9d628094d681af8ef31e4cd992b0baa996b097dec9c0a28e4d5881ac17b7916ec3bf330f4128 AUX libreoffice-7.5.8.2-libcmis-0.6.patch 1501 BLAKE2B c9ca894061e1439ead362432d969a27ea8ae96d2a86baec46085ec3e9e62871ea127f52afa9be5ef214e5e9b91d8cf9600610c1867d14ea0230ecafb519c42ce SHA512 9fea4cc4e4378e48faa0b27db8d0308c50d974ff8fa3cc971bc4cad3f9b08467ab97c44e03424dd1f0fa73f27826cb6403bac04ae0879c6b8e3a0436110675c9 +AUX libreoffice-7.5.9.2-libxml2-2.12.patch 12445 BLAKE2B 3675c092e6a6d5f357a623fd0381faf53d20f66a555895450f0b437b0ca709a9bb2453a351abcf2e5caaad17dcaa8a9bebf2ede559ad6311c5f382088f44e460 SHA512 ffe0c6a3c696bf7549dcd4b6907d35b271361a53aa730502569b5073ecef15747f40886a554da0b369f549ab2fccb897dba7c1c04332f9271ba98d9ac11dc6ea AUX libreoffice.confd 228 BLAKE2B 7b9ed0d08b91b6e78dd3a2ac242cac48ef141c25bf25713b5fa6c4fdea3d5b0e16b4073a864fbec328edf4008729869fba5236e9cc113ba9bd3d6de5c10153c3 SHA512 6718cfd481b4349d70b718d4811f80ac0eff60d465b9f9eeff8ab9641de1fecb6197023f98bb1fca77a57b48ae2d8e38803f3af3a51191b1df71aa8cc5d33661 AUX libreoffice.initd 507 BLAKE2B d49fd0f48254160fff3eb90a75294c6cf044805352a982ab3d2127426a18a6171e5043c071b59581a1f927a7c499c8abb58820081c6ba6e285097c883917f0e3 SHA512 fee4720898510b1aa07a9ed597d041d1e1edfb8f8b8e9596ef4254d4d3c1e8a959bbd65202a377289910ed28283f9c8a4bdc893d2d0835f37ee28cd3c7cb010d DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f88f22d3ec7898c529c374f13059979450aabdccc9781ca91dd27d0119dfec3d33dda073c2973fa4a8aacae13924c9a67e38a1422c48bfee41b6f3e8 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a @@ -40,6 +41,6 @@ DIST skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz 10868024 BLAKE2B EBUILD libreoffice-7.5.6.2.ebuild 19491 BLAKE2B 2490afc5b4cd9051045417fd00c940ef301d325121034cbaa848f43b8d63b159244b7a3a239cc30dc4eecca1e3a29de9a978f7439da8b08433d13aa4b703d45c SHA512 ddf1bf883e33692dcc461bbecbe68370f532fd6ac81d94aa6d72d21d4530fc1279710b72515809c7860d2f8acb92fd597922702f36b43b4fa4b13682af93e9fc EBUILD libreoffice-7.5.8.2-r2.ebuild 19789 BLAKE2B b128395ff0b99419af869a4b7f6fa1dc34f9210c67091a1d69a09f1905062f72bae41b14a9549f3efa92c5089cb811587ef60216ba3df5f342ef14bf26508cf9 SHA512 8c5abe7af02d3ce1ace1e0c394fae3d11cbdb794256f5d984620805b4527e84e03565d4435471dbbdf2e41e229a886b15e1fc2c1238c55daf590226ea54fb5b5 EBUILD libreoffice-7.5.8.2.ebuild 19569 BLAKE2B d753545c41c347d6b20a05fba9cfc8e3d8ac3cdf2a62a80bd5dc67b20fba056d2e5a9cd47b1942d810c48f32e2038c22e57e6d222efc59e7adc2ca50d9f2e829 SHA512 099de720c145e12a6dc5d45c1bbd9e440103879bf7422556f0af4adced2b54a559cfbd7a7482e31ddce595630168392dbcd140f91224b33faded2f615ba9db21 -EBUILD libreoffice-7.5.9.2.ebuild 19652 BLAKE2B ed3cbeabfd3d2374010076cab00630321d71f295f6ed08b54fd4da45b5e3f9fdc4d3ce897fac5d649078e84528c3dea3e6b866f6606a237a2d6d5985d6df7492 SHA512 f50bd6f00e5453a195e4730d6961c7a63797097e41bb788cea351249103acc3e00c74537a25170a71c92f37cfa1d95f7ddf11a41ef3591eb56970ad9b97fbcc4 +EBUILD libreoffice-7.5.9.2.ebuild 19743 BLAKE2B 13ff3fbba35ae02c348fd68584a37d58cccc71250bdd734648c18025b826225091116675dddb51952a8435364d2a92ab0304cb7c1e8976db1bcceab98ff05499 SHA512 285a42b1b558053968c1cc820343a3ab5855e400fd400a32df5deb63041ffd3f382582eafe1a5777eb28d39268758d7e2dc52413854a8a1451de0cc6f354bf38 EBUILD libreoffice-9999.ebuild 19494 BLAKE2B 63836fb42a1bca23a8cf728548d4cb63268d38ef07f75e69fe0ae84902229620b0f2f5b7708114aaf054d48ccae6cd8c06cbace093b641e5fb4559edc1e8c56a SHA512 48243a2500c1f2fc6a05ade0d00a367a1282a87b723633c6f0ae80103021c69140baf27c949d0ed93160b2d485908889c5992eaeb8b284007f74d3bb4dfb226e MISC metadata.xml 1233 BLAKE2B f93989caf1340cda4c3327a3d3d033d224050848b32b9d80e0b093b024bf124d238f1aae9852d1a6173e8aee79314517dd12e589079e58378e5f63626a80957c SHA512 3af0cefdceeba7a45658a2151b0534f44b9dfe6d3af8374f3061cb098f607a36a2fe134e3c0280ce6d807b523f68e708b51e6f1b4178292a528405e18f12d686 diff --git a/app-office/libreoffice/files/libreoffice-7.5.9.2-libxml2-2.12.patch b/app-office/libreoffice/files/libreoffice-7.5.9.2-libxml2-2.12.patch new file mode 100644 index 000000000000..bc7ae2a561ff --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-7.5.9.2-libxml2-2.12.patch @@ -0,0 +1,303 @@ +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 + diff --git a/app-office/libreoffice/libreoffice-7.5.9.2.ebuild b/app-office/libreoffice/libreoffice-7.5.9.2.ebuild index b0ffc896108d..64d3859995c9 100644 --- a/app-office/libreoffice/libreoffice-7.5.9.2.ebuild +++ b/app-office/libreoffice/libreoffice-7.5.9.2.ebuild @@ -101,8 +101,8 @@ RESTRICT="!test? ( test )" LICENSE="|| ( LGPL-3 MPL-1.1 )" SLOT="0" -# [[ ${MY_PV} == *9999* ]] || \ -# KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux" +[[ ${MY_PV} == *9999* ]] || \ +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux" COMMON_DEPEND="${PYTHON_DEPS} app-arch/unzip @@ -298,9 +298,12 @@ PATCHES=( # maybe upstreamable "${FILESDIR}/libreoffice-7.5.8.2-icu-74-compatibility.patch" + # 7.6 branch + "${WORKDIR}/${PN}-7.5.2.2-loong-buildsys-fix.patch" # bug 881389 + # git master - "${WORKDIR}/${PN}-7.5.2.2-loong-buildsys-fix.patch" - "${FILESDIR}/${PN}-7.5.6.2-gcc-14.patch" + "${FILESDIR}/${PN}-7.5.6.2-gcc-14.patch" # bug 916621 + "${FILESDIR}/${P}-libxml2-2.12.patch" # bug 917691 ) S="${WORKDIR}/${PN}-${MY_PV}" @@ -411,6 +414,9 @@ src_configure() { RANLIB=llvm-ranlib LDFLAGS+=" -fuse-ld=lld" + # Workaround for bug #907905 + filter-lto + # Workaround for bug #915067 append-ldflags -Wl,--undefined-version @@ -437,9 +443,6 @@ src_configure() { strip-flags fi - # Workaround for bug #907905 - filter-lto - export LO_CLANG_CC=${CC} export LO_CLANG_CXX=${CXX} |