1 |
commit: 326e131f346eadf140523d0170595cb5fd030017 |
2 |
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Aug 22 03:28:56 2019 +0000 |
4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Aug 22 03:28:56 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=326e131f |
7 |
|
8 |
app-office/libreoffice: sync stable from tree |
9 |
|
10 |
Package-Manager: Portage-2.3.72, Repoman-2.3.17 |
11 |
RepoMan-Options: --force |
12 |
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org> |
13 |
|
14 |
app-office/libreoffice/Manifest | 4 +- |
15 |
.../files/libreoffice-5.2.5.1-glibc-2.24.patch | 10 - |
16 |
...libreoffice-6.0.3.2-disable-flaky-tests-1.patch | 216 --------------------- |
17 |
.../files/libreoffice-6.0.3.2-testTdf108947.patch | 13 -- |
18 |
...eoffice-6.0.6.2-disable-liborcus-unittest.patch | 13 -- |
19 |
.../files/libreoffice-6.0.6.2-linux-musl.patch | 60 ------ |
20 |
.../libreoffice-6.0.6.2-musl-fix-execinfo.patch | 39 ---- |
21 |
.../libreoffice-6.0.6.2-musl-fix-includes.patch | 36 ---- |
22 |
.../files/libreoffice-6.2-ldap-optional.patch | 178 +++++++++++++++++ |
23 |
...e-6.1.4.2.ebuild => libreoffice-6.2.5.2.ebuild} | 132 ++++++------- |
24 |
app-office/libreoffice/metadata.xml | 1 + |
25 |
11 files changed, 238 insertions(+), 464 deletions(-) |
26 |
|
27 |
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest |
28 |
index 1186c6f..a5b6cde 100644 |
29 |
--- a/app-office/libreoffice/Manifest |
30 |
+++ b/app-office/libreoffice/Manifest |
31 |
@@ -3,6 +3,6 @@ DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 BLAKE2B c067f60d0ee325 |
32 |
DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23092bc57ccd989f26ea04a323dcb17a0ea8baaa6a21b5d5e2b6e29fcae9d18ecd043073030e104ad56c86a115760590f57eda86c22c9fe478b0 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a |
33 |
DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f |
34 |
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a |
35 |
-DIST libreoffice-6.1.4.2.tar.xz 207710664 BLAKE2B 52bab412094c1ff7e184ea65c588360c18b061c3e14b7be07171f6b5831261766e2ac7d7373f5f789d125671da41e8b67d34360d4b7014dcb98df01828aeb094 SHA512 ba81b7744b908f9fe67a83e72c17c08b3b2e99599a5fd4f9cc1f2d81b3fd0ddb8065ae466205f85185ab9420350cea0b2d60108df3e583b74bd1fcd9e4eb0c3c |
36 |
+DIST libreoffice-6.2.5.2.tar.xz 215008848 BLAKE2B 5dd1ef185820944816e01c8ed6a7873a5a8fe6f7f4b41fad279729970d85ff868f51ed573e8b3d0a554ffd1f8e295b6ff2e493e7f7250f8cb1c7c2a40115abf4 SHA512 b46b6731c415ab354ad7d876cb8905cb9eae2ca71639abf049ea7f5930601c957cc0eb04a2cd06949073ba5e94778ecdb449692ed8bbfbd95b05f6e7980d8d10 |
37 |
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f |
38 |
-DIST libreoffice-help-6.1.4.2.tar.xz 15757700 BLAKE2B 53c398efb3b839740a9146ea1b0f70f019936c914f7aedf38b7da69faf532ab139a8847d6eb251b2850511e0e7bd169c74fafedd0926dc987659aa27878cf740 SHA512 e24f2f6795856da62f77ebfdcfedc8190b8ecef74e395fc263f0cab4a27c0fe3d95f37665747a590fc7a6a93c6c3473a2a4501c50d415cc602f85838955fe9ab |
39 |
+DIST libreoffice-help-6.2.5.2.tar.xz 13023680 BLAKE2B f1f3a03104c1270e59f2b9130a29e1fbc99a9bf76b2bf4cedef8dc61487c9a2036f143501ad7fcd0c056c8b72446305b7a4ca9a719b11200ade5feca35e5e7ea SHA512 14f964161bd827a5846ec667ae1dac80d1485450e172da44010103e31f3872df62595e8b1b1d45c720caac9256d2adaf8f5a0bb80d059d35f1c560b533eb764c |
40 |
|
41 |
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 |
42 |
deleted file mode 100644 |
43 |
index d714ff2..0000000 |
44 |
--- a/app-office/libreoffice/files/libreoffice-5.2.5.1-glibc-2.24.patch |
45 |
+++ /dev/null |
46 |
@@ -1,10 +0,0 @@ |
47 |
---- libreoffice-5.2.5.1.orig/desktop/unx/source/pagein.c 2017-01-11 16:54:33.000000000 -0800 |
48 |
-+++ libreoffice-5.2.5.1/desktop/unx/source/pagein.c 2017-02-03 10:22:51.697673613 -0800 |
49 |
-@@ -26,6 +26,7 @@ |
50 |
- #include <string.h> |
51 |
- #include <sys/stat.h> |
52 |
- #include <sys/types.h> |
53 |
-+#include <sys/sysmacros.h> |
54 |
- |
55 |
- /* do_pagein */ |
56 |
- static void do_pagein (const char * filename) |
57 |
|
58 |
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 |
59 |
deleted file mode 100644 |
60 |
index 03421c5..0000000 |
61 |
--- a/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-1.patch |
62 |
+++ /dev/null |
63 |
@@ -1,216 +0,0 @@ |
64 |
-Kindly borrowed from Debian. |
65 |
- |
66 |
-14:13 < mst__> _rene_, the toolkit unoapi tests are known to be flaky (in some |
67 |
- system dependent way) e.g. on the Win@6 tinderbox it always |
68 |
- crashes |
69 |
-14:14 < mst__> _rene_, sc.ScAccessible* tests also fail on some systems some of |
70 |
- the time |
71 |
- |
72 |
-diff --git a/toolkit/Module_toolkit.mk b/toolkit/Module_toolkit.mk |
73 |
-index 25db0b6..14e507c 100644 |
74 |
---- a/toolkit/Module_toolkit.mk |
75 |
-+++ b/toolkit/Module_toolkit.mk |
76 |
-@@ -26,11 +26,11 @@ $(eval $(call gb_Module_add_targets,toolkit,\ |
77 |
- ifneq ($(OOO_JUNIT_JAR),) |
78 |
- $(eval $(call gb_Module_add_subsequentcheck_targets,toolkit,\ |
79 |
- JunitTest_toolkit_complex \ |
80 |
-- JunitTest_toolkit_unoapi_1 \ |
81 |
-- JunitTest_toolkit_unoapi_2 \ |
82 |
-- JunitTest_toolkit_unoapi_3 \ |
83 |
-- JunitTest_toolkit_unoapi_4 \ |
84 |
- )) |
85 |
- endif |
86 |
-+# JunitTest_toolkit_unoapi_1 \ |
87 |
-+# JunitTest_toolkit_unoapi_2 \ |
88 |
-+# JunitTest_toolkit_unoapi_3 \ |
89 |
-+# JunitTest_toolkit_unoapi_4 \ |
90 |
- |
91 |
- # vim: set noet sw=4 ts=4: |
92 |
-diff --git a/sc/qa/unoapi/sc_1.sce b/sc/qa/unoapi/sc_1.sce |
93 |
-index fa1684c..cc8e1a5 100644 |
94 |
---- a/sc/qa/unoapi/sc_1.sce |
95 |
-+++ b/sc/qa/unoapi/sc_1.sce |
96 |
-@@ -24,10 +24,3 @@ |
97 |
- # i84554 -o sc.AccessibleEditableTextPara_PreviewNote |
98 |
- # i88241 -o sc.AccessibleEditableTextPara_HeaderFooter |
99 |
- -o sc.AccessibleEditableTextPara_PreviewCell |
100 |
---o sc.ScAccessibleCell |
101 |
--# i91044 -o sc.ScAccessibleCsvCell |
102 |
--# i91044 -o sc.ScAccessibleCsvGrid |
103 |
--# i84641 -o sc.ScAccessibleCsvRuler |
104 |
--# i88330 -o sc.ScAccessibleDocument |
105 |
--# i91045 -o sc.ScAccessibleDocumentPagePreview |
106 |
---o sc.ScAccessiblePageHeader |
107 |
-diff --git a/sc/qa/unoapi/sc_2.sce b/sc/qa/unoapi/sc_2.sce |
108 |
-index dbfc3e1..d235c5d 100644 |
109 |
---- a/sc/qa/unoapi/sc_2.sce |
110 |
-+++ b/sc/qa/unoapi/sc_2.sce |
111 |
-@@ -15,11 +15,6 @@ |
112 |
- # except in compliance with the License. You may obtain a copy of |
113 |
- # the License at http://www.apache.org/licenses/LICENSE-2.0 . |
114 |
- # |
115 |
--# fdo#FOO -o sc.ScAccessiblePageHeaderArea |
116 |
---o sc.ScAccessiblePreviewCell |
117 |
---o sc.ScAccessiblePreviewHeaderCell |
118 |
---o sc.ScAccessiblePreviewTable |
119 |
--# fdo#45337 -o sc.ScAccessibleSpreadsheet |
120 |
- # FIXME_REMOVE_WHEN_RE_BASE_COMPLETE |
121 |
- # -o sc.ScAnnotationObj |
122 |
- # -o sc.ScAnnotationShapeObj |
123 |
- |
124 |
-12:18 < _rene_> chris_wot: ping? |
125 |
-12:18 < chris_wot> heya |
126 |
-12:18 < chris_wot> you pinged? |
127 |
-12:19 < _rene_> chris_wot: any news on |
128 |
- https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815292? |
129 |
-12:20 < _rene_> (of course the this-night-uploaded rc3 also failed) |
130 |
-12:21 < chris_wot> ah, sorry - I've looked at an EMF regression, but I've not |
131 |
- gotten any further on that one |
132 |
-12:22 < chris_wot> I honestly think that for this one just disable the test for |
133 |
- now |
134 |
-12:22 < chris_wot> I'll ping the ML |
135 |
- |
136 |
-This seems fixed when opening the original doc. |
137 |
- |
138 |
-diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx |
139 |
-index 54eed4d..78019bd 100644 |
140 |
---- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx |
141 |
-+++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx |
142 |
-@@ -1128,30 +1128,30 @@ DECLARE_OOXMLEXPORT_TEST(testTDF93675, "no-numlevel-but-indented.odt") |
143 |
- |
144 |
- |
145 |
- |
146 |
--DECLARE_OOXMLEXPORT_TEST(testFlipAndRotateCustomShape, "flip_and_rotate.odt") |
147 |
--{ |
148 |
-- xmlDocPtr pXmlDoc = parseExport("word/document.xml"); |
149 |
-- if (!pXmlDoc) |
150 |
-- return; |
151 |
-- // there should be no flipH and flipV attributes in this case |
152 |
-- assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipH"); |
153 |
-- assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipV"); |
154 |
-- // check rotation angle |
155 |
-- assertXPath(pXmlDoc, "//a:xfrm", "rot", "13500000"); |
156 |
-- // check the first few coordinates of the polygon |
157 |
--#ifndef MACOSX /* Retina-related rounding roundtrip error |
158 |
-- * hard to smooth out due to the use of string compare |
159 |
-- * instead of number */ |
160 |
--#if !defined(_WIN32) |
161 |
-- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "x", "2351"); |
162 |
-- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "y", "3171"); |
163 |
-- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "x", "1695"); |
164 |
-- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "y", "3171"); |
165 |
-- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "x", "1695"); |
166 |
-- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "y", "1701"); |
167 |
--#endif |
168 |
--#endif |
169 |
--} |
170 |
-+//DECLARE_OOXMLEXPORT_TEST(testFlipAndRotateCustomShape, "flip_and_rotate.odt") |
171 |
-+//{ |
172 |
-+// xmlDocPtr pXmlDoc = parseExport("word/document.xml"); |
173 |
-+// if (!pXmlDoc) |
174 |
-+// return; |
175 |
-+// // there should be no flipH and flipV attributes in this case |
176 |
-+// assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipH"); |
177 |
-+// assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipV"); |
178 |
-+// // check rotation angle |
179 |
-+// assertXPath(pXmlDoc, "//a:xfrm", "rot", "13500000"); |
180 |
-+// // check the first few coordinates of the polygon |
181 |
-+//#ifndef MACOSX /* Retina-related rounding roundtrip error |
182 |
-+// * hard to smooth out due to the use of string compare |
183 |
-+// * instead of number */ |
184 |
-+//#if !defined(_WIN32) |
185 |
-+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "x", "2351"); |
186 |
-+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "y", "3171"); |
187 |
-+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "x", "1695"); |
188 |
-+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "y", "3171"); |
189 |
-+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "x", "1695"); |
190 |
-+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "y", "1701"); |
191 |
-+//#endif |
192 |
-+//#endif |
193 |
-+//} |
194 |
- |
195 |
- |
196 |
- CPPUNIT_PLUGIN_IMPLEMENT(); |
197 |
-diff --git a/svx/qa/unoapi/svx.sce b/svx/qa/unoapi/svx.sce |
198 |
-index 1c3925f..a16f001 100644 |
199 |
---- a/svx/qa/unoapi/svx.sce |
200 |
-+++ b/svx/qa/unoapi/svx.sce |
201 |
-@@ -25,7 +25,7 @@ |
202 |
- #i111216 -o svx.AccessiblePresentationGraphicShape |
203 |
- #i111216 -o svx.AccessiblePresentationOLEShape |
204 |
- #i85539 -o svx.AccessiblePresentationShape |
205 |
---o svx.AccessibleShape |
206 |
-+#-o svx.AccessibleShape |
207 |
- #i90294 -o svx.GraphicExporter |
208 |
- -o svx.SvxDrawPage |
209 |
- #i85501 -o svx.SvxGraphCtrlAccessibleContext |
210 |
- |
211 |
-19:26 <@x1sc0> _rene_, since that test is using exact dimensions, it seems it |
212 |
- fails on your side probably because the paragraph style is |
213 |
- different. 1. I will change the test to avoid the exact |
214 |
- dimensions. 2. meantime you can skip that test: |
215 |
-https://cgit.freedesktop.org/libreoffice/core/commit/?id=e05f16e6bf36efbaab16dd2ed1427a750ce7cafd |
216 |
-19:26 < IZBot> core - disable UI test that does exact comparison |
217 |
-19:27 < _rene_> mmh, ok, saw that but that was for a different test, so.. :) |
218 |
-19:27 -!- jacobo [~jaragunde@××××××××××××××.com] has quit [Quit: Leaving.] |
219 |
-19:27 < _rene_> thanks, will do |
220 |
- |
221 |
-diff --git a/uitest/writer_tests/tdf79236.py b/uitest/writer_tests/tdf79236.py |
222 |
-index 8585e48d8c64..704f42c009a1 100644 |
223 |
---- a/uitest/writer_tests/tdf79236.py |
224 |
-+++ b/uitest/writer_tests/tdf79236.py |
225 |
-@@ -8,8 +8,11 @@ from uitest.framework import UITestCase |
226 |
- import time |
227 |
- from uitest.uihelper.common import get_state_as_dict, type_text |
228 |
- |
229 |
-+import unittest |
230 |
-+ |
231 |
- class tdf79236(UITestCase): |
232 |
- |
233 |
-+ @unittest.skip("Currently broken") |
234 |
- def test_paragraph(self): |
235 |
- |
236 |
- self.ui_test.create_doc_in_start_center("writer") |
237 |
- |
238 |
-14:39 < ztamas> _rene_: chart2dump is used to fail because of font size differences, just use a bigger delta or disable it if it |
239 |
- fails for you. |
240 |
-14:40 <@sberg_> noelgrandin, no |
241 |
-14:40 < noelgrandin> sberg_, sure seems that way both in the debugger and in the resulting SAL_WARN output |
242 |
-14:42 < ztamas> _rene_: there were some work on making font rendering consistent on different platforms, but it's not finished |
243 |
- yet, I guess |
244 |
-diff --git a/chart2/Module_chart2.mk b/chart2/Module_chart2.mk |
245 |
-index 3273055d5373..cb452139170c 100644 |
246 |
---- a/chart2/Module_chart2.mk |
247 |
-+++ b/chart2/Module_chart2.mk |
248 |
-@@ -33,9 +33,9 @@ $(eval $(call gb_Module_add_slowcheck_targets,chart2,\ |
249 |
- CppunitTest_chart2_export \ |
250 |
- CppunitTest_chart2_import \ |
251 |
- CppunitTest_chart2_trendcalculators \ |
252 |
-- CppunitTest_chart2_dump \ |
253 |
- CppunitTest_chart2_pivot_chart_test \ |
254 |
- )) |
255 |
-+# CppunitTest_chart2_dump \ |
256 |
- |
257 |
- ifeq ($(ENABLE_CHART_TESTS),TRUE) |
258 |
- ifeq ($(WITH_FONTS), TRUE) |
259 |
-diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx |
260 |
-index 4d65beeb90c4..f3d71501c41a 100644 |
261 |
---- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx |
262 |
-+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx |
263 |
-@@ -1559,14 +1559,14 @@ DECLARE_OOXMLIMPORT_TEST(testTdf43017, "tdf43017.docx") |
264 |
- } |
265 |
- |
266 |
- |
267 |
--DECLARE_OOXMLIMPORT_TEST(testTdf112443, "tdf112443.docx") |
268 |
-+/*DECLARE_OOXMLIMPORT_TEST(testTdf112443, "tdf112443.docx") |
269 |
- { |
270 |
- // the position of the flying text frame should be off page |
271 |
- // 30624 below its anchor |
272 |
- OUString aTop = parseDump("//fly[1]/infos/bounds", "top"); |
273 |
- CPPUNIT_ASSERT_EQUAL( OUString("30624"), aTop ); |
274 |
- |
275 |
--} |
276 |
-+}*/ |
277 |
- |
278 |
- DECLARE_OOXMLIMPORT_TEST(testTdf113946, "tdf113946.docx") |
279 |
- { |
280 |
|
281 |
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 |
282 |
deleted file mode 100644 |
283 |
index bd84b31..0000000 |
284 |
--- a/app-office/libreoffice/files/libreoffice-6.0.3.2-testTdf108947.patch |
285 |
+++ /dev/null |
286 |
@@ -1,13 +0,0 @@ |
287 |
-diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx |
288 |
-index 457aedce0acb..4f02cf2b4040 100644 |
289 |
---- a/sw/qa/extras/rtfimport/rtfimport.cxx |
290 |
-+++ b/sw/qa/extras/rtfimport/rtfimport.cxx |
291 |
-@@ -1352,7 +1352,7 @@ DECLARE_RTFIMPORT_TEST(testImportHeaderFooter, "tdf108055.rtf") |
292 |
- DECLARE_RTFIMPORT_TEST(testTdf108947, "tdf108947.rtf") |
293 |
- { |
294 |
- //Check page count |
295 |
-- CPPUNIT_ASSERT_EQUAL(2, getPages()); |
296 |
-+ CPPUNIT_ASSERT_EQUAL(1, getPages()); |
297 |
- |
298 |
- //Check if Headers/Footers contain what they should in this document |
299 |
- uno::Reference<text::XText> xHeaderTextRight = getProperty<uno::Reference<text::XText>>( |
300 |
|
301 |
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 |
302 |
deleted file mode 100644 |
303 |
index afdca6b..0000000 |
304 |
--- a/app-office/libreoffice/files/libreoffice-6.0.6.2-disable-liborcus-unittest.patch |
305 |
+++ /dev/null |
306 |
@@ -1,13 +0,0 @@ |
307 |
---- a/sc/qa/unit/subsequent_filters-test.cxx 2018-02-22 18:45:41.000000000 +0100 |
308 |
-+++ b/sc/qa/unit/subsequent_filters-test.cxx 2018-03-02 11:24:08.616015560 +0100 |
309 |
-@@ -2395,7 +2395,9 @@ |
310 |
- CPPUNIT_ASSERT_MESSAGE("Style Name1 : Doesn't have Attribute background, but it should have.", |
311 |
- pStyleSheet->GetItemSet().HasItem(ATTR_BACKGROUND, &pItem)); |
312 |
- const SvxBrushItem* pBackground = static_cast<const SvxBrushItem*>(pItem); |
313 |
-- CPPUNIT_ASSERT_EQUAL(Color(254, 255, 204), pBackground->GetColor()); |
314 |
-+ /* This test fails with liborcus >= 0.13.3 |
315 |
-+ * CPPUNIT_ASSERT_EQUAL(Color(254, 255, 204), pBackground->GetColor()); |
316 |
-+ */ |
317 |
- |
318 |
- CPPUNIT_ASSERT_MESSAGE("Style Name1 : Doesn't have Attribute border, but it should have.", |
319 |
- pStyleSheet->GetItemSet().HasItem(ATTR_BORDER, &pItem)); |
320 |
|
321 |
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 |
322 |
deleted file mode 100644 |
323 |
index 5fbf6b3..0000000 |
324 |
--- a/app-office/libreoffice/files/libreoffice-6.0.6.2-linux-musl.patch |
325 |
+++ /dev/null |
326 |
@@ -1,60 +0,0 @@ |
327 |
---- libreoffice-5.3.0.3/configure.ac.orig 2017-01-26 22:22:46.000000000 +0000 |
328 |
-+++ libreoffice-5.3.0.3/configure.ac 2017-02-08 13:14:16.777547599 +0000 |
329 |
-@@ -652,7 +652,7 @@ |
330 |
- fi |
331 |
- ;; |
332 |
- |
333 |
--linux-gnu*|k*bsd*-gnu*) |
334 |
-+linux-gnu*|linux-musl*|k*bsd*-gnu*) |
335 |
- test_gtk=yes |
336 |
- build_gstreamer_1_0=yes |
337 |
- build_gstreamer_0_10=yes |
338 |
-@@ -4170,7 +4170,7 @@ |
339 |
- esac |
340 |
- ;; |
341 |
- |
342 |
--linux-gnu*) |
343 |
-+linux-gnu*|linux-musl*) |
344 |
- COM=GCC |
345 |
- USING_X11=TRUE |
346 |
- OS=LINUX |
347 |
-@@ -7197,7 +7197,7 @@ |
348 |
- test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread" |
349 |
- ;; |
350 |
- |
351 |
-- linux-gnu*) |
352 |
-+ linux-gnu*|linux-musl*) |
353 |
- JAVAINC="-I$JAVA_HOME/include" |
354 |
- JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux" |
355 |
- test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread" |
356 |
-@@ -9748,21 +9748,6 @@ |
357 |
- fi |
358 |
- AC_SUBST(SYSTEM_LIBEXTTEXTCAT_DATA) |
359 |
- |
360 |
--dnl *************************************** |
361 |
--dnl testing libc version for Linux... |
362 |
--dnl *************************************** |
363 |
--if test "$_os" = "Linux"; then |
364 |
-- AC_MSG_CHECKING([whether libc is >= 2.1.1]) |
365 |
-- exec 6>/dev/null # no output |
366 |
-- AC_CHECK_LIB(c, gnu_get_libc_version, HAVE_LIBC=yes; export HAVE_LIBC) |
367 |
-- exec 6>&1 # output on again |
368 |
-- if test "$HAVE_LIBC"; then |
369 |
-- AC_MSG_RESULT([yes]) |
370 |
-- else |
371 |
-- AC_MSG_ERROR([no, upgrade libc]) |
372 |
-- fi |
373 |
--fi |
374 |
-- |
375 |
- dnl ========================================= |
376 |
- dnl Check for the Windows SDK. |
377 |
- dnl ========================================= |
378 |
-@@ -12775,7 +12760,7 @@ |
379 |
- |
380 |
- case "$host_os" in |
381 |
- |
382 |
-- aix*|dragonfly*|freebsd*|linux-gnu*|*netbsd*|openbsd*) |
383 |
-+ aix*|dragonfly*|freebsd*|linux-gnu*|linux-musl*|*netbsd*|openbsd*) |
384 |
- if test "$ENABLE_JAVA" != ""; then |
385 |
- pathmunge "$JAVA_HOME/bin" "after" |
386 |
- fi |
387 |
|
388 |
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 |
389 |
deleted file mode 100644 |
390 |
index 4c3b359..0000000 |
391 |
--- a/app-office/libreoffice/files/libreoffice-6.0.6.2-musl-fix-execinfo.patch |
392 |
+++ /dev/null |
393 |
@@ -1,39 +0,0 @@ |
394 |
-diff --git a/sal/osl/unx/backtrace.h b/sal/osl/unx/backtrace.h |
395 |
-index 5fafc1c..408c12c 100644 |
396 |
---- a/sal/osl/unx/backtrace.h |
397 |
-+++ b/sal/osl/unx/backtrace.h |
398 |
-@@ -20,7 +20,7 @@ |
399 |
- #ifndef INCLUDED_SAL_OSL_UNX_BACKTRACE_H |
400 |
- #define INCLUDED_SAL_OSL_UNX_BACKTRACE_H |
401 |
- |
402 |
--#if defined (LINUX) |
403 |
-+#if defined (LINUX) && defined (__GLIBC__) |
404 |
- |
405 |
- #include <execinfo.h> |
406 |
- |
407 |
-diff --git a/sal/osl/unx/signal.cxx b/sal/osl/unx/signal.cxx |
408 |
-index f4c9a9c..da6d9cf 100644 |
409 |
---- a/sal/osl/unx/signal.cxx |
410 |
-+++ b/sal/osl/unx/signal.cxx |
411 |
-@@ -35,7 +35,7 @@ |
412 |
- |
413 |
- #endif /* MACOSX */ |
414 |
- |
415 |
--#ifdef LINUX |
416 |
-+#if defined(LINUX) && defined(__GLIBC__) |
417 |
- #include <execinfo.h> |
418 |
- #include <link.h> |
419 |
- #define INCLUDE_BACKTRACE |
420 |
-diff --git a/sal/osl/unx/backtrace.c b/sal/osl/unx/backtrace.c |
421 |
-index 1d9a58b..fd648e4 100644 |
422 |
---- a/sal/osl/unx/backtrace.c |
423 |
-+++ b/sal/osl/unx/backtrace.c |
424 |
-@@ -282,7 +282,7 @@ void backtrace_symbols_fd( void **buffer, int size, int fd ) |
425 |
- } |
426 |
- } |
427 |
- |
428 |
--#elif !defined LINUX |
429 |
-+#elif !defined(__GLIBC__) |
430 |
- |
431 |
- int backtrace( void **buffer, int max_frames ) |
432 |
- { |
433 |
|
434 |
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 |
435 |
deleted file mode 100644 |
436 |
index 4a837a9..0000000 |
437 |
--- a/app-office/libreoffice/files/libreoffice-6.0.6.2-musl-fix-includes.patch |
438 |
+++ /dev/null |
439 |
@@ -1,36 +0,0 @@ |
440 |
-diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx |
441 |
-index f177d86..99bb408 100644 |
442 |
---- a/sd/source/ui/remotecontrol/BluetoothServer.cxx |
443 |
-+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx |
444 |
-@@ -21,7 +21,7 @@ |
445 |
- #include <dbus/dbus.h> |
446 |
- #include <errno.h> |
447 |
- #include <fcntl.h> |
448 |
-- #include <sys/unistd.h> |
449 |
-+ #include <unistd.h> |
450 |
- #include <sys/socket.h> |
451 |
- #include <bluetooth/bluetooth.h> |
452 |
- #include <bluetooth/rfcomm.h> |
453 |
-diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx |
454 |
-index 932e928..b65ced7 100644 |
455 |
---- a/vcl/inc/headless/svpinst.hxx |
456 |
-+++ b/vcl/inc/headless/svpinst.hxx |
457 |
-@@ -30,7 +30,7 @@ |
458 |
- |
459 |
- #include <list> |
460 |
- |
461 |
--#include <time.h> |
462 |
-+#include <sys/time.h> |
463 |
- |
464 |
- #define VIRTUAL_DESKTOP_WIDTH 1024 |
465 |
- #define VIRTUAL_DESKTOP_HEIGHT 768 |
466 |
---- a/avmedia/source/vlc/wrapper/Types.hxx 2017-01-12 01:54:33.000000000 +0100 |
467 |
-+++ b/avmedia/source/vlc/wrapper/Types.hxx 2017-01-27 20:03:39.243895504 +0100 |
468 |
-@@ -15,6 +15,7 @@ |
469 |
- #if defined(_WIN32) |
470 |
- typedef __int64 libvlc_time_t; |
471 |
- #else |
472 |
-+# include <stdint.h> |
473 |
- typedef int64_t libvlc_time_t; |
474 |
- #endif |
475 |
- |
476 |
|
477 |
diff --git a/app-office/libreoffice/files/libreoffice-6.2-ldap-optional.patch b/app-office/libreoffice/files/libreoffice-6.2-ldap-optional.patch |
478 |
new file mode 100644 |
479 |
index 0000000..c926897 |
480 |
--- /dev/null |
481 |
+++ b/app-office/libreoffice/files/libreoffice-6.2-ldap-optional.patch |
482 |
@@ -0,0 +1,178 @@ |
483 |
+From 6776c53b7ce2e431d8636f4e5a755f50f787ec8f Mon Sep 17 00:00:00 2001 |
484 |
+From: Andrew Udvare <audvare@×××××.com> |
485 |
+Date: Tue, 8 Jan 2019 04:53:51 -0500 |
486 |
+Subject: Make LDAP support optional |
487 |
+ |
488 |
+Change-Id: Ifbd3903494a81e7b155bf6468f6ca2c50b3370a4 |
489 |
+Reviewed-on: https://gerrit.libreoffice.org/65958 |
490 |
+Tested-by: Jenkins |
491 |
+Reviewed-by: Markus Mohrhard <markus.mohrhard@××××××××××.com> |
492 |
+--- |
493 |
+ Repository.mk | 2 +- |
494 |
+ RepositoryExternal.mk | 3 ++- |
495 |
+ configure.ac | 24 ++++++++++++++++++++++- |
496 |
+ connectivity/Library_postgresql-sdbc-impl.mk | 2 +- |
497 |
+ extensions/Module_extensions.mk | 7 ++++++- |
498 |
+ external/postgresql/ExternalProject_postgresql.mk | 5 +++-- |
499 |
+ postprocess/Rdb_services.mk | 2 +- |
500 |
+ 7 files changed, 37 insertions(+), 8 deletions(-) |
501 |
+ |
502 |
+diff --git a/Repository.mk b/Repository.mk |
503 |
+index 4ae8528..4d8389b 100644 |
504 |
+--- a/Repository.mk |
505 |
++++ b/Repository.mk |
506 |
+@@ -389,7 +389,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ |
507 |
+ hyphen \ |
508 |
+ icg \ |
509 |
+ $(if $(ENABLE_JAVA),jdbc) \ |
510 |
+- ldapbe2 \ |
511 |
++ $(if $(ENABLE_LDAP),ldapbe2) \ |
512 |
+ $(if $(filter WNT,$(OS)),WinUserInfoBe) \ |
513 |
+ localebe1 \ |
514 |
+ log \ |
515 |
+diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk |
516 |
+index 602ff6d..3c9be87 100644 |
517 |
+--- a/RepositoryExternal.mk |
518 |
++++ b/RepositoryExternal.mk |
519 |
+@@ -2900,7 +2900,7 @@ endef |
520 |
+ |
521 |
+ endif # SYSTEM_HSQLDB |
522 |
+ |
523 |
+- |
524 |
++ifeq ($(ENABLE_LDAP),TRUE) |
525 |
+ ifneq ($(SYSTEM_OPENLDAP),) |
526 |
+ |
527 |
+ define gb_LinkTarget__use_openldap |
528 |
+@@ -2929,6 +2929,7 @@ $(call gb_LinkTarget_add_libs,$(1), \ |
529 |
+ ) |
530 |
+ |
531 |
+ endef |
532 |
++endif |
533 |
+ |
534 |
+ define gb_ExternalProject__use_openldap |
535 |
+ $(call gb_ExternalProject_use_external_project,$(1),openldap) |
536 |
+diff --git a/configure.ac b/configure.ac |
537 |
+index f880308..35c7e02 100644 |
538 |
+--- a/configure.ac |
539 |
++++ b/configure.ac |
540 |
+@@ -1519,6 +1519,11 @@ libo_FUZZ_ARG_ENABLE(formula-logger, |
541 |
+ ) |
542 |
+ ) |
543 |
+ |
544 |
++AC_ARG_ENABLE(ldap, |
545 |
++ AS_HELP_STRING([--disable-ldap], |
546 |
++ [Disable LDAP support.]), |
547 |
++,enable_ldap=yes) |
548 |
++ |
549 |
+ dnl =================================================================== |
550 |
+ dnl Optional Packages (--with/without-) |
551 |
+ dnl =================================================================== |
552 |
+@@ -9214,12 +9219,29 @@ else |
553 |
+ fi |
554 |
+ AC_SUBST(SYSTEM_ODBC_HEADERS) |
555 |
+ |
556 |
++dnl =================================================================== |
557 |
++dnl Enable LDAP support |
558 |
++dnl =================================================================== |
559 |
++ |
560 |
++if test "$_os" != "WINNT" -a "$_os" != "iOS" -a "$_os" != "Android"; then |
561 |
++AC_MSG_CHECKING([whether to enable LDAP support]) |
562 |
++ if test "$enable_ldap" != "yes"; then |
563 |
++ AC_MSG_RESULT([no]) |
564 |
++ ENABLE_LDAP="" |
565 |
++ enable_ldap=no |
566 |
++ else |
567 |
++ AC_MSG_RESULT([yes]) |
568 |
++ ENABLE_LDAP="TRUE" |
569 |
++ AC_DEFINE(HAVE_FEATURE_LDAP) |
570 |
++ fi |
571 |
++fi |
572 |
++AC_SUBST(ENABLE_LDAP) |
573 |
+ |
574 |
+ dnl =================================================================== |
575 |
+ dnl Check for system openldap |
576 |
+ dnl =================================================================== |
577 |
+ |
578 |
+-if test "$_os" != "WINNT" -a "$_os" != "iOS" -a "$_os" != "Android"; then |
579 |
++if test "$_os" != "WINNT" -a "$_os" != "iOS" -a "$_os" != "Android" -a "$ENABLE_LDAP" != ""; then |
580 |
+ AC_MSG_CHECKING([which openldap library to use]) |
581 |
+ if test "$with_system_openldap" = "yes"; then |
582 |
+ AC_MSG_RESULT([external]) |
583 |
+diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk |
584 |
+index 53cebd0..3d048f3 100644 |
585 |
+--- a/connectivity/Library_postgresql-sdbc-impl.mk |
586 |
++++ b/connectivity/Library_postgresql-sdbc-impl.mk |
587 |
+@@ -47,7 +47,7 @@ $(eval $(call gb_Library_use_externals,postgresql-sdbc-impl,\ |
588 |
+ postgresql \ |
589 |
+ $(if $(filter-out MSC,$(COM)), \ |
590 |
+ openssl \ |
591 |
+- openldap \ |
592 |
++ $(if $(ENABLE_LDAP),openldap) \ |
593 |
+ nss3 \ |
594 |
+ plc4 \ |
595 |
+ ssl3 \ |
596 |
+diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk |
597 |
+index f84a9ca..43dd929 100644 |
598 |
+--- a/extensions/Module_extensions.mk |
599 |
++++ b/extensions/Module_extensions.mk |
600 |
+@@ -16,7 +16,6 @@ $(eval $(call gb_Module_add_l10n_targets,extensions,\ |
601 |
+ ifneq ($(filter-out iOS ANDROID,$(OS)),) |
602 |
+ $(eval $(call gb_Module_add_targets,extensions,\ |
603 |
+ Library_abp \ |
604 |
+- Library_ldapbe2 \ |
605 |
+ $(if $(filter WNT,$(OS)),Library_WinUserInfoBe) \ |
606 |
+ Library_log \ |
607 |
+ Library_scn \ |
608 |
+@@ -28,6 +27,12 @@ $(eval $(call gb_Module_add_targets,extensions,\ |
609 |
+ )) |
610 |
+ endif |
611 |
+ |
612 |
++ifeq ($(ENABLE_LDAP),TRUE) |
613 |
++$(eval $(call gb_Module_add_targets,extensions,\ |
614 |
++ Library_ldapbe2 \ |
615 |
++)) |
616 |
++endif |
617 |
++ |
618 |
+ ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) |
619 |
+ $(eval $(call gb_Module_add_targets,extensions,\ |
620 |
+ Library_bib \ |
621 |
+diff --git a/external/postgresql/ExternalProject_postgresql.mk b/external/postgresql/ExternalProject_postgresql.mk |
622 |
+index f6617e5..fc4342c 100644 |
623 |
+--- a/external/postgresql/ExternalProject_postgresql.mk |
624 |
++++ b/external/postgresql/ExternalProject_postgresql.mk |
625 |
+@@ -10,7 +10,7 @@ |
626 |
+ $(eval $(call gb_ExternalProject_ExternalProject,postgresql)) |
627 |
+ |
628 |
+ $(eval $(call gb_ExternalProject_use_externals,postgresql,\ |
629 |
+- openldap \ |
630 |
++ $(if $(ENABLE_LDAP),openldap) \ |
631 |
+ openssl \ |
632 |
+ zlib \ |
633 |
+ )) |
634 |
+@@ -64,9 +64,10 @@ $(call gb_ExternalProject_get_state_target,postgresql,build) : |
635 |
+ $(if $(DISABLE_OPENSSL),,--with-openssl \ |
636 |
+ $(if $(WITH_KRB5), --with-krb5) \ |
637 |
+ $(if $(WITH_GSSAPI),--with-gssapi)) \ |
638 |
++ $(if $(ENABLE_LDAP),,--with-ldap=no) \ |
639 |
+ CPPFLAGS="$(postgresql_CPPFLAGS)" \ |
640 |
+ LDFLAGS="$(postgresql_LDFLAGS)" \ |
641 |
+- EXTRA_LDAP_LIBS="-llber -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4" \ |
642 |
++ $(if $(ENABLE_LDAP),EXTRA_LDAP_LIBS="-llber -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4") \ |
643 |
+ && cd src/interfaces/libpq \ |
644 |
+ && MAKEFLAGS= && $(MAKE) all-static-lib) |
645 |
+ |
646 |
+diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk |
647 |
+index c70d1ca..342f19b 100644 |
648 |
+--- a/postprocess/Rdb_services.mk |
649 |
++++ b/postprocess/Rdb_services.mk |
650 |
+@@ -293,7 +293,7 @@ $(eval $(call gb_Rdb_add_components,services,\ |
651 |
+ desktop/source/offacc/offacc \ |
652 |
+ $(if $(DISABLE_GUI),,desktop/source/splash/spl) \ |
653 |
+ extensions/source/abpilot/abp \ |
654 |
+- extensions/source/config/ldap/ldapbe2 \ |
655 |
++ $(if $(ENABLE_LDAP),extensions/source/config/ldap/ldapbe2) \ |
656 |
+ $(if $(filter WNT,$(OS)),\ |
657 |
+ extensions/source/config/WinUserInfo/WinUserInfoBe \ |
658 |
+ ) \ |
659 |
+-- |
660 |
+cgit v1.1 |
661 |
|
662 |
diff --git a/app-office/libreoffice/libreoffice-6.1.4.2.ebuild b/app-office/libreoffice/libreoffice-6.2.5.2.ebuild |
663 |
similarity index 88% |
664 |
rename from app-office/libreoffice/libreoffice-6.1.4.2.ebuild |
665 |
rename to app-office/libreoffice/libreoffice-6.2.5.2.ebuild |
666 |
index ba47781..5994e6d 100644 |
667 |
--- a/app-office/libreoffice/libreoffice-6.1.4.2.ebuild |
668 |
+++ b/app-office/libreoffice/libreoffice-6.2.5.2.ebuild |
669 |
@@ -1,9 +1,9 @@ |
670 |
# Copyright 1999-2019 Gentoo Authors |
671 |
# Distributed under the terms of the GNU General Public License v2 |
672 |
|
673 |
-EAPI=6 |
674 |
+EAPI=7 |
675 |
|
676 |
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} ) |
677 |
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) |
678 |
PYTHON_REQ_USE="threads(+),xml" |
679 |
|
680 |
MY_PV="${PV/_alpha/.alpha}" |
681 |
@@ -21,7 +21,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz" |
682 |
# PATCHSET="${P}-patchset-01.tar.xz" |
683 |
|
684 |
[[ ${MY_PV} == *9999* ]] && inherit git-r3 |
685 |
-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 |
686 |
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils |
687 |
|
688 |
DESCRIPTION="A full office productivity suite" |
689 |
HOMEPAGE="https://www.libreoffice.org" |
690 |
@@ -63,12 +63,11 @@ unset ADDONS_SRC |
691 |
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" |
692 |
|
693 |
IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird |
694 |
-googledrive gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc |
695 |
+googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test vlc |
696 |
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" |
697 |
|
698 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
699 |
bluetooth? ( dbus ) |
700 |
- kde? ( gtk ) |
701 |
libreoffice_extensions_nlpsolver? ( java ) |
702 |
libreoffice_extensions_scripting-beanshell? ( java ) |
703 |
libreoffice_extensions_scripting-javascript? ( java ) |
704 |
@@ -80,6 +79,14 @@ SLOT="0" |
705 |
[[ ${MY_PV} == *9999* ]] || \ |
706 |
KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux" |
707 |
|
708 |
+BDEPEND=" |
709 |
+ dev-util/intltool |
710 |
+ sys-devel/bison |
711 |
+ sys-devel/flex |
712 |
+ sys-devel/gettext |
713 |
+ virtual/pkgconfig |
714 |
+ odk? ( >=app-doc/doxygen-1.8.4 ) |
715 |
+" |
716 |
COMMON_DEPEND="${PYTHON_DEPS} |
717 |
app-arch/unzip |
718 |
app-arch/zip |
719 |
@@ -111,7 +118,7 @@ COMMON_DEPEND="${PYTHON_DEPS} |
720 |
dev-libs/icu:= |
721 |
dev-libs/libassuan |
722 |
dev-libs/libgpg-error |
723 |
- =dev-libs/liborcus-0.13* |
724 |
+ >=dev-libs/liborcus-0.14.0 |
725 |
dev-libs/librevenge |
726 |
dev-libs/libxml2 |
727 |
dev-libs/libxslt |
728 |
@@ -119,6 +126,7 @@ COMMON_DEPEND="${PYTHON_DEPS} |
729 |
dev-libs/nss |
730 |
>=dev-libs/redland-1.0.16 |
731 |
>=dev-libs/xmlsec-1.2.24[nss] |
732 |
+ media-gfx/fontforge |
733 |
media-gfx/graphite2 |
734 |
media-libs/fontconfig |
735 |
media-libs/freetype:2 |
736 |
@@ -133,7 +141,6 @@ COMMON_DEPEND="${PYTHON_DEPS} |
737 |
media-libs/libzmf |
738 |
net-libs/neon |
739 |
net-misc/curl |
740 |
- net-nds/openldap |
741 |
sci-mathematics/lpsolve |
742 |
sys-libs/zlib |
743 |
virtual/glu |
744 |
@@ -144,10 +151,13 @@ COMMON_DEPEND="${PYTHON_DEPS} |
745 |
x11-libs/libXrandr |
746 |
x11-libs/libXrender |
747 |
accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] ) |
748 |
- bluetooth? ( net-wireless/bluez ) |
749 |
+ bluetooth? ( |
750 |
+ dev-libs/glib:2 |
751 |
+ net-wireless/bluez |
752 |
+ ) |
753 |
coinmp? ( sci-libs/coinor-mp ) |
754 |
cups? ( net-print/cups ) |
755 |
- dbus? ( dev-libs/dbus-glib ) |
756 |
+ dbus? ( sys-apps/dbus ) |
757 |
eds? ( |
758 |
dev-libs/glib:2 |
759 |
gnome-base/dconf |
760 |
@@ -182,32 +192,14 @@ COMMON_DEPEND="${PYTHON_DEPS} |
761 |
kde-frameworks/kio:5 |
762 |
kde-frameworks/kwindowsystem:5 |
763 |
) |
764 |
+ ldap? ( net-nds/openldap ) |
765 |
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) |
766 |
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) |
767 |
- mysql? ( dev-db/mysql-connector-c++ ) |
768 |
+ mariadb? ( dev-db/mariadb-connector-c ) |
769 |
+ !mariadb? ( dev-db/mysql-connector-c ) |
770 |
pdfimport? ( app-text/poppler:=[cxx] ) |
771 |
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) |
772 |
" |
773 |
- |
774 |
-RDEPEND="${COMMON_DEPEND} |
775 |
- !app-office/libreoffice-bin |
776 |
- !app-office/libreoffice-bin-debug |
777 |
- !app-office/openoffice |
778 |
- media-fonts/liberation-fonts |
779 |
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) |
780 |
- java? ( >=virtual/jre-1.6 ) |
781 |
- kde? ( kde-frameworks/breeze-icons:* ) |
782 |
- vlc? ( media-video/vlc ) |
783 |
-" |
784 |
- |
785 |
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then |
786 |
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*" |
787 |
-else |
788 |
- # Translations are not reliable on live ebuilds |
789 |
- # rather force people to use english only. |
790 |
- PDEPEND="!app-office/libreoffice-l10n" |
791 |
-fi |
792 |
- |
793 |
# FIXME: cppunit should be moved to test conditional |
794 |
# after everything upstream is under gbuild |
795 |
# as dmake execute tests right away |
796 |
@@ -217,14 +209,9 @@ DEPEND="${COMMON_DEPEND} |
797 |
dev-perl/Archive-Zip |
798 |
>=dev-util/cppunit-1.14.0 |
799 |
>=dev-util/gperf-3 |
800 |
- dev-util/intltool |
801 |
- =dev-util/mdds-1.3*:1= |
802 |
+ >=dev-util/mdds-1.4.1:1= |
803 |
media-libs/glm |
804 |
- sys-devel/bison |
805 |
- sys-devel/flex |
806 |
- sys-devel/gettext |
807 |
sys-devel/ucpp |
808 |
- virtual/pkgconfig |
809 |
x11-base/xorg-proto |
810 |
x11-libs/libXt |
811 |
x11-libs/libXtst |
812 |
@@ -232,7 +219,6 @@ DEPEND="${COMMON_DEPEND} |
813 |
dev-java/ant-core |
814 |
>=virtual/jdk-1.6 |
815 |
) |
816 |
- odk? ( >=app-doc/doxygen-1.8.4 ) |
817 |
test? ( |
818 |
app-crypt/gnupg |
819 |
dev-util/cppunit |
820 |
@@ -240,8 +226,27 @@ DEPEND="${COMMON_DEPEND} |
821 |
media-fonts/liberation-fonts |
822 |
) |
823 |
" |
824 |
+RDEPEND="${COMMON_DEPEND} |
825 |
+ !app-office/libreoffice-bin |
826 |
+ !app-office/libreoffice-bin-debug |
827 |
+ !app-office/openoffice |
828 |
+ media-fonts/liberation-fonts |
829 |
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) |
830 |
+ java? ( >=virtual/jre-1.6 ) |
831 |
+ kde? ( kde-frameworks/breeze-icons:* ) |
832 |
+ vlc? ( media-video/vlc ) |
833 |
+" |
834 |
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then |
835 |
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*" |
836 |
+else |
837 |
+ # Translations are not reliable on live ebuilds |
838 |
+ # rather force people to use english only. |
839 |
+ PDEPEND="!app-office/libreoffice-l10n" |
840 |
+fi |
841 |
|
842 |
PATCHES=( |
843 |
+ # master branch |
844 |
+ "${FILESDIR}/${PN}-6.2-ldap-optional.patch" |
845 |
# "${WORKDIR}"/${PATCHSET/.tar.xz/} |
846 |
|
847 |
# not upstreamable stuff |
848 |
@@ -396,6 +401,7 @@ src_configure() { |
849 |
--with-system-headers |
850 |
--with-system-jars |
851 |
--with-system-libs |
852 |
+ --enable-build-opensymbol |
853 |
--enable-cairo-canvas |
854 |
--enable-largefile |
855 |
--enable-mergelibs |
856 |
@@ -404,18 +410,16 @@ src_configure() { |
857 |
--enable-randr |
858 |
--enable-release-build |
859 |
--disable-breakpad |
860 |
+ --disable-bundle-mariadb |
861 |
--disable-ccache |
862 |
--disable-dependency-tracking |
863 |
--disable-epm |
864 |
--disable-fetch-external |
865 |
--disable-gstreamer-0-10 |
866 |
- --disable-kde5 |
867 |
--disable-online-update |
868 |
--disable-openssl |
869 |
--disable-pdfium |
870 |
- --disable-qt5 |
871 |
--disable-report-builder |
872 |
- --with-alloc=system |
873 |
--with-build-version="${gentoo_buildid}" |
874 |
--enable-extension-integration |
875 |
--with-external-dict-dir="${EPREFIX}/usr/share/myspell" |
876 |
@@ -430,8 +434,8 @@ src_configure() { |
877 |
--with-x |
878 |
--without-fonts |
879 |
--without-myspell-dicts |
880 |
- --without-help |
881 |
- --with-helppack-integration |
882 |
+ --with-help="html" |
883 |
+ --without-helppack-integration |
884 |
--with-system-gpgmepp |
885 |
--without-system-sane |
886 |
$(use_enable bluetooth sdremote-bluetooth) |
887 |
@@ -444,8 +448,9 @@ src_configure() { |
888 |
$(use_enable gstreamer gstreamer-1-0) |
889 |
$(use_enable gtk gtk3) |
890 |
$(use_enable gtk2 gtk) |
891 |
- $(use_enable kde gtk3-kde5) |
892 |
- $(use_enable mysql ext-mariadb-connector) |
893 |
+ $(use_enable kde kde5) |
894 |
+ $(use_enable kde qt5) |
895 |
+ $(use_enable ldap) |
896 |
$(use_enable odk) |
897 |
$(use_enable pdfimport) |
898 |
$(use_enable postgres postgresql-sdbc) |
899 |
@@ -455,10 +460,13 @@ src_configure() { |
900 |
$(use_with googledrive gdrive-client-id ${google_default_client_id}) |
901 |
$(use_with googledrive gdrive-client-secret ${google_default_client_secret}) |
902 |
$(use_with java) |
903 |
- $(use_with mysql system-mysql-cppconn) |
904 |
$(use_with odk doxygen) |
905 |
) |
906 |
|
907 |
+ if use gtk && use kde; then |
908 |
+ myeconfargs+=( --enable-gtk3-kde5 ) |
909 |
+ fi |
910 |
+ |
911 |
if use eds || use gtk; then |
912 |
myeconfargs+=( --enable-dconf --enable-gio ) |
913 |
else |
914 |
@@ -493,6 +501,7 @@ src_configure() { |
915 |
|
916 |
is-flagq "-flto*" && myeconfargs+=( --enable-lto ) |
917 |
|
918 |
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \ |
919 |
econf "${myeconfargs[@]}" |
920 |
} |
921 |
|
922 |
@@ -503,24 +512,6 @@ src_compile() { |
923 |
addpredict /dev/ati |
924 |
addpredict /dev/nvidiactl |
925 |
|
926 |
- # hack for offlinehelp, this needs fixing upstream at some point |
927 |
- # it is broken because we send --without-help |
928 |
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506 |
929 |
- ( |
930 |
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die |
931 |
- source "${T}/config_host.mk" 2&> /dev/null |
932 |
- |
933 |
- local path="${WORKDIR}/helpcontent2/source/auxiliary/" |
934 |
- mkdir -p "${path}" || die |
935 |
- |
936 |
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\"" |
937 |
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \ |
938 |
- -dir=helpcontent2/source/media/helpimg \ |
939 |
- > "${path}/helpimg.ilst" |
940 |
- [[ -s "${path}/helpimg.ilst" ]] || \ |
941 |
- ewarn "The help images list is empty, something is fishy, report a bug." |
942 |
- ) |
943 |
- |
944 |
local target |
945 |
use test && target="build" || target="build-nocheck" |
946 |
|
947 |
@@ -552,27 +543,18 @@ src_install() { |
948 |
insinto /usr/$(get_libdir)/${PN}/program |
949 |
newins "${WORKDIR}/branding-sofficerc" sofficerc |
950 |
dodir /etc/env.d |
951 |
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die |
952 |
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die |
953 |
fi |
954 |
- |
955 |
- # Hack for offlinehelp, this needs fixing upstream at some point. |
956 |
- # It is broken because we send --without-help |
957 |
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506 |
958 |
- insinto /usr/$(get_libdir)/libreoffice/help |
959 |
- doins xmlhelp/util/*.xsl |
960 |
- |
961 |
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin |
962 |
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin |
963 |
} |
964 |
|
965 |
pkg_postinst() { |
966 |
- gnome2_icon_cache_update |
967 |
+ xdg_icon_cache_update |
968 |
xdg_desktop_database_update |
969 |
xdg_mimeinfo_database_update |
970 |
} |
971 |
|
972 |
pkg_postrm() { |
973 |
- gnome2_icon_cache_update |
974 |
+ xdg_icon_cache_update |
975 |
xdg_desktop_database_update |
976 |
xdg_mimeinfo_database_update |
977 |
} |
978 |
|
979 |
diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml |
980 |
index 1035568..6b51466 100644 |
981 |
--- a/app-office/libreoffice/metadata.xml |
982 |
+++ b/app-office/libreoffice/metadata.xml |
983 |
@@ -14,6 +14,7 @@ version</longdescription> |
984 |
<flag name="coinmp">Use sci-libs/coinor-mp as alternative solver</flag> |
985 |
<flag name="googledrive">Enable support for remote files on Google Drive</flag> |
986 |
<flag name="gtk2">Enable legacy gtk2 frontend</flag> |
987 |
+ <flag name="mariadb">Prefer mariadb connector over mysql connector</flag> |
988 |
<flag name="odk">Build the Office Development Kit</flag> |
989 |
<flag name="pdfimport">Enable PDF import via the Poppler library</flag> |
990 |
<flag name="vlc">Use <pkg>media-video/vlc</pkg> for video embedding</flag> |