aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2016-08-10 04:07:06 -0400
committerAnthony G. Basile <blueness@gentoo.org>2016-08-10 04:07:06 -0400
commita07541f85f8e0b5b973fbe6f2e92aebaa1560115 (patch)
treed3e5d20eb84fbd813b016f1c31690417a861149d /app-office
parentnet-misc/iputils: fix tracepath header order (diff)
downloadmusl-a07541f85f8e0b5b973fbe6f2e92aebaa1560115.tar.gz
musl-a07541f85f8e0b5b973fbe6f2e92aebaa1560115.tar.bz2
musl-a07541f85f8e0b5b973fbe6f2e92aebaa1560115.zip
app-office/libreoffice: version bump to 5.1.4.2
Package-Manager: portage-2.2.28 RepoMan-Options: --force
Diffstat (limited to 'app-office')
-rw-r--r--app-office/libreoffice/Manifest10
-rw-r--r--app-office/libreoffice/files/libreoffice-5.1.4.2-gcc6.patch40
-rw-r--r--app-office/libreoffice/files/libreoffice-curl-7.50.0.patch23
-rw-r--r--app-office/libreoffice/libreoffice-5.1.4.2-r99.ebuild (renamed from app-office/libreoffice/libreoffice-5.0.5.2-r99.ebuild)195
-rw-r--r--app-office/libreoffice/metadata.xml2
5 files changed, 154 insertions, 116 deletions
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 2972578..b8389b1 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -3,6 +3,8 @@ AUX libreoffice-4.4.1.2-fix-includes.patch 1149 SHA256 2044d4c997472a46e95c68fa8
AUX libreoffice-4.4.1.2-linux-musl.patch 1962 SHA256 5cf5a446e5769f6a2df01c5c10702514fe9178334d1e53d3c7df843ca72c6fa2 SHA512 5fb4d5bf5cab21a0c95a9e51a4a138b427a08677c34bc14287c3eb74926b606345d5185c76bbe8957043d79dc33d46cf4aaa5182642c7fb9136dc48ed9e7fabb WHIRLPOOL 3e089da32a5425f1e892c80635489fde99198a5b15e1be94b996c49f2cf77e45144f624d68d9c11aef921bce0ce0ac632d52af348335ba5d61ae6049e9c4282b
AUX libreoffice-4.4.1.2-musl-fix-execinfo.patch 736 SHA256 7171dfa651a7ee81b4e13a9fd9131428d9a65af138cac4cb428ae6c3e4bcb1f3 SHA512 567123f990c4a47c2e4cebf99f3486150740015e647ca2b2521e606f3350fc55ceda6c7ac031302da34e8fc90747d66619334fcfda4e7b8998456fe3619ab860 WHIRLPOOL d25df4d89e5739f3586296569345c38d44aeb59c1f6ed83ddd9c76139e6e5b639506c5d761838c2faa70e8a30bb6b68b15c4bdf3255f7658542f70c91bffeb32
AUX libreoffice-5.0.5.2-linux-musl.patch 1908 SHA256 b4fe6b57d1351c4d6a28dc67971c8e43448215c6ab6ffabfde5106da560a5c5d SHA512 cbb465e641616537a8f7c2438bf87661fb409b8337486b5a8ab7f1ecf099c9c4d96f531fef18f8f17ddca4813d3df4162629b93434ac35b7d01c7683de928524 WHIRLPOOL e305c2855c9141e6a1fd296cd8e05e50c388a9a30e4bb8dd4ba60773929abd660ac8940e42f2aad418f58a696f6232570d9000114113aaaf016d74462775c766
+AUX libreoffice-5.1.4.2-gcc6.patch 1595 SHA256 a1f3978a91afee987b46abda4c0f9ecc2ec6d11c467b98153d94006439adcc21 SHA512 d0bd586e093bcc043c13c5d90ea1834a2333511df012a74fbf1a89f2e6c9f44a2e7b78af5654443d89ddcc9a89930b28a4d31e1b3b9c324898c0cef4c2c985af WHIRLPOOL c0ccfac9807b470295e23687a9427619c9ebc5300d12a4908a6289008578b8175633f753e0256a378996e31292bf8cda4c28e932d686257b1736e620776a4205
+AUX libreoffice-curl-7.50.0.patch 814 SHA256 ad365a9569d46509bf621568277cf15ee9fc29f63233e8256f86e1f0640032f2 SHA512 3e861c0f456fecd74116176dffe38e9bfb83959e3bf45e1b11bdeeda6226a7ba17b45cd514642f8f54d2406e98cb15da253b5adb248c4c74b95eb727fe16f9d8 WHIRLPOOL 22ac7f78268681a2e961b20be586db16d70d8f654246bfe8101effdd9315c80949cf604f34965bc6de265c884b42d4794ac28da78a70a9b58b408d6d829960e1
DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 SHA256 d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a WHIRLPOOL c4b3b0c3e10171155e1d3431e8ab9b495dbf2fb924882024306bfb53f533f5b0231c06f47e3cfa77052013a816ea4cc5f237cc76fdb44a048fb6d5c177729aec
DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 SHA256 eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c WHIRLPOOL 16eb79e3674250fcb760b9698b4980414052d20f720d946701d1915c9b8915b4af75378668653d29581b77c19fcdba8f51d1f834c286cfcefcf4a420f8fcc1d5
DIST 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz 1652670 SHA256 390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a SHA512 5664203e6426880041cdb227e91f79f00d2ca7ae28c6997f61b72cc599aac55838d082d2b2b551bd7a228424c350ddea5d41599b8ca58d444a2cd46c9206ea91 WHIRLPOOL 6486c48b73a4f79760b443cfd397b704eca0fd32b72304ae7e7cfa0f43583b0af15c7384548b5215ae57513ed8366c8f3a74630ab466ba19a63b346af8c5eaca
@@ -11,8 +13,8 @@ DIST 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 555
DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 SHA256 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f WHIRLPOOL 8e446eb44188046b0e90694feba232f42c2e9f13d0f43783a18de37c94b86ff919b994931125c5d8001ecd320c1f4db5da482847304aa61646600a3bb33144b4
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a WHIRLPOOL 60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c
DIST d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz 16525605 SHA256 1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f SHA512 d08a7fe432e8df47d1d8992a45bb5f33149cb75b90eb74b2f2e457628d21a94b17eae0045096b053d2a866bf7710c775581c3e417b5dfaf66601aa18071b7305 WHIRLPOOL 95dc6ec0fb293c3538c1d51241283edf4e21647dcfd10229233ab7c3f13f7c78e6bb02c4d292a7cd2a2ec95575d775f0395e837bbc88ab4ddbaa5adfd62be2f0
-DIST libreoffice-5.0.5.2.tar.xz 167135308 SHA256 1ee729db840cf98bb00fed8c65550ccd6ced03123e3befcc511fe8df6f671b88 SHA512 f469d2faccd3e445324b0e8219a8a31b4dc8314a9b0559bfff06dd422eb6e6a9194dd4777391e71daa9bddf362cccca958defe165805f91e8334f95f36a011d2 WHIRLPOOL df4d74171c95f57a1a0fc7d25b7668abde5bb4eb8b326fd2179b4f311f5e63408919ca69bf2efe7effb2700488e11a0b4dc2059a5ce9c6a2de81d8f80314f598
+DIST libreoffice-5.1.4.2.tar.xz 176233960 SHA256 cae54a79ed858ad92044179b5c33bd29c5770a8eccde04ed80c5ebfd92078385 SHA512 80e79b6a20f85e295fead9fc5f9578d846a889fe6bc7a0f51b76117408ee6c8e7fbddf99c22e2caaac3253f10907121ed3508cefab2fb1b2ccaa90c4cf52c33a WHIRLPOOL 2005e5321b6e25196db535a786c50b66c635b07d1482e562f1595f3f84fbf0c702717d934d50e319822f194f1bdc9d15da1885658042d277ae8535f75f9856ba
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
-DIST libreoffice-help-5.0.5.2.tar.xz 1882884 SHA256 6664496d23d3e7e56dbca22b7cd9a2cf66e0e91609a20976870e0e235540c02a SHA512 63a27a160a98360d04f062c4a9b123ed0e89a4e081aaa03e50b0df7ef04c4396977401f909541a5f3510a3c2d7dbfc4c52839a1a4adc1a29bae8dd6a8056a170 WHIRLPOOL b9aae3d2f622ebb27bd9943d8111ec9c3fcfc77b35b1b93f294ed8fe7106ab001a10260c7f9ed45b5f9ca65229d15f25a3a92f6000682b6ae651c0cf16e81fed
-EBUILD libreoffice-5.0.5.2-r99.ebuild 18444 SHA256 1759cd26f67c99ec8e0d061938b884229b38caa919fdf9f0c2eff420e35a3f2c SHA512 08b19ddfaee0c4a4bf405ba461b59561cdab715f5cdc394ec48347e547aa7b65a5c813badf4f9cdb618d5a83e8bcec8f78781989c2801737e168d1371fda6b52 WHIRLPOOL b4009561d7482423a60ec73dcf4e5256eaa2f90ef3eaa3e545cb946fe92321490b3de332149c0cba9b985963098ad84a669b9799b55b23cf7e7262192ba51c89
-MISC metadata.xml 1274 SHA256 bd4493db2b60fa26fdc8101687d92cea7760d19676f08a8c36b820755a1f8c6a SHA512 c25b674ddedf86ab66c6cea0e40822b658fab3e281f31d7e0ece4311c2edd7a1f1bee0ea20fc1e35224c8000443b38320be104fa26ce3cfa95df26ee5927aab1 WHIRLPOOL f5d25cc64f3dc9cbb92a84bcabb828c582e97617a34fd655c6ede9d0422a1e3e5d00bc87e37f2128d7ba394d51af2c42b6e0ee9ec255ad563b53e71f4675393d
+DIST libreoffice-help-5.1.4.2.tar.xz 1905160 SHA256 60356c3e3a8e5ba8216c18e127cfa2b7d0eb55c69e50f056e8f78a7d9dc735cc SHA512 a8af619dff4b873574afd4b6cfc930543ab58a449a5cfa4b76a0edf242e18a885b6cba1f1a660e9a07e902c367f1a305c2c525f2b0a70e99f56ae5303abef5fe WHIRLPOOL 2e195dac9e6d2280ec3ac36243c4c62010e04763c5510a1f5e06f39e2f6e44aad555b460f72b2f09aba43a9571b3d20b50d6caf4a028e3e6acfe4e37d7598b70
+EBUILD libreoffice-5.1.4.2-r99.ebuild 17705 SHA256 e8b976164fe79af19dadad66cfcabcfb57635db6cad949d86846b9145979d581 SHA512 3e15d068ce14d1aae808195d3de85c28d6b126a91f44eefd77c957a89ec2724c953d10f97e25b274c7942833c3930b968a1947d0bea7821d0f1d7ed8a4f71230 WHIRLPOOL 9cf54ebac945be2b92857b94f003a58bfeaa621b297ec4be51032b9548332537540494a3c32983a84e53d4b0ee648abf63ca65334648e8be8ab9fa43a2d82717
+MISC metadata.xml 1425 SHA256 2ca5293a7d9b6a9a58235149d00aefd8a33f3d93df32a5d4c88b94d96bb0f181 SHA512 42787dbbddbfee01aa4b4c0ee2b6fe8e612e901736d18ab3fff8fd19917b4ab65e04eaee7dd13790ae2aebc52f74ce203fcedab8bdfdcbceabf9fa043d287c1f WHIRLPOOL 65925c5dee093ad51c04be88d33b34cfe677b6a27bc659602f0aa9a550f6ab716d0244ad4a76cf3a5b6ad6d6c9401a4cf8729251c30a141413f382d7b9653157
diff --git a/app-office/libreoffice/files/libreoffice-5.1.4.2-gcc6.patch b/app-office/libreoffice/files/libreoffice-5.1.4.2-gcc6.patch
new file mode 100644
index 0000000..9e7ee73
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-5.1.4.2-gcc6.patch
@@ -0,0 +1,40 @@
+From 91fcc0032c2d0d343b914dfe3bea0b0bf1589e91 Mon Sep 17 00:00:00 2001
+From: Rene Engelhard <rene@debian.org>
+Date: Tue, 24 May 2016 16:35:57 +0200
+Subject: [PATCH] KDE4 cflags no /usr/include usage to fix build failure with
+ gcc6
+
+Change-Id: I53106b9ebfa7cc5c7b6c6d6f3bb3a4e5f2261f4f
+---
+ configure.ac | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 091abb4..86cc7b6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -11117,6 +11117,7 @@ the root of your Qt installation by exporting QT4DIR before running "configure".
+ if test "x$kde_incdir" = "xno"; then
+ AC_MSG_ERROR([KDE4 headers not found. Please specify the root of your KDE4 installation by exporting KDE4DIR before running "configure".])
+ fi
++ if test "$kde_incdir" = "/usr/include"; then kde_incdir=; fi
+
+ dnl Check for KDE4 libraries
+ AC_MSG_CHECKING([for KDE4 libraries])
+@@ -11134,7 +11135,12 @@ the root of your Qt installation by exporting QT4DIR before running "configure".
+ fi
+
+ PKG_CHECK_MODULES([QT4],[QtNetwork QtGui])
+- KDE4_CFLAGS="-I$kde_incdir $QT4_CFLAGS -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
++ if ! test -z "$kde_incdir"; then
++ KDE4_CFLAGS="-I$kde_incdir $QT4_CFLAGS -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
++ else
++ KDE4_CFLAGS="$QT4_CFLAGS -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
++ fi
++
+ KDE4_LIBS="-L$kde_libdir -lkio -lkfile -lkdeui -lkdecore -L$qt_lib_dir $QT4_LIBS"
+ KDE4_CFLAGS=$(printf '%s' "$KDE4_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
+ FilterLibs "$KDE4_LIBS"
+--
+2.9.0
+
diff --git a/app-office/libreoffice/files/libreoffice-curl-7.50.0.patch b/app-office/libreoffice/files/libreoffice-curl-7.50.0.patch
new file mode 100644
index 0000000..4a947d0
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-curl-7.50.0.patch
@@ -0,0 +1,23 @@
+From 0b8e589875ffd84150470832de18ebd79989efc0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Mon, 25 Jul 2016 12:08:35 +0100
+Subject: curl 7.50.0 has CURL as typedef struct Curl_easy
+
+Change-Id: I22e5e2cdf78c38087579071c1b1570a8adc7d3c4
+
+diff --git a/ucb/source/ucp/ftp/ftploaderthread.cxx b/ucb/source/ucp/ftp/ftploaderthread.cxx
+index be68d9a..315ccb7 100644
+--- a/ucb/source/ucp/ftp/ftploaderthread.cxx
++++ b/ucb/source/ucp/ftp/ftploaderthread.cxx
+@@ -71,7 +71,7 @@ FTPLoaderThread::~FTPLoaderThread() {
+
+
+ CURL* FTPLoaderThread::handle() {
+- CURL* ret = osl_getThreadKeyData(m_threadKey);
++ CURL* ret = static_cast<CURL*>(osl_getThreadKeyData(m_threadKey));
+ if(!ret) {
+ ret = curl_easy_init();
+ if (ret != nullptr) {
+--
+cgit v0.10.2
+
diff --git a/app-office/libreoffice/libreoffice-5.0.5.2-r99.ebuild b/app-office/libreoffice/libreoffice-5.1.4.2-r99.ebuild
index 46b3362..4b508d0 100644
--- a/app-office/libreoffice/libreoffice-5.0.5.2-r99.ebuild
+++ b/app-office/libreoffice/libreoffice-5.1.4.2-r99.ebuild
@@ -2,10 +2,9 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
KDE_REQUIRED="optional"
-QT_MINIMAL="4.7.4"
KDE_SCM="git"
CMAKE_REQUIRED="never"
@@ -20,7 +19,6 @@ DEV_URI="
http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
http://download.documentfoundation.org/libreoffice/old/${PV}/
"
-EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
ADDONS_URI="http://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
@@ -75,79 +73,69 @@ ADDONS_SRC=(
SRC_URI+=" ${ADDONS_SRC[*]}"
unset ADDONS_URI
-unset EXT_URI
unset ADDONS_SRC
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
-+gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc"
-
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-# Unpackaged separate extensions:
-# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
-# hunart: only on ooo extensions -> fubared download path somewhere on sf
-# numbertext, typo, validator, watch-window: ^^
-# oooblogger: no homepage or anything
# Extensions that need extra work:
-for lo_xt in ${LO_EXTS}; do
- IUSE+=" libreoffice_extensions_${lo_xt}"
-done
-unset lo_xt
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome google
+gstreamer +gtk gtk3 jemalloc kde libressl mysql odk postgres quickstarter telepathy test vlc
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-COMMON_DEPEND="
- ${PYTHON_DEPS}
- app-arch/zip
+COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
- >=app-text/hunspell-1.3.2-r3
- app-text/mythes
+ app-arch/zip
+ app-text/hunspell
>=app-text/libabw-0.1.0
- >=app-text/libexttextcat-3.2
- >=app-text/libebook-0.1.1
- >=app-text/libetonyek-0.1.2
+ >=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.5
+ >=app-text/libmwaw-0.3.1
>=app-text/libodfgen-0.1.0
app-text/libwpd:0.10[tools]
app-text/libwpg:0.3
- =app-text/libwps-0.4*
- >=app-text/poppler-0.16:=[cxx]
+ >=app-text/libwps-0.4
+ app-text/mythes
+ app-text/poppler:=[cxx]
>=dev-cpp/clucene-2.3.3.4-r2
=dev-cpp/libcmis-0.5*
dev-db/unixODBC
+ dev-lang/perl
>=dev-libs/boost-1.55:=
dev-libs/expat
- >=dev-libs/hyphen-2.7.1
- >=dev-libs/icu-4.8.1.1:=
- =dev-libs/liborcus-0.7*
- >=dev-libs/librevenge-0.0.1
- >=dev-libs/nspr-4.8.8
- >=dev-libs/nss-3.12.9
- >=dev-lang/perl-5.0
+ dev-libs/hyphen
+ dev-libs/icu:=
+ =dev-libs/liborcus-0.9*
+ 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
media-gfx/graphite2
- >=media-libs/fontconfig-2.8.0
+ media-libs/fontconfig
media-libs/freetype:2
- >=media-libs/glew-1.10
+ >=media-libs/glew-1.10:=
>=media-libs/harfbuzz-0.9.18:=[icu(+)]
media-libs/lcms:2
- >=media-libs/libpng-1.4:0=
>=media-libs/libcdr-0.1.0
>=media-libs/libfreehand-0.1.0
media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
>=media-libs/libvisio-0.1.0
- >=net-misc/curl-7.21.4
net-libs/neon
+ net-misc/curl
net-nds/openldap
sci-mathematics/lpsolve
virtual/jpeg:0
- >=x11-libs/cairo-1.10.0[X]
+ x11-libs/cairo[X,-xlib-xcb]
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
@@ -157,45 +145,41 @@ COMMON_DEPEND="
coinmp? ( sci-libs/coinor-mp )
collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
cups? ( net-print/cups )
- dbus? ( >=dev-libs/dbus-glib-0.92 )
- eds? ( gnome-extra/evolution-data-server )
+ dbus? ( dev-libs/dbus-glib )
+ eds? (
+ dev-libs/glib:2
+ gnome-extra/evolution-data-server
+ )
firebird? ( >=dev-db/firebird-2.5 )
gltf? ( media-libs/libgltf )
- gnome? ( gnome-base/gconf:2 )
- gtk? (
- x11-libs/gdk-pixbuf[X]
- >=x11-libs/gtk+-2.24:2
- )
- gtk3? ( >=x11-libs/gtk+-3.8:3 )
+ gnome? ( gnome-base/dconf )
gstreamer? (
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
)
- jemalloc? ( dev-libs/jemalloc )
- libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- libreoffice_extensions_wiki-publisher? (
- dev-java/commons-codec:0
- dev-java/commons-httpclient:3
- dev-java/commons-lang:2.1
- dev-java/commons-logging:0
+ gtk? (
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.24:2
)
- mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
- telepathy? (
+ gtk3? (
dev-libs/glib:2
- >=net-libs/telepathy-glib-0.18.0
- >=x11-libs/gtk+-2.24:2
+ dev-libs/gobject-introspection
+ >=x11-libs/gtk+-3.8:3
)
+ jemalloc? ( dev-libs/jemalloc )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mysql? ( dev-db/mysql-connector-c++ )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+ telepathy? ( net-libs/telepathy-glib )
"
RDEPEND="${COMMON_DEPEND}
!app-office/libreoffice-bin
!app-office/libreoffice-bin-debug
- !<app-office/openoffice-bin-3.4.0-r1
!app-office/openoffice
- media-fonts/libertine
media-fonts/liberation-fonts
+ media-fonts/libertine
media-fonts/urw-fonts
java? ( >=virtual/jre-1.6 )
kde? ( $(add_kdeapps_dep kioclient) )
@@ -214,6 +198,7 @@ fi
# 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
@@ -224,12 +209,9 @@ DEPEND="${COMMON_DEPEND}
>=dev-util/mdds-0.12.0:0=
media-libs/glm
net-misc/npapi-sdk
- >=sys-apps/findutils-4.4.2
sys-devel/bison
- sys-apps/coreutils
sys-devel/flex
sys-devel/gettext
- >=sys-devel/make-3.82
sys-devel/ucpp
sys-libs/zlib
virtual/pkgconfig
@@ -240,19 +222,18 @@ DEPEND="${COMMON_DEPEND}
x11-proto/xineramaproto
x11-proto/xproto
java? (
+ dev-java/ant-core
>=virtual/jdk-1.6
- >=dev-java/ant-core-1.7
)
odk? ( >=app-doc/doxygen-1.8.4 )
test? ( dev-util/cppunit )
"
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
bluetooth? ( dbus )
collada? ( gltf )
- gnome? ( gtk )
eds? ( gnome )
+ gnome? ( gtk )
telepathy? ( gtk )
libreoffice_extensions_nlpsolver? ( java )
libreoffice_extensions_scripting-beanshell? ( java )
@@ -261,6 +242,10 @@ REQUIRED_USE="
"
PATCHES=(
+ # from 5.2 branch
+ "${FILESDIR}/${PN}-5.1.4.2-gcc6.patch"
+ "${FILESDIR}/${PN}-curl-7.50.0.patch"
+
# not upstreamable stuff
"${FILESDIR}/${PN}-4.4-system-pyuno.patch"
@@ -271,21 +256,25 @@ PATCHES=(
)
CHECKREQS_MEMORY="512M"
-if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
-pkg_pretend() {
- local pgslot
+if [[ ${MERGE_TYPE} != binary ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+elif [[ ${MERGE_TYPE} != binary ]] ; then
+ CHECKREQS_DISK_BUILD="6G"
+fi
+pkg_pretend() {
use java || \
ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
if [[ ${MERGE_TYPE} != binary ]]; then
check-reqs_pkg_pretend
- if [[ $(gcc-major-version) -lt 4 ]] || {
- [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]]; }
- then
- eerror "Compilation with gcc older than 4.6 is not supported"
+ if [[ $(tc-getCC) == clang ]] ; then
+ : # ignore clang, which works
+ elif [[ $(gcc-major-version) -lt 4 ]] || {
+ [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then
+ eerror "Compilation with gcc older than 4.7 is not supported"
die "Too old gcc found."
fi
fi
@@ -293,7 +282,7 @@ pkg_pretend() {
# Ensure pg version but we have to be sure the pg is installed (first
# install on clean system)
if use postgres && has_version dev-db/postgresql; then
- pgslot=$(postgresql-config show)
+ local pgslot=$(postgresql-config show)
if [[ ${pgslot//.} -lt 90 ]] ; then
eerror "PostgreSQL slot must be set to 9.0 or higher."
eerror " postgresql-config set 9.0"
@@ -338,16 +327,9 @@ src_unpack() {
}
src_prepare() {
- # patchset
- if [[ -n ${PATCHSET} ]]; then
- EPATCH_FORCE="yes" \
- EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
- EPATCH_SUFFIX="patch" \
- epatch
- fi
-
- epatch "${PATCHES[@]}"
- epatch_user
+ [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
+ eapply "${PATCHES[@]}"
+ eapply_user
AT_M4DIR="m4" eautoreconf
# hack in the autogen.sh
@@ -377,12 +359,17 @@ src_prepare() {
src_configure() {
local java_opts
local internal_libs
- local lo_ext
local ext_opts
+ # Set up Google API keys, see http://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 2.7 enablement:
+ # System python enablement:
export PYTHON_CFLAGS=$(python_get_CFLAGS)
export PYTHON_LIBS=$(python_get_LIBS)
@@ -425,15 +412,6 @@ src_configure() {
use libreoffice_extensions_scripting-javascript && \
java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
-
- if use libreoffice_extensions_wiki-publisher; then
- java_opts+="
- --with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar)
- --with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
- --with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
- --with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
- "
- fi
fi
# system headers/libs/...: enforce using system packages
@@ -442,11 +420,6 @@ src_configure() {
# --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
- # --disable-gnome-vfs: old gnome virtual fs support
- # --disable-kdeab: kde3 adressbook
- # --disable-kde: kde3 support
- # --disable-systray: quickstarter does not actually work at all so do not
- # promote it
# --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
@@ -471,13 +444,9 @@ src_configure() {
--disable-dependency-tracking \
--disable-epm \
--disable-fetch-external \
- --disable-gnome-vfs \
--disable-gstreamer-0-10 \
--disable-report-builder \
- --disable-kdeab \
- --disable-kde \
--disable-online-update \
- --disable-systray \
--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
--with-build-version="Gentoo official package" \
--enable-extension-integration \
@@ -504,9 +473,8 @@ src_configure() {
$(use_enable eds evolution2) \
$(use_enable firebird firebird-sdbc) \
$(use_enable gltf) \
- $(use_enable gnome gconf) \
$(use_enable gnome gio) \
- $(use_enable gnome lockdown) \
+ $(use_enable gnome dconf) \
$(use_enable gstreamer gstreamer-1-0) \
$(use_enable gtk) \
$(use_enable gtk3) \
@@ -514,11 +482,14 @@ src_configure() {
$(use_enable mysql ext-mariadb-connector) \
$(use_enable odk) \
$(use_enable postgres postgresql-sdbc) \
+ $(use_enable quickstarter systray) \
$(use_enable telepathy) \
$(use_enable vlc) \
$(use_with coinmp system-coinmp) \
$(use_with collada system-opencollada) \
$(use_with gltf system-libgltf) \
+ $(use_with google gdrive-client-id ${google_default_client_id}) \
+ $(use_with google gdrive-client-secret ${google_default_client_secret}) \
$(use_with java) \
$(use_with mysql system-mysql-cppconn) \
$(use_with odk doxygen) \
@@ -588,7 +559,7 @@ src_install() {
insinto /usr/$(get_libdir)/libreoffice/help
doins xmlhelp/util/*.xsl
- # Remove desktop files for support to old installs that can't parse mime
+ # Remove desktop files to support old installs that can't parse mime
rm -r "${ED}"usr/share/mimelnk/ || die
# FIXME: Hack add missing file
diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml
index 2c92bb7..e1f2f47 100644
--- a/app-office/libreoffice/metadata.xml
+++ b/app-office/libreoffice/metadata.xml
@@ -14,9 +14,11 @@ version</longdescription>
<flag name="coinmp">Use sci-libs/coinor-mp as alternative solver</flag>
<flag name="collada">Enable Collada for rendering 3D models stored in *.dae and *.kmz format</flag>
<flag name="gltf">Use media-libs/libgltf for inserting 3D models in the glTF format into presentations</flag>
+ <flag name="google">Enable support for remote files on Google Drive</flag>
<flag name="gtk3">Enable highly experimental gtk3 frontend</flag>
<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag>
<flag name="odk">Build the Office Development Kit</flag>
+ <flag name="quickstarter">Build the system tray quickstarter</flag>
<flag name="telepathy">Enable document colaboration features using telepathy communication framework.</flag>
<flag name="vlc">Use <pkg>media-video/vlc</pkg> for video embedding</flag>
</use>