1 |
commit: d415443669b964032fc629babd4db038a2924116 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jul 13 18:15:14 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jul 14 08:20:23 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4154436 |
7 |
|
8 |
app-office/libreoffice: Drop 5.4.7.2 |
9 |
|
10 |
Package-Manager: Portage-2.3.42, Repoman-2.3.9 |
11 |
|
12 |
app-office/libreoffice/Manifest | 2 - |
13 |
.../libreoffice-5.4.4.2-gtk3-no-gtk-build.patch | 13 - |
14 |
.../files/libreoffice-5.4.4.2-poppler-0.62.patch | 44 -- |
15 |
.../files/libreoffice-5.4.7.2-glm-0.9.9.patch | 82 --- |
16 |
app-office/libreoffice/libreoffice-5.4.7.2.ebuild | 550 --------------------- |
17 |
app-office/libreoffice/metadata.xml | 1 - |
18 |
6 files changed, 692 deletions(-) |
19 |
|
20 |
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest |
21 |
index 1a7ea0406ec..49895535eda 100644 |
22 |
--- a/app-office/libreoffice/Manifest |
23 |
+++ b/app-office/libreoffice/Manifest |
24 |
@@ -3,13 +3,11 @@ DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 BLAKE2B c067f60d0ee325 |
25 |
DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23092bc57ccd989f26ea04a323dcb17a0ea8baaa6a21b5d5e2b6e29fcae9d18ecd043073030e104ad56c86a115760590f57eda86c22c9fe478b0 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a |
26 |
DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f |
27 |
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a |
28 |
-DIST libreoffice-5.4.7.2.tar.xz 194486484 BLAKE2B 82c28025f20842dc6a1cf410e84953208ec36462e2018cc07edfcd9d1086c8e83ac93dcf75148df6b670c4b20cd8c1c7904851e3c7eb46c62c521781e013926e SHA512 712c66de9216b5b7fd48310610801b4f1f17465f8ff282cb7e070a50104ccdb4a5a71f6a58eedb828a7a58f7521b5c725745d5e0f6ece62596b7485161cf01f8 |
29 |
DIST libreoffice-6.0.3.2-patchset-01.tar.xz 39268 BLAKE2B 0bf5ad04323cbd2cf157dacc96aa9d3344d683f3303e5c284a83c0f8783d23881402393f2361d4db1270cf75424ff6f12e5b16540b3f7ccb624c29ccc8c71416 SHA512 f6632afe1c7bcdfb1ca82059d299f808e5eee982c176aa2cc5d728e11b833c3fe921c9c627847bc12128ae5e32c901cbbdfec0b71a22bb9a4b5041b645ed934f |
30 |
DIST libreoffice-6.0.3.2.tar.xz 203747760 BLAKE2B 8a666aa2e3e880b050ac8eed93a1c55ddbfa7ce74364b0dff4f5be446cf64c4fe347b164716a7d226c6cfbac01dbd3f11b89ecff75460ccd902ac44fe93d5daa SHA512 d1ec8982f185926d3f3040bcdef737e7c74fcf5b360a12a91983eac92843510553759ffa84c7d244df13036fc32149ffe13dd6a56fb1bda6f64fd5a318fd7879 |
31 |
DIST libreoffice-6.0.5.2-patchset-01.tar.xz 39820 BLAKE2B d8b436378b05a8a58156817b5d1e0323fd6fcfde9aa9fc4fc6a8056a06a16c84c5860ffe1ae715faddb707c5aa417b43e6c7f5c05821f86208edbb3778d830a1 SHA512 ec99a6358c0a20075abc0aa136ad6ccded4562fa0f25897efe2a8783fb33b97b92a2dd8041206b3344a79dfd10ebe98b79c8bf0b4e8539e45942978f0028dc59 |
32 |
DIST libreoffice-6.0.5.2-patchset-02.tar.xz 43072 BLAKE2B bcd6406b06bef83ac26e227bc77fed76b67e11f0150a23015e8c83c7092b8efd6f35ec8bbac12bbfda6c597ebaa1782391a624b10a7af0bface6b480b6603802 SHA512 fe764e02cff85a064f8b25e34b3f3558a9fc65051da154e94654c2322e8f50487a97b699a6ab886ec9db00d31a8ca544aaf0b93794e03d17fbbe90b83b44124d |
33 |
DIST libreoffice-6.0.5.2.tar.xz 204795724 BLAKE2B d027e83dc5f3908af25975354f8d0ef9a4a9a4fb601dada54d04cdc5bc6d0a0dbedda89ac0cf5bbe88da29382431bddfd331e56b63b88e9f5a23b9299c65b61a SHA512 796ce4b54adc2b1b032f1f125425141a1c584a9f7dd145ed677916ba7a28c11e895a34ff8bf34cc208d15408cb3ea0c0942546300d1be6309bd9ad6544400684 |
34 |
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f |
35 |
-DIST libreoffice-help-5.4.7.2.tar.xz 2343112 BLAKE2B 690c147e8bfdea9d1860131ad8528e2e2eea64da7293c8b7c3a4ad07e771749573b69fb11bed8c8c171b5760ec67a0a3b30eab06e38e5a725ffc11d0959c71c6 SHA512 8abd0bbf70dcfd5cf0ad713c8d34be541ddd27cda98403cbb331b62a4099c08b14be784362b857a41b8b2c756d01e36f043b97bdd5062a2bddeae29b8b70f6a2 |
36 |
DIST libreoffice-help-6.0.3.2.tar.xz 2972952 BLAKE2B 90b62af89bbdec436e8ca5ede3aa8aa57109e22136d454850a108fd4aac1eace166432be8152d623b06ba9e04001a579b3200bbbd20caa1ac6c3b97026319dd3 SHA512 cb538553efd94c7a6f9059b6fb74351adba5449d7f4555558fd0337950528be2bbb7ddf7aaef4992eb18f432c42133d17bf8f0af9d3fe29eddd9d620ab847a40 |
37 |
DIST libreoffice-help-6.0.5.2.tar.xz 2972956 BLAKE2B cfe585fb690bc0a348b67aae1330daa61a0a08acc580fad147853d84c9496d0ad4c4b14598492d4aba9af4afe7fa65bff0161a77b1c0cae9089d50e2a542e0c1 SHA512 975c547e59280e08e554bc658642660fc17e5785b45254b40f969f4b42088d5a350dec72ae6b6f1aa60d7bc95bd9d2c2134f6b395ee86e6f9f5af09f52cc50e1 |
38 |
|
39 |
diff --git a/app-office/libreoffice/files/libreoffice-5.4.4.2-gtk3-no-gtk-build.patch b/app-office/libreoffice/files/libreoffice-5.4.4.2-gtk3-no-gtk-build.patch |
40 |
deleted file mode 100644 |
41 |
index f0e2c55c936..00000000000 |
42 |
--- a/app-office/libreoffice/files/libreoffice-5.4.4.2-gtk3-no-gtk-build.patch |
43 |
+++ /dev/null |
44 |
@@ -1,13 +0,0 @@ |
45 |
-Fix build with USE="gtk3 -gtk" |
46 |
-https://bugs.gentoo.org/641812 |
47 |
- |
48 |
---- a/vcl/unx/gtk3/gtk3gtkframe.cxx 2017-12-12 18:45:07.000000000 +0100 |
49 |
-+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx 2017-12-21 13:20:31.935843032 +0100 |
50 |
-@@ -21,6 +21,7 @@ |
51 |
- #include <unx/gtk/gtkdata.hxx> |
52 |
- #include <unx/gtk/gtkinst.hxx> |
53 |
- #include <unx/gtk/gtkgdi.hxx> |
54 |
-+#include <unx/gtk/gtksalmenu.hxx> |
55 |
- #include <vcl/help.hxx> |
56 |
- #include <vcl/keycodes.hxx> |
57 |
- #include <vcl/layout.hxx> |
58 |
|
59 |
diff --git a/app-office/libreoffice/files/libreoffice-5.4.4.2-poppler-0.62.patch b/app-office/libreoffice/files/libreoffice-5.4.4.2-poppler-0.62.patch |
60 |
deleted file mode 100644 |
61 |
index e6d7dff898d..00000000000 |
62 |
--- a/app-office/libreoffice/files/libreoffice-5.4.4.2-poppler-0.62.patch |
63 |
+++ /dev/null |
64 |
@@ -1,44 +0,0 @@ |
65 |
-Fix build with >=poppler-0.62.0, cleanup ifdef and raise minimum poppler version. |
66 |
- |
67 |
---- a/configure.ac 2017-12-12 18:45:07.000000000 +0100 |
68 |
-+++ b/configure.ac 2018-01-04 23:57:16.410999542 +0100 |
69 |
-@@ -10403,7 +10403,7 @@ |
70 |
- if test "$with_system_poppler" = "yes"; then |
71 |
- AC_MSG_RESULT([external]) |
72 |
- SYSTEM_POPPLER=TRUE |
73 |
-- PKG_CHECK_MODULES( POPPLER, poppler >= 0.12.0 ) |
74 |
-+ PKG_CHECK_MODULES( POPPLER, poppler >= 0.21.1 ) |
75 |
- AC_LANG_PUSH([C++]) |
76 |
- save_CXXFLAGS=$CXXFLAGS |
77 |
- save_CPPFLAGS=$CPPFLAGS |
78 |
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2017-12-12 18:45:07.000000000 +0100 |
79 |
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2018-01-05 00:29:16.541246738 +0100 |
80 |
-@@ -32,13 +32,11 @@ |
81 |
- #pragma warning(push, 1) |
82 |
- #endif |
83 |
- |
84 |
--// sigh, UTF8.h was removed in poppler-0.21.0 and put back in 0.21.1 |
85 |
- // FIXME: we can't use #if POPPLER_CHECK_VERSION(0, 21, 0) && !POPPLER_CHECK_VERSION(0, 21, 1) |
86 |
- // because the internal poppler does not provide poppler-version.h and the macro always returns 0 |
87 |
--#if POPPLER_CHECK_VERSION(0, 21, 1) |
88 |
--#include "UTF8.h" |
89 |
--#elif POPPLER_CHECK_VERSION(0, 21, 0) |
90 |
--#include "UTF.h" |
91 |
-+// UTF8.h was renamed to UnicodeMapFuncs.h in poppler-0.62.0 |
92 |
-+#if POPPLER_CHECK_VERSION(0, 62, 0) |
93 |
-+#include "UnicodeMapFuncs.h" |
94 |
- #else |
95 |
- #include "UTF8.h" |
96 |
- #endif |
97 |
-@@ -918,7 +916,11 @@ |
98 |
- ); |
99 |
- |
100 |
- // silence spurious warning |
101 |
-+#if POPPLER_CHECK_VERSION(0, 62, 0) |
102 |
-+ (void)&mapUTF16; |
103 |
-+#else |
104 |
- (void)&mapUCS2; |
105 |
-+#endif |
106 |
- |
107 |
- char buf[9]; |
108 |
- for( int i=0; i<uLen; ++i ) |
109 |
|
110 |
diff --git a/app-office/libreoffice/files/libreoffice-5.4.7.2-glm-0.9.9.patch b/app-office/libreoffice/files/libreoffice-5.4.7.2-glm-0.9.9.patch |
111 |
deleted file mode 100644 |
112 |
index 28982d90c36..00000000000 |
113 |
--- a/app-office/libreoffice/files/libreoffice-5.4.7.2-glm-0.9.9.patch |
114 |
+++ /dev/null |
115 |
@@ -1,82 +0,0 @@ |
116 |
-From 7984347b9a2fce74cdce0c1c5b27f6e2b55a2f49 Mon Sep 17 00:00:00 2001 |
117 |
-From: Rene Engelhard <rene@××××××.org> |
118 |
-Date: Sun, 28 Jan 2018 19:48:25 +0100 |
119 |
-Subject: fix build with glm 0.9.9 |
120 |
- |
121 |
-In file included from /usr/include/glm/gtx/norm.hpp:18:0, |
122 |
- from /data/rene/git/LibreOffice/master/vcl/inc/opengl/VertexUti |
123 |
-ls.hxx:16, |
124 |
- from /data/rene/git/LibreOffice/master/vcl/inc/opengl/LineRende |
125 |
-rUtils.hxx:14, |
126 |
- from /data/rene/git/LibreOffice/master/vcl/opengl/LineRenderUti |
127 |
-ls.cxx:11: |
128 |
-/usr/include/glm/gtx/quaternion.hpp:23:3: error: #error "GLM: GLM_GTX_quaternion |
129 |
- is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." |
130 |
- # error "GLM: GLM_GTX_quaternion is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." |
131 |
- ^~~~~ |
132 |
- |
133 |
-so just define it. |
134 |
- |
135 |
-Change-Id: I981bfb5fd944f32a3774b3f9b183989773bf235f |
136 |
-Reviewed-on: https://gerrit.libreoffice.org/48799 |
137 |
-Tested-by: Jenkins <ci@×××××××××××.org> |
138 |
-Tested-by: Rene Engelhard <rene@××××××.org> |
139 |
-Reviewed-by: Rene Engelhard <rene@××××××.org> |
140 |
---- |
141 |
- chart2/Library_chartcore.mk | 6 ++++++ |
142 |
- chart2/Library_chartopengl.mk | 6 ++++++ |
143 |
- vcl/Library_vcl.mk | 6 ++++++ |
144 |
- 3 files changed, 18 insertions(+) |
145 |
- |
146 |
-diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk |
147 |
-index f785d09..08455f9 100644 |
148 |
---- a/chart2/Library_chartcore.mk |
149 |
-+++ b/chart2/Library_chartcore.mk |
150 |
-@@ -23,6 +23,12 @@ $(eval $(call gb_Library_add_defs,chartcore,\ |
151 |
- -DOOO_DLLIMPLEMENTATION_CHARTVIEW \ |
152 |
- )) |
153 |
- |
154 |
-+ifeq ($(SYSTEM_GLM),TRUE) |
155 |
-+$(eval $(call gb_Library_add_defs,chartcore,\ |
156 |
-+ -DGLM_ENABLE_EXPERIMENTAL \ |
157 |
-+)) |
158 |
-+endif |
159 |
-+ |
160 |
- $(eval $(call gb_Library_set_precompiled_header,chartcore,$(SRCDIR)/chart2/inc/pch/precompiled_chartcore)) |
161 |
- |
162 |
- $(eval $(call gb_Library_use_externals,chartcore,\ |
163 |
-diff --git a/chart2/Library_chartopengl.mk b/chart2/Library_chartopengl.mk |
164 |
-index f999f94..8b5a22c 100644 |
165 |
---- a/chart2/Library_chartopengl.mk |
166 |
-+++ b/chart2/Library_chartopengl.mk |
167 |
-@@ -54,5 +54,11 @@ $(eval $(call gb_Library_add_exception_objects,chartopengl,\ |
168 |
- chart2/source/view/main/DummyXShape \ |
169 |
- chart2/source/view/main/OpenGLRender \ |
170 |
- )) |
171 |
-+ |
172 |
-+ifeq ($(SYSTEM_GLM),TRUE) |
173 |
-+$(eval $(call gb_Library_add_defs,chartopengl,\ |
174 |
-+ -DGLM_ENABLE_EXPERIMENTAL \ |
175 |
-+)) |
176 |
-+endif |
177 |
- |
178 |
- # vim: set noet sw=4 ts=4: |
179 |
-diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk |
180 |
-index 699d6ab..a2caa8e 100644 |
181 |
---- a/vcl/Library_vcl.mk |
182 |
-+++ b/vcl/Library_vcl.mk |
183 |
-@@ -49,6 +49,12 @@ $(eval $(call gb_Library_add_defs,vcl,\ |
184 |
- -DENABLE_MERGELIBS=$(if $(MERGELIBS),1,0) \ |
185 |
- )) |
186 |
- |
187 |
-+ifeq ($(SYSTEM_GLM),TRUE) |
188 |
-+$(eval $(call gb_Library_add_defs,vcl,\ |
189 |
-+ -DGLM_ENABLE_EXPERIMENTAL \ |
190 |
-+)) |
191 |
-+endif |
192 |
-+ |
193 |
- $(eval $(call gb_Library_use_sdk_api,vcl)) |
194 |
- |
195 |
- $(eval $(call gb_Library_use_custom_headers,vcl,\ |
196 |
--- |
197 |
-cgit v1.1 |
198 |
|
199 |
diff --git a/app-office/libreoffice/libreoffice-5.4.7.2.ebuild b/app-office/libreoffice/libreoffice-5.4.7.2.ebuild |
200 |
deleted file mode 100644 |
201 |
index a2e8ed475fa..00000000000 |
202 |
--- a/app-office/libreoffice/libreoffice-5.4.7.2.ebuild |
203 |
+++ /dev/null |
204 |
@@ -1,550 +0,0 @@ |
205 |
-# Copyright 1999-2018 Gentoo Foundation |
206 |
-# Distributed under the terms of the GNU General Public License v2 |
207 |
- |
208 |
-EAPI=6 |
209 |
- |
210 |
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) |
211 |
-PYTHON_REQ_USE="threads,xml" |
212 |
- |
213 |
-# experimental ; release ; old |
214 |
-# Usually the tarballs are moved a lot so this should make |
215 |
-# everyone happy. |
216 |
-DEV_URI=" |
217 |
- https://dev-builds.libreoffice.org/pre-releases/src |
218 |
- https://download.documentfoundation.org/libreoffice/src/${PV:0:5}/ |
219 |
- https://downloadarchive.documentfoundation.org/libreoffice/old/${PV}/src |
220 |
-" |
221 |
-ADDONS_URI="https://dev-www.libreoffice.org/src/" |
222 |
- |
223 |
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz" |
224 |
-# PATCHSET="${P}-patchset-01.tar.xz" |
225 |
- |
226 |
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3" |
227 |
-inherit multiprocessing autotools bash-completion-r1 check-reqs gnome2-utils java-pkg-opt-2 pax-utils python-single-r1 toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS} |
228 |
-unset SCM_ECLASS |
229 |
- |
230 |
-DESCRIPTION="A full office productivity suite" |
231 |
-HOMEPAGE="https://www.libreoffice.org" |
232 |
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )" |
233 |
-[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}" |
234 |
- |
235 |
-# Split modules following git/tarballs |
236 |
-# Core MUST be first! |
237 |
-# Help is used for the image generator |
238 |
-# Only release has the tarballs |
239 |
-if [[ ${PV} != *9999* ]]; then |
240 |
- for i in ${DEV_URI}; do |
241 |
- SRC_URI+=" ${i}/${P}.tar.xz" |
242 |
- SRC_URI+=" ${i}/${PN}-help-${PV}.tar.xz" |
243 |
- done |
244 |
- unset i |
245 |
-fi |
246 |
-unset DEV_URI |
247 |
- |
248 |
-# Really required addons |
249 |
-# These are bundles that can't be removed for now due to huge patchsets. |
250 |
-# If you want them gone, patches are welcome. |
251 |
-ADDONS_SRC=( |
252 |
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )" |
253 |
- # no release for 8 years, should we package it? |
254 |
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" |
255 |
- # Does not build with 1.6 rhino at all |
256 |
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" |
257 |
- # requirement of rhino |
258 |
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" |
259 |
- # not packageable |
260 |
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" |
261 |
-) |
262 |
-SRC_URI+=" ${ADDONS_SRC[*]}" |
263 |
- |
264 |
-unset ADDONS_URI |
265 |
-unset ADDONS_SRC |
266 |
- |
267 |
-# Extensions that need extra work: |
268 |
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" |
269 |
- |
270 |
-IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive |
271 |
-gstreamer +gtk gtk3 jemalloc libressl mysql odk pdfimport postgres test vlc |
272 |
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" |
273 |
- |
274 |
-LICENSE="|| ( LGPL-3 MPL-1.1 )" |
275 |
-SLOT="0" |
276 |
-[[ ${PV} == *9999* ]] || \ |
277 |
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" |
278 |
- |
279 |
-COMMON_DEPEND="${PYTHON_DEPS} |
280 |
- app-arch/unzip |
281 |
- app-arch/zip |
282 |
- app-crypt/gpgme[cxx] |
283 |
- app-text/hunspell:= |
284 |
- >=app-text/libabw-0.1.0 |
285 |
- >=app-text/libebook-0.1 |
286 |
- >=app-text/libetonyek-0.1 |
287 |
- app-text/libexttextcat |
288 |
- app-text/liblangtag |
289 |
- >=app-text/libmspub-0.1.0 |
290 |
- >=app-text/libmwaw-0.3.1 |
291 |
- >=app-text/libodfgen-0.1.0 |
292 |
- app-text/libstaroffice |
293 |
- app-text/libwpd:0.10[tools] |
294 |
- app-text/libwpg:0.3 |
295 |
- >=app-text/libwps-0.4 |
296 |
- app-text/mythes |
297 |
- >=dev-cpp/clucene-2.3.3.4-r2 |
298 |
- =dev-cpp/libcmis-0.5* |
299 |
- dev-db/unixODBC |
300 |
- dev-lang/perl |
301 |
- dev-libs/boost:=[nls] |
302 |
- dev-libs/expat |
303 |
- dev-libs/hyphen |
304 |
- dev-libs/icu:= |
305 |
- dev-libs/libassuan |
306 |
- dev-libs/libgpg-error |
307 |
- =dev-libs/liborcus-0.12* |
308 |
- dev-libs/librevenge |
309 |
- dev-libs/nspr |
310 |
- dev-libs/nss |
311 |
- !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) |
312 |
- libressl? ( dev-libs/libressl ) |
313 |
- >=dev-libs/redland-1.0.16 |
314 |
- >=dev-libs/xmlsec-1.2.24[nss] |
315 |
- media-gfx/graphite2 |
316 |
- media-libs/fontconfig |
317 |
- media-libs/freetype:2 |
318 |
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu] |
319 |
- media-libs/lcms:2 |
320 |
- >=media-libs/libcdr-0.1.0 |
321 |
- >=media-libs/libepoxy-1.3.1[X] |
322 |
- >=media-libs/libfreehand-0.1.0 |
323 |
- media-libs/libpagemaker |
324 |
- >=media-libs/libpng-1.4:0= |
325 |
- >=media-libs/libvisio-0.1.0 |
326 |
- media-libs/libzmf |
327 |
- net-libs/neon |
328 |
- net-misc/curl |
329 |
- net-nds/openldap |
330 |
- sci-mathematics/lpsolve |
331 |
- virtual/glu |
332 |
- virtual/jpeg:0 |
333 |
- virtual/opengl |
334 |
- x11-libs/cairo[X] |
335 |
- x11-libs/libXinerama |
336 |
- x11-libs/libXrandr |
337 |
- x11-libs/libXrender |
338 |
- bluetooth? ( net-wireless/bluez ) |
339 |
- coinmp? ( sci-libs/coinor-mp ) |
340 |
- cups? ( net-print/cups ) |
341 |
- dbus? ( dev-libs/dbus-glib ) |
342 |
- eds? ( |
343 |
- dev-libs/glib:2 |
344 |
- gnome-base/dconf |
345 |
- gnome-extra/evolution-data-server |
346 |
- ) |
347 |
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) |
348 |
- gstreamer? ( |
349 |
- media-libs/gstreamer:1.0 |
350 |
- media-libs/gst-plugins-base:1.0 |
351 |
- ) |
352 |
- gtk? ( |
353 |
- x11-libs/gdk-pixbuf |
354 |
- >=x11-libs/gtk+-2.24:2 |
355 |
- ) |
356 |
- gtk3? ( |
357 |
- dev-libs/glib:2 |
358 |
- dev-libs/gobject-introspection |
359 |
- gnome-base/dconf |
360 |
- x11-libs/gtk+:3 |
361 |
- ) |
362 |
- jemalloc? ( dev-libs/jemalloc ) |
363 |
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) |
364 |
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) |
365 |
- mysql? ( dev-db/mysql-connector-c++ ) |
366 |
- pdfimport? ( app-text/poppler:=[cxx] ) |
367 |
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) |
368 |
-" |
369 |
- |
370 |
-RDEPEND="${COMMON_DEPEND} |
371 |
- !app-office/libreoffice-bin |
372 |
- !app-office/libreoffice-bin-debug |
373 |
- !app-office/openoffice |
374 |
- media-fonts/dejavu |
375 |
- media-fonts/liberation-fonts |
376 |
- media-fonts/libertine |
377 |
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) |
378 |
- java? ( >=virtual/jre-1.6 ) |
379 |
- vlc? ( media-video/vlc ) |
380 |
-" |
381 |
- |
382 |
-if [[ ${PV} != *9999* ]]; then |
383 |
- PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*" |
384 |
-else |
385 |
- # Translations are not reliable on live ebuilds |
386 |
- # rather force people to use english only. |
387 |
- PDEPEND="!app-office/libreoffice-l10n" |
388 |
-fi |
389 |
- |
390 |
-# FIXME: cppunit should be moved to test conditional |
391 |
-# after everything upstream is under gbuild |
392 |
-# as dmake execute tests right away |
393 |
-DEPEND="${COMMON_DEPEND} |
394 |
- !<sys-devel/make-3.82 |
395 |
- >=dev-libs/libatomic_ops-7.2d |
396 |
- >=dev-libs/libxml2-2.7.8 |
397 |
- dev-libs/libxslt |
398 |
- dev-perl/Archive-Zip |
399 |
- >=dev-util/cppunit-1.14.0 |
400 |
- >=dev-util/gperf-3 |
401 |
- dev-util/intltool |
402 |
- >=dev-util/mdds-1.2.2:1= |
403 |
- media-libs/glm |
404 |
- sys-devel/bison |
405 |
- sys-devel/flex |
406 |
- sys-devel/gettext |
407 |
- sys-devel/ucpp |
408 |
- sys-libs/zlib |
409 |
- virtual/pkgconfig |
410 |
- x11-base/xorg-proto |
411 |
- x11-libs/libXt |
412 |
- x11-libs/libXtst |
413 |
- java? ( |
414 |
- dev-java/ant-core |
415 |
- >=virtual/jdk-1.6 |
416 |
- ) |
417 |
- odk? ( >=app-doc/doxygen-1.8.4 ) |
418 |
- test? ( |
419 |
- dev-util/cppunit |
420 |
- media-fonts/dejavu |
421 |
- ) |
422 |
-" |
423 |
- |
424 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE} |
425 |
- bluetooth? ( dbus ) |
426 |
- libreoffice_extensions_nlpsolver? ( java ) |
427 |
- libreoffice_extensions_scripting-beanshell? ( java ) |
428 |
- libreoffice_extensions_scripting-javascript? ( java ) |
429 |
- libreoffice_extensions_wiki-publisher? ( java ) |
430 |
-" |
431 |
- |
432 |
-PATCHES=( |
433 |
- # not upstreamable stuff |
434 |
- "${FILESDIR}/${PN}-5.4-system-pyuno.patch" |
435 |
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" |
436 |
- # 6.0 branch |
437 |
- "${FILESDIR}/${PN}-5.4.4.2-poppler-0.62.patch" # bug 642602 |
438 |
- "${FILESDIR}/${PN}-6.0.3.2-poppler-0.64.patch" # bug 653478 |
439 |
- "${FILESDIR}/${P}-glm-0.9.9.patch" # bug 657178 |
440 |
- # 6.1 branch |
441 |
- "${FILESDIR}/${PN}-6.0.4.2-glm-0.9.9.patch" # bug 657178 |
442 |
- |
443 |
- # TODO: upstream |
444 |
- "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch" |
445 |
- "${FILESDIR}/${PN}-5.4.4.2-gtk3-no-gtk-build.patch" # bug 641812 |
446 |
-) |
447 |
- |
448 |
-pkg_pretend() { |
449 |
- use java || \ |
450 |
- ewarn "If you plan to use Base application you should enable java or you will get various crashes." |
451 |
- |
452 |
- if has_version "<app-office/libreoffice-5.3.0[firebird]"; then |
453 |
- ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so" |
454 |
- ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version." |
455 |
- ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base" |
456 |
- fi |
457 |
- |
458 |
- if [[ ${MERGE_TYPE} != binary ]]; then |
459 |
- CHECKREQS_MEMORY="512M" |
460 |
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then |
461 |
- CHECKREQS_DISK_BUILD="22G" |
462 |
- else |
463 |
- CHECKREQS_DISK_BUILD="6G" |
464 |
- fi |
465 |
- check-reqs_pkg_pretend |
466 |
- fi |
467 |
-} |
468 |
- |
469 |
-pkg_setup() { |
470 |
- java-pkg-opt-2_pkg_setup |
471 |
- python-single-r1_pkg_setup |
472 |
- xdg_environment_reset |
473 |
- |
474 |
- if [[ ${MERGE_TYPE} != binary ]]; then |
475 |
- CHECKREQS_MEMORY="512M" |
476 |
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then |
477 |
- CHECKREQS_DISK_BUILD="22G" |
478 |
- else |
479 |
- CHECKREQS_DISK_BUILD="6G" |
480 |
- fi |
481 |
- check-reqs_pkg_setup |
482 |
- fi |
483 |
-} |
484 |
- |
485 |
-src_unpack() { |
486 |
- default |
487 |
- |
488 |
- if [[ ${PV} = *9999* ]]; then |
489 |
- local base_uri branch mypv |
490 |
- base_uri="https://anongit.freedesktop.org/git" |
491 |
- branch="master" |
492 |
- mypv=${PV/.9999} |
493 |
- [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}" |
494 |
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}" |
495 |
- git-r3_checkout "${base_uri}/${PN}/core" |
496 |
- |
497 |
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master" |
498 |
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help |
499 |
- fi |
500 |
-} |
501 |
- |
502 |
-src_prepare() { |
503 |
- default |
504 |
- |
505 |
- AT_M4DIR="m4" eautoreconf |
506 |
- # hack in the autogen.sh |
507 |
- touch autogen.lastrun |
508 |
- |
509 |
- # system pyuno mess |
510 |
- sed -i \ |
511 |
- -e "s:%eprefix%:${EPREFIX}:g" \ |
512 |
- -e "s:%libdir%:$(get_libdir):g" \ |
513 |
- pyuno/source/module/uno.py \ |
514 |
- pyuno/source/officehelper.py || die |
515 |
- # sed in the tests |
516 |
- sed -i \ |
517 |
- -e "s#all : build unitcheck#all : build#g" \ |
518 |
- solenv/gbuild/Module.mk || die |
519 |
- sed -i \ |
520 |
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \ |
521 |
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \ |
522 |
- Makefile.in || die |
523 |
- |
524 |
- sed -i \ |
525 |
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \ |
526 |
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \ |
527 |
- bin/distro-install-desktop-integration || die |
528 |
- |
529 |
- if use branding; then |
530 |
- # hack... |
531 |
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/galaxy/brand/intro.png" || die |
532 |
- fi |
533 |
- |
534 |
- # Don't list pdfimport support in desktop when built with none, bug # 605464 |
535 |
- if ! use pdfimport; then |
536 |
- sed -i \ |
537 |
- -e ":MimeType: s:application/pdf;::" \ |
538 |
- -e ":Keywords: s:pdf;::" \ |
539 |
- sysui/desktop/menus/draw.desktop || die |
540 |
- fi |
541 |
-} |
542 |
- |
543 |
-src_configure() { |
544 |
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys |
545 |
- # Note: these are for Gentoo use ONLY. For your own distribution, please get |
546 |
- # your own set of keys. Feel free to contact chromium@g.o for more info. |
547 |
- local google_default_client_id="329227923882.apps.googleusercontent.com" |
548 |
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu" |
549 |
- |
550 |
- # optimization flags |
551 |
- export GMAKE_OPTIONS="${MAKEOPTS}" |
552 |
- # System python enablement: |
553 |
- export PYTHON_CFLAGS=$(python_get_CFLAGS) |
554 |
- export PYTHON_LIBS=$(python_get_LIBS) |
555 |
- |
556 |
- # system headers/libs/...: enforce using system packages |
557 |
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad |
558 |
- # --enable-cairo: ensure that cairo is always required |
559 |
- # --enable-*-link: link to the library rather than just dlopen on runtime |
560 |
- # --enable-release-build: build the libreoffice as release |
561 |
- # --disable-fetch-external: prevent dowloading during compile phase |
562 |
- # --enable-extension-integration: enable any extension integration support |
563 |
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs |
564 |
- # --disable-report-builder: too much java packages pulled in without pkgs |
565 |
- # --without-system-sane: just sane.h header that is used for scan in writer, |
566 |
- # not linked or anything else, worthless to depend on |
567 |
- # --disable-pdfium: not yet packaged |
568 |
- local myeconfargs=( |
569 |
- --with-system-dicts |
570 |
- --with-system-epoxy |
571 |
- --with-system-headers |
572 |
- --with-system-jars |
573 |
- --with-system-libs |
574 |
- --enable-cairo-canvas |
575 |
- --enable-largefile |
576 |
- --enable-mergelibs |
577 |
- --enable-neon |
578 |
- --enable-python=system |
579 |
- --enable-randr |
580 |
- --enable-release-build |
581 |
- --disable-breakpad |
582 |
- --disable-ccache |
583 |
- --disable-collada |
584 |
- --disable-dependency-tracking |
585 |
- --disable-epm |
586 |
- --disable-fetch-external |
587 |
- --disable-gltf |
588 |
- --disable-gstreamer-0-10 |
589 |
- --disable-kde4 |
590 |
- --disable-online-update |
591 |
- --disable-pdfium |
592 |
- --disable-report-builder |
593 |
- --disable-systray |
594 |
- --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") |
595 |
- --with-build-version="Gentoo official package" |
596 |
- --enable-extension-integration |
597 |
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell" |
598 |
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" |
599 |
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell" |
600 |
- --with-external-tar="${DISTDIR}" |
601 |
- --with-lang="" |
602 |
- --with-parallelism=$(makeopts_jobs) |
603 |
- --with-system-ucpp |
604 |
- --with-vendor="Gentoo Foundation" |
605 |
- --with-x |
606 |
- --without-fonts |
607 |
- --without-myspell-dicts |
608 |
- --without-help |
609 |
- --with-helppack-integration |
610 |
- --with-system-gpgmepp |
611 |
- --without-system-sane |
612 |
- $(use_enable bluetooth sdremote-bluetooth) |
613 |
- $(use_enable coinmp) |
614 |
- $(use_enable cups) |
615 |
- $(use_enable dbus) |
616 |
- $(use_enable debug) |
617 |
- $(use_enable eds evolution2) |
618 |
- $(use_enable firebird firebird-sdbc) |
619 |
- $(use_enable gstreamer gstreamer-1-0) |
620 |
- $(use_enable gtk) |
621 |
- $(use_enable gtk3) |
622 |
- $(use_enable mysql ext-mariadb-connector) |
623 |
- $(use_enable odk) |
624 |
- $(use_enable pdfimport) |
625 |
- $(use_enable postgres postgresql-sdbc) |
626 |
- $(use_enable vlc) |
627 |
- $(use_with coinmp system-coinmp) |
628 |
- $(use_with googledrive gdrive-client-id ${google_default_client_id}) |
629 |
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret}) |
630 |
- $(use_with java) |
631 |
- $(use_with mysql system-mysql-cppconn) |
632 |
- $(use_with odk doxygen) |
633 |
- ) |
634 |
- |
635 |
- if use eds || use gtk3; then |
636 |
- myeconfargs+=( --enable-dconf --enable-gio ) |
637 |
- else |
638 |
- myeconfargs+=( --disable-dconf --disable-gio ) |
639 |
- fi |
640 |
- |
641 |
- # libreoffice extensions handling |
642 |
- for lo_xt in ${LO_EXTS}; do |
643 |
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then |
644 |
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) ) |
645 |
- else |
646 |
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) ) |
647 |
- fi |
648 |
- done |
649 |
- |
650 |
- if use java; then |
651 |
- # hsqldb: system one is too new |
652 |
- myeconfargs+=( |
653 |
- --without-junit |
654 |
- --without-system-hsqldb |
655 |
- --with-ant-home="${ANT_HOME}" |
656 |
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null) |
657 |
- --with-jvm-path="${EPREFIX}/usr/lib/" |
658 |
- ) |
659 |
- |
660 |
- use libreoffice_extensions_scripting-beanshell && \ |
661 |
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) ) |
662 |
- |
663 |
- use libreoffice_extensions_scripting-javascript && \ |
664 |
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) ) |
665 |
- fi |
666 |
- |
667 |
- is-flagq "-flto*" && myeconfargs+=( --enable-lto ) |
668 |
- |
669 |
- econf "${myeconfargs[@]}" |
670 |
-} |
671 |
- |
672 |
-src_compile() { |
673 |
- # more and more LO stuff tries to use OpenGL, including tests during build |
674 |
- # bug 501508, bug 540624, bug 545974 and probably more |
675 |
- addpredict /dev/dri |
676 |
- addpredict /dev/ati |
677 |
- addpredict /dev/nvidiactl |
678 |
- |
679 |
- # hack for offlinehelp, this needs fixing upstream at some point |
680 |
- # it is broken because we send --without-help |
681 |
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506 |
682 |
- ( |
683 |
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die |
684 |
- source "${T}/config_host.mk" 2&> /dev/null |
685 |
- |
686 |
- local path="${WORKDIR}/helpcontent2/source/auxiliary/" |
687 |
- mkdir -p "${path}" || die |
688 |
- |
689 |
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\"" |
690 |
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \ |
691 |
- -dir=helpcontent2/source/media/helpimg \ |
692 |
- > "${path}/helpimg.ilst" |
693 |
- [[ -s "${path}/helpimg.ilst" ]] || \ |
694 |
- ewarn "The help images list is empty, something is fishy, report a bug." |
695 |
- ) |
696 |
- |
697 |
- local target |
698 |
- use test && target="build" || target="build-nocheck" |
699 |
- |
700 |
- # this is not a proper make script |
701 |
- make ${target} || die |
702 |
-} |
703 |
- |
704 |
-src_test() { |
705 |
- make unitcheck || die |
706 |
- make slowcheck || die |
707 |
-} |
708 |
- |
709 |
-src_install() { |
710 |
- # This is not Makefile so no buildserver |
711 |
- make DESTDIR="${D}" distro-pack-install -o build -o check || die |
712 |
- |
713 |
- # bug 593514 |
714 |
- if use gtk3; then |
715 |
- dosym libreoffice/program/liblibreofficekitgtk.so \ |
716 |
- /usr/$(get_libdir)/liblibreofficekitgtk.so |
717 |
- fi |
718 |
- |
719 |
- # bash completion aliases |
720 |
- bashcomp_alias \ |
721 |
- libreoffice \ |
722 |
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice |
723 |
- |
724 |
- if use branding; then |
725 |
- insinto /usr/$(get_libdir)/${PN}/program |
726 |
- newins "${WORKDIR}/branding-sofficerc" sofficerc |
727 |
- dodir /etc/env.d |
728 |
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die |
729 |
- fi |
730 |
- |
731 |
- # Hack for offlinehelp, this needs fixing upstream at some point. |
732 |
- # It is broken because we send --without-help |
733 |
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506 |
734 |
- insinto /usr/$(get_libdir)/libreoffice/help |
735 |
- doins xmlhelp/util/*.xsl |
736 |
- |
737 |
- # Remove desktop files to support old installs that can't parse mime |
738 |
- rm -r "${ED}"usr/share/mimelnk/ || die |
739 |
- |
740 |
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin |
741 |
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin |
742 |
-} |
743 |
- |
744 |
-pkg_postinst() { |
745 |
- gnome2_icon_cache_update |
746 |
- xdg_desktop_database_update |
747 |
- xdg_mimeinfo_database_update |
748 |
-} |
749 |
- |
750 |
-pkg_postrm() { |
751 |
- gnome2_icon_cache_update |
752 |
- xdg_desktop_database_update |
753 |
- xdg_mimeinfo_database_update |
754 |
-} |
755 |
|
756 |
diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml |
757 |
index 174cf72da38..b63d524dac8 100644 |
758 |
--- a/app-office/libreoffice/metadata.xml |
759 |
+++ b/app-office/libreoffice/metadata.xml |
760 |
@@ -14,7 +14,6 @@ version</longdescription> |
761 |
<flag name="coinmp">Use sci-libs/coinor-mp as alternative solver</flag> |
762 |
<flag name="googledrive">Enable support for remote files on Google Drive</flag> |
763 |
<flag name="gtk2">Enable legacy gtk2 frontend</flag> |
764 |
- <flag name="gtk3">Enable experimental gtk3 frontend</flag> |
765 |
<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag> |
766 |
<flag name="odk">Build the Office Development Kit</flag> |
767 |
<flag name="pdfimport">Enable PDF import via the Poppler library</flag> |