1 |
commit: 7f34e50ef9126f62b6a5ae8e34b7b5e7c29a014e |
2 |
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jan 28 18:42:15 2020 +0000 |
4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 28 18:42:15 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=7f34e50e |
7 |
|
8 |
app-office/libreoffice: Update to latest stable |
9 |
|
10 |
Package-Manager: Portage-2.3.86, Repoman-2.3.20 |
11 |
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org> |
12 |
|
13 |
app-office/libreoffice/Manifest | 4 +- |
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 |
...e-6.2.5.2.ebuild => libreoffice-6.3.4.2.ebuild} | 37 ++++++----- |
17 |
app-office/libreoffice/metadata.xml | 1 - |
18 |
5 files changed, 139 insertions(+), 20 deletions(-) |
19 |
|
20 |
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest |
21 |
index a5b6cde..1083824 100644 |
22 |
--- a/app-office/libreoffice/Manifest |
23 |
+++ b/app-office/libreoffice/Manifest |
24 |
@@ -3,6 +3,6 @@ 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-6.2.5.2.tar.xz 215008848 BLAKE2B 5dd1ef185820944816e01c8ed6a7873a5a8fe6f7f4b41fad279729970d85ff868f51ed573e8b3d0a554ffd1f8e295b6ff2e493e7f7250f8cb1c7c2a40115abf4 SHA512 b46b6731c415ab354ad7d876cb8905cb9eae2ca71639abf049ea7f5930601c957cc0eb04a2cd06949073ba5e94778ecdb449692ed8bbfbd95b05f6e7980d8d10 |
29 |
+DIST libreoffice-6.3.4.2.tar.xz 225632492 BLAKE2B 587fe7e6298ded60fa08963f572733eb8e387c00b428201bb6f1de7eddcf9d9ee97438231ed3f961bd22628bde0fd9dfeacb63febdc566cde781bcebb9c9a71d SHA512 2ed687ae805da36635419729066a2924f1e38a6b0f8d2692c42b366450a261012adfcd8a5d7915d9cfd292d07519fc32c596cdb56d7be6b12a49618b18d6f3d2 |
30 |
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f |
31 |
-DIST libreoffice-help-6.2.5.2.tar.xz 13023680 BLAKE2B f1f3a03104c1270e59f2b9130a29e1fbc99a9bf76b2bf4cedef8dc61487c9a2036f143501ad7fcd0c056c8b72446305b7a4ca9a719b11200ade5feca35e5e7ea SHA512 14f964161bd827a5846ec667ae1dac80d1485450e172da44010103e31f3872df62595e8b1b1d45c720caac9256d2adaf8f5a0bb80d059d35f1c560b533eb764c |
32 |
+DIST libreoffice-help-6.3.4.2.tar.xz 13191636 BLAKE2B c1696efa0ec9fef9dbcc0c0388de8a384484af1453d200e08820ba910cdcb65638b189566a19868281fd1777213812fde06adb07c1a662302eea1d0a791ff5a0 SHA512 8c74c82c7d73adb1523300d1f7500769f5a623fdba60b440a63c122cbfeb631a6a34ecbcb115b0154a6957be1918306f7d0c1f465030f8e8cfd5c9a1acad17c9 |
33 |
|
34 |
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 |
35 |
new file mode 100644 |
36 |
index 0000000..5fa7b34 |
37 |
--- /dev/null |
38 |
+++ b/app-office/libreoffice/files/libreoffice-6.3.3.2-mysql-connector-c-8.patch |
39 |
@@ -0,0 +1,45 @@ |
40 |
+From 5917ba8bc645a2b105ec089101b8a664481b5b61 Mon Sep 17 00:00:00 2001 |
41 |
+From: Peter Levine <plevine457@×××××.com> |
42 |
+Date: Thu, 17 Oct 2019 23:08:57 -0400 |
43 |
+Subject: Fix building against MySQL Connector/C 8 |
44 |
+ |
45 |
+In MySQL Connector/C 8, my_bool is replaced by bool. It was |
46 |
+previously defined as char. When building against |
47 |
+MySQL Connector/C 8, this leads to type punning build errors. |
48 |
+Redefine affected members of struct BindMetaData as bool if using |
49 |
+version 8 of greater. Otherwise, default to char. |
50 |
+ |
51 |
+Change-Id: If12b975d95afae86502867cb334cb4195802f91d |
52 |
+Reviewed-on: https://gerrit.libreoffice.org/81002 |
53 |
+Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@×××.de> |
54 |
+Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@×××.de> |
55 |
+--- |
56 |
+ .../source/drivers/mysqlc/mysqlc_preparedstatement.hxx | 10 ++++++++-- |
57 |
+ 1 file changed, 8 insertions(+), 2 deletions(-) |
58 |
+ |
59 |
+diff --git a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx |
60 |
+index 1df2c70..3450473 100644 |
61 |
+--- a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx |
62 |
++++ b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx |
63 |
+@@ -39,11 +39,17 @@ using ::com::sun::star::uno::Reference; |
64 |
+ using ::com::sun::star::uno::RuntimeException; |
65 |
+ using ::com::sun::star::uno::Type; |
66 |
+ |
67 |
++#if defined MYSQL_VERSION_ID && (MYSQL_VERSION_ID >= 80000) && !defined MARIADB_BASE_VERSION |
68 |
++using my_bool = bool; |
69 |
++#else |
70 |
++using my_bool = char; |
71 |
++#endif |
72 |
++ |
73 |
+ struct BindMetaData |
74 |
+ { |
75 |
+- char is_null = 0; |
76 |
++ my_bool is_null = 0; |
77 |
+ unsigned long length = 0; |
78 |
+- char error = 0; |
79 |
++ my_bool error = 0; |
80 |
+ }; |
81 |
+ |
82 |
+ typedef ::cppu::ImplHelper5<css::sdbc::XPreparedStatement, css::sdbc::XParameters, |
83 |
+-- |
84 |
+cgit v1.1 |
85 |
|
86 |
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 |
87 |
new file mode 100644 |
88 |
index 0000000..d5697f2 |
89 |
--- /dev/null |
90 |
+++ b/app-office/libreoffice/files/libreoffice-6.3.4.2-poppler-0.83.patch |
91 |
@@ -0,0 +1,72 @@ |
92 |
+From 9065cd8d9a19864f6b618f2dc10daf577badd9ee Mon Sep 17 00:00:00 2001 |
93 |
+From: Martin Milata <martin@××××××××××××.cz> |
94 |
+Date: Wed, 4 Dec 2019 02:37:40 +0100 |
95 |
+Subject: Fix build with poppler-0.83 |
96 |
+ |
97 |
+Change-Id: I7a3684932b8f9c403a3368b42fa4d8039c67f1a9 |
98 |
+Reviewed-on: https://gerrit.libreoffice.org/84384 |
99 |
+Tested-by: Jenkins |
100 |
+Reviewed-by: Michael Stahl <michael.stahl@×××.de> |
101 |
+--- |
102 |
+ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 7 +++++++ |
103 |
+ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 4 ++++ |
104 |
+ sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx | 4 ++++ |
105 |
+ 3 files changed, 15 insertions(+) |
106 |
+ |
107 |
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |
108 |
+index 26048177e87d..e9c2a407c279 100644 |
109 |
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |
110 |
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |
111 |
+@@ -491,11 +491,18 @@ void PDFOutDev::writeFontFile( GfxFont* gfxFont ) const |
112 |
+ gfree(pBuf); |
113 |
+ } |
114 |
+ |
115 |
++#if POPPLER_CHECK_VERSION(0, 83, 0) |
116 |
++void PDFOutDev::printPath( const GfxPath* pPath ) |
117 |
++#else |
118 |
+ void PDFOutDev::printPath( GfxPath* pPath ) |
119 |
++#endif |
120 |
+ { |
121 |
+ int nSubPaths = pPath ? pPath->getNumSubpaths() : 0; |
122 |
+ for( int i=0; i<nSubPaths; i++ ) |
123 |
+ { |
124 |
++#if POPPLER_CHECK_VERSION(0, 83, 0) |
125 |
++ const |
126 |
++#endif |
127 |
+ GfxSubpath* pSub = pPath->getSubpath( i ); |
128 |
+ const int nPoints = pSub->getNumPoints(); |
129 |
+ |
130 |
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx |
131 |
+index 02f6b59f6f15..2e7d2186f9a1 100644 |
132 |
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx |
133 |
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx |
134 |
+@@ -149,7 +149,11 @@ namespace pdfi |
135 |
+ |
136 |
+ int parseFont( long long nNewId, GfxFont* pFont, GfxState* state ) const; |
137 |
+ void writeFontFile( GfxFont* gfxFont ) const; |
138 |
++#if POPPLER_CHECK_VERSION(0, 83, 0) |
139 |
++ static void printPath( const GfxPath* pPath ); |
140 |
++#else |
141 |
+ static void printPath( GfxPath* pPath ); |
142 |
++#endif |
143 |
+ |
144 |
+ public: |
145 |
+ explicit PDFOutDev( PDFDoc* pDoc ); |
146 |
+diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx |
147 |
+index 42178b650cdd..b1a54bd09c5f 100644 |
148 |
+--- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx |
149 |
++++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx |
150 |
+@@ -68,7 +68,11 @@ int main(int argc, char **argv) |
151 |
+ } |
152 |
+ |
153 |
+ // read config file |
154 |
++#if POPPLER_CHECK_VERSION(0, 83, 0) |
155 |
++ globalParams = std::make_unique<GlobalParams>(); |
156 |
++#else |
157 |
+ globalParams = new GlobalParams(); |
158 |
++#endif |
159 |
+ globalParams->setErrQuiet(true); |
160 |
+ #if defined(_MSC_VER) |
161 |
+ globalParams->setupBaseFonts(nullptr); |
162 |
+-- |
163 |
+cgit v1.2.1 |
164 |
|
165 |
diff --git a/app-office/libreoffice/libreoffice-6.2.5.2.ebuild b/app-office/libreoffice/libreoffice-6.3.4.2.ebuild |
166 |
similarity index 96% |
167 |
rename from app-office/libreoffice/libreoffice-6.2.5.2.ebuild |
168 |
rename to app-office/libreoffice/libreoffice-6.3.4.2.ebuild |
169 |
index 5994e6d..b0ff46d 100644 |
170 |
--- a/app-office/libreoffice/libreoffice-6.2.5.2.ebuild |
171 |
+++ b/app-office/libreoffice/libreoffice-6.3.4.2.ebuild |
172 |
@@ -1,9 +1,9 @@ |
173 |
-# Copyright 1999-2019 Gentoo Authors |
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=( python2_7 python3_{5,6,7} ) |
180 |
+PYTHON_COMPAT=( python3_{6,7,8} ) |
181 |
PYTHON_REQ_USE="threads(+),xml" |
182 |
|
183 |
MY_PV="${PV/_alpha/.alpha}" |
184 |
@@ -63,7 +63,7 @@ unset ADDONS_SRC |
185 |
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" |
186 |
|
187 |
IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird |
188 |
-googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test vlc |
189 |
+googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test |
190 |
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" |
191 |
|
192 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
193 |
@@ -74,6 +74,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} |
194 |
libreoffice_extensions_wiki-publisher? ( java ) |
195 |
" |
196 |
|
197 |
+RESTRICT="!test? ( test )" |
198 |
+ |
199 |
LICENSE="|| ( LGPL-3 MPL-1.1 )" |
200 |
SLOT="0" |
201 |
[[ ${MY_PV} == *9999* ]] || \ |
202 |
@@ -109,7 +111,7 @@ COMMON_DEPEND="${PYTHON_DEPS} |
203 |
>=app-text/libwps-0.4 |
204 |
app-text/mythes |
205 |
>=dev-cpp/clucene-2.3.3.4-r2 |
206 |
- =dev-cpp/libcmis-0.5* |
207 |
+ >=dev-cpp/libcmis-0.5.2 |
208 |
dev-db/unixODBC |
209 |
dev-lang/perl |
210 |
dev-libs/boost:=[nls] |
211 |
@@ -125,7 +127,7 @@ COMMON_DEPEND="${PYTHON_DEPS} |
212 |
dev-libs/nspr |
213 |
dev-libs/nss |
214 |
>=dev-libs/redland-1.0.16 |
215 |
- >=dev-libs/xmlsec-1.2.24[nss] |
216 |
+ >=dev-libs/xmlsec-1.2.28[nss] |
217 |
media-gfx/fontforge |
218 |
media-gfx/graphite2 |
219 |
media-libs/fontconfig |
220 |
@@ -184,8 +186,8 @@ COMMON_DEPEND="${PYTHON_DEPS} |
221 |
kde? ( |
222 |
dev-qt/qtcore:5 |
223 |
dev-qt/qtgui:5 |
224 |
- dev-qt/qtx11extras:5 |
225 |
dev-qt/qtwidgets:5 |
226 |
+ dev-qt/qtx11extras:5 |
227 |
kde-frameworks/kconfig:5 |
228 |
kde-frameworks/kcoreaddons:5 |
229 |
kde-frameworks/ki18n:5 |
230 |
@@ -208,7 +210,7 @@ DEPEND="${COMMON_DEPEND} |
231 |
>=dev-libs/libatomic_ops-7.2d |
232 |
dev-perl/Archive-Zip |
233 |
>=dev-util/cppunit-1.14.0 |
234 |
- >=dev-util/gperf-3 |
235 |
+ >=dev-util/gperf-3.1 |
236 |
>=dev-util/mdds-1.4.1:1= |
237 |
media-libs/glm |
238 |
sys-devel/ucpp |
239 |
@@ -234,7 +236,6 @@ RDEPEND="${COMMON_DEPEND} |
240 |
|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) |
241 |
java? ( >=virtual/jre-1.6 ) |
242 |
kde? ( kde-frameworks/breeze-icons:* ) |
243 |
- vlc? ( media-video/vlc ) |
244 |
" |
245 |
if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then |
246 |
PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*" |
247 |
@@ -245,8 +246,6 @@ else |
248 |
fi |
249 |
|
250 |
PATCHES=( |
251 |
- # master branch |
252 |
- "${FILESDIR}/${PN}-6.2-ldap-optional.patch" |
253 |
# "${WORKDIR}"/${PATCHSET/.tar.xz/} |
254 |
|
255 |
# not upstreamable stuff |
256 |
@@ -254,6 +253,10 @@ PATCHES=( |
257 |
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" |
258 |
"${FILESDIR}/${PN}-6.1-nomancompress.patch" |
259 |
|
260 |
+ # master branch |
261 |
+ "${FILESDIR}/${PN}-6.3.3.2-mysql-connector-c-8.patch" # bug #692422 |
262 |
+ "${FILESDIR}/${P}-poppler-0.83.patch" |
263 |
+ |
264 |
# musl compatibility by AlpineLinux |
265 |
"${FILESDIR}/${PN}-6.1.4.2-linux-musl.patch" |
266 |
"${FILESDIR}/${PN}-6.1.4.2-musl-fix-execinfo.patch" |
267 |
@@ -275,8 +278,11 @@ _check_reqs() { |
268 |
} |
269 |
|
270 |
pkg_pretend() { |
271 |
- use java || \ |
272 |
- ewarn "If you plan to use Base application you should enable java or you will get various crashes." |
273 |
+ if ! use java && ! use firebird; then |
274 |
+ ewarn "If you plan to use Base application you must enable either firebird or java." |
275 |
+ fi |
276 |
+ |
277 |
+ use java || ewarn "Without java, several wizards are not going to be available." |
278 |
|
279 |
if has_version "<app-office/libreoffice-5.3.0[firebird]"; then |
280 |
ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so" |
281 |
@@ -416,10 +422,12 @@ src_configure() { |
282 |
--disable-epm |
283 |
--disable-fetch-external |
284 |
--disable-gstreamer-0-10 |
285 |
+ --disable-gtk3-kde5 |
286 |
--disable-online-update |
287 |
--disable-openssl |
288 |
--disable-pdfium |
289 |
--disable-report-builder |
290 |
+ --disable-vlc |
291 |
--with-build-version="${gentoo_buildid}" |
292 |
--enable-extension-integration |
293 |
--with-external-dict-dir="${EPREFIX}/usr/share/myspell" |
294 |
@@ -454,7 +462,6 @@ src_configure() { |
295 |
$(use_enable odk) |
296 |
$(use_enable pdfimport) |
297 |
$(use_enable postgres postgresql-sdbc) |
298 |
- $(use_enable vlc) |
299 |
$(use_with accessibility lxml) |
300 |
$(use_with coinmp system-coinmp) |
301 |
$(use_with googledrive gdrive-client-id ${google_default_client_id}) |
302 |
@@ -463,10 +470,6 @@ src_configure() { |
303 |
$(use_with odk doxygen) |
304 |
) |
305 |
|
306 |
- if use gtk && use kde; then |
307 |
- myeconfargs+=( --enable-gtk3-kde5 ) |
308 |
- fi |
309 |
- |
310 |
if use eds || use gtk; then |
311 |
myeconfargs+=( --enable-dconf --enable-gio ) |
312 |
else |
313 |
|
314 |
diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml |
315 |
index 6b51466..38a66bc 100644 |
316 |
--- a/app-office/libreoffice/metadata.xml |
317 |
+++ b/app-office/libreoffice/metadata.xml |
318 |
@@ -17,6 +17,5 @@ version</longdescription> |
319 |
<flag name="mariadb">Prefer mariadb connector over mysql connector</flag> |
320 |
<flag name="odk">Build the Office Development Kit</flag> |
321 |
<flag name="pdfimport">Enable PDF import via the Poppler library</flag> |
322 |
- <flag name="vlc">Use <pkg>media-video/vlc</pkg> for video embedding</flag> |
323 |
</use> |
324 |
</pkgmetadata> |