diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-02-11 16:09:52 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-02-11 16:09:52 +0000 |
commit | f78108598211053d41752a83e0345441bb9014ae (patch) | |
tree | dd2fc7ae0a1aea7bda4942ab0c453d1e55284b37 /app-office/libreoffice | |
parent | dc45b83b28fb83e9659492066e347b8dc60bc9e3 (diff) |
gentoo resync : 11.02.2018
Diffstat (limited to 'app-office/libreoffice')
-rw-r--r-- | app-office/libreoffice/Manifest | 15 | ||||
-rw-r--r-- | app-office/libreoffice/files/libreoffice-5.4.5.1-pyuno-crash.patch | 87 | ||||
-rw-r--r-- | app-office/libreoffice/files/libreoffice-6.0.0.1-poppler-0.62.patch | 44 | ||||
-rw-r--r-- | app-office/libreoffice/libreoffice-5.4.5.1.ebuild | 580 | ||||
-rw-r--r-- | app-office/libreoffice/libreoffice-6.0.1.1.ebuild (renamed from app-office/libreoffice/libreoffice-6.0.0.3.ebuild) | 7 | ||||
-rw-r--r-- | app-office/libreoffice/libreoffice-6.0.9999.ebuild | 8 | ||||
-rw-r--r-- | app-office/libreoffice/libreoffice-9999.ebuild | 6 |
7 files changed, 686 insertions, 61 deletions
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 05c1fdbe22e4..17e29b7ac29d 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -3,7 +3,7 @@ AUX libreoffice-5.3.4.2-kioclient5.patch 605 BLAKE2B 30961066c080c4d06ca978b7c0a AUX libreoffice-5.4-system-pyuno.patch 1399 BLAKE2B d7516b0ac19509dae8eaaac94acad65e35c71b68ea0f2962c41d9422a89993dc90e76b1f7cd3d19f8f3860b443f063ee1c17024c7f56fd3b8470d2b690eb9c32 SHA512 41b57b857a294b8ac234aaf160dbd380008f716ffdf481b7c733f1dab8702876aad827ab9f1b8f2f26778f0b3a6dfdc9e3ae190188a484d9aeb4568df2e9b418 AUX libreoffice-5.4.4.2-gtk3-no-gtk-build.patch 436 BLAKE2B 609d8867eee6830e79cbbbce96b260a9401b8b26385bb0af3a4627a8350f046282c9d8084787be03195bc36ed7cd91465b5017ca0801abaca8a0048cc8994bfb SHA512 d2d3e03c2962f4996839808a0c766d60ec897d764b3b1c8c588ba17da7d2d320083f88b8ade5709bbc359e3529ab5c4510806d7ec2a5aa79899b05da6f802851 AUX libreoffice-5.4.4.2-poppler-0.62.patch 1556 BLAKE2B 73c6218c1b12308b80db6cf93c1cd3d5fa317b5a65832df942c521f931e9bc1b624b1a50b3f7a34e168dad2c4e8ea9db7169b3f3ee27787f3aa1815f771368bc SHA512 759fb125ac09309c4b7dee4ee2d57c4e275b95dd31dbf5df7ff25dec687fd473815ad307dc4dc500ace11823c9f2b2e7bddf5c986fdfa2eddd3051eee7240cae -AUX libreoffice-6.0.0.1-poppler-0.62.patch 1556 BLAKE2B 58f446358e4c8da29a2afecc9fa1480a11ff3a2c11a750390069013f67c393ce859991b7aeab062f310edd9e7ec4680a2345b8742c5f6850a5af006c17588cbc SHA512 30d55d3d5bbecbe697f7cf735db017d992a41b5032290fce50956187f7e1823fe403613bbdb55cf0ef1b9f2fc3561a479552fb80293cff117c311a838a52686b +AUX libreoffice-5.4.5.1-pyuno-crash.patch 3214 BLAKE2B 0df77d6f8d5fdfdc18665e881f5dcfd0d7323c2782ce91e74d972a743a36751cc270e3d50b8b2eeddb6d2c4470352a4ad1727a5c6fa708b47bc4d8b5f62636ba SHA512 203d75b8d246cb921926c287cb318d394e01331326cf027344680315c3afb155a3ad5df286e00f8ec71a4d99c6bf77f4b1d7ac9e35d16c4bf5ba8a7fdad37ea3 DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f88f22d3ec7898c529c374f13059979450aabdccc9781ca91dd27d0119dfec3d33dda073c2973fa4a8aacae13924c9a67e38a1422c48bfee41b6f3e8 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 BLAKE2B c067f60d0ee325feae4f168ad0f84602708fe724a1d9a9a054ed4991992c1d4637b31083cf569326b8aac1ec598e71ec65fb31ee16233b9c736e97ef062b47d7 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23092bc57ccd989f26ea04a323dcb17a0ea8baaa6a21b5d5e2b6e29fcae9d18ecd043073030e104ad56c86a115760590f57eda86c22c9fe478b0 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a @@ -11,14 +11,17 @@ DIST 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 555 DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a DIST libreoffice-5.4.4.2.tar.xz 193657116 BLAKE2B 1be8565481bbdf930f6bbbd894dbe5d0be7faeba068517e15a2b23acfd2d8d06960e5991fd9d990c49ad13857177020e22fdb5c272587bc25cac4bdf23bb7fa1 SHA512 f7142fd73aa037b0bbffd3fa5af58049ab6688900976296ba2e53956227aef8920cb229aad4eec05ff36c8dde584415f7893893cc81cac72b305f67b80e36882 +DIST libreoffice-5.4.5.1.tar.xz 193846832 BLAKE2B 50e9afb84d6e1901c3a6c99d1a4d3e274894d001afce71a0ced6a3ba0682995adf75e21eed40cfbc6d159581bf152273fad85615030fee33ba63dbf1ca15148d SHA512 70ef595aab3ddc81a000c18f2f783e5a87d98326fd3b69923c43e94e832a7f4d89f0d7444073d9ec48590e9a90b9fcd049ba0c85d17ac7921cd022cb2d0bebd5 DIST libreoffice-6.0.0.3-patchset-01.tar.xz 33032 BLAKE2B 1fad88d703b9ff097a6870d6f74731de3e6bd5f7b91938e674b28bf82bae0b075d910a930b2e3c82fc1ff5dff81f13575fed351f8165cec67903e8949e06b9d4 SHA512 2fb4f02e93b648fbf611b62ad8bfe93fd4b228bee84612a9d62e9bc061cabf51ae76d7d9cbfbad186669db109fe829765c816eb27960f97ca37e7fe0536d72e9 -DIST libreoffice-6.0.0.3.tar.xz 203284136 BLAKE2B 2d8190499439addddfa017f12b22c4b80001169af5021a546cdbf5eaea3c47a2ac1d190e98efe5022050431805417824c29295068631ec596a6357b13528c52d SHA512 2b2c0fafec5db23317a2c3236b482b0cef9c0edfabab94495a0fd3007b271eaa1dbfa97711819b3b8fb2e2375fbdfb4c662df4ffc8c519255ac84357b4c45e62 +DIST libreoffice-6.0.1.1.tar.xz 203420780 BLAKE2B 80478e0627843abcf61c067592f3220f83ae43123d95dcab82197389f538f843001a6fabdc0d67e3cbca734cf68f2effdc09fa7d15e7b49c719f26d9ebf70791 SHA512 dc9dbef56a5c1df0ac0a4418a42e9200fe1a2e52d3708ad9d86ad1b35171c258fa9a88a4427992aeae83f5e0f22613cf885f068c99e76e5fe376888f4edf7855 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f DIST libreoffice-help-5.4.4.2.tar.xz 2343352 BLAKE2B d94528f6dcc85730f2443f3a84beff0cd113bb9c423d767c74d831649e56b0c92279474a0f1169ebc0ffd7804d57dba86aaa352e7fd1d9df9721f3ff6059047c SHA512 55abdde1cf0f62d213a897cc30b92ae04960c9b1e6e69c4f86242d2beecd787f44be9c3d0c8684d775ffe40b17d685a71739c9c2f08753649c4e1298fdf94226 -DIST libreoffice-help-6.0.0.3.tar.xz 2972556 BLAKE2B 6805f6a28cf29c6d55732051763f12ad2dc2c76c27c518dc40b85f2ef8f7ad4943de3a55629da4de77ee1ebd3b62a8e225e0ee260081f3c25cbffc60a21970c1 SHA512 9058edf71e34e55e23f5559af94d12d5f12c38385b30d75919283f435eac07dfc790d116b556aca0d0aa30f5119aea39f07a123a1f1e5ad172f5b19b3f7dc4b0 +DIST libreoffice-help-5.4.5.1.tar.xz 2343180 BLAKE2B bd36ecae88313b60e9ad220f8ce47185e070e275d873741e96a98fd6d2dbf546b579fc304c1931775de86734710d2b91542ee9c9749b6036fe8e443cfecb60ed SHA512 b3860dd592207f83b8c6613fdb42962a9e175f6e850282cef6380869add7fe81c7292fdd145f2e2616f8113e2c18f6ed60210d4a182c1be021d7a1db61c9d89d +DIST libreoffice-help-6.0.1.1.tar.xz 2972872 BLAKE2B fed3b8182a9459453a71c0cf76b53220081b33bf4a5f88ef603b39101a19a80f4545033c5e2f817c973d0edfdca48c954249761246d53c1eea798a5059ee2800 SHA512 bbebc878b25f80642c6ebd961e8531cf4f1379cc409a63391ca731e83e71e4e83e2a7ef6ae00b56812a8a4ae2c5de5ea5465aba70b357850b7b9c5f672521336 EBUILD libreoffice-5.4.4.2.ebuild 17359 BLAKE2B 98eba91fb6a2cec8b592808b7c4d2e77df4fe4f858b3ff37f7b89f93faa0a81edcf68e89fae3b8a6acba803cc5cb4571bddc25df63b6131c42ae5059469daffe SHA512 11d73295add5952d7e70d920ee21ddd8c21b09b0eef8e110d28a760a863d227d5f45ad4ab7ea1a36a511c1ded51046c944a6d27453b18c35711e8747f823d8d2 +EBUILD libreoffice-5.4.5.1.ebuild 17388 BLAKE2B 968131a367d496d58fac515e8f1499f7a7d42594b74c0187696aa60fa49c085e4721c71259e18fc6264d4957f813edbb40a42d1b423dbbc8f9a9ea0e7dccaec8 SHA512 d38284df128f5bdeeb046e10fa6d6910eb415ad33c4babf82e81e55b135b07131a304e283907b2453c2c178c47a417f43efae02f877a5a9c8c0e016913ada31a EBUILD libreoffice-5.4.9999.ebuild 17313 BLAKE2B 1701bda68e2ebfdba50ed889d6d13a261a6e8127aa2f47aae68a4e7f39d771f716983f8beee7c927244e101783ba9e50512f35a16c959c979d1475c2baff8b55 SHA512 640c75d7e9b1806249d61006b9b6524c28cf68a6b90936effd0dcca45f5b58bc1b327ed2b37fda815d09c827bd3c5805780bf3e65078fea658518d5219e0fc21 -EBUILD libreoffice-6.0.0.3.ebuild 16558 BLAKE2B 897b19fd23ebf476b3b1e4ae7904416513b3c16690b86d97d040ad8c449f387b5d84ef62f7cf23b678d3f5afa2379c12bbca7443c875ee1b8bf0a78169f91410 SHA512 9401ef29848f63588671e4fb7fbf66ae1caa9db090e355d164c0ad348c1e415989339888425fd6a8278866b5f777f6c102795c505e3dc36895bd726ee495802b -EBUILD libreoffice-6.0.9999.ebuild 16509 BLAKE2B be4e30efc68c2dbf7d9876a4a6be12090f3203f70513417d9839ffbf229d6f228a4d08039ca402ad9fa0355367389bcd803ac16eff10ff63fcff5c498e54cc8a SHA512 f81162fa524813c036275b191edc404c3c1dc5a5e414b581edbe156c6c233519db0978b71b0c78b095e6c67803e598371c8cad34caf508194e18c0f9e8abddd5 -EBUILD libreoffice-9999.ebuild 16399 BLAKE2B 6d80bd72a3704f1e2e5316999b9b0a80145f1ac9127caaed496e1178e5be43e8b59c097e054dc7af2197fa121bcd1a7b1e8cbaf9b42c7e5a897f0c8e5d3de79e SHA512 5c09becaad0e632822d5a08e18f40a15eb078531cb1eaf54fa33cc31588994a650a44f928d85b73ff67e14f4f8b605dd4c039cea75674ac01719306d048c390f +EBUILD libreoffice-6.0.1.1.ebuild 16494 BLAKE2B f2e4e28c9edd29f92cfd190c0a09106ecbaa3a25e7a4fc37740f418184bb2c36712219b23f016e58c65b5bb91b5af14e08649cb8c5724a98ba6e0e15c914f094 SHA512 31b9d824c78f9fa635ee2727c45c54be57170787ba28013a86694caf50996eca8d184a1eae17b3fb311315a06125f4022e1d54dda367e3f414f868e199db3016 +EBUILD libreoffice-6.0.9999.ebuild 16494 BLAKE2B f2e4e28c9edd29f92cfd190c0a09106ecbaa3a25e7a4fc37740f418184bb2c36712219b23f016e58c65b5bb91b5af14e08649cb8c5724a98ba6e0e15c914f094 SHA512 31b9d824c78f9fa635ee2727c45c54be57170787ba28013a86694caf50996eca8d184a1eae17b3fb311315a06125f4022e1d54dda367e3f414f868e199db3016 +EBUILD libreoffice-9999.ebuild 16396 BLAKE2B f75a8020eacab73fbb6a5d976c17212fb1d6a019053fba730045dcf784497cb8a4338066fe970f9cdf86c09cdb1a3547c7bcaf4bbc836386a72be4ff3b928643 SHA512 68d5f743cfd40531863bdc6f7cfbd393c72303e5b9ef79388ef6d4c7a9fe353757b146e9896f2f904fc9d3f5a1738242d8ed2bac5dd50cf7c332d77cfe6d611f MISC metadata.xml 1443 BLAKE2B cbf2c4306fdcde291bcb0692af7dc9f43f1eaf05fe93d6faffbc85833dc4d5ae653cc299a9bdb55dfb335c8aff316893a72ac48488fb372f667f81212648fe75 SHA512 df37d47b0f2f9f9c229b0d558d69fcda897a54b8ef1584d9940a7817885d52aa6b17b1879cf3103a9129fcac0611b4fe49213876bd2e446c70e57735a144b323 diff --git a/app-office/libreoffice/files/libreoffice-5.4.5.1-pyuno-crash.patch b/app-office/libreoffice/files/libreoffice-5.4.5.1-pyuno-crash.patch new file mode 100644 index 000000000000..850f56465c77 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-5.4.5.1-pyuno-crash.patch @@ -0,0 +1,87 @@ +From 42e2c4af310deb7660b07c6307459c9d2a42bb8b Mon Sep 17 00:00:00 2001 +From: Michael Stahl <mstahl@redhat.com> +Date: Thu, 1 Feb 2018 13:52:00 +0100 +Subject: tdf#114815 pyuno: avoid 2 threads initing python in parallel + +According to the crash reports, it's possible for the grammar checking +thread to call GetGrammarChecker, instantiating lightproof, at the same +time as the main thread instantiates LngSvcMgr, which also instantiates +(some?) (all?) grammar checkers. + +Ensure that pyuno_loader::CreateInstance() initialises Python only +once with a C++11 thread safe static. + +For the backport, use rtl::Static instead, because on the 5.4 branch +MSVC does not have HAVE_THREADSAFE_STATICS enabled. + +Change-Id: I5b1faba9107355c508831a078366e4a29fdbfadf +(cherry picked from commit 5357ca82846ea7147ad61e9340f25647a5934eb0) +Reviewed-on: https://gerrit.libreoffice.org/49116 +Tested-by: Jenkins <ci@libreoffice.org> +Reviewed-by: Stephan Bergmann <sbergman@redhat.com> +(cherry picked from commit 362b0c521c1c58dc8ea5e87ecbb482d5bdc073f4) +Reviewed-on: https://gerrit.libreoffice.org/49298 +Reviewed-by: Michael Meeks <michael.meeks@collabora.com> +Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> +Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> +--- + pyuno/source/loader/pyuno_loader.cxx | 25 +++++++++++++++++++++---- + 1 file changed, 21 insertions(+), 4 deletions(-) + +diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx +index adbf6c8..0408af0 100644 +--- a/pyuno/source/loader/pyuno_loader.cxx ++++ b/pyuno/source/loader/pyuno_loader.cxx +@@ -31,6 +31,7 @@ + #include <rtl/ustrbuf.hxx> + #include <rtl/strbuf.hxx> + #include <rtl/bootstrap.hxx> ++#include <rtl/instance.hxx> + + #include <cppuhelper/implementationentry.hxx> + #include <cppuhelper/factory.hxx> +@@ -176,11 +177,10 @@ static void prependPythonPath( const OUString & pythonPathBootstrap ) + osl_setEnvironment(envVar.pData, envValue.pData); + } + +-Reference< XInterface > CreateInstance( const Reference< XComponentContext > & ctx ) ++struct PythonInit + { +- Reference< XInterface > ret; +- +- if( ! Py_IsInitialized() ) ++PythonInit() { ++ if (! Py_IsInitialized()) // may be inited by getComponentContext() already + { + OUString pythonPath; + OUString pythonHome; +@@ -236,9 +236,26 @@ Reference< XInterface > CreateInstance( const Reference< XComponentContext > & c + // PyThreadAttach below. + PyThreadState_Delete(tstate); + } ++} ++}; ++ ++namespace { ++ struct thePythonInit : public rtl::Static<PythonInit, thePythonInit> {}; ++} ++ ++Reference<XInterface> CreateInstance(const Reference<XComponentContext> & ctx) ++{ ++ // tdf#114815 thread-safe static to init python only once ++ thePythonInit::get(); ++ ++ Reference< XInterface > ret; + + PyThreadAttach attach( PyInterpreterState_Head() ); + { ++ // note: this can't race against getComponentContext() because ++ // either (in soffice.bin) CreateInstance() must be called before ++ // getComponentContext() can be called, or (in python.bin) the other ++ // way around + if( ! Runtime::isInitialized() ) + { + Runtime::initialize( ctx ); +-- +cgit v1.1 + diff --git a/app-office/libreoffice/files/libreoffice-6.0.0.1-poppler-0.62.patch b/app-office/libreoffice/files/libreoffice-6.0.0.1-poppler-0.62.patch deleted file mode 100644 index f0ecc3b990b4..000000000000 --- a/app-office/libreoffice/files/libreoffice-6.0.0.1-poppler-0.62.patch +++ /dev/null @@ -1,44 +0,0 @@ -Fix build with >=poppler-0.62.0, cleanup ifdef and raise minimum poppler version. - ---- a/configure.ac 2017-12-12 18:45:07.000000000 +0100 -+++ b/configure.ac 2018-01-04 23:57:16.410999542 +0100 -@@ -10403,7 +10403,7 @@ - if test "$with_system_poppler" = "yes"; then - AC_MSG_RESULT([external]) - SYSTEM_POPPLER=TRUE -- PKG_CHECK_MODULES( POPPLER, poppler >= 0.12.0 ) -+ PKG_CHECK_MODULES( POPPLER, poppler >= 0.21.1 ) - AC_LANG_PUSH([C++]) - save_CXXFLAGS=$CXXFLAGS - save_CPPFLAGS=$CPPFLAGS ---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2017-12-12 18:45:07.000000000 +0100 -+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2018-01-05 00:29:16.541246738 +0100 -@@ -32,13 +32,11 @@ - #pragma warning(push, 1) - #endif - --// sigh, UTF8.h was removed in poppler-0.21.0 and put back in 0.21.1 - // FIXME: we can't use #if POPPLER_CHECK_VERSION(0, 21, 0) && !POPPLER_CHECK_VERSION(0, 21, 1) - // because the internal poppler does not provide poppler-version.h and the macro always returns 0 --#if POPPLER_CHECK_VERSION(0, 21, 1) --#include <UTF8.h> --#elif POPPLER_CHECK_VERSION(0, 21, 0) --#include "UTF.h" -+// UTF8.h was renamed to UnicodeMapFuncs.h in poppler-0.62.0 -+#if POPPLER_CHECK_VERSION(0, 62, 0) -+#include "UnicodeMapFuncs.h" - #else - #include "UTF8.h" - #endif -@@ -918,7 +916,11 @@ - ); - - // silence spurious warning -+#if POPPLER_CHECK_VERSION(0, 62, 0) -+ (void)&mapUTF16; -+#else - (void)&mapUCS2; -+#endif - - char buf[9]; - for( int i=0; i<uLen; ++i ) diff --git a/app-office/libreoffice/libreoffice-5.4.5.1.ebuild b/app-office/libreoffice/libreoffice-5.4.5.1.ebuild new file mode 100644 index 000000000000..9ebcfd8ed956 --- /dev/null +++ b/app-office/libreoffice/libreoffice-5.4.5.1.ebuild @@ -0,0 +1,580 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) +PYTHON_REQ_USE="threads,xml" + +# experimental ; release ; old +# Usually the tarballs are moved a lot so this should make +# everyone happy. +DEV_URI=" + https://dev-builds.libreoffice.org/pre-releases/src + https://download.documentfoundation.org/libreoffice/src/${PV:0:5}/ + https://download.documentfoundation.org/libreoffice/old/${PV}/ +" +ADDONS_URI="https://dev-www.libreoffice.org/src/" + +BRANDING="${PN}-branding-gentoo-0.8.tar.xz" +# PATCHSET="${P}-patchset-01.tar.xz" + +[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3" +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} +unset SCM_ECLASS + +DESCRIPTION="A full office productivity suite" +HOMEPAGE="https://www.libreoffice.org" +SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )" +[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}" + +# Split modules following git/tarballs +# Core MUST be first! +# Help is used for the image generator +# Only release has the tarballs +if [[ ${PV} != *9999* ]]; then + for i in ${DEV_URI}; do + SRC_URI+=" ${i}/${P}.tar.xz" + SRC_URI+=" ${i}/${PN}-help-${PV}.tar.xz" + done + unset i +fi +unset DEV_URI + +# Really required addons +# These are bundles that can't be removed for now due to huge patchsets. +# If you want them gone, patches are welcome. +ADDONS_SRC=( + "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )" + "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )" + # no release for 8 years, should we package it? + "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" + # Does not build with 1.6 rhino at all + "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" + # requirement of rhino + "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" + # not packageable + "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" +) +SRC_URI+=" ${ADDONS_SRC[*]}" + +unset ADDONS_URI +unset ADDONS_SRC + +# Extensions that need extra work: +LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" + +IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf googledrive +gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter test vlc +$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" + +LICENSE="|| ( LGPL-3 MPL-1.1 )" +SLOT="0" +[[ ${PV} == *9999* ]] || \ +KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" + +COMMON_DEPEND="${PYTHON_DEPS} + app-arch/unzip + app-arch/zip + app-crypt/gpgme[cxx] + app-text/hunspell:= + >=app-text/libabw-0.1.0 + >=app-text/libebook-0.1 + >=app-text/libetonyek-0.1 + app-text/libexttextcat + app-text/liblangtag + >=app-text/libmspub-0.1.0 + >=app-text/libmwaw-0.3.1 + >=app-text/libodfgen-0.1.0 + app-text/libstaroffice + app-text/libwpd:0.10[tools] + app-text/libwpg:0.3 + >=app-text/libwps-0.4 + app-text/mythes + >=dev-cpp/clucene-2.3.3.4-r2 + =dev-cpp/libcmis-0.5* + dev-db/unixODBC + dev-lang/perl + dev-libs/boost:= + dev-libs/expat + dev-libs/hyphen + dev-libs/icu:= + dev-libs/libassuan + dev-libs/libgpg-error + =dev-libs/liborcus-0.12* + dev-libs/librevenge + dev-libs/nspr + dev-libs/nss + !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) + libressl? ( dev-libs/libressl ) + >=dev-libs/redland-1.0.16 + >=dev-libs/xmlsec-1.2.24[nss] + media-gfx/graphite2 + media-libs/fontconfig + media-libs/freetype:2 + >=media-libs/harfbuzz-0.9.42:=[graphite,icu] + media-libs/lcms:2 + >=media-libs/libcdr-0.1.0 + >=media-libs/libepoxy-1.3.1[X] + >=media-libs/libfreehand-0.1.0 + media-libs/libpagemaker + >=media-libs/libpng-1.4:0= + >=media-libs/libvisio-0.1.0 + media-libs/libzmf + net-libs/neon + net-misc/curl + net-nds/openldap + sci-mathematics/lpsolve + virtual/glu + virtual/jpeg:0 + virtual/opengl + x11-libs/cairo[X] + x11-libs/libXinerama + x11-libs/libXrandr + x11-libs/libXrender + bluetooth? ( net-wireless/bluez ) + coinmp? ( sci-libs/coinor-mp ) + collada? ( media-libs/opencollada ) + cups? ( net-print/cups ) + dbus? ( dev-libs/dbus-glib ) + eds? ( + dev-libs/glib:2 + gnome-base/dconf + gnome-extra/evolution-data-server + ) + firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 ) + gltf? ( >=media-libs/libgltf-0.1.0 ) + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + ) + gtk? ( + x11-libs/gdk-pixbuf + >=x11-libs/gtk+-2.24:2 + ) + gtk3? ( + dev-libs/glib:2 + dev-libs/gobject-introspection + gnome-base/dconf + x11-libs/gtk+:3 + ) + jemalloc? ( dev-libs/jemalloc ) + kde? ( + dev-qt/qtcore:4 + dev-qt/qtgui:4 + kde-frameworks/kdelibs + ) + libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) + libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) + mysql? ( dev-db/mysql-connector-c++ ) + pdfimport? ( app-text/poppler:=[cxx] ) + postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) +" + +RDEPEND="${COMMON_DEPEND} + !app-office/libreoffice-bin + !app-office/libreoffice-bin-debug + !app-office/openoffice + media-fonts/dejavu + media-fonts/liberation-fonts + media-fonts/libertine + || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) + java? ( >=virtual/jre-1.6 ) + kde? ( kde-frameworks/oxygen-icons:* ) + vlc? ( media-video/vlc ) +" + +if [[ ${PV} != *9999* ]]; then + PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*" +else + # Translations are not reliable on live ebuilds + # rather force people to use english only. + PDEPEND="!app-office/libreoffice-l10n" +fi + +# FIXME: cppunit should be moved to test conditional +# after everything upstream is under gbuild +# as dmake execute tests right away +DEPEND="${COMMON_DEPEND} + !<sys-devel/make-3.82 + >=dev-libs/libatomic_ops-7.2d + >=dev-libs/libxml2-2.7.8 + dev-libs/libxslt + dev-perl/Archive-Zip + >=dev-util/cppunit-1.14.0 + >=dev-util/gperf-3 + dev-util/intltool + >=dev-util/mdds-1.2.2:1= + media-libs/glm + sys-devel/bison + sys-devel/flex + sys-devel/gettext + sys-devel/ucpp + sys-libs/zlib + virtual/pkgconfig + x11-libs/libXt + x11-libs/libXtst + x11-proto/randrproto + x11-proto/xextproto + x11-proto/xineramaproto + x11-proto/xproto + java? ( + dev-java/ant-core + >=virtual/jdk-1.6 + ) + odk? ( >=app-doc/doxygen-1.8.4 ) + test? ( + dev-util/cppunit + media-fonts/dejavu + ) +" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + bluetooth? ( dbus ) + collada? ( gltf ) + libreoffice_extensions_nlpsolver? ( java ) + libreoffice_extensions_scripting-beanshell? ( java ) + libreoffice_extensions_scripting-javascript? ( java ) + libreoffice_extensions_wiki-publisher? ( java ) +" + +PATCHES=( + # not upstreamable stuff + "${FILESDIR}/${PN}-5.4-system-pyuno.patch" + "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" + + # TODO: upstream + "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch" + "${FILESDIR}/${PN}-5.4.4.2-poppler-0.62.patch" # bug 642602 + + "${FILESDIR}/${P}-pyuno-crash.patch" # 5.4.5 branch commit after release +) + +pkg_pretend() { + use java || \ + ewarn "If you plan to use Base application you should enable java or you will get various crashes." + + if has_version "<app-office/libreoffice-5.3.0[firebird]"; then + ewarn "Firebird has been upgraded to version 3.0.0. It is unable to read back Firebird 2.5 data," + ewarn "so embedded firebird odb files created in LibreOffice pre-5.3 cannot be opened with LibreOffice 5.3." + ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base" + fi + + if [[ ${MERGE_TYPE} != binary ]]; then + + CHECKREQS_MEMORY="512M" + if is-flagq "-g*" && ! is-flagq "-g*0" ; then + CHECKREQS_DISK_BUILD="22G" + else + CHECKREQS_DISK_BUILD="6G" + fi + check-reqs_pkg_pretend + fi +} + +pkg_setup() { + java-pkg-opt-2_pkg_setup + python-single-r1_pkg_setup + xdg_environment_reset + + if [[ ${MERGE_TYPE} != binary ]]; then + CHECKREQS_MEMORY="512M" + if is-flagq "-g*" && ! is-flagq "-g*0" ; then + CHECKREQS_DISK_BUILD="22G" + else + CHECKREQS_DISK_BUILD="6G" + fi + check-reqs_pkg_setup + fi +} + +src_unpack() { + [[ -n ${PATCHSET} ]] && unpack ${PATCHSET} + use branding && unpack "${BRANDING}" + + if [[ ${PV} != *9999* ]]; then + unpack "${P}.tar.xz" + unpack "${PN}-help-${PV}.tar.xz" + else + local base_uri branch mypv + base_uri="https://anongit.freedesktop.org/git" + branch="master" + mypv=${PV/.9999} + [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}" + git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}" + git-r3_checkout "${base_uri}/${PN}/core" + + git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master" + git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help + fi +} + +src_prepare() { + [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}" + default + + AT_M4DIR="m4" eautoreconf + # hack in the autogen.sh + touch autogen.lastrun + + # system pyuno mess + sed -i \ + -e "s:%eprefix%:${EPREFIX}:g" \ + -e "s:%libdir%:$(get_libdir):g" \ + pyuno/source/module/uno.py \ + pyuno/source/officehelper.py || die + # sed in the tests + sed -i \ + -e "s#all : build unitcheck#all : build#g" \ + solenv/gbuild/Module.mk || die + sed -i \ + -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \ + -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \ + Makefile.in || die + + sed -i \ + -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \ + -e "s,\$INSTALLDIRNAME.sh,${PN}," \ + bin/distro-install-desktop-integration || die + + if use branding; then + # hack... + mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die + fi + + # Don't list pdfimport support in desktop when built with none, bug # 605464 + if ! use pdfimport; then + sed -i \ + -e ":MimeType: s:application/pdf;::" \ + -e ":Keywords: s:pdf;::" \ + sysui/desktop/menus/draw.desktop || die + fi +} + +src_configure() { + # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys + # Note: these are for Gentoo use ONLY. For your own distribution, please get + # your own set of keys. Feel free to contact chromium@gentoo.org for more info. + local google_default_client_id="329227923882.apps.googleusercontent.com" + local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu" + + # optimization flags + export GMAKE_OPTIONS="${MAKEOPTS}" + # System python enablement: + export PYTHON_CFLAGS=$(python_get_CFLAGS) + export PYTHON_LIBS=$(python_get_LIBS) + + if use collada; then + export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser" + export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser" + fi + + if use kde; then + # bug 544108, bug 599076 + export QMAKEQT4="$(qt4_get_bindir)/qmake" + export MOCQT4="$(qt4_get_bindir)/moc" + fi + + # system headers/libs/...: enforce using system packages + # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad + # --enable-cairo: ensure that cairo is always required + # --enable-*-link: link to the library rather than just dlopen on runtime + # --enable-release-build: build the libreoffice as release + # --disable-fetch-external: prevent dowloading during compile phase + # --enable-extension-integration: enable any extension integration support + # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs + # --disable-report-builder: too much java packages pulled in without pkgs + # --without-system-sane: just sane.h header that is used for scan in writer, + # not linked or anything else, worthless to depend on + # --disable-pdfium: not yet packaged + local myeconfargs=( + --with-system-dicts + --with-system-epoxy + --with-system-headers + --with-system-jars + --with-system-libs + --enable-cairo-canvas + --enable-largefile + --enable-mergelibs + --enable-neon + --enable-python=system + --enable-randr + --enable-release-build + --disable-breakpad + --disable-ccache + --disable-dependency-tracking + --disable-epm + --disable-fetch-external + --disable-gstreamer-0-10 + --disable-online-update + --disable-pdfium + --disable-report-builder + --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") + --with-build-version="Gentoo official package" + --enable-extension-integration + --with-external-dict-dir="${EPREFIX}/usr/share/myspell" + --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" + --with-external-thes-dir="${EPREFIX}/usr/share/myspell" + --with-external-tar="${DISTDIR}" + --with-lang="" + --with-parallelism=$(makeopts_jobs) + --with-system-ucpp + --with-vendor="Gentoo Foundation" + --with-x + --without-fonts + --without-myspell-dicts + --without-help + --with-helppack-integration + --with-system-gpgmepp + --without-system-sane + $(use_enable bluetooth sdremote-bluetooth) + $(use_enable coinmp) + $(use_enable collada) + $(use_enable cups) + $(use_enable debug) + $(use_enable dbus) + $(use_enable eds evolution2) + $(use_enable firebird firebird-sdbc) + $(use_enable gltf) + $(use_enable gstreamer gstreamer-1-0) + $(use_enable gtk) + $(use_enable gtk3) + $(use_enable kde kde4) + $(use_enable mysql ext-mariadb-connector) + $(use_enable odk) + $(use_enable pdfimport) + $(use_enable postgres postgresql-sdbc) + $(use_enable quickstarter systray) + $(use_enable vlc) + $(use_with coinmp system-coinmp) + $(use_with collada system-opencollada) + $(use_with gltf system-libgltf) + $(use_with googledrive gdrive-client-id ${google_default_client_id}) + $(use_with googledrive gdrive-client-secret ${google_default_client_secret}) + $(use_with java) + $(use_with mysql system-mysql-cppconn) + $(use_with odk doxygen) + ) + + if use eds || use gtk3; then + myeconfargs+=( --enable-dconf --enable-gio ) + else + myeconfargs+=( --disable-dconf --disable-gio ) + fi + + # libreoffice extensions handling + for lo_xt in ${LO_EXTS}; do + if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then + myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) ) + else + myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) ) + fi + done + + if use java; then + # hsqldb: system one is too new + myeconfargs+=( + --without-junit + --without-system-hsqldb + --with-ant-home="${ANT_HOME}" + --with-jdk-home=$(java-config --jdk-home 2>/dev/null) + --with-jvm-path="${EPREFIX}/usr/lib/" + ) + + use libreoffice_extensions_scripting-beanshell && \ + myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) ) + + use libreoffice_extensions_scripting-javascript && \ + myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) ) + fi + + econf "${myeconfargs[@]}" +} + +src_compile() { + # more and more LO stuff tries to use OpenGL, including tests during build + # bug 501508, bug 540624, bug 545974 and probably more + addpredict /dev/dri + addpredict /dev/ati + addpredict /dev/nvidiactl + + # hack for offlinehelp, this needs fixing upstream at some point + # it is broken because we send --without-help + # https://bugs.freedesktop.org/show_bug.cgi?id=46506 + ( + grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die + source "${T}/config_host.mk" 2&> /dev/null + + local path="${WORKDIR}/helpcontent2/source/auxiliary/" + mkdir -p "${path}" || die + + echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\"" + perl "${S}/helpcontent2/helpers/create_ilst.pl" \ + -dir=helpcontent2/source/media/helpimg \ + > "${path}/helpimg.ilst" + [[ -s "${path}/helpimg.ilst" ]] || \ + ewarn "The help images list is empty, something is fishy, report a bug." + ) + + local target + use test && target="build" || target="build-nocheck" + + # this is not a proper make script + make ${target} || die +} + +src_test() { + make unitcheck || die + make slowcheck || die +} + +src_install() { + # This is not Makefile so no buildserver + make DESTDIR="${D}" distro-pack-install -o build -o check || die + + # bug 593514 + if use gtk3; then + dosym libreoffice/program/liblibreofficekitgtk.so \ + /usr/$(get_libdir)/liblibreofficekitgtk.so + fi + + # bash completion aliases + bashcomp_alias \ + libreoffice \ + unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice + + if use branding; then + insinto /usr/$(get_libdir)/${PN}/program + newins "${WORKDIR}/branding-sofficerc" sofficerc + dodir /etc/env.d + echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die + fi + + # Hack for offlinehelp, this needs fixing upstream at some point. + # It is broken because we send --without-help + # https://bugs.freedesktop.org/show_bug.cgi?id=46506 + insinto /usr/$(get_libdir)/libreoffice/help + doins xmlhelp/util/*.xsl + + # Remove desktop files to support old installs that can't parse mime + rm -r "${ED}"usr/share/mimelnk/ || die + + pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin + pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + gnome2_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update +} diff --git a/app-office/libreoffice/libreoffice-6.0.0.3.ebuild b/app-office/libreoffice/libreoffice-6.0.1.1.ebuild index fb3e9b376d04..73e251cb02ea 100644 --- a/app-office/libreoffice/libreoffice-6.0.0.3.ebuild +++ b/app-office/libreoffice/libreoffice-6.0.1.1.ebuild @@ -96,7 +96,7 @@ COMMON_DEPEND="${PYTHON_DEPS} =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl - dev-libs/boost:= + dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= @@ -250,7 +250,6 @@ PATCHES=( # TODO: upstream "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch" - "${FILESDIR}/${PN}-6.0.0.1-poppler-0.62.patch" # bug 642602 # gtk3-kde5 vcl plugin backported from master "${WORKDIR}"/${PATCHSET/.tar.xz/} @@ -261,8 +260,8 @@ pkg_pretend() { ewarn "If you plan to use Base application you should enable java or you will get various crashes." if has_version "<app-office/libreoffice-5.3.0[firebird]"; then - ewarn "Firebird has been upgraded to version 3.0.0. It is unable to read back Firebird 2.5 data," - ewarn "so embedded firebird odb files created in LibreOffice pre-5.3 cannot be opened with LibreOffice 5.3." + ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so" + ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version." ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base" fi diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild index 9890bb1bf837..73e251cb02ea 100644 --- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild +++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild @@ -70,7 +70,7 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" LICENSE="|| ( LGPL-3 MPL-1.1 )" SLOT="0" [[ ${PV} == *9999* ]] || \ -KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" COMMON_DEPEND="${PYTHON_DEPS} app-arch/unzip @@ -96,7 +96,7 @@ COMMON_DEPEND="${PYTHON_DEPS} =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl - dev-libs/boost:= + dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= @@ -260,8 +260,8 @@ pkg_pretend() { ewarn "If you plan to use Base application you should enable java or you will get various crashes." if has_version "<app-office/libreoffice-5.3.0[firebird]"; then - ewarn "Firebird has been upgraded to version 3.0.0. It is unable to read back Firebird 2.5 data," - ewarn "so embedded firebird odb files created in LibreOffice pre-5.3 cannot be opened with LibreOffice 5.3." + ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so" + ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version." ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base" fi diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index 4869257cf96d..319eeddd2776 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -96,7 +96,7 @@ COMMON_DEPEND="${PYTHON_DEPS} =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl - dev-libs/boost:= + dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= @@ -258,8 +258,8 @@ pkg_pretend() { ewarn "If you plan to use Base application you should enable java or you will get various crashes." if has_version "<app-office/libreoffice-5.3.0[firebird]"; then - ewarn "Firebird has been upgraded to version 3.0.0. It is unable to read back Firebird 2.5 data," - ewarn "so embedded firebird odb files created in LibreOffice pre-5.3 cannot be opened with LibreOffice 5.3." + ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so" + ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version." ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base" fi |