1 |
commit: b1a74e52606cac591c8721fd76b458fafde394a9 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Apr 10 14:59:27 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 11 09:02:55 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1a74e52 |
7 |
|
8 |
app-office/libreoffice: Drop 6.2.3.1 |
9 |
|
10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
11 |
Package-Manager: Portage-2.3.62, Repoman-2.3.11 |
12 |
|
13 |
app-office/libreoffice/Manifest | 2 - |
14 |
...6.2.3.1-kf5-update-delayed-frame-destruct.patch | 113 ----- |
15 |
app-office/libreoffice/libreoffice-6.2.3.1.ebuild | 549 --------------------- |
16 |
3 files changed, 664 deletions(-) |
17 |
|
18 |
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest |
19 |
index 0443321a6d0..2bedfe043ea 100644 |
20 |
--- a/app-office/libreoffice/Manifest |
21 |
+++ b/app-office/libreoffice/Manifest |
22 |
@@ -6,10 +6,8 @@ DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd9058 |
23 |
DIST libreoffice-6.1.5.2.tar.xz 207918636 BLAKE2B bb4e57a5363e7dc6757c537ef46231ff748649ca4b79993f371e787adba8cd1f3dd988f11e8813c24eb952d00355b02b15f0b126ea2c1f9d9ce7d6c26bf71c38 SHA512 36027ad8a3940e803908561e04feebce297db2fd570b7e43bb43d8c0b7885729eeaf0a64fc5f9e642c1008ffea0b3b1b6d0008e349cd1897425dc818ac8bf140 |
24 |
DIST libreoffice-6.2.2.2-patchset-01.tar.xz 6952 BLAKE2B 6b6b5280c9c65b7995d49bd0a5c0667226366f498f04d747e883d21490c88fcdd5abe4348ffe37d3060d0b685d4c3c3cd5e826351b22f24b68779bc5ca9d92b3 SHA512 63cce0839f65962df425f212306ed65e3899c6da857f74d7ea335bd48712fab2faa1de7dbc28a5022021a408f02cb972c3bb7b511f6e1209f103b8d214e163ac |
25 |
DIST libreoffice-6.2.2.2.tar.xz 214029032 BLAKE2B fc95d9dcb594bd18317285ecf593fb69825ecf061f7a339b48c01c858ee0340390d635a75f9be2d522f0b8883365d013b72b52f81cded509a2748ad354b9006c SHA512 f58f73fc76c57cbcbc24f63680ebc06f72cbbff9c1339c8186e70bf5f0f9ad0203ed2898ee7dd82cfb2bd0239d96a1534cec635847fe8fb50a0abe70848d2125 |
26 |
-DIST libreoffice-6.2.3.1.tar.xz 214212540 BLAKE2B 62898ab40a19e8517d32c427d68364289b73a8f13ea9c7b33f380f784908f5dbad2cbefe5e6e878c337b42306e29e2d7c574da36397b1bcd48651a519a8c04e0 SHA512 d835725f769af98c91ffe2e9cd6edb0361bbd7d8122ec6660fabebeec5830d14bc485ffa2b50a6bebcc72271440763e4aee427228c37ea81773bc83ef0650035 |
27 |
DIST libreoffice-6.2.3.2.tar.xz 214234080 BLAKE2B d565a7bc80cb550179ba38a1f2233bda68acf312e8966db84a72b242a10673ac81198370ffa46a7a222ad6c0654f5691404f1a17d7b0c9a60fd378d04dc6d550 SHA512 06c7e67c521eb9d94aa1a63464a4531b61b0fa0a8f77a0ecd1584535826232557a971471bea87dbc0b794979e1cddb201dbfdf0c4a2b4261ea63730e15cd8000 |
28 |
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f |
29 |
DIST libreoffice-help-6.1.5.2.tar.xz 15758000 BLAKE2B e8db833db00116e210cd6da578ab05089fd12128bfb8015600027c9afca09a1afe7a62e30a0271dffead5d176c0195eae9095d0e00450a926999efadf3f7572f SHA512 0575244ae595af7383b244fd3f1855b7d63820f9c3ebf87bc9d0758463b4b289988bbed99f0985508d34793967734fd83ae2d1a5db514479bb2fe32e0498fc9f |
30 |
DIST libreoffice-help-6.2.2.2.tar.xz 15267780 BLAKE2B 6e5300f8cbd202ccf411d7f5d5268075e53d004b986917a382b0bcae6e3eb2a6b69ff36bbb38b23e9661f2f0df0388032dfc2156c7e2665414137e125cc83247 SHA512 c9aebd77aa44ea54e08c9e305aa073e29a02b11fbe118f346f2bb17a6aa8c3ff13fa3ba212a29eaa4c2b3861365bf4a8683979c5e77c57fa538ef18f4aea7ae4 |
31 |
-DIST libreoffice-help-6.2.3.1.tar.xz 13023992 BLAKE2B 5cb0f6081f60cf2ac6fe9e1e8715c5e48a4e8769a44dda1dd8a66aed18992710c6075a18ff19d3c5dba136d41396da42fd66d9ce1f1cc4d5fbc77a5c04f72e6d SHA512 1bc10999401bd7fe2a7454eb036675fd43cca9c4d0ef817f28c82cb6d3818afd44428b75fd31b2dac84a77a79f0a026679fd582ffa572b79bba38de1470f8857 |
32 |
DIST libreoffice-help-6.2.3.2.tar.xz 13024476 BLAKE2B 1d4a993b4725dfeb2993db6ad8afa4f1cc6d68f0e3e51cf712e3983b9eb3d5e092b2fea69628b5f88237c59ec568e1a02a5898bcb0f950288ece6b4408de153a SHA512 3c2c05f22bebf59662ff2948b59055c2b8b962f8c717e8d894a6f0df1878cd13cce0e55d39c2cbbf7e83af61623149d757ec65495c4ed23a1e587832595be037 |
33 |
|
34 |
diff --git a/app-office/libreoffice/files/libreoffice-6.2.3.1-kf5-update-delayed-frame-destruct.patch b/app-office/libreoffice/files/libreoffice-6.2.3.1-kf5-update-delayed-frame-destruct.patch |
35 |
deleted file mode 100644 |
36 |
index 17843e007e0..00000000000 |
37 |
--- a/app-office/libreoffice/files/libreoffice-6.2.3.1-kf5-update-delayed-frame-destruct.patch |
38 |
+++ /dev/null |
39 |
@@ -1,113 +0,0 @@ |
40 |
-From d622be2d6bcfcc2c7260421e0eaa09c76ce15da2 Mon Sep 17 00:00:00 2001 |
41 |
-From: Aleksei Nikiforov <darktemplar@×××××××.ru> |
42 |
-Date: Wed, 6 Mar 2019 16:10:17 +0300 |
43 |
-Subject: tdf#123406 KDE5: Update delayed frame destruction |
44 |
- |
45 |
-Move deleteLater() call to the different event loop. |
46 |
-This fixes issue with frames not being disposed of |
47 |
-deterministically, and previously opened window |
48 |
-not reactivating. |
49 |
- |
50 |
-Also hide modal dialog window before unsetting modal mode. |
51 |
-Unsetting modal mode may require to toggle window visibility. |
52 |
-Window will be hidden soon anyway, |
53 |
-and additional generated events might make finding correct |
54 |
-focused window harder. |
55 |
- |
56 |
-Change-Id: Id7839f817075785287b09f6ac79eb3fb211726aa |
57 |
-Reviewed-on: https://gerrit.libreoffice.org/68852 |
58 |
-Tested-by: Jenkins |
59 |
-Reviewed-by: Katarina Behrens <Katarina.Behrens@×××.de> |
60 |
-Reviewed-on: https://gerrit.libreoffice.org/70078 |
61 |
-Reviewed-by: Thorsten Behrens <Thorsten.Behrens@×××.de> |
62 |
---- |
63 |
- vcl/inc/qt5/Qt5Instance.hxx | 2 ++ |
64 |
- vcl/qt5/Qt5Instance.cxx | 12 ++++++++++-- |
65 |
- vcl/source/window/dialog.cxx | 4 ++-- |
66 |
- 3 files changed, 14 insertions(+), 4 deletions(-) |
67 |
- |
68 |
-diff --git a/vcl/inc/qt5/Qt5Instance.hxx b/vcl/inc/qt5/Qt5Instance.hxx |
69 |
-index 91682bd..cece484 100644 |
70 |
---- a/vcl/inc/qt5/Qt5Instance.hxx |
71 |
-+++ b/vcl/inc/qt5/Qt5Instance.hxx |
72 |
-@@ -50,10 +50,12 @@ public: |
73 |
- |
74 |
- private Q_SLOTS: |
75 |
- bool ImplYield(bool bWait, bool bHandleAllCurrentEvents); |
76 |
-+ static void deleteObjectLater(QObject* pObject); |
77 |
- |
78 |
- Q_SIGNALS: |
79 |
- bool ImplYieldSignal(bool bWait, bool bHandleAllCurrentEvents); |
80 |
- std::unique_ptr<SalMenu> createMenuSignal(bool, Menu*); |
81 |
-+ void deleteObjectLaterSignal(QObject* pObject); |
82 |
- |
83 |
- public: |
84 |
- explicit Qt5Instance(bool bUseCairo = false); |
85 |
-diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx |
86 |
-index 8de9fc7..58f93fe 100644 |
87 |
---- a/vcl/qt5/Qt5Instance.cxx |
88 |
-+++ b/vcl/qt5/Qt5Instance.cxx |
89 |
-@@ -67,6 +67,12 @@ Qt5Instance::Qt5Instance(bool bUseCairo) |
90 |
- Qt::BlockingQueuedConnection); |
91 |
- connect(this, &Qt5Instance::createMenuSignal, this, &Qt5Instance::CreateMenu, |
92 |
- Qt::BlockingQueuedConnection); |
93 |
-+ |
94 |
-+ // this one needs to be queued non-blocking |
95 |
-+ // in order to have this event arriving to correct event processing loop |
96 |
-+ connect(this, &Qt5Instance::deleteObjectLaterSignal, this, |
97 |
-+ [](QObject* pObject) { Qt5Instance::deleteObjectLater(pObject); }, |
98 |
-+ Qt::QueuedConnection); |
99 |
- } |
100 |
- |
101 |
- Qt5Instance::~Qt5Instance() |
102 |
-@@ -78,6 +84,8 @@ Qt5Instance::~Qt5Instance() |
103 |
- free(m_pFakeArgvFreeable[i]); |
104 |
- } |
105 |
- |
106 |
-+void Qt5Instance::deleteObjectLater(QObject* pObject) { pObject->deleteLater(); } |
107 |
-+ |
108 |
- SalFrame* Qt5Instance::CreateChildFrame(SystemParentData* /*pParent*/, SalFrameStyleFlags nStyle) |
109 |
- { |
110 |
- return new Qt5Frame(nullptr, nStyle, m_bUseCairo); |
111 |
-@@ -94,7 +102,7 @@ void Qt5Instance::DestroyFrame(SalFrame* pFrame) |
112 |
- if (pFrame) |
113 |
- { |
114 |
- assert(dynamic_cast<Qt5Frame*>(pFrame)); |
115 |
-- static_cast<Qt5Frame*>(pFrame)->deleteLater(); |
116 |
-+ Q_EMIT deleteObjectLaterSignal(static_cast<Qt5Frame*>(pFrame)); |
117 |
- } |
118 |
- } |
119 |
- |
120 |
-@@ -109,7 +117,7 @@ void Qt5Instance::DestroyObject(SalObject* pObject) |
121 |
- if (pObject) |
122 |
- { |
123 |
- assert(dynamic_cast<Qt5Object*>(pObject)); |
124 |
-- static_cast<Qt5Object*>(pObject)->deleteLater(); |
125 |
-+ Q_EMIT deleteObjectLaterSignal(static_cast<Qt5Object*>(pObject)); |
126 |
- } |
127 |
- } |
128 |
- |
129 |
-diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx |
130 |
-index 0c75f85..1688163 100644 |
131 |
---- a/vcl/source/window/dialog.cxx |
132 |
-+++ b/vcl/source/window/dialog.cxx |
133 |
-@@ -1097,6 +1097,8 @@ void Dialog::EndDialog( long nResult ) |
134 |
- |
135 |
- const bool bModal = GetType() != WindowType::MODELESSDIALOG; |
136 |
- |
137 |
-+ Hide(); |
138 |
-+ |
139 |
- if (bModal) |
140 |
- { |
141 |
- SetModalInputMode(false); |
142 |
-@@ -1121,8 +1123,6 @@ void Dialog::EndDialog( long nResult ) |
143 |
- } |
144 |
- } |
145 |
- |
146 |
-- Hide(); |
147 |
-- |
148 |
- if (bModal && GetParent()) |
149 |
- { |
150 |
- NotifyEvent aNEvt( MouseNotifyEvent::ENDEXECUTEDIALOG, this ); |
151 |
--- |
152 |
-cgit v1.1 |
153 |
|
154 |
diff --git a/app-office/libreoffice/libreoffice-6.2.3.1.ebuild b/app-office/libreoffice/libreoffice-6.2.3.1.ebuild |
155 |
deleted file mode 100644 |
156 |
index ff477aefb76..00000000000 |
157 |
--- a/app-office/libreoffice/libreoffice-6.2.3.1.ebuild |
158 |
+++ /dev/null |
159 |
@@ -1,549 +0,0 @@ |
160 |
-# Copyright 1999-2019 Gentoo Authors |
161 |
-# Distributed under the terms of the GNU General Public License v2 |
162 |
- |
163 |
-EAPI=7 |
164 |
- |
165 |
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) |
166 |
-PYTHON_REQ_USE="threads(+),xml" |
167 |
- |
168 |
-MY_PV="${PV/_alpha/.alpha}" |
169 |
-MY_PV="${MY_PV/_beta/.beta}" |
170 |
-# experimental ; release ; old |
171 |
-# Usually the tarballs are moved a lot so this should make everyone happy. |
172 |
-DEV_URI=" |
173 |
- https://dev-builds.libreoffice.org/pre-releases/src |
174 |
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/ |
175 |
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src |
176 |
-" |
177 |
-ADDONS_URI="https://dev-www.libreoffice.org/src/" |
178 |
- |
179 |
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz" |
180 |
-# PATCHSET="${P}-patchset-01.tar.xz" |
181 |
- |
182 |
-[[ ${MY_PV} == *9999* ]] && inherit git-r3 |
183 |
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg |
184 |
- |
185 |
-DESCRIPTION="A full office productivity suite" |
186 |
-HOMEPAGE="https://www.libreoffice.org" |
187 |
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )" |
188 |
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}" |
189 |
- |
190 |
-# Split modules following git/tarballs; Core MUST be first! |
191 |
-# Help is used for the image generator |
192 |
-# Only release has the tarballs |
193 |
-if [[ ${MY_PV} != *9999* ]]; then |
194 |
- for i in ${DEV_URI}; do |
195 |
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz" |
196 |
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz" |
197 |
- done |
198 |
- unset i |
199 |
-fi |
200 |
-unset DEV_URI |
201 |
- |
202 |
-# Really required addons |
203 |
-# These are bundles that can't be removed for now due to huge patchsets. |
204 |
-# If you want them gone, patches are welcome. |
205 |
-ADDONS_SRC=( |
206 |
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )" |
207 |
- # no release for 8 years, should we package it? |
208 |
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" |
209 |
- # Does not build with 1.6 rhino at all |
210 |
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" |
211 |
- # requirement of rhino |
212 |
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" |
213 |
- # not packageable |
214 |
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" |
215 |
-) |
216 |
-SRC_URI+=" ${ADDONS_SRC[*]}" |
217 |
- |
218 |
-unset ADDONS_URI |
219 |
-unset ADDONS_SRC |
220 |
- |
221 |
-# Extensions that need extra work: |
222 |
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" |
223 |
- |
224 |
-IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird |
225 |
-googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test vlc |
226 |
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" |
227 |
- |
228 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE} |
229 |
- bluetooth? ( dbus ) |
230 |
- libreoffice_extensions_nlpsolver? ( java ) |
231 |
- libreoffice_extensions_scripting-beanshell? ( java ) |
232 |
- libreoffice_extensions_scripting-javascript? ( java ) |
233 |
- libreoffice_extensions_wiki-publisher? ( java ) |
234 |
-" |
235 |
- |
236 |
-LICENSE="|| ( LGPL-3 MPL-1.1 )" |
237 |
-SLOT="0" |
238 |
-[[ ${MY_PV} == *9999* ]] || \ |
239 |
-KEYWORDS="" |
240 |
-# KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" |
241 |
- |
242 |
-BDEPEND=" |
243 |
- dev-util/intltool |
244 |
- sys-devel/bison |
245 |
- sys-devel/flex |
246 |
- sys-devel/gettext |
247 |
- virtual/pkgconfig |
248 |
- odk? ( >=app-doc/doxygen-1.8.4 ) |
249 |
-" |
250 |
-COMMON_DEPEND="${PYTHON_DEPS} |
251 |
- app-arch/unzip |
252 |
- app-arch/zip |
253 |
- app-crypt/gpgme[cxx] |
254 |
- app-text/hunspell:= |
255 |
- >=app-text/libabw-0.1.0 |
256 |
- >=app-text/libebook-0.1 |
257 |
- app-text/libepubgen |
258 |
- >=app-text/libetonyek-0.1 |
259 |
- app-text/libexttextcat |
260 |
- app-text/liblangtag |
261 |
- >=app-text/libmspub-0.1.0 |
262 |
- >=app-text/libmwaw-0.3.1 |
263 |
- app-text/libnumbertext |
264 |
- >=app-text/libodfgen-0.1.0 |
265 |
- app-text/libqxp |
266 |
- app-text/libstaroffice |
267 |
- app-text/libwpd:0.10[tools] |
268 |
- app-text/libwpg:0.3 |
269 |
- >=app-text/libwps-0.4 |
270 |
- app-text/mythes |
271 |
- >=dev-cpp/clucene-2.3.3.4-r2 |
272 |
- =dev-cpp/libcmis-0.5* |
273 |
- dev-db/unixODBC |
274 |
- dev-lang/perl |
275 |
- dev-libs/boost:=[nls] |
276 |
- dev-libs/expat |
277 |
- dev-libs/hyphen |
278 |
- dev-libs/icu:= |
279 |
- dev-libs/libassuan |
280 |
- dev-libs/libgpg-error |
281 |
- >=dev-libs/liborcus-0.14.0 |
282 |
- dev-libs/librevenge |
283 |
- dev-libs/libxml2 |
284 |
- dev-libs/libxslt |
285 |
- dev-libs/nspr |
286 |
- dev-libs/nss |
287 |
- >=dev-libs/redland-1.0.16 |
288 |
- >=dev-libs/xmlsec-1.2.24[nss] |
289 |
- media-gfx/fontforge |
290 |
- media-gfx/graphite2 |
291 |
- media-libs/fontconfig |
292 |
- media-libs/freetype:2 |
293 |
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu] |
294 |
- media-libs/lcms:2 |
295 |
- >=media-libs/libcdr-0.1.0 |
296 |
- >=media-libs/libepoxy-1.3.1[X] |
297 |
- >=media-libs/libfreehand-0.1.0 |
298 |
- media-libs/libpagemaker |
299 |
- >=media-libs/libpng-1.4:0= |
300 |
- >=media-libs/libvisio-0.1.0 |
301 |
- media-libs/libzmf |
302 |
- net-libs/neon |
303 |
- net-misc/curl |
304 |
- sci-mathematics/lpsolve |
305 |
- sys-libs/zlib |
306 |
- virtual/glu |
307 |
- virtual/jpeg:0 |
308 |
- virtual/opengl |
309 |
- x11-libs/cairo[X] |
310 |
- x11-libs/libXinerama |
311 |
- x11-libs/libXrandr |
312 |
- x11-libs/libXrender |
313 |
- accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] ) |
314 |
- bluetooth? ( |
315 |
- dev-libs/glib:2 |
316 |
- net-wireless/bluez |
317 |
- ) |
318 |
- coinmp? ( sci-libs/coinor-mp ) |
319 |
- cups? ( net-print/cups ) |
320 |
- dbus? ( sys-apps/dbus ) |
321 |
- eds? ( |
322 |
- dev-libs/glib:2 |
323 |
- gnome-base/dconf |
324 |
- gnome-extra/evolution-data-server |
325 |
- ) |
326 |
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) |
327 |
- gstreamer? ( |
328 |
- media-libs/gstreamer:1.0 |
329 |
- media-libs/gst-plugins-base:1.0 |
330 |
- ) |
331 |
- gtk? ( |
332 |
- dev-libs/glib:2 |
333 |
- dev-libs/gobject-introspection |
334 |
- gnome-base/dconf |
335 |
- media-libs/mesa[egl] |
336 |
- x11-libs/gtk+:3 |
337 |
- x11-libs/pango |
338 |
- ) |
339 |
- gtk2? ( |
340 |
- x11-libs/gdk-pixbuf |
341 |
- >=x11-libs/gtk+-2.24:2 |
342 |
- x11-libs/pango |
343 |
- ) |
344 |
- kde? ( |
345 |
- dev-qt/qtcore:5 |
346 |
- dev-qt/qtgui:5 |
347 |
- dev-qt/qtx11extras:5 |
348 |
- dev-qt/qtwidgets:5 |
349 |
- kde-frameworks/kconfig:5 |
350 |
- kde-frameworks/kcoreaddons:5 |
351 |
- kde-frameworks/ki18n:5 |
352 |
- kde-frameworks/kio:5 |
353 |
- kde-frameworks/kwindowsystem:5 |
354 |
- ) |
355 |
- ldap? ( net-nds/openldap ) |
356 |
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) |
357 |
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) |
358 |
- mariadb? ( dev-db/mariadb-connector-c ) |
359 |
- !mariadb? ( dev-db/mysql-connector-c ) |
360 |
- pdfimport? ( app-text/poppler:=[cxx] ) |
361 |
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) |
362 |
-" |
363 |
-# FIXME: cppunit should be moved to test conditional |
364 |
-# after everything upstream is under gbuild |
365 |
-# as dmake execute tests right away |
366 |
-# tests apparently also need google-carlito-fonts (not packaged) |
367 |
-DEPEND="${COMMON_DEPEND} |
368 |
- >=dev-libs/libatomic_ops-7.2d |
369 |
- dev-perl/Archive-Zip |
370 |
- >=dev-util/cppunit-1.14.0 |
371 |
- >=dev-util/gperf-3 |
372 |
- >=dev-util/mdds-1.4.1:1= |
373 |
- media-libs/glm |
374 |
- sys-devel/ucpp |
375 |
- x11-base/xorg-proto |
376 |
- x11-libs/libXt |
377 |
- x11-libs/libXtst |
378 |
- java? ( |
379 |
- dev-java/ant-core |
380 |
- >=virtual/jdk-1.6 |
381 |
- ) |
382 |
- test? ( |
383 |
- app-crypt/gnupg |
384 |
- dev-util/cppunit |
385 |
- media-fonts/dejavu |
386 |
- media-fonts/liberation-fonts |
387 |
- ) |
388 |
-" |
389 |
-RDEPEND="${COMMON_DEPEND} |
390 |
- !app-office/libreoffice-bin |
391 |
- !app-office/libreoffice-bin-debug |
392 |
- !app-office/openoffice |
393 |
- media-fonts/liberation-fonts |
394 |
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) |
395 |
- java? ( >=virtual/jre-1.6 ) |
396 |
- kde? ( kde-frameworks/breeze-icons:* ) |
397 |
- vlc? ( media-video/vlc ) |
398 |
-" |
399 |
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then |
400 |
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*" |
401 |
-else |
402 |
- # Translations are not reliable on live ebuilds |
403 |
- # rather force people to use english only. |
404 |
- PDEPEND="!app-office/libreoffice-l10n" |
405 |
-fi |
406 |
- |
407 |
-PATCHES=( |
408 |
- # master branch |
409 |
- "${FILESDIR}/${PN}-6.2-ldap-optional.patch" |
410 |
- # 6.2 stable branch |
411 |
- "${FILESDIR}/${P}-qt5-kf5-disable-qt-hidpi-scaling.patch" |
412 |
- "${FILESDIR}/${P}-kf5-update-delayed-frame-destruct.patch" |
413 |
- # "${WORKDIR}"/${PATCHSET/.tar.xz/} |
414 |
- |
415 |
- # not upstreamable stuff |
416 |
- "${FILESDIR}/${PN}-5.4-system-pyuno.patch" |
417 |
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" |
418 |
- "${FILESDIR}/${PN}-6.1-nomancompress.patch" |
419 |
-) |
420 |
- |
421 |
-S="${WORKDIR}/${PN}-${MY_PV}" |
422 |
- |
423 |
-_check_reqs() { |
424 |
- CHECKREQS_MEMORY="512M" |
425 |
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then |
426 |
- CHECKREQS_DISK_BUILD="22G" |
427 |
- else |
428 |
- CHECKREQS_DISK_BUILD="6G" |
429 |
- fi |
430 |
- check-reqs_$1 |
431 |
-} |
432 |
- |
433 |
-pkg_pretend() { |
434 |
- use java || \ |
435 |
- ewarn "If you plan to use Base application you should enable java or you will get various crashes." |
436 |
- |
437 |
- if has_version "<app-office/libreoffice-5.3.0[firebird]"; then |
438 |
- ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so" |
439 |
- ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version." |
440 |
- ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base" |
441 |
- fi |
442 |
- |
443 |
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend |
444 |
-} |
445 |
- |
446 |
-pkg_setup() { |
447 |
- java-pkg-opt-2_pkg_setup |
448 |
- python-single-r1_pkg_setup |
449 |
- |
450 |
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup |
451 |
-} |
452 |
- |
453 |
-src_unpack() { |
454 |
- default |
455 |
- |
456 |
- if [[ ${MY_PV} = *9999* ]]; then |
457 |
- local base_uri branch mypv |
458 |
- base_uri="https://anongit.freedesktop.org/git" |
459 |
- branch="master" |
460 |
- mypv=${MY_PV/.9999} |
461 |
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}" |
462 |
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}" |
463 |
- git-r3_checkout "${base_uri}/${PN}/core" |
464 |
- LOCOREGIT_VERSION=${EGIT_VERSION} |
465 |
- |
466 |
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master" |
467 |
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help |
468 |
- fi |
469 |
-} |
470 |
- |
471 |
-src_prepare() { |
472 |
- xdg_src_prepare |
473 |
- |
474 |
- # sandbox violations on many systems, we don't need it. Bug #646406 |
475 |
- sed -i \ |
476 |
- -e "/KF5_CONFIG/s/kf5-config/no/" \ |
477 |
- configure.ac || die "Failed to disable kf5-config" |
478 |
- |
479 |
- AT_M4DIR="m4" eautoreconf |
480 |
- # hack in the autogen.sh |
481 |
- touch autogen.lastrun |
482 |
- |
483 |
- # system pyuno mess |
484 |
- sed -i \ |
485 |
- -e "s:%eprefix%:${EPREFIX}:g" \ |
486 |
- -e "s:%libdir%:$(get_libdir):g" \ |
487 |
- pyuno/source/module/uno.py \ |
488 |
- pyuno/source/officehelper.py || die |
489 |
- # sed in the tests |
490 |
- sed -i \ |
491 |
- -e "s#all : build unitcheck#all : build#g" \ |
492 |
- solenv/gbuild/Module.mk || die |
493 |
- sed -i \ |
494 |
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \ |
495 |
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \ |
496 |
- Makefile.in || die |
497 |
- |
498 |
- sed -i \ |
499 |
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \ |
500 |
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \ |
501 |
- bin/distro-install-desktop-integration || die |
502 |
- |
503 |
- if use branding; then |
504 |
- # hack... |
505 |
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die |
506 |
- fi |
507 |
- |
508 |
- # Don't list pdfimport support in desktop when built with none, bug # 605464 |
509 |
- if ! use pdfimport; then |
510 |
- sed -i \ |
511 |
- -e ":MimeType: s:application/pdf;::" \ |
512 |
- -e ":Keywords: s:pdf;::" \ |
513 |
- sysui/desktop/menus/draw.desktop || die |
514 |
- fi |
515 |
-} |
516 |
- |
517 |
-src_configure() { |
518 |
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys |
519 |
- # Note: these are for Gentoo use ONLY. For your own distribution, please get |
520 |
- # your own set of keys. Feel free to contact chromium@g.o for more info. |
521 |
- local google_default_client_id="329227923882.apps.googleusercontent.com" |
522 |
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu" |
523 |
- |
524 |
- # optimization flags |
525 |
- export GMAKE_OPTIONS="${MAKEOPTS}" |
526 |
- # System python enablement: |
527 |
- export PYTHON_CFLAGS=$(python_get_CFLAGS) |
528 |
- export PYTHON_LIBS=$(python_get_LIBS) |
529 |
- |
530 |
- if use kde; then |
531 |
- export QT_SELECT=5 # bug 639620 needs proper fix though |
532 |
- export QT5DIR="$(qt5_get_bindir)/../" |
533 |
- export MOC5="$(qt5_get_bindir)/moc" |
534 |
- fi |
535 |
- |
536 |
- local gentoo_buildid="Gentoo official package" |
537 |
- if [[ -n ${LOCOREGIT_VERSION} ]]; then |
538 |
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})" |
539 |
- fi |
540 |
- |
541 |
- # system headers/libs/...: enforce using system packages |
542 |
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad |
543 |
- # --enable-cairo: ensure that cairo is always required |
544 |
- # --enable-*-link: link to the library rather than just dlopen on runtime |
545 |
- # --enable-release-build: build the libreoffice as release |
546 |
- # --disable-fetch-external: prevent dowloading during compile phase |
547 |
- # --enable-extension-integration: enable any extension integration support |
548 |
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs |
549 |
- # --disable-report-builder: too much java packages pulled in without pkgs |
550 |
- # --without-system-sane: just sane.h header that is used for scan in writer, |
551 |
- # not linked or anything else, worthless to depend on |
552 |
- # --disable-pdfium: not yet packaged |
553 |
- local myeconfargs=( |
554 |
- --with-system-dicts |
555 |
- --with-system-epoxy |
556 |
- --with-system-headers |
557 |
- --with-system-jars |
558 |
- --with-system-libs |
559 |
- --enable-build-opensymbol |
560 |
- --enable-cairo-canvas |
561 |
- --enable-largefile |
562 |
- --enable-mergelibs |
563 |
- --enable-neon |
564 |
- --enable-python=system |
565 |
- --enable-randr |
566 |
- --enable-release-build |
567 |
- --disable-breakpad |
568 |
- --disable-bundle-mariadb |
569 |
- --disable-ccache |
570 |
- --disable-dependency-tracking |
571 |
- --disable-epm |
572 |
- --disable-fetch-external |
573 |
- --disable-gstreamer-0-10 |
574 |
- --disable-online-update |
575 |
- --disable-openssl |
576 |
- --disable-pdfium |
577 |
- --disable-report-builder |
578 |
- --with-build-version="${gentoo_buildid}" |
579 |
- --enable-extension-integration |
580 |
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell" |
581 |
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" |
582 |
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell" |
583 |
- --with-external-tar="${DISTDIR}" |
584 |
- --with-lang="" |
585 |
- --with-parallelism=$(makeopts_jobs) |
586 |
- --with-system-ucpp |
587 |
- --with-tls=nss |
588 |
- --with-vendor="Gentoo Foundation" |
589 |
- --with-x |
590 |
- --without-fonts |
591 |
- --without-myspell-dicts |
592 |
- --with-help="html" |
593 |
- --without-helppack-integration |
594 |
- --with-system-gpgmepp |
595 |
- --without-system-sane |
596 |
- $(use_enable bluetooth sdremote-bluetooth) |
597 |
- $(use_enable coinmp) |
598 |
- $(use_enable cups) |
599 |
- $(use_enable dbus) |
600 |
- $(use_enable debug) |
601 |
- $(use_enable eds evolution2) |
602 |
- $(use_enable firebird firebird-sdbc) |
603 |
- $(use_enable gstreamer gstreamer-1-0) |
604 |
- $(use_enable gtk gtk3) |
605 |
- $(use_enable gtk2 gtk) |
606 |
- $(use_enable kde kde5) |
607 |
- $(use_enable kde qt5) |
608 |
- $(use_enable ldap) |
609 |
- $(use_enable odk) |
610 |
- $(use_enable pdfimport) |
611 |
- $(use_enable postgres postgresql-sdbc) |
612 |
- $(use_enable vlc) |
613 |
- $(use_with accessibility lxml) |
614 |
- $(use_with coinmp system-coinmp) |
615 |
- $(use_with googledrive gdrive-client-id ${google_default_client_id}) |
616 |
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret}) |
617 |
- $(use_with java) |
618 |
- $(use_with odk doxygen) |
619 |
- ) |
620 |
- |
621 |
- if use gtk && use kde; then |
622 |
- myeconfargs+=( --enable-gtk3-kde5 ) |
623 |
- fi |
624 |
- |
625 |
- if use eds || use gtk; then |
626 |
- myeconfargs+=( --enable-dconf --enable-gio ) |
627 |
- else |
628 |
- myeconfargs+=( --disable-dconf --disable-gio ) |
629 |
- fi |
630 |
- |
631 |
- # libreoffice extensions handling |
632 |
- for lo_xt in ${LO_EXTS}; do |
633 |
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then |
634 |
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) ) |
635 |
- else |
636 |
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) ) |
637 |
- fi |
638 |
- done |
639 |
- |
640 |
- if use java; then |
641 |
- # hsqldb: system one is too new |
642 |
- myeconfargs+=( |
643 |
- --without-junit |
644 |
- --without-system-hsqldb |
645 |
- --with-ant-home="${ANT_HOME}" |
646 |
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null) |
647 |
- --with-jvm-path="${EPREFIX}/usr/lib/" |
648 |
- ) |
649 |
- |
650 |
- use libreoffice_extensions_scripting-beanshell && \ |
651 |
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) ) |
652 |
- |
653 |
- use libreoffice_extensions_scripting-javascript && \ |
654 |
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) ) |
655 |
- fi |
656 |
- |
657 |
- is-flagq "-flto*" && myeconfargs+=( --enable-lto ) |
658 |
- |
659 |
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \ |
660 |
- econf "${myeconfargs[@]}" |
661 |
-} |
662 |
- |
663 |
-src_compile() { |
664 |
- # more and more LO stuff tries to use OpenGL, including tests during build |
665 |
- # bug 501508, bug 540624, bug 545974 and probably more |
666 |
- addpredict /dev/dri |
667 |
- addpredict /dev/ati |
668 |
- addpredict /dev/nvidiactl |
669 |
- |
670 |
- local target |
671 |
- use test && target="build" || target="build-nocheck" |
672 |
- |
673 |
- # this is not a proper make script |
674 |
- make ${target} || die |
675 |
-} |
676 |
- |
677 |
-src_test() { |
678 |
- make unitcheck || die |
679 |
- make slowcheck || die |
680 |
-} |
681 |
- |
682 |
-src_install() { |
683 |
- # This is not Makefile so no buildserver |
684 |
- make DESTDIR="${D}" distro-pack-install -o build -o check || die |
685 |
- |
686 |
- # bug 593514 |
687 |
- if use gtk; then |
688 |
- dosym libreoffice/program/liblibreofficekitgtk.so \ |
689 |
- /usr/$(get_libdir)/liblibreofficekitgtk.so |
690 |
- fi |
691 |
- |
692 |
- # bash completion aliases |
693 |
- bashcomp_alias \ |
694 |
- libreoffice \ |
695 |
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice |
696 |
- |
697 |
- if use branding; then |
698 |
- insinto /usr/$(get_libdir)/${PN}/program |
699 |
- newins "${WORKDIR}/branding-sofficerc" sofficerc |
700 |
- dodir /etc/env.d |
701 |
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die |
702 |
- fi |
703 |
-} |
704 |
- |
705 |
-pkg_preinst() { |
706 |
- java-utils-2_pkg_preinst |
707 |
- xdg_pkg_preinst |
708 |
-} |