commit: 326e131f346eadf140523d0170595cb5fd030017 Author: Jory Pratt <anarchy <AT> gentoo <DOT> org> AuthorDate: Thu Aug 22 03:28:56 2019 +0000 Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> CommitDate: Thu Aug 22 03:28:56 2019 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=326e131f
app-office/libreoffice: sync stable from tree Package-Manager: Portage-2.3.72, Repoman-2.3.17 RepoMan-Options: --force Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org> app-office/libreoffice/Manifest | 4 +- .../files/libreoffice-5.2.5.1-glibc-2.24.patch | 10 - ...libreoffice-6.0.3.2-disable-flaky-tests-1.patch | 216 --------------------- .../files/libreoffice-6.0.3.2-testTdf108947.patch | 13 -- ...eoffice-6.0.6.2-disable-liborcus-unittest.patch | 13 -- .../files/libreoffice-6.0.6.2-linux-musl.patch | 60 ------ .../libreoffice-6.0.6.2-musl-fix-execinfo.patch | 39 ---- .../libreoffice-6.0.6.2-musl-fix-includes.patch | 36 ---- .../files/libreoffice-6.2-ldap-optional.patch | 178 +++++++++++++++++ ...e-6.1.4.2.ebuild => libreoffice-6.2.5.2.ebuild} | 132 ++++++------- app-office/libreoffice/metadata.xml | 1 + 11 files changed, 238 insertions(+), 464 deletions(-) diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 1186c6f..a5b6cde 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -3,6 +3,6 @@ DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 BLAKE2B c067f60d0ee325 DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23092bc57ccd989f26ea04a323dcb17a0ea8baaa6a21b5d5e2b6e29fcae9d18ecd043073030e104ad56c86a115760590f57eda86c22c9fe478b0 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a -DIST libreoffice-6.1.4.2.tar.xz 207710664 BLAKE2B 52bab412094c1ff7e184ea65c588360c18b061c3e14b7be07171f6b5831261766e2ac7d7373f5f789d125671da41e8b67d34360d4b7014dcb98df01828aeb094 SHA512 ba81b7744b908f9fe67a83e72c17c08b3b2e99599a5fd4f9cc1f2d81b3fd0ddb8065ae466205f85185ab9420350cea0b2d60108df3e583b74bd1fcd9e4eb0c3c +DIST libreoffice-6.2.5.2.tar.xz 215008848 BLAKE2B 5dd1ef185820944816e01c8ed6a7873a5a8fe6f7f4b41fad279729970d85ff868f51ed573e8b3d0a554ffd1f8e295b6ff2e493e7f7250f8cb1c7c2a40115abf4 SHA512 b46b6731c415ab354ad7d876cb8905cb9eae2ca71639abf049ea7f5930601c957cc0eb04a2cd06949073ba5e94778ecdb449692ed8bbfbd95b05f6e7980d8d10 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f -DIST libreoffice-help-6.1.4.2.tar.xz 15757700 BLAKE2B 53c398efb3b839740a9146ea1b0f70f019936c914f7aedf38b7da69faf532ab139a8847d6eb251b2850511e0e7bd169c74fafedd0926dc987659aa27878cf740 SHA512 e24f2f6795856da62f77ebfdcfedc8190b8ecef74e395fc263f0cab4a27c0fe3d95f37665747a590fc7a6a93c6c3473a2a4501c50d415cc602f85838955fe9ab +DIST libreoffice-help-6.2.5.2.tar.xz 13023680 BLAKE2B f1f3a03104c1270e59f2b9130a29e1fbc99a9bf76b2bf4cedef8dc61487c9a2036f143501ad7fcd0c056c8b72446305b7a4ca9a719b11200ade5feca35e5e7ea SHA512 14f964161bd827a5846ec667ae1dac80d1485450e172da44010103e31f3872df62595e8b1b1d45c720caac9256d2adaf8f5a0bb80d059d35f1c560b533eb764c diff --git a/app-office/libreoffice/files/libreoffice-5.2.5.1-glibc-2.24.patch b/app-office/libreoffice/files/libreoffice-5.2.5.1-glibc-2.24.patch deleted file mode 100644 index d714ff2..0000000 --- a/app-office/libreoffice/files/libreoffice-5.2.5.1-glibc-2.24.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- libreoffice-5.2.5.1.orig/desktop/unx/source/pagein.c 2017-01-11 16:54:33.000000000 -0800 -+++ libreoffice-5.2.5.1/desktop/unx/source/pagein.c 2017-02-03 10:22:51.697673613 -0800 -@@ -26,6 +26,7 @@ - #include <string.h> - #include <sys/stat.h> - #include <sys/types.h> -+#include <sys/sysmacros.h> - - /* do_pagein */ - static void do_pagein (const char * filename) diff --git a/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-1.patch b/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-1.patch deleted file mode 100644 index 03421c5..0000000 --- a/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-1.patch +++ /dev/null @@ -1,216 +0,0 @@ -Kindly borrowed from Debian. - -14:13 < mst__> _rene_, the toolkit unoapi tests are known to be flaky (in some - system dependent way) e.g. on the Win@6 tinderbox it always - crashes -14:14 < mst__> _rene_, sc.ScAccessible* tests also fail on some systems some of - the time - -diff --git a/toolkit/Module_toolkit.mk b/toolkit/Module_toolkit.mk -index 25db0b6..14e507c 100644 ---- a/toolkit/Module_toolkit.mk -+++ b/toolkit/Module_toolkit.mk -@@ -26,11 +26,11 @@ $(eval $(call gb_Module_add_targets,toolkit,\ - ifneq ($(OOO_JUNIT_JAR),) - $(eval $(call gb_Module_add_subsequentcheck_targets,toolkit,\ - JunitTest_toolkit_complex \ -- JunitTest_toolkit_unoapi_1 \ -- JunitTest_toolkit_unoapi_2 \ -- JunitTest_toolkit_unoapi_3 \ -- JunitTest_toolkit_unoapi_4 \ - )) - endif -+# JunitTest_toolkit_unoapi_1 \ -+# JunitTest_toolkit_unoapi_2 \ -+# JunitTest_toolkit_unoapi_3 \ -+# JunitTest_toolkit_unoapi_4 \ - - # vim: set noet sw=4 ts=4: -diff --git a/sc/qa/unoapi/sc_1.sce b/sc/qa/unoapi/sc_1.sce -index fa1684c..cc8e1a5 100644 ---- a/sc/qa/unoapi/sc_1.sce -+++ b/sc/qa/unoapi/sc_1.sce -@@ -24,10 +24,3 @@ - # i84554 -o sc.AccessibleEditableTextPara_PreviewNote - # i88241 -o sc.AccessibleEditableTextPara_HeaderFooter - -o sc.AccessibleEditableTextPara_PreviewCell ---o sc.ScAccessibleCell --# i91044 -o sc.ScAccessibleCsvCell --# i91044 -o sc.ScAccessibleCsvGrid --# i84641 -o sc.ScAccessibleCsvRuler --# i88330 -o sc.ScAccessibleDocument --# i91045 -o sc.ScAccessibleDocumentPagePreview ---o sc.ScAccessiblePageHeader -diff --git a/sc/qa/unoapi/sc_2.sce b/sc/qa/unoapi/sc_2.sce -index dbfc3e1..d235c5d 100644 ---- a/sc/qa/unoapi/sc_2.sce -+++ b/sc/qa/unoapi/sc_2.sce -@@ -15,11 +15,6 @@ - # except in compliance with the License. You may obtain a copy of - # the License at http://www.apache.org/licenses/LICENSE-2.0 . - # --# fdo#FOO -o sc.ScAccessiblePageHeaderArea ---o sc.ScAccessiblePreviewCell ---o sc.ScAccessiblePreviewHeaderCell ---o sc.ScAccessiblePreviewTable --# fdo#45337 -o sc.ScAccessibleSpreadsheet - # FIXME_REMOVE_WHEN_RE_BASE_COMPLETE - # -o sc.ScAnnotationObj - # -o sc.ScAnnotationShapeObj - -12:18 < _rene_> chris_wot: ping? -12:18 < chris_wot> heya -12:18 < chris_wot> you pinged? -12:19 < _rene_> chris_wot: any news on - https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815292? -12:20 < _rene_> (of course the this-night-uploaded rc3 also failed) -12:21 < chris_wot> ah, sorry - I've looked at an EMF regression, but I've not - gotten any further on that one -12:22 < chris_wot> I honestly think that for this one just disable the test for - now -12:22 < chris_wot> I'll ping the ML - -This seems fixed when opening the original doc. - -diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx -index 54eed4d..78019bd 100644 ---- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx -+++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx -@@ -1128,30 +1128,30 @@ DECLARE_OOXMLEXPORT_TEST(testTDF93675, "no-numlevel-but-indented.odt") - - - --DECLARE_OOXMLEXPORT_TEST(testFlipAndRotateCustomShape, "flip_and_rotate.odt") --{ -- xmlDocPtr pXmlDoc = parseExport("word/document.xml"); -- if (!pXmlDoc) -- return; -- // there should be no flipH and flipV attributes in this case -- assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipH"); -- assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipV"); -- // check rotation angle -- assertXPath(pXmlDoc, "//a:xfrm", "rot", "13500000"); -- // check the first few coordinates of the polygon --#ifndef MACOSX /* Retina-related rounding roundtrip error -- * hard to smooth out due to the use of string compare -- * instead of number */ --#if !defined(_WIN32) -- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "x", "2351"); -- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "y", "3171"); -- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "x", "1695"); -- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "y", "3171"); -- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "x", "1695"); -- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "y", "1701"); --#endif --#endif --} -+//DECLARE_OOXMLEXPORT_TEST(testFlipAndRotateCustomShape, "flip_and_rotate.odt") -+//{ -+// xmlDocPtr pXmlDoc = parseExport("word/document.xml"); -+// if (!pXmlDoc) -+// return; -+// // there should be no flipH and flipV attributes in this case -+// assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipH"); -+// assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipV"); -+// // check rotation angle -+// assertXPath(pXmlDoc, "//a:xfrm", "rot", "13500000"); -+// // check the first few coordinates of the polygon -+//#ifndef MACOSX /* Retina-related rounding roundtrip error -+// * hard to smooth out due to the use of string compare -+// * instead of number */ -+//#if !defined(_WIN32) -+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "x", "2351"); -+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "y", "3171"); -+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "x", "1695"); -+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "y", "3171"); -+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "x", "1695"); -+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "y", "1701"); -+//#endif -+//#endif -+//} - - - CPPUNIT_PLUGIN_IMPLEMENT(); -diff --git a/svx/qa/unoapi/svx.sce b/svx/qa/unoapi/svx.sce -index 1c3925f..a16f001 100644 ---- a/svx/qa/unoapi/svx.sce -+++ b/svx/qa/unoapi/svx.sce -@@ -25,7 +25,7 @@ - #i111216 -o svx.AccessiblePresentationGraphicShape - #i111216 -o svx.AccessiblePresentationOLEShape - #i85539 -o svx.AccessiblePresentationShape ---o svx.AccessibleShape -+#-o svx.AccessibleShape - #i90294 -o svx.GraphicExporter - -o svx.SvxDrawPage - #i85501 -o svx.SvxGraphCtrlAccessibleContext - -19:26 <@x1sc0> _rene_, since that test is using exact dimensions, it seems it - fails on your side probably because the paragraph style is - different. 1. I will change the test to avoid the exact - dimensions. 2. meantime you can skip that test: -https://cgit.freedesktop.org/libreoffice/core/commit/?id=e05f16e6bf36efbaab16dd2ed1427a750ce7cafd -19:26 < IZBot> core - disable UI test that does exact comparison -19:27 < _rene_> mmh, ok, saw that but that was for a different test, so.. :) -19:27 -!- jacobo [[email protected]] has quit [Quit: Leaving.] -19:27 < _rene_> thanks, will do - -diff --git a/uitest/writer_tests/tdf79236.py b/uitest/writer_tests/tdf79236.py -index 8585e48d8c64..704f42c009a1 100644 ---- a/uitest/writer_tests/tdf79236.py -+++ b/uitest/writer_tests/tdf79236.py -@@ -8,8 +8,11 @@ from uitest.framework import UITestCase - import time - from uitest.uihelper.common import get_state_as_dict, type_text - -+import unittest -+ - class tdf79236(UITestCase): - -+ @unittest.skip("Currently broken") - def test_paragraph(self): - - self.ui_test.create_doc_in_start_center("writer") - -14:39 < ztamas> _rene_: chart2dump is used to fail because of font size differences, just use a bigger delta or disable it if it - fails for you. -14:40 <@sberg_> noelgrandin, no -14:40 < noelgrandin> sberg_, sure seems that way both in the debugger and in the resulting SAL_WARN output -14:42 < ztamas> _rene_: there were some work on making font rendering consistent on different platforms, but it's not finished - yet, I guess -diff --git a/chart2/Module_chart2.mk b/chart2/Module_chart2.mk -index 3273055d5373..cb452139170c 100644 ---- a/chart2/Module_chart2.mk -+++ b/chart2/Module_chart2.mk -@@ -33,9 +33,9 @@ $(eval $(call gb_Module_add_slowcheck_targets,chart2,\ - CppunitTest_chart2_export \ - CppunitTest_chart2_import \ - CppunitTest_chart2_trendcalculators \ -- CppunitTest_chart2_dump \ - CppunitTest_chart2_pivot_chart_test \ - )) -+# CppunitTest_chart2_dump \ - - ifeq ($(ENABLE_CHART_TESTS),TRUE) - ifeq ($(WITH_FONTS), TRUE) -diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx -index 4d65beeb90c4..f3d71501c41a 100644 ---- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx -+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx -@@ -1559,14 +1559,14 @@ DECLARE_OOXMLIMPORT_TEST(testTdf43017, "tdf43017.docx") - } - - --DECLARE_OOXMLIMPORT_TEST(testTdf112443, "tdf112443.docx") -+/*DECLARE_OOXMLIMPORT_TEST(testTdf112443, "tdf112443.docx") - { - // the position of the flying text frame should be off page - // 30624 below its anchor - OUString aTop = parseDump("//fly[1]/infos/bounds", "top"); - CPPUNIT_ASSERT_EQUAL( OUString("30624"), aTop ); - --} -+}*/ - - DECLARE_OOXMLIMPORT_TEST(testTdf113946, "tdf113946.docx") - { diff --git a/app-office/libreoffice/files/libreoffice-6.0.3.2-testTdf108947.patch b/app-office/libreoffice/files/libreoffice-6.0.3.2-testTdf108947.patch deleted file mode 100644 index bd84b31..0000000 --- a/app-office/libreoffice/files/libreoffice-6.0.3.2-testTdf108947.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx -index 457aedce0acb..4f02cf2b4040 100644 ---- a/sw/qa/extras/rtfimport/rtfimport.cxx -+++ b/sw/qa/extras/rtfimport/rtfimport.cxx -@@ -1352,7 +1352,7 @@ DECLARE_RTFIMPORT_TEST(testImportHeaderFooter, "tdf108055.rtf") - DECLARE_RTFIMPORT_TEST(testTdf108947, "tdf108947.rtf") - { - //Check page count -- CPPUNIT_ASSERT_EQUAL(2, getPages()); -+ CPPUNIT_ASSERT_EQUAL(1, getPages()); - - //Check if Headers/Footers contain what they should in this document - uno::Reference<text::XText> xHeaderTextRight = getProperty<uno::Reference<text::XText>>( diff --git a/app-office/libreoffice/files/libreoffice-6.0.6.2-disable-liborcus-unittest.patch b/app-office/libreoffice/files/libreoffice-6.0.6.2-disable-liborcus-unittest.patch deleted file mode 100644 index afdca6b..0000000 --- a/app-office/libreoffice/files/libreoffice-6.0.6.2-disable-liborcus-unittest.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/sc/qa/unit/subsequent_filters-test.cxx 2018-02-22 18:45:41.000000000 +0100 -+++ b/sc/qa/unit/subsequent_filters-test.cxx 2018-03-02 11:24:08.616015560 +0100 -@@ -2395,7 +2395,9 @@ - CPPUNIT_ASSERT_MESSAGE("Style Name1 : Doesn't have Attribute background, but it should have.", - pStyleSheet->GetItemSet().HasItem(ATTR_BACKGROUND, &pItem)); - const SvxBrushItem* pBackground = static_cast<const SvxBrushItem*>(pItem); -- CPPUNIT_ASSERT_EQUAL(Color(254, 255, 204), pBackground->GetColor()); -+ /* This test fails with liborcus >= 0.13.3 -+ * CPPUNIT_ASSERT_EQUAL(Color(254, 255, 204), pBackground->GetColor()); -+ */ - - CPPUNIT_ASSERT_MESSAGE("Style Name1 : Doesn't have Attribute border, but it should have.", - pStyleSheet->GetItemSet().HasItem(ATTR_BORDER, &pItem)); diff --git a/app-office/libreoffice/files/libreoffice-6.0.6.2-linux-musl.patch b/app-office/libreoffice/files/libreoffice-6.0.6.2-linux-musl.patch deleted file mode 100644 index 5fbf6b3..0000000 --- a/app-office/libreoffice/files/libreoffice-6.0.6.2-linux-musl.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- libreoffice-5.3.0.3/configure.ac.orig 2017-01-26 22:22:46.000000000 +0000 -+++ libreoffice-5.3.0.3/configure.ac 2017-02-08 13:14:16.777547599 +0000 -@@ -652,7 +652,7 @@ - fi - ;; - --linux-gnu*|k*bsd*-gnu*) -+linux-gnu*|linux-musl*|k*bsd*-gnu*) - test_gtk=yes - build_gstreamer_1_0=yes - build_gstreamer_0_10=yes -@@ -4170,7 +4170,7 @@ - esac - ;; - --linux-gnu*) -+linux-gnu*|linux-musl*) - COM=GCC - USING_X11=TRUE - OS=LINUX -@@ -7197,7 +7197,7 @@ - test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread" - ;; - -- linux-gnu*) -+ linux-gnu*|linux-musl*) - JAVAINC="-I$JAVA_HOME/include" - JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux" - test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread" -@@ -9748,21 +9748,6 @@ - fi - AC_SUBST(SYSTEM_LIBEXTTEXTCAT_DATA) - --dnl *************************************** --dnl testing libc version for Linux... --dnl *************************************** --if test "$_os" = "Linux"; then -- AC_MSG_CHECKING([whether libc is >= 2.1.1]) -- exec 6>/dev/null # no output -- AC_CHECK_LIB(c, gnu_get_libc_version, HAVE_LIBC=yes; export HAVE_LIBC) -- exec 6>&1 # output on again -- if test "$HAVE_LIBC"; then -- AC_MSG_RESULT([yes]) -- else -- AC_MSG_ERROR([no, upgrade libc]) -- fi --fi -- - dnl ========================================= - dnl Check for the Windows SDK. - dnl ========================================= -@@ -12775,7 +12760,7 @@ - - case "$host_os" in - -- aix*|dragonfly*|freebsd*|linux-gnu*|*netbsd*|openbsd*) -+ aix*|dragonfly*|freebsd*|linux-gnu*|linux-musl*|*netbsd*|openbsd*) - if test "$ENABLE_JAVA" != ""; then - pathmunge "$JAVA_HOME/bin" "after" - fi diff --git a/app-office/libreoffice/files/libreoffice-6.0.6.2-musl-fix-execinfo.patch b/app-office/libreoffice/files/libreoffice-6.0.6.2-musl-fix-execinfo.patch deleted file mode 100644 index 4c3b359..0000000 --- a/app-office/libreoffice/files/libreoffice-6.0.6.2-musl-fix-execinfo.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/sal/osl/unx/backtrace.h b/sal/osl/unx/backtrace.h -index 5fafc1c..408c12c 100644 ---- a/sal/osl/unx/backtrace.h -+++ b/sal/osl/unx/backtrace.h -@@ -20,7 +20,7 @@ - #ifndef INCLUDED_SAL_OSL_UNX_BACKTRACE_H - #define INCLUDED_SAL_OSL_UNX_BACKTRACE_H - --#if defined (LINUX) -+#if defined (LINUX) && defined (__GLIBC__) - - #include <execinfo.h> - -diff --git a/sal/osl/unx/signal.cxx b/sal/osl/unx/signal.cxx -index f4c9a9c..da6d9cf 100644 ---- a/sal/osl/unx/signal.cxx -+++ b/sal/osl/unx/signal.cxx -@@ -35,7 +35,7 @@ - - #endif /* MACOSX */ - --#ifdef LINUX -+#if defined(LINUX) && defined(__GLIBC__) - #include <execinfo.h> - #include <link.h> - #define INCLUDE_BACKTRACE -diff --git a/sal/osl/unx/backtrace.c b/sal/osl/unx/backtrace.c -index 1d9a58b..fd648e4 100644 ---- a/sal/osl/unx/backtrace.c -+++ b/sal/osl/unx/backtrace.c -@@ -282,7 +282,7 @@ void backtrace_symbols_fd( void **buffer, int size, int fd ) - } - } - --#elif !defined LINUX -+#elif !defined(__GLIBC__) - - int backtrace( void **buffer, int max_frames ) - { diff --git a/app-office/libreoffice/files/libreoffice-6.0.6.2-musl-fix-includes.patch b/app-office/libreoffice/files/libreoffice-6.0.6.2-musl-fix-includes.patch deleted file mode 100644 index 4a837a9..0000000 --- a/app-office/libreoffice/files/libreoffice-6.0.6.2-musl-fix-includes.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx -index f177d86..99bb408 100644 ---- a/sd/source/ui/remotecontrol/BluetoothServer.cxx -+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx -@@ -21,7 +21,7 @@ - #include <dbus/dbus.h> - #include <errno.h> - #include <fcntl.h> -- #include <sys/unistd.h> -+ #include <unistd.h> - #include <sys/socket.h> - #include <bluetooth/bluetooth.h> - #include <bluetooth/rfcomm.h> -diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx -index 932e928..b65ced7 100644 ---- a/vcl/inc/headless/svpinst.hxx -+++ b/vcl/inc/headless/svpinst.hxx -@@ -30,7 +30,7 @@ - - #include <list> - --#include <time.h> -+#include <sys/time.h> - - #define VIRTUAL_DESKTOP_WIDTH 1024 - #define VIRTUAL_DESKTOP_HEIGHT 768 ---- a/avmedia/source/vlc/wrapper/Types.hxx 2017-01-12 01:54:33.000000000 +0100 -+++ b/avmedia/source/vlc/wrapper/Types.hxx 2017-01-27 20:03:39.243895504 +0100 -@@ -15,6 +15,7 @@ - #if defined(_WIN32) - typedef __int64 libvlc_time_t; - #else -+# include <stdint.h> - typedef int64_t libvlc_time_t; - #endif - diff --git a/app-office/libreoffice/files/libreoffice-6.2-ldap-optional.patch b/app-office/libreoffice/files/libreoffice-6.2-ldap-optional.patch new file mode 100644 index 0000000..c926897 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-6.2-ldap-optional.patch @@ -0,0 +1,178 @@ +From 6776c53b7ce2e431d8636f4e5a755f50f787ec8f Mon Sep 17 00:00:00 2001 +From: Andrew Udvare <[email protected]> +Date: Tue, 8 Jan 2019 04:53:51 -0500 +Subject: Make LDAP support optional + +Change-Id: Ifbd3903494a81e7b155bf6468f6ca2c50b3370a4 +Reviewed-on: https://gerrit.libreoffice.org/65958 +Tested-by: Jenkins +Reviewed-by: Markus Mohrhard <[email protected]> +--- + Repository.mk | 2 +- + RepositoryExternal.mk | 3 ++- + configure.ac | 24 ++++++++++++++++++++++- + connectivity/Library_postgresql-sdbc-impl.mk | 2 +- + extensions/Module_extensions.mk | 7 ++++++- + external/postgresql/ExternalProject_postgresql.mk | 5 +++-- + postprocess/Rdb_services.mk | 2 +- + 7 files changed, 37 insertions(+), 8 deletions(-) + +diff --git a/Repository.mk b/Repository.mk +index 4ae8528..4d8389b 100644 +--- a/Repository.mk ++++ b/Repository.mk +@@ -389,7 +389,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ + hyphen \ + icg \ + $(if $(ENABLE_JAVA),jdbc) \ +- ldapbe2 \ ++ $(if $(ENABLE_LDAP),ldapbe2) \ + $(if $(filter WNT,$(OS)),WinUserInfoBe) \ + localebe1 \ + log \ +diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk +index 602ff6d..3c9be87 100644 +--- a/RepositoryExternal.mk ++++ b/RepositoryExternal.mk +@@ -2900,7 +2900,7 @@ endef + + endif # SYSTEM_HSQLDB + +- ++ifeq ($(ENABLE_LDAP),TRUE) + ifneq ($(SYSTEM_OPENLDAP),) + + define gb_LinkTarget__use_openldap +@@ -2929,6 +2929,7 @@ $(call gb_LinkTarget_add_libs,$(1), \ + ) + + endef ++endif + + define gb_ExternalProject__use_openldap + $(call gb_ExternalProject_use_external_project,$(1),openldap) +diff --git a/configure.ac b/configure.ac +index f880308..35c7e02 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1519,6 +1519,11 @@ libo_FUZZ_ARG_ENABLE(formula-logger, + ) + ) + ++AC_ARG_ENABLE(ldap, ++ AS_HELP_STRING([--disable-ldap], ++ [Disable LDAP support.]), ++,enable_ldap=yes) ++ + dnl =================================================================== + dnl Optional Packages (--with/without-) + dnl =================================================================== +@@ -9214,12 +9219,29 @@ else + fi + AC_SUBST(SYSTEM_ODBC_HEADERS) + ++dnl =================================================================== ++dnl Enable LDAP support ++dnl =================================================================== ++ ++if test "$_os" != "WINNT" -a "$_os" != "iOS" -a "$_os" != "Android"; then ++AC_MSG_CHECKING([whether to enable LDAP support]) ++ if test "$enable_ldap" != "yes"; then ++ AC_MSG_RESULT([no]) ++ ENABLE_LDAP="" ++ enable_ldap=no ++ else ++ AC_MSG_RESULT([yes]) ++ ENABLE_LDAP="TRUE" ++ AC_DEFINE(HAVE_FEATURE_LDAP) ++ fi ++fi ++AC_SUBST(ENABLE_LDAP) + + dnl =================================================================== + dnl Check for system openldap + dnl =================================================================== + +-if test "$_os" != "WINNT" -a "$_os" != "iOS" -a "$_os" != "Android"; then ++if test "$_os" != "WINNT" -a "$_os" != "iOS" -a "$_os" != "Android" -a "$ENABLE_LDAP" != ""; then + AC_MSG_CHECKING([which openldap library to use]) + if test "$with_system_openldap" = "yes"; then + AC_MSG_RESULT([external]) +diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk +index 53cebd0..3d048f3 100644 +--- a/connectivity/Library_postgresql-sdbc-impl.mk ++++ b/connectivity/Library_postgresql-sdbc-impl.mk +@@ -47,7 +47,7 @@ $(eval $(call gb_Library_use_externals,postgresql-sdbc-impl,\ + postgresql \ + $(if $(filter-out MSC,$(COM)), \ + openssl \ +- openldap \ ++ $(if $(ENABLE_LDAP),openldap) \ + nss3 \ + plc4 \ + ssl3 \ +diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk +index f84a9ca..43dd929 100644 +--- a/extensions/Module_extensions.mk ++++ b/extensions/Module_extensions.mk +@@ -16,7 +16,6 @@ $(eval $(call gb_Module_add_l10n_targets,extensions,\ + ifneq ($(filter-out iOS ANDROID,$(OS)),) + $(eval $(call gb_Module_add_targets,extensions,\ + Library_abp \ +- Library_ldapbe2 \ + $(if $(filter WNT,$(OS)),Library_WinUserInfoBe) \ + Library_log \ + Library_scn \ +@@ -28,6 +27,12 @@ $(eval $(call gb_Module_add_targets,extensions,\ + )) + endif + ++ifeq ($(ENABLE_LDAP),TRUE) ++$(eval $(call gb_Module_add_targets,extensions,\ ++ Library_ldapbe2 \ ++)) ++endif ++ + ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) + $(eval $(call gb_Module_add_targets,extensions,\ + Library_bib \ +diff --git a/external/postgresql/ExternalProject_postgresql.mk b/external/postgresql/ExternalProject_postgresql.mk +index f6617e5..fc4342c 100644 +--- a/external/postgresql/ExternalProject_postgresql.mk ++++ b/external/postgresql/ExternalProject_postgresql.mk +@@ -10,7 +10,7 @@ + $(eval $(call gb_ExternalProject_ExternalProject,postgresql)) + + $(eval $(call gb_ExternalProject_use_externals,postgresql,\ +- openldap \ ++ $(if $(ENABLE_LDAP),openldap) \ + openssl \ + zlib \ + )) +@@ -64,9 +64,10 @@ $(call gb_ExternalProject_get_state_target,postgresql,build) : + $(if $(DISABLE_OPENSSL),,--with-openssl \ + $(if $(WITH_KRB5), --with-krb5) \ + $(if $(WITH_GSSAPI),--with-gssapi)) \ ++ $(if $(ENABLE_LDAP),,--with-ldap=no) \ + CPPFLAGS="$(postgresql_CPPFLAGS)" \ + LDFLAGS="$(postgresql_LDFLAGS)" \ +- EXTRA_LDAP_LIBS="-llber -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4" \ ++ $(if $(ENABLE_LDAP),EXTRA_LDAP_LIBS="-llber -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4") \ + && cd src/interfaces/libpq \ + && MAKEFLAGS= && $(MAKE) all-static-lib) + +diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk +index c70d1ca..342f19b 100644 +--- a/postprocess/Rdb_services.mk ++++ b/postprocess/Rdb_services.mk +@@ -293,7 +293,7 @@ $(eval $(call gb_Rdb_add_components,services,\ + desktop/source/offacc/offacc \ + $(if $(DISABLE_GUI),,desktop/source/splash/spl) \ + extensions/source/abpilot/abp \ +- extensions/source/config/ldap/ldapbe2 \ ++ $(if $(ENABLE_LDAP),extensions/source/config/ldap/ldapbe2) \ + $(if $(filter WNT,$(OS)),\ + extensions/source/config/WinUserInfo/WinUserInfoBe \ + ) \ +-- +cgit v1.1 diff --git a/app-office/libreoffice/libreoffice-6.1.4.2.ebuild b/app-office/libreoffice/libreoffice-6.2.5.2.ebuild similarity index 88% rename from app-office/libreoffice/libreoffice-6.1.4.2.ebuild rename to app-office/libreoffice/libreoffice-6.2.5.2.ebuild index ba47781..5994e6d 100644 --- a/app-office/libreoffice/libreoffice-6.1.4.2.ebuild +++ b/app-office/libreoffice/libreoffice-6.2.5.2.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} ) +PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) PYTHON_REQ_USE="threads(+),xml" MY_PV="${PV/_alpha/.alpha}" @@ -21,7 +21,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz" # PATCHSET="${P}-patchset-01.tar.xz" [[ ${MY_PV} == *9999* ]] && inherit git-r3 -inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils +inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils DESCRIPTION="A full office productivity suite" HOMEPAGE="https://www.libreoffice.org"; @@ -63,12 +63,11 @@ unset ADDONS_SRC LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird -googledrive gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc +googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test vlc $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" REQUIRED_USE="${PYTHON_REQUIRED_USE} bluetooth? ( dbus ) - kde? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) @@ -80,6 +79,14 @@ SLOT="0" [[ ${MY_PV} == *9999* ]] || \ KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux" +BDEPEND=" + dev-util/intltool + sys-devel/bison + sys-devel/flex + sys-devel/gettext + virtual/pkgconfig + odk? ( >=app-doc/doxygen-1.8.4 ) +" COMMON_DEPEND="${PYTHON_DEPS} app-arch/unzip app-arch/zip @@ -111,7 +118,7 @@ COMMON_DEPEND="${PYTHON_DEPS} dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error - =dev-libs/liborcus-0.13* + >=dev-libs/liborcus-0.14.0 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt @@ -119,6 +126,7 @@ COMMON_DEPEND="${PYTHON_DEPS} dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] + media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 @@ -133,7 +141,6 @@ COMMON_DEPEND="${PYTHON_DEPS} media-libs/libzmf net-libs/neon net-misc/curl - net-nds/openldap sci-mathematics/lpsolve sys-libs/zlib virtual/glu @@ -144,10 +151,13 @@ COMMON_DEPEND="${PYTHON_DEPS} x11-libs/libXrandr x11-libs/libXrender accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] ) - bluetooth? ( net-wireless/bluez ) + bluetooth? ( + dev-libs/glib:2 + net-wireless/bluez + ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) - dbus? ( dev-libs/dbus-glib ) + dbus? ( sys-apps/dbus ) eds? ( dev-libs/glib:2 gnome-base/dconf @@ -182,32 +192,14 @@ COMMON_DEPEND="${PYTHON_DEPS} kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) + ldap? ( net-nds/openldap ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) - mysql? ( dev-db/mysql-connector-c++ ) + mariadb? ( dev-db/mariadb-connector-c ) + !mariadb? ( dev-db/mysql-connector-c ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) " - -RDEPEND="${COMMON_DEPEND} - !app-office/libreoffice-bin - !app-office/libreoffice-bin-debug - !app-office/openoffice - media-fonts/liberation-fonts - || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) - java? ( >=virtual/jre-1.6 ) - kde? ( kde-frameworks/breeze-icons:* ) - vlc? ( media-video/vlc ) -" - -if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then - PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*" -else - # Translations are not reliable on live ebuilds - # rather force people to use english only. - PDEPEND="!app-office/libreoffice-l10n" -fi - # FIXME: cppunit should be moved to test conditional # after everything upstream is under gbuild # as dmake execute tests right away @@ -217,14 +209,9 @@ DEPEND="${COMMON_DEPEND} dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3 - dev-util/intltool - =dev-util/mdds-1.3*:1= + >=dev-util/mdds-1.4.1:1= media-libs/glm - sys-devel/bison - sys-devel/flex - sys-devel/gettext sys-devel/ucpp - virtual/pkgconfig x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst @@ -232,7 +219,6 @@ DEPEND="${COMMON_DEPEND} dev-java/ant-core >=virtual/jdk-1.6 ) - odk? ( >=app-doc/doxygen-1.8.4 ) test? ( app-crypt/gnupg dev-util/cppunit @@ -240,8 +226,27 @@ DEPEND="${COMMON_DEPEND} media-fonts/liberation-fonts ) " +RDEPEND="${COMMON_DEPEND} + !app-office/libreoffice-bin + !app-office/libreoffice-bin-debug + !app-office/openoffice + media-fonts/liberation-fonts + || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) + java? ( >=virtual/jre-1.6 ) + kde? ( kde-frameworks/breeze-icons:* ) + vlc? ( media-video/vlc ) +" +if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then + PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*" +else + # Translations are not reliable on live ebuilds + # rather force people to use english only. + PDEPEND="!app-office/libreoffice-l10n" +fi PATCHES=( + # master branch + "${FILESDIR}/${PN}-6.2-ldap-optional.patch" # "${WORKDIR}"/${PATCHSET/.tar.xz/} # not upstreamable stuff @@ -396,6 +401,7 @@ src_configure() { --with-system-headers --with-system-jars --with-system-libs + --enable-build-opensymbol --enable-cairo-canvas --enable-largefile --enable-mergelibs @@ -404,18 +410,16 @@ src_configure() { --enable-randr --enable-release-build --disable-breakpad + --disable-bundle-mariadb --disable-ccache --disable-dependency-tracking --disable-epm --disable-fetch-external --disable-gstreamer-0-10 - --disable-kde5 --disable-online-update --disable-openssl --disable-pdfium - --disable-qt5 --disable-report-builder - --with-alloc=system --with-build-version="${gentoo_buildid}" --enable-extension-integration --with-external-dict-dir="${EPREFIX}/usr/share/myspell" @@ -430,8 +434,8 @@ src_configure() { --with-x --without-fonts --without-myspell-dicts - --without-help - --with-helppack-integration + --with-help="html" + --without-helppack-integration --with-system-gpgmepp --without-system-sane $(use_enable bluetooth sdremote-bluetooth) @@ -444,8 +448,9 @@ src_configure() { $(use_enable gstreamer gstreamer-1-0) $(use_enable gtk gtk3) $(use_enable gtk2 gtk) - $(use_enable kde gtk3-kde5) - $(use_enable mysql ext-mariadb-connector) + $(use_enable kde kde5) + $(use_enable kde qt5) + $(use_enable ldap) $(use_enable odk) $(use_enable pdfimport) $(use_enable postgres postgresql-sdbc) @@ -455,10 +460,13 @@ src_configure() { $(use_with googledrive gdrive-client-id ${google_default_client_id}) $(use_with googledrive gdrive-client-secret ${google_default_client_secret}) $(use_with java) - $(use_with mysql system-mysql-cppconn) $(use_with odk doxygen) ) + if use gtk && use kde; then + myeconfargs+=( --enable-gtk3-kde5 ) + fi + if use eds || use gtk; then myeconfargs+=( --enable-dconf --enable-gio ) else @@ -493,6 +501,7 @@ src_configure() { is-flagq "-flto*" && myeconfargs+=( --enable-lto ) + MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \ econf "${myeconfargs[@]}" } @@ -503,24 +512,6 @@ src_compile() { addpredict /dev/ati addpredict /dev/nvidiactl - # hack for offlinehelp, this needs fixing upstream at some point - # it is broken because we send --without-help - # https://bugs.freedesktop.org/show_bug.cgi?id=46506 - ( - grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die - source "${T}/config_host.mk" 2&> /dev/null - - local path="${WORKDIR}/helpcontent2/source/auxiliary/" - mkdir -p "${path}" || die - - echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\"" - perl "${S}/helpcontent2/helpers/create_ilst.pl" \ - -dir=helpcontent2/source/media/helpimg \ - > "${path}/helpimg.ilst" - [[ -s "${path}/helpimg.ilst" ]] || \ - ewarn "The help images list is empty, something is fishy, report a bug." - ) - local target use test && target="build" || target="build-nocheck" @@ -552,27 +543,18 @@ src_install() { insinto /usr/$(get_libdir)/${PN}/program newins "${WORKDIR}/branding-sofficerc" sofficerc dodir /etc/env.d - echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die + echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die fi - - # Hack for offlinehelp, this needs fixing upstream at some point. - # It is broken because we send --without-help - # https://bugs.freedesktop.org/show_bug.cgi?id=46506 - insinto /usr/$(get_libdir)/libreoffice/help - doins xmlhelp/util/*.xsl - - pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin - pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin } pkg_postinst() { - gnome2_icon_cache_update + xdg_icon_cache_update xdg_desktop_database_update xdg_mimeinfo_database_update } pkg_postrm() { - gnome2_icon_cache_update + xdg_icon_cache_update xdg_desktop_database_update xdg_mimeinfo_database_update } diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml index 1035568..6b51466 100644 --- a/app-office/libreoffice/metadata.xml +++ b/app-office/libreoffice/metadata.xml @@ -14,6 +14,7 @@ version</longdescription> <flag name="coinmp">Use sci-libs/coinor-mp as alternative solver</flag> <flag name="googledrive">Enable support for remote files on Google Drive</flag> <flag name="gtk2">Enable legacy gtk2 frontend</flag> + <flag name="mariadb">Prefer mariadb connector over mysql connector</flag> <flag name="odk">Build the Office Development Kit</flag> <flag name="pdfimport">Enable PDF import via the Poppler library</flag> <flag name="vlc">Use <pkg>media-video/vlc</pkg> for video embedding</flag>
