1 |
commit: dc34107985bf6375e54dace8b6f8762b2eabf8d7 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun May 31 21:00:28 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun May 31 21:08:38 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc341079 |
7 |
|
8 |
app-office/libreoffice: Drop 6.3.4.2-r1 |
9 |
|
10 |
Package-Manager: Portage-2.3.100, Repoman-2.3.22 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
app-office/libreoffice/Manifest | 2 - |
14 |
.../libreoffice-6.3.3.2-mysql-connector-c-8.patch | 45 -- |
15 |
.../files/libreoffice-6.3.4.2-poppler-0.83.patch | 72 --- |
16 |
.../libreoffice/libreoffice-6.3.4.2-r1.ebuild | 559 --------------------- |
17 |
app-office/libreoffice/metadata.xml | 1 - |
18 |
5 files changed, 679 deletions(-) |
19 |
|
20 |
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest |
21 |
index 8a38d5aa745..973d29b2b71 100644 |
22 |
--- a/app-office/libreoffice/Manifest |
23 |
+++ b/app-office/libreoffice/Manifest |
24 |
@@ -5,11 +5,9 @@ DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c18 |
25 |
DIST QR-Code-generator-1.4.0.tar.gz 146339 BLAKE2B b2cb329877426861e0245747ac1e8f1275ca7428b3c6768af60dec5c9bb46e93a3fee81fc77257e151604b5f6748c9f29582e9fccc2a4088747c95fe5f673124 SHA512 314a757bfdf9a38bcf07fd7a0103d28a2d1dd7311b8234761304efeef7bfdb740db78ab01e6b67e99a28d523cc2be9c1073b2de9d65e853d191c3dad19af56d0 |
26 |
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a |
27 |
DIST dtoa-20180411.tgz 48893 BLAKE2B 4a03dc67e44353ae1c0653c8305d2df9bcfef16b48dff6df5c857a6bd0510a92aa6d9b9660ad63b2344d5195fef072e526f8d7900791b15442923b63196dda3f SHA512 722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85 |
28 |
-DIST libreoffice-6.3.4.2.tar.xz 225632492 BLAKE2B 587fe7e6298ded60fa08963f572733eb8e387c00b428201bb6f1de7eddcf9d9ee97438231ed3f961bd22628bde0fd9dfeacb63febdc566cde781bcebb9c9a71d SHA512 2ed687ae805da36635419729066a2924f1e38a6b0f8d2692c42b366450a261012adfcd8a5d7915d9cfd292d07519fc32c596cdb56d7be6b12a49618b18d6f3d2 |
29 |
DIST libreoffice-6.4.3.2.tar.xz 230409812 BLAKE2B f9cdad1540c45525bd70596dc3033e3466fcdf3d96547222b936141e49ff6d45581ca59d0e42c4bb79fcb63586d748ccafae712369e024105235e2a9b69be7ce SHA512 ee11c704fa7184ffe371aa36c835c4c7fb06ef03d08fa0a5a9e647e80610db275e091d1ac79c1fe11af0c7f14dd72c821da9e7e6ba59573fc88cec79f84c873a |
30 |
DIST libreoffice-6.4.4.2.tar.xz 231325236 BLAKE2B 25e1c765cb0ff9c195ca46a9fe857eef22ab6319da6b069e2c5c093a8f13eac2e1c5efa31fbacd4e3acbdc07e75745ff5c62c180cb61141319422720405a4638 SHA512 8e2b6a2d34fbc182ce4ec0b6d6bfb30665ff5cee0a27a22551c71d4eddf63b812d676ea8dea9a2e4bb028a2365b5e23908679efbe4696032e1abeedecb85b8d3 |
31 |
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f |
32 |
-DIST libreoffice-help-6.3.4.2.tar.xz 13191636 BLAKE2B c1696efa0ec9fef9dbcc0c0388de8a384484af1453d200e08820ba910cdcb65638b189566a19868281fd1777213812fde06adb07c1a662302eea1d0a791ff5a0 SHA512 8c74c82c7d73adb1523300d1f7500769f5a623fdba60b440a63c122cbfeb631a6a34ecbcb115b0154a6957be1918306f7d0c1f465030f8e8cfd5c9a1acad17c9 |
33 |
DIST libreoffice-help-6.4.3.2.tar.xz 88297704 BLAKE2B bbd1af159c8b8db1909335f37095812ec3ce81d73644a30a85f3e37daeabeb9a158451b8e586f24d4b7544c8cd0948eeb20ede464384c3277d196f33322e63fb SHA512 9f8c1bcde27d153389d124af1393d0939262c85a1624f0b475a5515b5737612cb607d04742a069534771eee51ba98896926804ec7001d6bc2110dccdd6e7615a |
34 |
DIST libreoffice-help-6.4.4.2.tar.xz 88296340 BLAKE2B 73ef558b830e0e2899eb72727e0eb81327807ff2d474c8d956700a09bcadc73cbff26688063f91d3a496afa55ab9a7d4847d84334b89fe4fafe17fb445fbb33d SHA512 7084428e63a458c4e35c135b16dd980fa98695be0ba974cac656a7ef6cb15b059a082891c3f74b72a62f92549afefe46c14ab30b5491fd9e3fea6d5923720b3d |
35 |
DIST skia-m83-8ce842d38d0b32149e874d6855c91e8c68ba65a7.tar.xz 8218672 BLAKE2B cfeb805d82ce1f5dd70c7365983fa8107d5ccda9409b2654c032115cdf8a1c32fa0451162b0cceec3dcc0054e3d0d0e13583ea93843b0d0a6eb948cc31c15ce0 SHA512 1018fc1cc8a7edc15745cc20791f9a22e5b318018ba619d6cb5b6995d3e81ab93c910bb3a42734872d3be54893c2ce7db507b2c61088660b2ce6630ff9b36ebb |
36 |
|
37 |
diff --git a/app-office/libreoffice/files/libreoffice-6.3.3.2-mysql-connector-c-8.patch b/app-office/libreoffice/files/libreoffice-6.3.3.2-mysql-connector-c-8.patch |
38 |
deleted file mode 100644 |
39 |
index 5fa7b343f4f..00000000000 |
40 |
--- a/app-office/libreoffice/files/libreoffice-6.3.3.2-mysql-connector-c-8.patch |
41 |
+++ /dev/null |
42 |
@@ -1,45 +0,0 @@ |
43 |
-From 5917ba8bc645a2b105ec089101b8a664481b5b61 Mon Sep 17 00:00:00 2001 |
44 |
-From: Peter Levine <plevine457@×××××.com> |
45 |
-Date: Thu, 17 Oct 2019 23:08:57 -0400 |
46 |
-Subject: Fix building against MySQL Connector/C 8 |
47 |
- |
48 |
-In MySQL Connector/C 8, my_bool is replaced by bool. It was |
49 |
-previously defined as char. When building against |
50 |
-MySQL Connector/C 8, this leads to type punning build errors. |
51 |
-Redefine affected members of struct BindMetaData as bool if using |
52 |
-version 8 of greater. Otherwise, default to char. |
53 |
- |
54 |
-Change-Id: If12b975d95afae86502867cb334cb4195802f91d |
55 |
-Reviewed-on: https://gerrit.libreoffice.org/81002 |
56 |
-Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@×××.de> |
57 |
-Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@×××.de> |
58 |
---- |
59 |
- .../source/drivers/mysqlc/mysqlc_preparedstatement.hxx | 10 ++++++++-- |
60 |
- 1 file changed, 8 insertions(+), 2 deletions(-) |
61 |
- |
62 |
-diff --git a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx |
63 |
-index 1df2c70..3450473 100644 |
64 |
---- a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx |
65 |
-+++ b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx |
66 |
-@@ -39,11 +39,17 @@ using ::com::sun::star::uno::Reference; |
67 |
- using ::com::sun::star::uno::RuntimeException; |
68 |
- using ::com::sun::star::uno::Type; |
69 |
- |
70 |
-+#if defined MYSQL_VERSION_ID && (MYSQL_VERSION_ID >= 80000) && !defined MARIADB_BASE_VERSION |
71 |
-+using my_bool = bool; |
72 |
-+#else |
73 |
-+using my_bool = char; |
74 |
-+#endif |
75 |
-+ |
76 |
- struct BindMetaData |
77 |
- { |
78 |
-- char is_null = 0; |
79 |
-+ my_bool is_null = 0; |
80 |
- unsigned long length = 0; |
81 |
-- char error = 0; |
82 |
-+ my_bool error = 0; |
83 |
- }; |
84 |
- |
85 |
- typedef ::cppu::ImplHelper5<css::sdbc::XPreparedStatement, css::sdbc::XParameters, |
86 |
--- |
87 |
-cgit v1.1 |
88 |
|
89 |
diff --git a/app-office/libreoffice/files/libreoffice-6.3.4.2-poppler-0.83.patch b/app-office/libreoffice/files/libreoffice-6.3.4.2-poppler-0.83.patch |
90 |
deleted file mode 100644 |
91 |
index d5697f29f01..00000000000 |
92 |
--- a/app-office/libreoffice/files/libreoffice-6.3.4.2-poppler-0.83.patch |
93 |
+++ /dev/null |
94 |
@@ -1,72 +0,0 @@ |
95 |
-From 9065cd8d9a19864f6b618f2dc10daf577badd9ee Mon Sep 17 00:00:00 2001 |
96 |
-From: Martin Milata <martin@××××××××××××.cz> |
97 |
-Date: Wed, 4 Dec 2019 02:37:40 +0100 |
98 |
-Subject: Fix build with poppler-0.83 |
99 |
- |
100 |
-Change-Id: I7a3684932b8f9c403a3368b42fa4d8039c67f1a9 |
101 |
-Reviewed-on: https://gerrit.libreoffice.org/84384 |
102 |
-Tested-by: Jenkins |
103 |
-Reviewed-by: Michael Stahl <michael.stahl@×××.de> |
104 |
---- |
105 |
- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 7 +++++++ |
106 |
- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 4 ++++ |
107 |
- sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx | 4 ++++ |
108 |
- 3 files changed, 15 insertions(+) |
109 |
- |
110 |
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |
111 |
-index 26048177e87d..e9c2a407c279 100644 |
112 |
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |
113 |
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |
114 |
-@@ -491,11 +491,18 @@ void PDFOutDev::writeFontFile( GfxFont* gfxFont ) const |
115 |
- gfree(pBuf); |
116 |
- } |
117 |
- |
118 |
-+#if POPPLER_CHECK_VERSION(0, 83, 0) |
119 |
-+void PDFOutDev::printPath( const GfxPath* pPath ) |
120 |
-+#else |
121 |
- void PDFOutDev::printPath( GfxPath* pPath ) |
122 |
-+#endif |
123 |
- { |
124 |
- int nSubPaths = pPath ? pPath->getNumSubpaths() : 0; |
125 |
- for( int i=0; i<nSubPaths; i++ ) |
126 |
- { |
127 |
-+#if POPPLER_CHECK_VERSION(0, 83, 0) |
128 |
-+ const |
129 |
-+#endif |
130 |
- GfxSubpath* pSub = pPath->getSubpath( i ); |
131 |
- const int nPoints = pSub->getNumPoints(); |
132 |
- |
133 |
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx |
134 |
-index 02f6b59f6f15..2e7d2186f9a1 100644 |
135 |
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx |
136 |
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx |
137 |
-@@ -149,7 +149,11 @@ namespace pdfi |
138 |
- |
139 |
- int parseFont( long long nNewId, GfxFont* pFont, GfxState* state ) const; |
140 |
- void writeFontFile( GfxFont* gfxFont ) const; |
141 |
-+#if POPPLER_CHECK_VERSION(0, 83, 0) |
142 |
-+ static void printPath( const GfxPath* pPath ); |
143 |
-+#else |
144 |
- static void printPath( GfxPath* pPath ); |
145 |
-+#endif |
146 |
- |
147 |
- public: |
148 |
- explicit PDFOutDev( PDFDoc* pDoc ); |
149 |
-diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx |
150 |
-index 42178b650cdd..b1a54bd09c5f 100644 |
151 |
---- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx |
152 |
-+++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx |
153 |
-@@ -68,7 +68,11 @@ int main(int argc, char **argv) |
154 |
- } |
155 |
- |
156 |
- // read config file |
157 |
-+#if POPPLER_CHECK_VERSION(0, 83, 0) |
158 |
-+ globalParams = std::make_unique<GlobalParams>(); |
159 |
-+#else |
160 |
- globalParams = new GlobalParams(); |
161 |
-+#endif |
162 |
- globalParams->setErrQuiet(true); |
163 |
- #if defined(_MSC_VER) |
164 |
- globalParams->setupBaseFonts(nullptr); |
165 |
--- |
166 |
-cgit v1.2.1 |
167 |
|
168 |
diff --git a/app-office/libreoffice/libreoffice-6.3.4.2-r1.ebuild b/app-office/libreoffice/libreoffice-6.3.4.2-r1.ebuild |
169 |
deleted file mode 100644 |
170 |
index 9822d3839d1..00000000000 |
171 |
--- a/app-office/libreoffice/libreoffice-6.3.4.2-r1.ebuild |
172 |
+++ /dev/null |
173 |
@@ -1,559 +0,0 @@ |
174 |
-# Copyright 1999-2020 Gentoo Authors |
175 |
-# Distributed under the terms of the GNU General Public License v2 |
176 |
- |
177 |
-EAPI=7 |
178 |
- |
179 |
-PYTHON_COMPAT=( python3_{6,7,8} ) |
180 |
-PYTHON_REQ_USE="threads(+),xml" |
181 |
- |
182 |
-MY_PV="${PV/_alpha/.alpha}" |
183 |
-MY_PV="${MY_PV/_beta/.beta}" |
184 |
-# experimental ; release ; old |
185 |
-# Usually the tarballs are moved a lot so this should make everyone happy. |
186 |
-DEV_URI=" |
187 |
- https://dev-builds.libreoffice.org/pre-releases/src |
188 |
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/ |
189 |
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src |
190 |
-" |
191 |
-ADDONS_URI="https://dev-www.libreoffice.org/src/" |
192 |
- |
193 |
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz" |
194 |
-# PATCHSET="${P}-patchset-01.tar.xz" |
195 |
- |
196 |
-[[ ${MY_PV} == *9999* ]] && inherit git-r3 |
197 |
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils |
198 |
- |
199 |
-DESCRIPTION="A full office productivity suite" |
200 |
-HOMEPAGE="https://www.libreoffice.org" |
201 |
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )" |
202 |
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}" |
203 |
- |
204 |
-# Split modules following git/tarballs; Core MUST be first! |
205 |
-# Help is used for the image generator |
206 |
-# Only release has the tarballs |
207 |
-if [[ ${MY_PV} != *9999* ]]; then |
208 |
- for i in ${DEV_URI}; do |
209 |
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz" |
210 |
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz" |
211 |
- done |
212 |
- unset i |
213 |
-fi |
214 |
-unset DEV_URI |
215 |
- |
216 |
-# Really required addons |
217 |
-# These are bundles that can't be removed for now due to huge patchsets. |
218 |
-# If you want them gone, patches are welcome. |
219 |
-ADDONS_SRC=( |
220 |
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )" |
221 |
- # no release for 8 years, should we package it? |
222 |
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" |
223 |
- # Does not build with 1.6 rhino at all |
224 |
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" |
225 |
- # requirement of rhino |
226 |
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" |
227 |
- # not packageable |
228 |
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" |
229 |
-) |
230 |
-SRC_URI+=" ${ADDONS_SRC[*]}" |
231 |
- |
232 |
-unset ADDONS_URI |
233 |
-unset ADDONS_SRC |
234 |
- |
235 |
-# Extensions that need extra work: |
236 |
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" |
237 |
- |
238 |
-IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird |
239 |
-googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test |
240 |
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" |
241 |
- |
242 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE} |
243 |
- bluetooth? ( dbus ) |
244 |
- libreoffice_extensions_nlpsolver? ( java ) |
245 |
- libreoffice_extensions_scripting-beanshell? ( java ) |
246 |
- libreoffice_extensions_scripting-javascript? ( java ) |
247 |
- libreoffice_extensions_wiki-publisher? ( java ) |
248 |
-" |
249 |
- |
250 |
-RESTRICT="!test? ( test )" |
251 |
- |
252 |
-LICENSE="|| ( LGPL-3 MPL-1.1 )" |
253 |
-SLOT="0" |
254 |
-[[ ${MY_PV} == *9999* ]] || \ |
255 |
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux" |
256 |
- |
257 |
-BDEPEND=" |
258 |
- dev-util/intltool |
259 |
- sys-devel/bison |
260 |
- sys-devel/flex |
261 |
- sys-devel/gettext |
262 |
- virtual/pkgconfig |
263 |
- odk? ( >=app-doc/doxygen-1.8.4 ) |
264 |
-" |
265 |
-COMMON_DEPEND="${PYTHON_DEPS} |
266 |
- app-arch/unzip |
267 |
- app-arch/zip |
268 |
- app-crypt/gpgme[cxx] |
269 |
- app-text/hunspell:= |
270 |
- >=app-text/libabw-0.1.0 |
271 |
- >=app-text/libebook-0.1 |
272 |
- app-text/libepubgen |
273 |
- >=app-text/libetonyek-0.1 |
274 |
- app-text/libexttextcat |
275 |
- app-text/liblangtag |
276 |
- >=app-text/libmspub-0.1.0 |
277 |
- >=app-text/libmwaw-0.3.1 |
278 |
- app-text/libnumbertext |
279 |
- >=app-text/libodfgen-0.1.0 |
280 |
- app-text/libqxp |
281 |
- app-text/libstaroffice |
282 |
- app-text/libwpd:0.10[tools] |
283 |
- app-text/libwpg:0.3 |
284 |
- >=app-text/libwps-0.4 |
285 |
- app-text/mythes |
286 |
- >=dev-cpp/clucene-2.3.3.4-r2 |
287 |
- >=dev-cpp/libcmis-0.5.2 |
288 |
- dev-db/unixODBC |
289 |
- dev-lang/perl |
290 |
- dev-libs/boost:=[nls] |
291 |
- dev-libs/expat |
292 |
- dev-libs/hyphen |
293 |
- dev-libs/icu:= |
294 |
- dev-libs/libassuan |
295 |
- dev-libs/libgpg-error |
296 |
- =dev-libs/liborcus-0.14* |
297 |
- dev-libs/librevenge |
298 |
- dev-libs/libxml2 |
299 |
- dev-libs/libxslt |
300 |
- dev-libs/nspr |
301 |
- dev-libs/nss |
302 |
- >=dev-libs/redland-1.0.16 |
303 |
- >=dev-libs/xmlsec-1.2.28[nss] |
304 |
- media-gfx/fontforge |
305 |
- media-gfx/graphite2 |
306 |
- media-libs/fontconfig |
307 |
- media-libs/freetype:2 |
308 |
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu] |
309 |
- media-libs/lcms:2 |
310 |
- >=media-libs/libcdr-0.1.0 |
311 |
- >=media-libs/libepoxy-1.3.1[X] |
312 |
- >=media-libs/libfreehand-0.1.0 |
313 |
- media-libs/libpagemaker |
314 |
- >=media-libs/libpng-1.4:0= |
315 |
- >=media-libs/libvisio-0.1.0 |
316 |
- media-libs/libzmf |
317 |
- net-libs/neon |
318 |
- net-misc/curl |
319 |
- sci-mathematics/lpsolve |
320 |
- sys-libs/zlib |
321 |
- virtual/glu |
322 |
- virtual/jpeg:0 |
323 |
- virtual/opengl |
324 |
- x11-libs/cairo[X] |
325 |
- x11-libs/libXinerama |
326 |
- x11-libs/libXrandr |
327 |
- x11-libs/libXrender |
328 |
- accessibility? ( |
329 |
- $(python_gen_cond_dep ' |
330 |
- dev-python/lxml[${PYTHON_MULTI_USEDEP}] |
331 |
- ') |
332 |
- ) |
333 |
- bluetooth? ( |
334 |
- dev-libs/glib:2 |
335 |
- net-wireless/bluez |
336 |
- ) |
337 |
- coinmp? ( sci-libs/coinor-mp ) |
338 |
- cups? ( net-print/cups ) |
339 |
- dbus? ( sys-apps/dbus ) |
340 |
- eds? ( |
341 |
- dev-libs/glib:2 |
342 |
- gnome-base/dconf |
343 |
- gnome-extra/evolution-data-server |
344 |
- ) |
345 |
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) |
346 |
- gstreamer? ( |
347 |
- media-libs/gstreamer:1.0 |
348 |
- media-libs/gst-plugins-base:1.0 |
349 |
- ) |
350 |
- gtk? ( |
351 |
- dev-libs/glib:2 |
352 |
- dev-libs/gobject-introspection |
353 |
- gnome-base/dconf |
354 |
- media-libs/mesa[egl] |
355 |
- x11-libs/gtk+:3 |
356 |
- x11-libs/pango |
357 |
- ) |
358 |
- gtk2? ( |
359 |
- x11-libs/gdk-pixbuf |
360 |
- >=x11-libs/gtk+-2.24:2 |
361 |
- x11-libs/pango |
362 |
- ) |
363 |
- kde? ( |
364 |
- dev-qt/qtcore:5 |
365 |
- dev-qt/qtgui:5 |
366 |
- dev-qt/qtwidgets:5 |
367 |
- dev-qt/qtx11extras:5 |
368 |
- kde-frameworks/kconfig:5 |
369 |
- kde-frameworks/kcoreaddons:5 |
370 |
- kde-frameworks/ki18n:5 |
371 |
- kde-frameworks/kio:5 |
372 |
- kde-frameworks/kwindowsystem:5 |
373 |
- ) |
374 |
- ldap? ( net-nds/openldap ) |
375 |
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) |
376 |
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) |
377 |
- mariadb? ( dev-db/mariadb-connector-c ) |
378 |
- !mariadb? ( dev-db/mysql-connector-c ) |
379 |
- pdfimport? ( app-text/poppler:=[cxx] ) |
380 |
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) |
381 |
-" |
382 |
-# FIXME: cppunit should be moved to test conditional |
383 |
-# after everything upstream is under gbuild |
384 |
-# as dmake execute tests right away |
385 |
-# tests apparently also need google-carlito-fonts (not packaged) |
386 |
-DEPEND="${COMMON_DEPEND} |
387 |
- >=dev-libs/libatomic_ops-7.2d |
388 |
- dev-perl/Archive-Zip |
389 |
- >=dev-util/cppunit-1.14.0 |
390 |
- >=dev-util/gperf-3.1 |
391 |
- =dev-util/mdds-1.4*:1= |
392 |
- media-libs/glm |
393 |
- sys-devel/ucpp |
394 |
- x11-base/xorg-proto |
395 |
- x11-libs/libXt |
396 |
- x11-libs/libXtst |
397 |
- java? ( |
398 |
- dev-java/ant-core |
399 |
- >=virtual/jdk-1.6 |
400 |
- ) |
401 |
- test? ( |
402 |
- app-crypt/gnupg |
403 |
- dev-util/cppunit |
404 |
- media-fonts/dejavu |
405 |
- media-fonts/liberation-fonts |
406 |
- ) |
407 |
-" |
408 |
-RDEPEND="${COMMON_DEPEND} |
409 |
- !app-office/libreoffice-bin |
410 |
- !app-office/libreoffice-bin-debug |
411 |
- !app-office/openoffice |
412 |
- media-fonts/liberation-fonts |
413 |
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) |
414 |
- java? ( >=virtual/jre-1.6 ) |
415 |
- kde? ( kde-frameworks/breeze-icons:* ) |
416 |
-" |
417 |
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then |
418 |
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*" |
419 |
-else |
420 |
- # Translations are not reliable on live ebuilds |
421 |
- # rather force people to use english only. |
422 |
- PDEPEND="!app-office/libreoffice-l10n" |
423 |
-fi |
424 |
- |
425 |
-PATCHES=( |
426 |
- # "${WORKDIR}"/${PATCHSET/.tar.xz/} |
427 |
- |
428 |
- # not upstreamable stuff |
429 |
- "${FILESDIR}/${PN}-5.4-system-pyuno.patch" |
430 |
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" |
431 |
- "${FILESDIR}/${PN}-6.1-nomancompress.patch" |
432 |
- |
433 |
- # master branch |
434 |
- "${FILESDIR}/${PN}-6.3.3.2-mysql-connector-c-8.patch" # bug #692422 |
435 |
- "${FILESDIR}/${P}-poppler-0.83.patch" |
436 |
-) |
437 |
- |
438 |
-S="${WORKDIR}/${PN}-${MY_PV}" |
439 |
- |
440 |
-_check_reqs() { |
441 |
- CHECKREQS_MEMORY="512M" |
442 |
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then |
443 |
- CHECKREQS_DISK_BUILD="22G" |
444 |
- else |
445 |
- CHECKREQS_DISK_BUILD="6G" |
446 |
- fi |
447 |
- check-reqs_$1 |
448 |
-} |
449 |
- |
450 |
-pkg_pretend() { |
451 |
- if ! use java && ! use firebird; then |
452 |
- ewarn "If you plan to use Base application you must enable either firebird or java." |
453 |
- fi |
454 |
- |
455 |
- use java || ewarn "Without java, several wizards are not going to be available." |
456 |
- |
457 |
- if has_version "<app-office/libreoffice-5.3.0[firebird]"; then |
458 |
- ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so" |
459 |
- ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version." |
460 |
- ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base" |
461 |
- fi |
462 |
- |
463 |
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend |
464 |
-} |
465 |
- |
466 |
-pkg_setup() { |
467 |
- java-pkg-opt-2_pkg_setup |
468 |
- python-single-r1_pkg_setup |
469 |
- xdg_environment_reset |
470 |
- |
471 |
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup |
472 |
-} |
473 |
- |
474 |
-src_unpack() { |
475 |
- default |
476 |
- |
477 |
- if [[ ${MY_PV} = *9999* ]]; then |
478 |
- local base_uri branch mypv |
479 |
- base_uri="https://anongit.freedesktop.org/git" |
480 |
- branch="master" |
481 |
- mypv=${MY_PV/.9999} |
482 |
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}" |
483 |
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}" |
484 |
- git-r3_checkout "${base_uri}/${PN}/core" |
485 |
- LOCOREGIT_VERSION=${EGIT_VERSION} |
486 |
- |
487 |
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master" |
488 |
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help |
489 |
- fi |
490 |
-} |
491 |
- |
492 |
-src_prepare() { |
493 |
- default |
494 |
- |
495 |
- # sandbox violations on many systems, we don't need it. Bug #646406 |
496 |
- sed -i \ |
497 |
- -e "/KF5_CONFIG/s/kf5-config/no/" \ |
498 |
- configure.ac || die "Failed to disable kf5-config" |
499 |
- |
500 |
- AT_M4DIR="m4" eautoreconf |
501 |
- # hack in the autogen.sh |
502 |
- touch autogen.lastrun |
503 |
- |
504 |
- # system pyuno mess |
505 |
- sed -i \ |
506 |
- -e "s:%eprefix%:${EPREFIX}:g" \ |
507 |
- -e "s:%libdir%:$(get_libdir):g" \ |
508 |
- pyuno/source/module/uno.py \ |
509 |
- pyuno/source/officehelper.py || die |
510 |
- # sed in the tests |
511 |
- sed -i \ |
512 |
- -e "s#all : build unitcheck#all : build#g" \ |
513 |
- solenv/gbuild/Module.mk || die |
514 |
- sed -i \ |
515 |
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \ |
516 |
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \ |
517 |
- Makefile.in || die |
518 |
- |
519 |
- sed -i \ |
520 |
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \ |
521 |
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \ |
522 |
- bin/distro-install-desktop-integration || die |
523 |
- |
524 |
- if use branding; then |
525 |
- # hack... |
526 |
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die |
527 |
- fi |
528 |
- |
529 |
- # Don't list pdfimport support in desktop when built with none, bug # 605464 |
530 |
- if ! use pdfimport; then |
531 |
- sed -i \ |
532 |
- -e ":MimeType: s:application/pdf;::" \ |
533 |
- -e ":Keywords: s:pdf;::" \ |
534 |
- sysui/desktop/menus/draw.desktop || die |
535 |
- fi |
536 |
-} |
537 |
- |
538 |
-src_configure() { |
539 |
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys |
540 |
- # Note: these are for Gentoo use ONLY. For your own distribution, please get |
541 |
- # your own set of keys. Feel free to contact chromium@g.o for more info. |
542 |
- local google_default_client_id="329227923882.apps.googleusercontent.com" |
543 |
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu" |
544 |
- |
545 |
- # optimization flags |
546 |
- export GMAKE_OPTIONS="${MAKEOPTS}" |
547 |
- # System python enablement: |
548 |
- export PYTHON_CFLAGS=$(python_get_CFLAGS) |
549 |
- export PYTHON_LIBS=$(python_get_LIBS) |
550 |
- |
551 |
- if use kde; then |
552 |
- export QT_SELECT=5 # bug 639620 needs proper fix though |
553 |
- export QT5DIR="$(qt5_get_bindir)/../" |
554 |
- export MOC5="$(qt5_get_bindir)/moc" |
555 |
- fi |
556 |
- |
557 |
- local gentoo_buildid="Gentoo official package" |
558 |
- if [[ -n ${LOCOREGIT_VERSION} ]]; then |
559 |
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})" |
560 |
- fi |
561 |
- |
562 |
- # system headers/libs/...: enforce using system packages |
563 |
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad |
564 |
- # --enable-cairo: ensure that cairo is always required |
565 |
- # --enable-*-link: link to the library rather than just dlopen on runtime |
566 |
- # --enable-release-build: build the libreoffice as release |
567 |
- # --disable-fetch-external: prevent dowloading during compile phase |
568 |
- # --enable-extension-integration: enable any extension integration support |
569 |
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs |
570 |
- # --disable-report-builder: too much java packages pulled in without pkgs |
571 |
- # --without-system-sane: just sane.h header that is used for scan in writer, |
572 |
- # not linked or anything else, worthless to depend on |
573 |
- # --disable-pdfium: not yet packaged |
574 |
- local myeconfargs=( |
575 |
- --with-system-dicts |
576 |
- --with-system-epoxy |
577 |
- --with-system-headers |
578 |
- --with-system-jars |
579 |
- --with-system-libs |
580 |
- --enable-build-opensymbol |
581 |
- --enable-cairo-canvas |
582 |
- --enable-largefile |
583 |
- --enable-mergelibs |
584 |
- --enable-neon |
585 |
- --enable-python=system |
586 |
- --enable-randr |
587 |
- --enable-release-build |
588 |
- --disable-breakpad |
589 |
- --disable-bundle-mariadb |
590 |
- --disable-ccache |
591 |
- --disable-epm |
592 |
- --disable-fetch-external |
593 |
- --disable-gstreamer-0-10 |
594 |
- --disable-gtk3-kde5 |
595 |
- --disable-online-update |
596 |
- --disable-openssl |
597 |
- --disable-pdfium |
598 |
- --disable-report-builder |
599 |
- --disable-vlc |
600 |
- --with-build-version="${gentoo_buildid}" |
601 |
- --enable-extension-integration |
602 |
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell" |
603 |
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" |
604 |
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell" |
605 |
- --with-external-tar="${DISTDIR}" |
606 |
- --with-lang="" |
607 |
- --with-parallelism=$(makeopts_jobs) |
608 |
- --with-system-ucpp |
609 |
- --with-tls=nss |
610 |
- --with-vendor="Gentoo Foundation" |
611 |
- --with-x |
612 |
- --without-fonts |
613 |
- --without-myspell-dicts |
614 |
- --with-help="html" |
615 |
- --without-helppack-integration |
616 |
- --with-system-gpgmepp |
617 |
- --without-system-sane |
618 |
- $(use_enable bluetooth sdremote-bluetooth) |
619 |
- $(use_enable coinmp) |
620 |
- $(use_enable cups) |
621 |
- $(use_enable dbus) |
622 |
- $(use_enable debug) |
623 |
- $(use_enable eds evolution2) |
624 |
- $(use_enable firebird firebird-sdbc) |
625 |
- $(use_enable gstreamer gstreamer-1-0) |
626 |
- $(use_enable gtk gtk3) |
627 |
- $(use_enable gtk2 gtk) |
628 |
- $(use_enable kde kde5) |
629 |
- $(use_enable kde qt5) |
630 |
- $(use_enable ldap) |
631 |
- $(use_enable odk) |
632 |
- $(use_enable pdfimport) |
633 |
- $(use_enable postgres postgresql-sdbc) |
634 |
- $(use_with accessibility lxml) |
635 |
- $(use_with coinmp system-coinmp) |
636 |
- $(use_with googledrive gdrive-client-id ${google_default_client_id}) |
637 |
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret}) |
638 |
- $(use_with java) |
639 |
- $(use_with odk doxygen) |
640 |
- ) |
641 |
- |
642 |
- if use eds || use gtk; then |
643 |
- myeconfargs+=( --enable-dconf --enable-gio ) |
644 |
- else |
645 |
- myeconfargs+=( --disable-dconf --disable-gio ) |
646 |
- fi |
647 |
- |
648 |
- # libreoffice extensions handling |
649 |
- for lo_xt in ${LO_EXTS}; do |
650 |
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then |
651 |
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) ) |
652 |
- else |
653 |
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) ) |
654 |
- fi |
655 |
- done |
656 |
- |
657 |
- if use java; then |
658 |
- # hsqldb: system one is too new |
659 |
- myeconfargs+=( |
660 |
- --without-junit |
661 |
- --without-system-hsqldb |
662 |
- --with-ant-home="${ANT_HOME}" |
663 |
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null) |
664 |
- --with-jvm-path="${EPREFIX}/usr/lib/" |
665 |
- ) |
666 |
- |
667 |
- use libreoffice_extensions_scripting-beanshell && \ |
668 |
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) ) |
669 |
- |
670 |
- use libreoffice_extensions_scripting-javascript && \ |
671 |
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) ) |
672 |
- fi |
673 |
- |
674 |
- is-flagq "-flto*" && myeconfargs+=( --enable-lto ) |
675 |
- |
676 |
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \ |
677 |
- econf "${myeconfargs[@]}" |
678 |
-} |
679 |
- |
680 |
-src_compile() { |
681 |
- # more and more LO stuff tries to use OpenGL, including tests during build |
682 |
- # bug 501508, bug 540624, bug 545974 and probably more |
683 |
- addpredict /dev/dri |
684 |
- addpredict /dev/ati |
685 |
- addpredict /dev/nvidiactl |
686 |
- |
687 |
- local target |
688 |
- use test && target="build" || target="build-nocheck" |
689 |
- |
690 |
- # this is not a proper make script |
691 |
- make ${target} || die |
692 |
-} |
693 |
- |
694 |
-src_test() { |
695 |
- make unitcheck || die |
696 |
- make slowcheck || die |
697 |
-} |
698 |
- |
699 |
-src_install() { |
700 |
- # This is not Makefile so no buildserver |
701 |
- make DESTDIR="${D}" distro-pack-install -o build -o check || die |
702 |
- |
703 |
- # bug 593514 |
704 |
- if use gtk; then |
705 |
- dosym libreoffice/program/liblibreofficekitgtk.so \ |
706 |
- /usr/$(get_libdir)/liblibreofficekitgtk.so |
707 |
- fi |
708 |
- |
709 |
- # bash completion aliases |
710 |
- bashcomp_alias \ |
711 |
- libreoffice \ |
712 |
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice |
713 |
- |
714 |
- if use branding; then |
715 |
- insinto /usr/$(get_libdir)/${PN}/program |
716 |
- newins "${WORKDIR}/branding-sofficerc" sofficerc |
717 |
- dodir /etc/env.d |
718 |
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die |
719 |
- fi |
720 |
-} |
721 |
- |
722 |
-pkg_postinst() { |
723 |
- xdg_icon_cache_update |
724 |
- xdg_desktop_database_update |
725 |
- xdg_mimeinfo_database_update |
726 |
-} |
727 |
- |
728 |
-pkg_postrm() { |
729 |
- xdg_icon_cache_update |
730 |
- xdg_desktop_database_update |
731 |
- xdg_mimeinfo_database_update |
732 |
-} |
733 |
|
734 |
diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml |
735 |
index 38a66bc313d..e13325955e7 100644 |
736 |
--- a/app-office/libreoffice/metadata.xml |
737 |
+++ b/app-office/libreoffice/metadata.xml |
738 |
@@ -13,7 +13,6 @@ version</longdescription> |
739 |
<use> |
740 |
<flag name="coinmp">Use sci-libs/coinor-mp as alternative solver</flag> |
741 |
<flag name="googledrive">Enable support for remote files on Google Drive</flag> |
742 |
- <flag name="gtk2">Enable legacy gtk2 frontend</flag> |
743 |
<flag name="mariadb">Prefer mariadb connector over mysql connector</flag> |
744 |
<flag name="odk">Build the Office Development Kit</flag> |
745 |
<flag name="pdfimport">Enable PDF import via the Poppler library</flag> |