diff options
Diffstat (limited to 'app-office')
25 files changed, 0 insertions, 2814 deletions
diff --git a/app-office/archi/Manifest b/app-office/archi/Manifest deleted file mode 100644 index d40202ad..00000000 --- a/app-office/archi/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST Archi-lnx32_64-2.4.0.tar.gz 46073078 SHA256 114cb3e0d5f999cf079ed046689281b62cd5851e5b7e479d1201d71578fde25c SHA512 bb43a37e57024df40ba13105ce3c60a50d44a6b3e3e9af0a3c1c3f49e71cf600c7b36a2d786fb1386da8bdf5dc1085bad6a733390a625561b90bb25de91e4743 WHIRLPOOL 8122327c31bff84c97d806e32b4165b252c1e4a433e9ad918d44380c11df621330e515fa91a8ceef499cfe46d20abacd2780fa892ca88701acea4906717d5472 diff --git a/app-office/archi/archi-2.4.0.ebuild b/app-office/archi/archi-2.4.0.ebuild deleted file mode 100644 index d71649c7..00000000 --- a/app-office/archi/archi-2.4.0.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="5" - -inherit eutils - -DESCRIPTION="A free, open source, cross-platform tool and editor to create ArchiMate models." -HOMEPAGE="http://archi.cetis.ac.uk/" -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -SRC_URI="http://archi.cetis.ac.uk/download/latest/Archi-lnx32_64-${PV}.tar.gz" -IUSE="doc examples" -RESTRICT="strip mirror" -RDEPEND=">=virtual/jre-1.6" - -INSTALLDIR="/opt/Archi" -S="${WORKDIR}/Archi" - -src_install() { - # application - insinto ${INSTALLDIR} - doins -r configuration plugins - - # executables - if use x86; then - doins Archi32* - chmod 755 "${D}/${INSTALLDIR}/Archi32" - elif use amd64; then - doins Archi64* - chmod 755 "${D}/${INSTALLDIR}/Archi64" - fi - - # icon - newicon -s 128 icon.xpm archi.xpm - - # docs - if use doc; then - dodoc about.html - dodoc about_files/* - dodoc docs/* - fi - - # examples - if use examples; then - dodoc -r examples - fi -} diff --git a/app-office/clean-libreoffice-l10n.sh b/app-office/clean-libreoffice-l10n.sh deleted file mode 100755 index 86ffbee7..00000000 --- a/app-office/clean-libreoffice-l10n.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -ver="${1}" - -if [ -z "${ver}" ]; then - echo "${0} <ver>" >&2 - exit 1 -fi - -for libre in libreoffice-l10n-*; do - pushd "${libre}" || exit 1 - git rm "${libre}"-${ver}.ebuild - ebuild "$(ls -1 *.ebuild | head -n 1)" manifest - popd -done diff --git a/app-office/do-libreoffice-bump.sh b/app-office/do-libreoffice-bump.sh deleted file mode 100755 index bf3447cc..00000000 --- a/app-office/do-libreoffice-bump.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -FROM_PV="4.2.5" -TO_PV="4.2.6" -FAILED_LANGS="" -DONE_LANGS="" -for item in `find -name libreoffice-l10n-*${FROM_PV}*.ebuild`; do - - echo $item - newfile=${item/${FROM_PV}/${TO_PV}} - cp "${item}" "${newfile}" || exit 1 - - # do manifest - ebuild "${newfile}" manifest - if [ "$?" != "0" ]; then - FAILED_LANGS="${FAILED_LANGS} ${newfile}" - rm "${newfile}" - else - DONE_LANGS="${DONE_LANGS} ${newfile}" - git add "${newfile}" - fi - -done - -echo "FAILED => ${FAILED_LANGS}" -echo "DONE => ${DONE_LANGS}" diff --git a/app-office/fixup_missing_libre_langs.sh b/app-office/fixup_missing_libre_langs.sh deleted file mode 100755 index 39f31ab7..00000000 --- a/app-office/fixup_missing_libre_langs.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -LANGS="af ar as ast be_BY bg bn bo br brx bs ca ca_XV cs cy da de dgo dz el en \ -en_GB en_ZA eo es et eu fa fi fr ga gd gl gu he hi hr hu id is it ja ka kk km kn \ -ko kok ks ku ky lo lt lv mai mk ml mn mni mr ms my nb ne nl nn nr ns oc om or pa_IN \ -pap pl ps pt pt_BR ro ru rw sa_IN sat sd sh si sk sl sq sr ss st sv sw_TZ ta te tg \ -th ti tn tr ts ug uk uz ve vi xh zh_CN zh_TW zu" - -FAILED="" -source_ebuild="libreoffice-l10n-af/libreoffice-l10n-af-3.3.0.ebuild" -for lang in ${LANGS}; do - dir="libreoffice-l10n-${lang}" - if [ -d "${dir}" ]; then - continue - fi - echo "creating ${dir}" - mkdir "${dir}" || exit 1 - new_ebuild="${dir}/${dir}-3.3.0.ebuild" - cp "${source_ebuild}" "${new_ebuild}" || exit 1 - ebuild "${new_ebuild}" manifest || FAILED+="${new_ebuild}" -done -echo "failed: ${FAILED}" diff --git a/app-office/libreoffice-l10n-ro/Manifest b/app-office/libreoffice-l10n-ro/Manifest deleted file mode 100644 index 34e92886..00000000 --- a/app-office/libreoffice-l10n-ro/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_ro.tar.gz 2397321 SHA256 00e3266a72527a6ec3fb3ff6d3f1f875f6573bf6407854e22790544e9c3dc1ee SHA512 cca0a147906e5488b90d9386931e5e6e4cb803c339365d1e75a9db5e55f82f724a5e680f834dc3ea38fd3684e95e37c10e7594ed47405f5daf8761dc17487cf0 WHIRLPOOL 0b7a3980aaae93e61ee4ac757242b496b4b7c0d76999ec318e16612e86015bdd2a043c479b742037c9a1b42cb9550cbaa0f9216e4c93b989cfcaaeedeb033da5 -DIST LibreOffice_4.2.6-secfix_Linux_x86_rpm_langpack_ro.tar.gz 2396709 SHA256 e761f901a24ab95ea1490623b6467a3631329470315f6aa7ea55dce47821189c SHA512 dbb28913867538ddf9fedd301b4deb70a811b66ed07cd2a894b1b39d6499f2a7f45901e047e7a1d21c9a4ead8fc1ac446c9ab8b7a95f133dc148c918b31aa610 WHIRLPOOL 9d2033a7997b9f923bb3ea335b2fab6d3af894a924ea6498aa309d4232ad8634d1643b47ffdc69139d00d9dd3ae034b023557fc0582741f23ab17f9139810580 -DIST LibreOffice_4.4.1_Linux_x86_rpm_langpack_ro.tar.gz 2368593 SHA256 c7a5c914c4929fcbb78eb03d1faa263467d59b1dd68d7ca9d0c8eb9f93cc177b SHA512 785d0d976760e4706c148519a076b2458a16caf954dfd146510cb7cfe4a5c9b3b3dbee3869fee12972ae089d1a5f3d4195d1bcf97323942f2745a22be397c6ea WHIRLPOOL b7da3d19b06218d1ea0e0b3eccf79ee771f8fb40814d3cc5e82e9fa1347d83286c0c9d56f0778de32209c8d6c55c69a93c238024a76c8d029fc9626ec8e9eb3f diff --git a/app-office/libreoffice-l10n-ro/libreoffice-l10n-ro-4.2.5.ebuild b/app-office/libreoffice-l10n-ro/libreoffice-l10n-ro-4.2.5.ebuild deleted file mode 100644 index 3fba8053..00000000 --- a/app-office/libreoffice-l10n-ro/libreoffice-l10n-ro-4.2.5.ebuild +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 2004-2011 Sabayon Linux -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -HELPPACK_AVAIL="0" -L10N_LANG="Romanian" -inherit libreoffice-l10n-2 - diff --git a/app-office/libreoffice-l10n-ro/libreoffice-l10n-ro-4.2.6.ebuild b/app-office/libreoffice-l10n-ro/libreoffice-l10n-ro-4.2.6.ebuild deleted file mode 100644 index 3fba8053..00000000 --- a/app-office/libreoffice-l10n-ro/libreoffice-l10n-ro-4.2.6.ebuild +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 2004-2011 Sabayon Linux -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -HELPPACK_AVAIL="0" -L10N_LANG="Romanian" -inherit libreoffice-l10n-2 - diff --git a/app-office/libreoffice-l10n-ro/libreoffice-l10n-ro-4.4.1.ebuild b/app-office/libreoffice-l10n-ro/libreoffice-l10n-ro-4.4.1.ebuild deleted file mode 100644 index 3fba8053..00000000 --- a/app-office/libreoffice-l10n-ro/libreoffice-l10n-ro-4.4.1.ebuild +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 2004-2011 Sabayon Linux -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -HELPPACK_AVAIL="0" -L10N_LANG="Romanian" -inherit libreoffice-l10n-2 - diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest deleted file mode 100644 index fc15bdf1..00000000 --- a/app-office/libreoffice/Manifest +++ /dev/null @@ -1,13 +0,0 @@ -DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 SHA256 d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a WHIRLPOOL c4b3b0c3e10171155e1d3431e8ab9b495dbf2fb924882024306bfb53f533f5b0231c06f47e3cfa77052013a816ea4cc5f237cc76fdb44a048fb6d5c177729aec -DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 SHA256 eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6 -DIST 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz 1652670 SHA256 390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a SHA512 5664203e6426880041cdb227e91f79f00d2ca7ae28c6997f61b72cc599aac55838d082d2b2b551bd7a228424c350ddea5d41599b8ca58d444a2cd46c9206ea91 WHIRLPOOL 6486c48b73a4f79760b443cfd397b704eca0fd32b72304ae7e7cfa0f43583b0af15c7384548b5215ae57513ed8366c8f3a74630ab466ba19a63b346af8c5eaca -DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 SHA256 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a WHIRLPOOL a5156d06323699d2cbf539f14f5f44f54ebf33e86c7f14e98acd4c6e29c3e496f91dd6792401148ffa32e3dcb1cd4f087ed804e306b241cef86de0aa347d25d4 -DIST 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 555291 SHA256 b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb SHA512 1e8a39205f21206d239871bd636f17768eb3997e08ba065c1111a537564bec2b4e97bcb2f7cd9e652a1d9b4f31cb0662010303c393aedc84b920bb5f41b27be8 WHIRLPOOL d809712c3fcaca922d64f67a14d9dc3e750ecf359687c7ba0e8c6c7fc7750e43721a21ce29d5a3b0b87b83bfe7b71947e701ba4aed0a337ec35ecbb22d8dec34 -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-4.2.6.3.tar.xz 123839476 SHA256 d954b9fd0df1e51d5441254ae932262b3f4a06ff3275f1a97dea1b369d4f8f9a SHA512 689bb422285bc4db479d940d87e8cc12a2aeb7c410a9928f12ec853ad05b89729b7a893f546318c68c30eb6759db081a194746a5baa7185ddf4074465503629f WHIRLPOOL cdb9a91b71cd04e3d9d8744c0ac433cb49c720ae36000ef107f0bd4e1ce0ef83589413f63dcb13f7484b6aa4428e1c714893a9158aaab152e51c6019cbda1ad9 -DIST libreoffice-4.4.1.2.tar.xz 164055640 SHA256 4ed40b6554674dc0b010af0599b94066334fe80f3dc8a3fb34543f9d847b475d SHA512 0a7166ec0f3ce920e3473af14bb48568e88cb03f4c9a9d1c93fde70ca7f8518fcbb2e9e1df3177ed05408253b1737f7702e714553dd0c05c110a71ac27deace6 WHIRLPOOL ec85d5e56d4d96fdcc48d9a855c394d64404d189ae6e3f34ee8c1cab5226608dee78f29664d9f2fd2747357debe0505377189520594e0b19b8264cd00ac87990 -DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538 -DIST libreoffice-help-4.2.6.3.tar.xz 1855444 SHA256 892a78b667f5b1d771920c71bb010a7b1e537d965007591288094ae1e37bf21f SHA512 7eb441bd8e07485a3f003a3317a050c2a9a623d63b42ccbd1dd8e8fa387ab3ea8155e6a2ee135c829a851517a2bfe1ca78d89927ba4afe2f5cc6a59d14e5de80 WHIRLPOOL 217b634e51695465f4ff8e78145a7b4030b634c37f7daf0f8c46fc13db72dc9fdbb9ea8c4b669fd0c7a61fa5a1b75386cf966e3f351534a33691a817baac9e6e -DIST libreoffice-help-4.4.1.2.tar.xz 1875832 SHA256 07be8ca80e3552668f496584c2d9fbc3cce8a5e3947531c62c67bdf1bbb95d10 SHA512 a955c512535f85bfd21b03fa17c6431e7190002497c66f39022a0a37c022a81c6a07da2b212d9a844b11c28d0802f8ac75086ebfeff51d36ef962394c911d4e8 WHIRLPOOL 04d9f0794fd3677a5642197dd7abcb2e6d687adf4c6320ea2ddfc2a4fdaba3f07e18d04ac489a2e73c9c8fc247bc50aaa9f2bbc672664d4c03a7992eb31af720 diff --git a/app-office/libreoffice/files/libreoffice-3.7-system-pyuno.patch b/app-office/libreoffice/files/libreoffice-3.7-system-pyuno.patch deleted file mode 100644 index fe93728c..00000000 --- a/app-office/libreoffice/files/libreoffice-3.7-system-pyuno.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh -index a259bf6..672fa23 100755 ---- a/desktop/scripts/soffice.sh -+++ b/desktop/scripts/soffice.sh -@@ -129,6 +129,9 @@ if echo "$checks" | grep -q "cc" ; then - exit 1; - fi - -+PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH} -+export PYTHONPATH -+ - case "`uname -s`" in - NetBSD|OpenBSD|FreeBSD|DragonFly) - # this is a temporary hack until we can live with the default search paths -diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py -index 4ff2606..6a05eed 100644 ---- a/pyuno/source/module/uno.py -+++ b/pyuno/source/module/uno.py -@@ -16,8 +16,12 @@ - # except in compliance with the License. You may obtain a copy of - # the License at http://www.apache.org/licenses/LICENSE-2.0 . - # -+import os - import sys - -+sys.path.append('%eprefix%/usr/%libdir%/libreoffice/program') -+if getattr(os.environ, 'URE_BOOTSTRAP', None) is None: -+ os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:%eprefix%/usr/%libdir%/libreoffice/program/fundamentalrc" - import pyuno - - try: -diff --git a/scripting/source/pyprov/officehelper.py b/scripting/source/pyprov/officehelper.py -index 99d3b03..704edab 100755 ---- a/scripting/source/pyprov/officehelper.py -+++ b/scripting/source/pyprov/officehelper.py -@@ -44,7 +44,7 @@ def bootstrap(): - if "UNO_PATH" in os.environ: - sOffice = os.environ["UNO_PATH"] - else: -- sOffice = "" # lets hope for the best -+ sOffice = "%eprefix%/usr/%libdir%/libreoffice/program" - sOffice = os.path.join(sOffice, "soffice") - if platform.startswith("win"): - sOffice += ".exe" diff --git a/app-office/libreoffice/files/libreoffice-4.1.3.2-kde-calchang.patch b/app-office/libreoffice/files/libreoffice-4.1.3.2-kde-calchang.patch deleted file mode 100644 index 8cf3a2b3..00000000 --- a/app-office/libreoffice/files/libreoffice-4.1.3.2-kde-calchang.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 95f60222e75486336b6569afa8f34d60b51c94ad Mon Sep 17 00:00:00 2001 -From: Jan-Marek Glogowski <glogow@fbihome.de> -Date: Thu, 21 Nov 2013 12:40:57 +0100 -Subject: [PATCH] fdo#67011: Run Display::Yield through KDEXLib::Yield. - -Drag'n'Drop is handled in a second thread, which tries to "yield -the display" while the main Qt thread probably is already -yielding. Both need the YieldMutex, which freezes the application -until the D'n'D thread times out. - -Trying to yield the display throught the application yield -results in a recursive loop. - -So this catches and breaks the recursion, but just inside the Qt -thread, so other processes can "yield on the display", instead -of simply disabling the Display::Yield. - -Change-Id: Ifba91aa89fe5b0a89cc94820935dc996a065112f -Reviewed-on: https://gerrit.libreoffice.org/6750 -Tested-by: Jan-Marek Glogowski <glogow@fbihome.de> -Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> ---- - vcl/unx/kde4/KDESalDisplay.cxx | 22 ++++++++++++++++------ - 1 file changed, 16 insertions(+), 6 deletions(-) - -diff --git a/vcl/unx/kde4/KDESalDisplay.cxx b/vcl/unx/kde4/KDESalDisplay.cxx -index 21440fc..ee330e7 100644 ---- a/vcl/unx/kde4/KDESalDisplay.cxx -+++ b/vcl/unx/kde4/KDESalDisplay.cxx -@@ -25,6 +25,8 @@ - #include <assert.h> - #include <unx/saldata.hxx> - -+#include <qthread.h> -+ - SalKDEDisplay* SalKDEDisplay::selfptr = NULL; - - SalKDEDisplay::SalKDEDisplay( Display* pDisp ) -@@ -48,18 +50,26 @@ SalKDEDisplay::~SalKDEDisplay() - - void SalKDEDisplay::Yield() - { -- if( DispatchInternalEvent() ) -+ // We yield the display throught the main Qt thread. -+ // Actually this Yield may call the Display::Yield, which results in an -+ // unlimited cycle. -+ static bool break_cyclic_yield_recursion = false; -+ bool is_qt_gui_thread = ( qApp->thread() == QThread::currentThread() ); -+ -+ if( DispatchInternalEvent() || break_cyclic_yield_recursion ) - return; - -+ if( is_qt_gui_thread ) -+ break_cyclic_yield_recursion = true; -+ - DBG_ASSERT( static_cast<SalYieldMutex*>(GetSalData()->m_pInstance->GetYieldMutex())->GetThreadId() == - osl::Thread::getCurrentIdentifier(), - "will crash soon since solar mutex not locked in SalKDEDisplay::Yield" ); - -- XEvent event; -- XNextEvent( pDisp_, &event ); -- if( checkDirectInputEvent( &event )) -- return; -- qApp->x11ProcessEvent( &event ); -+ static_cast<KDEXLib*>(GetXLib())->Yield( true, false ); -+ -+ if( is_qt_gui_thread ) -+ break_cyclic_yield_recursion = false; - } - - // HACK: When using Qt event loop, input methods (japanese, etc.) will get broken because --- -1.8.5.1 - diff --git a/app-office/libreoffice/files/libreoffice-4.1.3.2-kde-recursiverepaint.patch b/app-office/libreoffice/files/libreoffice-4.1.3.2-kde-recursiverepaint.patch deleted file mode 100644 index 7067c019..00000000 --- a/app-office/libreoffice/files/libreoffice-4.1.3.2-kde-recursiverepaint.patch +++ /dev/null @@ -1,141 +0,0 @@ -Minor modification for libreoffice-4.1: in line 137, reset Q_EMIT to -emit... dilfridge@gentoo.org - -From 13a34f4c6307d1bd2443cbf3fbd83bfdd8cdbafb Mon Sep 17 00:00:00 2001 -From: Jan-Marek Glogowski <glogow@fbihome.de> -Date: Fri, 15 Nov 2013 13:42:15 +0000 -Subject: Rewrite Qt4 based nested yield mutex locking. - -The Qt event loop may start a nested event loop, when checking for -clipboard and Drag'n'Drop events. - -Previously this was handled by running this nested yield loop -inside the main glib loop using - qApp->clipboard()->property( "useEventLoopWhenWaiting" ); - -But this results in nested paint events which crash LO: - QWidget::repaint: Recursive repaint detected - -To prevend yield mutex deadlocks, check for nested event loops -and always release the yield lock before starting the nested Yield -event loop. - -This fixes fdo#69002. - -Change-Id: I7e827abd3489783053ec7123372742a32555875d -Reviewed-on: https://gerrit.libreoffice.org/6685 -Reviewed-by: Michael Meeks <michael.meeks@collabora.com> -Reviewed-by: Thorsten Behrens <thb@documentfoundation.org> -Tested-by: Thorsten Behrens <thb@documentfoundation.org> ---- -diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx -index ee4a6e3..cb20be4 100644 ---- a/vcl/unx/kde4/KDE4FilePicker.cxx -+++ b/vcl/unx/kde4/KDE4FilePicker.cxx -@@ -58,6 +58,8 @@ - - #undef Region - -+#include "generic/geninst.h" -+ - using namespace ::com::sun::star; - using namespace ::com::sun::star::ui::dialogs; - using namespace ::com::sun::star::ui::dialogs::TemplateDescription; -@@ -253,28 +255,16 @@ sal_Int16 SAL_CALL KDE4FilePicker::execute() - _dialog->setFilter(_filter); - _dialog->filterWidget()->setEditable(false); - -- // At this point, SolarMutex is held. Opening the KDE file dialog here -- // can lead to QClipboard asking for clipboard contents. If LO core -- // is the owner of the clipboard content, this will block for 5 seconds -- // and timeout, since the clipboard thread will not be able to acquire -- // SolarMutex and thus won't be able to respond. If the event loops -- // are properly integrated and QClipboard can use a nested event loop -- // (see the KDE VCL plug), then this won't happen, but otherwise -- // simply release the SolarMutex here. The KDE file dialog does not -- // call back to the core, so this should be safe (and if it does, -- // SolarMutex will need to be re-acquired). -- long mutexrelease = 0; -- if( !qApp->clipboard()->property( "useEventLoopWhenWaiting" ).toBool()) -- mutexrelease = Application::ReleaseSolarMutex(); -- //block and wait for user input -+ // We're entering a nested loop. -+ // Release the yield mutex to prevent deadlocks. - int result = _dialog->exec(); -+ - // HACK: KFileDialog uses KConfig("kdeglobals") for saving some settings - // (such as the auto-extension flag), but that doesn't update KGlobal::config() - // (which is probably a KDE bug), so force reading the new configuration, - // otherwise the next opening of the dialog would use the old settings. - KGlobal::config()->reparseConfiguration(); -- if( !qApp->clipboard()->property( "useEventLoopWhenWaiting" ).toBool()) -- Application::AcquireSolarMutex( mutexrelease ); -+ - if( result == KFileDialog::Accepted) - return ExecutableDialogResults::OK; - -diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx -index 8e0eb67..67d7a4d 100644 ---- a/vcl/unx/kde4/KDEXLib.cxx -+++ b/vcl/unx/kde4/KDEXLib.cxx -@@ -225,9 +225,6 @@ void KDEXLib::setupEventLoop() - eventLoopType = GlibEventLoop; - old_gpoll = g_main_context_get_poll_func( NULL ); - g_main_context_set_poll_func( NULL, gpoll_wrapper ); -- // set QClipboard to use event loop, otherwise the main thread will hold -- // SolarMutex locked, which will prevent the clipboard thread from answering -- m_pApplication->clipboard()->setProperty( "useEventLoopWhenWaiting", true ); - return; - } - #endif -@@ -244,9 +241,6 @@ void KDEXLib::setupEventLoop() - eventLoopType = QtUnixEventLoop; - QInternal::callFunction( QInternal::GetUnixSelectFunction, reinterpret_cast< void** >( &qt_select )); - QInternal::callFunction( QInternal::SetUnixSelectFunction, reinterpret_cast< void** >( lo_select )); -- // set QClipboard to use event loop, otherwise the main thread will hold -- // SolarMutex locked, which will prevent the clipboard thread from answering -- m_pApplication->clipboard()->setProperty( "useEventLoopWhenWaiting", true ); - return; - } - #endif -@@ -300,6 +294,9 @@ void KDEXLib::socketNotifierActivated( int fd ) - - void KDEXLib::Yield( bool bWait, bool bHandleAllCurrentEvents ) - { -+ // Nested yield loop counter. -+ static int loop_depth = 0; -+ - if( eventLoopType == LibreOfficeEventLoop ) - { - if( qApp->thread() == QThread::currentThread()) -@@ -310,13 +307,24 @@ void KDEXLib::Yield( bool bWait, bool bHandleAllCurrentEvents ) - } - return SalXLib::Yield( bWait, bHandleAllCurrentEvents ); - } -+ - // if we are the main thread (which is where the event processing is done), - // good, just do it -- if( qApp->thread() == QThread::currentThread()) -+ if( qApp->thread() == QThread::currentThread()) { -+ // Release the yield lock before entering a nested loop. -+ if (loop_depth > 0) -+ SalYieldMutexReleaser aReleaser; -+ loop_depth++; - processYield( bWait, bHandleAllCurrentEvents ); -- else -- { // if this deadlocks, event processing needs to go into a separate thread -- // or some other solution needs to be found -+ loop_depth--; -+ } -+ else { -+ // we were called from another thread; -+ // release the yield lock to prevent deadlock. -+ SalYieldMutexReleaser aReleaser; -+ -+ // if this deadlocks, event processing needs to go into a separate -+ // thread or some other solution needs to be found - emit processYieldSignal( bWait, bHandleAllCurrentEvents ); - } - } --- -cgit v0.9.0.2-2-gbebe diff --git a/app-office/libreoffice/files/libreoffice-4.2.0.4-curl-config.patch b/app-office/libreoffice/files/libreoffice-4.2.0.4-curl-config.patch deleted file mode 100644 index e07f5ad9..00000000 --- a/app-office/libreoffice/files/libreoffice-4.2.0.4-curl-config.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- a/configure.ac 2014-01-27 22:35:34.000000000 +0100 -+++ b/configure.ac 2014-02-02 23:27:50.911033565 +0100 -@@ -8606,39 +8606,31 @@ - AC_MSG_RESULT([external]) - SYSTEM_CURL=YES - -- curl_version="" -- if test "$cross_compiling" = "yes"; then -- dnl At least the OBS mingw32-libcurl-devel package -- dnl comes with a proper .pc file -- PKG_CHECK_MODULES(CURL, libcurl,, [:]) -- if test -n "$CURL_PKG_ERRORS"; then -- AC_MSG_RESULT([no]) -- else -- curl_version=`$PKG_CONFIG --modversion libcurl` -- fi -- fi -- if test -z "$curl_version"; then -+ AC_MSG_CHECKING([whether libcurl is >= 7.13.1]) -+ -+ # First try PKGCONFIG and then fall back -+ PKG_CHECK_MODULES(CURL, libcurl >= 7.13.1,, [:]) -+ -+ if test -n "$CURL_PKG_ERRORS"; then - AC_PATH_PROG(CURLCONFIG, curl-config) - if test -z "$CURLCONFIG"; then -- AC_MSG_ERROR([install the libcurl development package]) -+ AC_MSG_ERROR([curl development files not found]) - fi - CURL_LIBS=`$CURLCONFIG --libs` - CURL_CFLAGS=$("$CURLCONFIG" --cflags | sed -e "s/-I/${ISYSTEM?}/g") - curl_version=`$CURLCONFIG --version | $SED -e 's/^libcurl //'` -- fi -- -- AC_MSG_CHECKING([whether libcurl is >= 7.13.1]) - -- case $curl_version in -- dnl brackets doubled below because Autoconf uses them as m4 quote characters, -- dnl so they need to be doubled to end up in the configure script -- 7.13.1|7.1[[4-9]].*|7.[[2-9]]?.*|7.???.*|[[8-9]].*|[[1-9]][[0-9]].*) -- AC_MSG_RESULT([yes, you have $curl_version]) -- ;; -- *) -- AC_MSG_ERROR([no, you have $curl_version]) -- ;; -- esac -+ case $curl_version in -+ dnl brackets doubled below because Autoconf uses them as m4 quote characters, -+ dnl so they need to be doubled to end up in the configure script -+ 7.13.1|7.1[[4-9]].*|7.[[2-9]]?.*|7.???.*|[[8-9]].*|[[1-9]][[0-9]].*) -+ ;; -+ *) -+ AC_MSG_ERROR([no, you have $curl_version]) -+ ;; -+ esac -+ fi -+ AC_MSG_RESULT([yes]) - - libo_MINGW_CHECK_DLL([libcurl]) - libo_MINGW_TRY_DLL([libintl]) diff --git a/app-office/libreoffice/files/libreoffice-4.2.6.3-jpeg9.patch b/app-office/libreoffice/files/libreoffice-4.2.6.3-jpeg9.patch deleted file mode 100644 index b72012b6..00000000 --- a/app-office/libreoffice/files/libreoffice-4.2.6.3-jpeg9.patch +++ /dev/null @@ -1,52 +0,0 @@ -From a96a0ae362070d8e99587c6d658c1e11895c717c Mon Sep 17 00:00:00 2001 -From: "Andreas K. Huettel (dilfridge)" <dilfridge@gentoo.org> -Date: Thu, 18 Sep 2014 22:43:35 +0200 -Subject: [PATCH] type conversion fixes for jpeg-9 compatibility - -backport of 867aa217e6bcb543ea61c61f10088042d632bd07 from libreoffice-4-3 branch ---- - vcl/source/filter/jpeg/JpegReader.cxx | 6 +++--- - vcl/source/filter/jpeg/JpegWriter.cxx | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/vcl/source/filter/jpeg/JpegReader.cxx b/vcl/source/filter/jpeg/JpegReader.cxx -index 89f9028..9014d00 100644 ---- a/vcl/source/filter/jpeg/JpegReader.cxx -+++ b/vcl/source/filter/jpeg/JpegReader.cxx -@@ -71,7 +71,7 @@ extern "C" void init_source (j_decompress_ptr cinfo) - * but we don't clear the input buffer. - * This is correct behavior for reading a series of images from one source. - */ -- source->start_of_file = sal_True; -+ source->start_of_file = TRUE; - } - - long StreamRead( SvStream* pStream, void* pBuffer, long nBufferSize ) -@@ -119,9 +119,9 @@ extern "C" boolean fill_input_buffer (j_decompress_ptr cinfo) - - source->pub.next_input_byte = source->buffer; - source->pub.bytes_in_buffer = nbytes; -- source->start_of_file = sal_False; -+ source->start_of_file = FALSE; - -- return sal_True; -+ return TRUE; - } - - extern "C" void skip_input_data (j_decompress_ptr cinfo, long numberOfBytes) -diff --git a/vcl/source/filter/jpeg/JpegWriter.cxx b/vcl/source/filter/jpeg/JpegWriter.cxx -index 102eb4d..ba2f788 100644 ---- a/vcl/source/filter/jpeg/JpegWriter.cxx -+++ b/vcl/source/filter/jpeg/JpegWriter.cxx -@@ -86,7 +86,7 @@ extern "C" boolean empty_output_buffer (j_compress_ptr cinfo) - destination->pub.next_output_byte = destination->buffer; - destination->pub.free_in_buffer = BUFFER_SIZE; - -- return sal_True; -+ return TRUE; - } - - extern "C" void term_destination (j_compress_ptr cinfo) --- -2.1.0 - diff --git a/app-office/libreoffice/files/libreoffice-4.3.5.2-remove-bashisms.patch b/app-office/libreoffice/files/libreoffice-4.3.5.2-remove-bashisms.patch deleted file mode 100644 index 370b4aaa..00000000 --- a/app-office/libreoffice/files/libreoffice-4.3.5.2-remove-bashisms.patch +++ /dev/null @@ -1,38 +0,0 @@ -From f53e79acd0d42f5c41e1104056af9cf23e9e2e2a Mon Sep 17 00:00:00 2001 -From: "Andreas K. Huettel (dilfridge)" <dilfridge@gentoo.org> -Date: Sun, 4 Jan 2015 15:33:35 +0100 -Subject: [PATCH] Replace bash-specific code from configure.ac, fixes build for - sh=dash users -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Original patch by Rémi Cardona <remi@gentoo.org> - -Change-Id: I815567df8a868c3997e8ac357b8529fded28c950 -Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=525454 -Reviewed-on: https://gerrit.libreoffice.org/13731 -Reviewed-by: Caolán McNamara <caolanm@redhat.com> -Tested-by: Caolán McNamara <caolanm@redhat.com> ---- - configure.ac | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 8aa33d0..5dbe640 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -11483,9 +11483,8 @@ test_font_map() - FONTFILE_LOWER="$(echo $FONTFILE | $AWK '{print tolower($0)}')" - - TESTEXPR="'${FONTFILE_LOWER}' = '$(echo $FONT | $AWK '{print tolower($0)}').ttf'" -- while true ; do -+ while test "$#" -ge 1 ; do - MAPPING="$(echo $1 | $AWK '{print tolower($0)}')"; shift -- test -n "$MAPPING" || break - TESTEXPR="${TESTEXPR} -o '${FONTFILE_LOWER}' = '$MAPPING-regular.ttf'" - done - if test $TESTEXPR --- -2.3.0 - diff --git a/app-office/libreoffice/files/libreoffice-4.4-system-pyuno.patch b/app-office/libreoffice/files/libreoffice-4.4-system-pyuno.patch deleted file mode 100644 index 1cf8e192..00000000 --- a/app-office/libreoffice/files/libreoffice-4.4-system-pyuno.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh -index a259bf6..672fa23 100755 ---- a/desktop/scripts/soffice.sh -+++ b/desktop/scripts/soffice.sh -@@ -129,6 +129,9 @@ if echo "$checks" | grep -q "cc" ; then - exit 1; - fi - -+PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH} -+export PYTHONPATH -+ - case "`uname -s`" in - NetBSD|OpenBSD|FreeBSD|DragonFly) - # this is a temporary hack until we can live with the default search paths -diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py -index 4ff2606..6a05eed 100644 ---- a/pyuno/source/module/uno.py -+++ b/pyuno/source/module/uno.py -@@ -16,8 +16,12 @@ - # except in compliance with the License. You may obtain a copy of - # the License at http://www.apache.org/licenses/LICENSE-2.0 . - # -+import os - import sys - -+sys.path.append('%eprefix%/usr/%libdir%/libreoffice/program') -+if getattr(os.environ, 'URE_BOOTSTRAP', None) is None: -+ os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:%eprefix%/usr/%libdir%/libreoffice/program/fundamentalrc" - import pyuno - - try: -diff --git a/pyuno/source/officehelper.py b/pyuno/source/officehelper.py -index 99d3b03..704edab 100755 ---- a/pyuno/source/officehelper.py -+++ b/pyuno/source/officehelper.py -@@ -44,7 +44,7 @@ def bootstrap(): - if "UNO_PATH" in os.environ: - sOffice = os.environ["UNO_PATH"] - else: -- sOffice = "" # lets hope for the best -+ sOffice = "%eprefix%/usr/%libdir%/libreoffice/program" - sOffice = os.path.join(sOffice, "soffice") - if platform.startswith("win"): - sOffice += ".exe" diff --git a/app-office/libreoffice/files/libreoffice-4.4.0.3-gcc-4.9-Os-link-failure.patch b/app-office/libreoffice/files/libreoffice-4.4.0.3-gcc-4.9-Os-link-failure.patch deleted file mode 100644 index 0f39688e..00000000 --- a/app-office/libreoffice/files/libreoffice-4.4.0.3-gcc-4.9-Os-link-failure.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 0e4b1d2127957459b79f41a96f1fa0061d399b3b Mon Sep 17 00:00:00 2001 -From: Michael Stahl <mstahl@redhat.com> -Date: Sat, 14 Feb 2015 00:17:06 +0100 -Subject: tdf#78174: toolkit: work around GCC 4.9 -Os link failure - -A build with gcc (GCC) 4.9.2 20141101 (Red Hat 4.9.2-1) for 32-bit x86 -fails because of these undefined symbols: - -> nm --demangle workdir/CxxObject/svx/source/fmcomp/fmgridif.o | grep - \\bWindowListenerMultiplexer::acquire - U non-virtual thunk to WindowListenerMultiplexer::acquire() - -They should probably be generated inline. Work around by out-lining the -definition of the methods. - -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64812 - -Change-Id: I318f7c39bdf1243be385bc6dc0a47862b22e92c5 -(cherry picked from commit 6b3aa0fe4094e87290bd33a30bd6cd99ee78ce38) -Reviewed-on: https://gerrit.libreoffice.org/14509 -Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> -Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> - -diff --git a/include/toolkit/helper/macros.hxx b/include/toolkit/helper/macros.hxx -index e048e75..b212dff 100644 ---- a/include/toolkit/helper/macros.hxx -+++ b/include/toolkit/helper/macros.hxx -@@ -112,8 +112,8 @@ class ClassName : public ListenerMultiplexerBase, public InterfaceName \ - public: \ - ClassName( ::cppu::OWeakObject& rSource ); \ - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; \ -- void SAL_CALL acquire() throw() SAL_OVERRIDE { ListenerMultiplexerBase::acquire(); } \ -- void SAL_CALL release() throw() SAL_OVERRIDE { ListenerMultiplexerBase::release(); } \ -+ void SAL_CALL acquire() throw() SAL_OVERRIDE; \ -+ void SAL_CALL release() throw() SAL_OVERRIDE; \ - void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - -@@ -124,8 +124,8 @@ class TOOLKIT_DLLPUBLIC ClassName : public ListenerMultiplexerBase, public Inter - public: \ - ClassName( ::cppu::OWeakObject& rSource ); \ - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; \ -- void SAL_CALL acquire() throw() SAL_OVERRIDE { ListenerMultiplexerBase::acquire(); } \ -- void SAL_CALL release() throw() SAL_OVERRIDE { ListenerMultiplexerBase::release(); } \ -+ void SAL_CALL acquire() throw() SAL_OVERRIDE; \ -+ void SAL_CALL release() throw() SAL_OVERRIDE; \ - void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - -@@ -140,6 +140,8 @@ ClassName::ClassName( ::cppu::OWeakObject& rSource ) \ - : ListenerMultiplexerBase( rSource ) \ - { \ - } \ -+void SAL_CALL ClassName::acquire() throw() { ListenerMultiplexerBase::acquire(); } \ -+void SAL_CALL ClassName::release() throw() { ListenerMultiplexerBase::release(); } \ - ::com::sun::star::uno::Any ClassName::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) \ - { \ - ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, \ -diff --git a/toolkit/source/helper/listenermultiplexer.cxx b/toolkit/source/helper/listenermultiplexer.cxx -index 797fad2..b109c5f 100644 ---- a/toolkit/source/helper/listenermultiplexer.cxx -+++ b/toolkit/source/helper/listenermultiplexer.cxx -@@ -47,6 +47,15 @@ EventListenerMultiplexer::EventListenerMultiplexer( ::cppu::OWeakObject& rSource - { - } - -+void SAL_CALL EventListenerMultiplexer::acquire() throw () -+{ -+ return ListenerMultiplexerBase::acquire(); -+} -+void SAL_CALL EventListenerMultiplexer::release() throw () -+{ -+ return ListenerMultiplexerBase::release(); -+} -+ - // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any EventListenerMultiplexer::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) - { --- -cgit v0.10.2 diff --git a/app-office/libreoffice/files/libreoffice-4.4.0.3-telepathy-build-fix.patch b/app-office/libreoffice/files/libreoffice-4.4.0.3-telepathy-build-fix.patch deleted file mode 100644 index 2833385a..00000000 --- a/app-office/libreoffice/files/libreoffice-4.4.0.3-telepathy-build-fix.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 623b38fa5769f8cdec10b54b2a600bc4c4e077e6 Mon Sep 17 00:00:00 2001 -From: David Tardon <dtardon@redhat.com> -Date: Sun, 11 Jan 2015 13:08:37 +0100 -Subject: OSL_ENSURE was not declared in this scope - -Change-Id: I426c0feee7b76fe02473e07fa209a61967af3e99 - -diff --git a/tubes/source/conference.cxx b/tubes/source/conference.cxx -index 86986fc..df4a63f 100644 ---- a/tubes/source/conference.cxx -+++ b/tubes/source/conference.cxx -@@ -248,7 +248,7 @@ static void channel_closed_cb( TpChannel *channel, gpointer user_data, GObject * - - void TeleConference::setChannel( TpAccount *pAccount, TpDBusTubeChannel* pChannel ) - { -- OSL_ENSURE( !mpChannel, "TeleConference::setChannel: already have channel"); -+ SAL_WARN_IF( mpChannel, "tubes", "TeleConference::setChannel: already have channel"); - if (mpChannel) - g_object_unref( mpChannel); - if (mpAccount) -@@ -297,7 +297,7 @@ bool TeleConference::offerTube() - { - INFO_LOGGER( "TeleConference::offerTube"); - -- OSL_ENSURE( mpChannel, "TeleConference::offerTube: no channel"); -+ SAL_WARN_IF( !mpChannel, "tubes", "TeleConference::offerTube: no channel"); - if (!mpChannel) - return false; - -@@ -319,7 +319,7 @@ bool TeleConference::setTube( GDBusConnection* pTube) - { - INFO_LOGGER( "TeleConference::setTube"); - -- OSL_ENSURE( !pImpl->mpTube, "TeleConference::setTube: already tubed"); -+ SAL_WARN_IF( pImpl->mpTube, "tubes", "TeleConference::setTube: already tubed"); - - pImpl->mpTube = pTube; - --- -cgit v0.10.2 diff --git a/app-office/libreoffice/files/libreoffice-4.4.1.2-add-kde4-open-url-script.patch b/app-office/libreoffice/files/libreoffice-4.4.1.2-add-kde4-open-url-script.patch deleted file mode 100644 index d4c4d28b..00000000 --- a/app-office/libreoffice/files/libreoffice-4.4.1.2-add-kde4-open-url-script.patch +++ /dev/null @@ -1,56 +0,0 @@ -From f7db2461292be3e23f5b3af47e488eaa8105d8db Mon Sep 17 00:00:00 2001 -From: Jan-Marek Glogowski <glogow@fbihome.de> -Date: Wed, 26 Nov 2014 13:35:42 +0100 -Subject: Add kde4-open-url script - -Adds a KDE4 specific URL processing script. - -Change-Id: I0116fa95f076a5772e88c616e93de542fe4fe4e4 - -diff --git a/shell/Package_scripts_kde.mk b/shell/Package_scripts_kde.mk -index c5e4978..162bcc5 100644 ---- a/shell/Package_scripts_kde.mk -+++ b/shell/Package_scripts_kde.mk -@@ -9,6 +9,12 @@ - - $(eval $(call gb_Package_Package,shell_scripts_kde,$(SRCDIR)/shell/source/unix/misc)) - -+ifeq ($(ENABLE_KDE),TRUE) - $(eval $(call gb_Package_add_file,shell_scripts_kde,$(LIBO_BIN_FOLDER)/kde-open-url,kde-open-url.sh)) -+endif -+ -+ifeq ($(ENABLE_KDE4),TRUE) -+$(eval $(call gb_Package_add_file,shell_scripts_kde,$(LIBO_BIN_FOLDER)/kde4-open-url,kde4-open-url.sh)) -+endif - - # vim: set shiftwidth=4 tabstop=4 noexpandtab: -diff --git a/shell/source/unix/misc/kde4-open-url.sh b/shell/source/unix/misc/kde4-open-url.sh -new file mode 100755 -index 0000000..e5b8125 ---- /dev/null -+++ b/shell/source/unix/misc/kde4-open-url.sh -@@ -0,0 +1,22 @@ -+#!/bin/sh -+# -+# This file is part of the LibreOffice project. -+# -+# This Source Code Form is subject to the terms of the Mozilla Public -+# License, v. 2.0. If a copy of the MPL was not distributed with this -+# file, You can obtain one at http://mozilla.org/MPL/2.0/. -+# -+# This file incorporates work covered by the following license notice: -+# -+# Licensed to the Apache Software Foundation (ASF) under one or more -+# contributor license agreements. See the NOTICE file distributed -+# with this work for additional information regarding copyright -+# ownership. The ASF licenses this file to you under the Apache -+# License, Version 2.0 (the "License"); you may not use this file -+# except in compliance with the License. You may obtain a copy of -+# the License at http://www.apache.org/licenses/LICENSE-2.0 . -+# -+ -+# use kde-open or xdg-open if available, falling back to our own open-url -+kde-open "$1" 2>/dev/null || xdg-open "$1" 2>/dev/null || `dirname "$0"`/open-url "$1" 2>/dev/null -+exit 0 --- -cgit v0.10.2 diff --git a/app-office/libreoffice/files/libreoffice-4.4.1.2-improve-KDE4FilePicker.patch b/app-office/libreoffice/files/libreoffice-4.4.1.2-improve-KDE4FilePicker.patch deleted file mode 100644 index 61e036ee..00000000 --- a/app-office/libreoffice/files/libreoffice-4.4.1.2-improve-KDE4FilePicker.patch +++ /dev/null @@ -1,192 +0,0 @@ -Merged upstream commits: - -6fc55b9abd783b624241d56e34751ea495adbd7d "KDE4: actually apply file dialog operation mode" -b613270a730ace29dd1b16b29be2222b34f34a5d "KDE4: improve default load and save dialog titles" - - -diff -u b/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx ---- b/vcl/unx/kde4/KDE4FilePicker.cxx -+++ b/vcl/unx/kde4/KDE4FilePicker.cxx -@@ -58,6 +58,8 @@ - - #include "generic/geninst.h" - -+#include "svids.hrc" -+ - using namespace ::com::sun::star; - using namespace ::com::sun::star::ui::dialogs; - using namespace ::com::sun::star::ui::dialogs::TemplateDescription; -@@ -109,7 +111,6 @@ - - KDE4FilePicker::KDE4FilePicker( const uno::Reference<uno::XComponentContext>& ) - : KDE4FilePicker_Base(_helperMutex) -- , _resMgr( ResMgr::CreateResMgr("fps_office") ) - , allowRemoteUrls( false ) - { - _extraControls = new QWidget(); -@@ -128,8 +129,7 @@ - #endif - - setMultiSelectionMode( false ); -- //default mode -- _dialog->setOperationMode(KFileDialog::Opening); -+ _dialog->setConfirmOverwrite( true ); - - // XExecutableDialog functions - connect( this, SIGNAL( setTitleSignal( const OUString & ) ), -@@ -202,7 +202,6 @@ - SalYieldMutexReleaser aReleaser; - return Q_EMIT cleanupProxySignal(); - } -- delete _resMgr; - delete _dialog; - } - -@@ -524,6 +523,24 @@ - return toOUString(label); - } - -+QString KDE4FilePicker::getResString( sal_Int16 aRedId ) -+{ -+ QString aResString; -+ -+ if( aRedId < 0 ) -+ return aResString; -+ -+ try -+ { -+ aResString = toQString(ResId(aRedId, *ImplGetResMgr()).toString()); -+ } -+ catch(...) -+ { -+ } -+ -+ return aResString.replace('~', '&'); -+} -+ - void KDE4FilePicker::addCustomControl(sal_Int16 controlId) - { - QWidget* widget = 0; -@@ -532,37 +549,37 @@ - switch (controlId) - { - case CHECKBOX_AUTOEXTENSION: -- resId = STR_SVT_FILEPICKER_AUTO_EXTENSION; -+ resId = STR_FPICKER_AUTO_EXTENSION; - break; - case CHECKBOX_PASSWORD: -- resId = STR_SVT_FILEPICKER_PASSWORD; -+ resId = STR_FPICKER_PASSWORD; - break; - case CHECKBOX_FILTEROPTIONS: -- resId = STR_SVT_FILEPICKER_FILTER_OPTIONS; -+ resId = STR_FPICKER_FILTER_OPTIONS; - break; - case CHECKBOX_READONLY: -- resId = STR_SVT_FILEPICKER_READONLY; -+ resId = STR_FPICKER_READONLY; - break; - case CHECKBOX_LINK: -- resId = STR_SVT_FILEPICKER_INSERT_AS_LINK; -+ resId = STR_FPICKER_INSERT_AS_LINK; - break; - case CHECKBOX_PREVIEW: -- resId = STR_SVT_FILEPICKER_SHOW_PREVIEW; -+ resId = STR_FPICKER_SHOW_PREVIEW; - break; - case CHECKBOX_SELECTION: -- resId = STR_SVT_FILEPICKER_SELECTION; -+ resId = STR_FPICKER_SELECTION; - break; - case PUSHBUTTON_PLAY: -- resId = STR_SVT_FILEPICKER_PLAY; -+ resId = STR_FPICKER_PLAY; - break; - case LISTBOX_VERSION: -- resId = STR_SVT_FILEPICKER_VERSION; -+ resId = STR_FPICKER_VERSION; - break; - case LISTBOX_TEMPLATE: -- resId = STR_SVT_FILEPICKER_TEMPLATES; -+ resId = STR_FPICKER_TEMPLATES; - break; - case LISTBOX_IMAGE_TEMPLATE: -- resId = STR_SVT_FILEPICKER_IMAGE_TEMPLATE; -+ resId = STR_FPICKER_IMAGE_TEMPLATE; - break; - case LISTBOX_VERSION_LABEL: - case LISTBOX_TEMPLATE_LABEL: -@@ -581,16 +598,7 @@ - case CHECKBOX_PREVIEW: - case CHECKBOX_SELECTION: - { -- QString label; -- -- if (_resMgr && resId != -1) -- { -- OUString s(ResId(resId, *_resMgr).toString()); -- label = toQString(s); -- label.replace("~", "&"); -- } -- -- widget = new QCheckBox(label, _extraControls); -+ widget = new QCheckBox(getResString(resId), _extraControls); - - // the checkbox is created even for CHECKBOX_AUTOEXTENSION to simplify - // code, but the checkbox is hidden and ignored -@@ -719,8 +727,22 @@ - 1 ); - } - -- _dialog->setOperationMode(operationMode); -- _dialog->setConfirmOverwrite(true); -+ _dialog->setOperationMode( operationMode ); -+ -+ sal_Int16 resId = -1; -+ switch (_dialog->operationMode()) -+ { -+ case KFileDialog::Opening: -+ resId = STR_FPICKER_OPEN; -+ break; -+ case KFileDialog::Saving: -+ resId = STR_FPICKER_SAVE; -+ break; -+ default: -+ break; -+ } -+ -+ _dialog->setCaption(getResString(resId)); - } - - void SAL_CALL KDE4FilePicker::cancel() -only in patch2: -unchanged: ---- a/vcl/unx/kde4/KDE4FilePicker.hxx -+++ b/vcl/unx/kde4/KDE4FilePicker.hxx -@@ -41,8 +41,6 @@ class KFileDialog; - class QWidget; - class QLayout; - --class ResMgr; -- - typedef ::cppu::WeakComponentImplHelper5 - < ::com::sun::star::ui::dialogs::XFilePicker2 - , ::com::sun::star::ui::dialogs::XFilePicker3 -@@ -61,8 +59,6 @@ protected: - - ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener > m_xListener; - -- ResMgr *_resMgr; -- - //the dialog to display - KFileDialog* _dialog; - -@@ -225,6 +221,8 @@ private: - //add a custom control widget to the file dialog - void addCustomControl(sal_Int16 controlId); - -+ QString getResString( sal_Int16 aRedId ); -+ - private Q_SLOTS: - void cleanupProxy(); - void checkProtocol(); diff --git a/app-office/libreoffice/libreoffice-4.2.5.2.ebuild b/app-office/libreoffice/libreoffice-4.2.5.2.ebuild deleted file mode 100644 index 15410524..00000000 --- a/app-office/libreoffice/libreoffice-4.2.5.2.ebuild +++ /dev/null @@ -1,595 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -KDE_REQUIRED="optional" -QT_MINIMAL="4.7.4" -KDE_SCM="git" -CMAKE_REQUIRED="never" - -PYTHON_COMPAT=( python2_7 python3_3 python3_4 ) -PYTHON_REQ_USE="threads,xml" - -# experimental ; release ; old -# Usually the tarballs are moved a lot so this should make -# everyone happy. -DEV_URI=" - http://dev-builds.libreoffice.org/pre-releases/src - 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" -# PATCHSET="${P}-patchset-01.tar.xz" - -[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2" -inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS} -unset SCM_ECLASS - -DESCRIPTION="LibreOffice, a full office productivity suite." -HOMEPAGE="http://www.libreoffice.org" -SRC_URI="branding? ( http://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 -MODULES="core help" -# Only release has the tarballs -if [[ ${PV} != *9999* ]]; then - for i in ${DEV_URI}; do - for mod in ${MODULES}; do - if [[ ${mod} == core ]]; then - SRC_URI+=" ${i}/${P}.tar.xz" - else - SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz" - fi - done - unset mod - 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+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz" -ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code -ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )" -ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it? -ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all -ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement of rhino -ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable -SRC_URI+=" ${ADDONS_SRC}" - -unset ADDONS_URI -unset EXT_URI -unset ADDONS_SRC - -IUSE="bluetooth +branding +cups dbus debug eds firebird gnome gstreamer +gtk -gtk3 jemalloc kde mysql odk opengl postgres telepathy test +vba vlc +webdav" - -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 - -LICENSE="|| ( LGPL-3 MPL-1.1 )" -SLOT="0" -[[ ${PV} == *9999* ]] || \ -KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" - -COMMON_DEPEND=" - ${PYTHON_DEPS} - app-arch/zip - app-arch/unzip - >=app-text/hunspell-1.3.2-r3 - app-text/mythes - app-text/libabw - >=app-text/libexttextcat-3.2 - app-text/libebook - app-text/libetonyek - app-text/liblangtag - app-text/libmspub - >=app-text/libmwaw-0.2 - >=app-text/libodfgen-0.0.3 - app-text/libwpd:0.9[tools] - app-text/libwpg:0.2 - >=app-text/libwps-0.2.2 - >=app-text/poppler-0.16:=[xpdf-headers(+),cxx] - >=dev-cpp/clucene-2.3.3.4-r2 - dev-cpp/libcmis:0.4 - dev-db/unixODBC - >=dev-libs/boost-1.46:= - dev-libs/expat - >=dev-libs/hyphen-2.7.1 - >=dev-libs/icu-4.8.1.1:= - >=dev-libs/libatomic_ops-7.2d - =dev-libs/liborcus-0.5*:= - >=dev-libs/nspr-4.8.8 - >=dev-libs/nss-3.12.9 - >=dev-lang/perl-5.0 - >=dev-libs/openssl-1.0.0d - >=dev-libs/redland-1.0.16[ssl] - media-gfx/graphite2 - >=media-libs/fontconfig-2.8.0 - media-libs/freetype:2 - >=media-libs/harfbuzz-0.9.18:=[icu(+)] - media-libs/lcms:2 - >=media-libs/libpng-1.4 - >=media-libs/libcdr-0.0.5 - media-libs/libfreehand - media-libs/libvisio - >=net-misc/curl-7.21.4 - net-nds/openldap - sci-mathematics/lpsolve - virtual/jpeg:0 - >=x11-libs/cairo-1.10.0[X] - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - bluetooth? ( net-wireless/bluez ) - cups? ( net-print/cups ) - dbus? ( >=dev-libs/dbus-glib-0.92 ) - eds? ( gnome-extra/evolution-data-server ) - firebird? ( >=dev-db/firebird-2.5 ) - gnome? ( gnome-base/gconf:2 ) - gtk? ( - x11-libs/gdk-pixbuf[X] - >=x11-libs/gtk+-2.24:2 - ) - gtk3? ( >=x11-libs/gtk+-3.2:3 ) - 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 - dev-java/tomcat-servlet-api:3.0 - ) - mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) - opengl? ( - virtual/glu - virtual/opengl - ) - postgres? ( >=dev-db/postgresql-base-9.0[kerberos] ) - telepathy? ( - dev-libs/glib:2 - >=net-libs/telepathy-glib-0.18.0 - >=x11-libs/gtk+-2.24:2 - ) - webdav? ( net-libs/neon ) -" - -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-ttf - media-fonts/liberation-fonts - media-fonts/urw-fonts - java? ( >=virtual/jre-1.6 ) - vlc? ( media-video/vlc ) -" - -# Force libreoffice-l10n-en_US installation -# This will install LibreOffice templates -L10N_VER="$(get_version_component_range 1-2)*" -PDEPEND="=app-office/libreoffice-l10n-en_US-${L10N_VER} - x11-themes/kogaion-artwork-loo" - -# FIXME: cppunit should be moved to test conditional -# after everything upstream is under gbuild -# as dmake execute tests right away -DEPEND="${COMMON_DEPEND} - >=dev-libs/libxml2-2.7.8 - dev-libs/libxslt - dev-perl/Archive-Zip - dev-util/cppunit - >=dev-util/gperf-3 - dev-util/intltool - >=dev-util/mdds-0.10.2:= - virtual/pkgconfig - 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 - x11-libs/libXt - x11-libs/libXtst - x11-proto/randrproto - x11-proto/xextproto - x11-proto/xineramaproto - x11-proto/xproto - java? ( - >=virtual/jdk-1.6 - >=dev-java/ant-core-1.7 - ) - odk? ( >=app-doc/doxygen-1.8.4 ) - test? ( dev-util/cppunit ) -" - -PATCHES=( - # not upstreamable stuff - "${FILESDIR}/${PN}-3.7-system-pyuno.patch" - - # staged for git master - "${FILESDIR}/${PN}-4.2.0.4-curl-config.patch" -) - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - bluetooth? ( dbus ) - gnome? ( gtk ) - eds? ( gnome ) - telepathy? ( gtk ) - libreoffice_extensions_nlpsolver? ( java ) - libreoffice_extensions_scripting-beanshell? ( java ) - libreoffice_extensions_scripting-javascript? ( java ) - libreoffice_extensions_wiki-publisher? ( java ) -" - -CHECKREQS_MEMORY="512M" -CHECKREQS_DISK_BUILD="6G" - -pkg_pretend() { - local pgslot - - 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" - die "Too old gcc found." - fi - fi - - # 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-base; then - pgslot=$(postgresql-config show) - if [[ ${pgslot//.} < 90 ]] ; then - eerror "PostgreSQL slot must be set to 9.0 or higher." - eerror " postgresql-config set 9.0" - die "PostgreSQL slot is not set to 9.0 or higher." - fi - fi -} - -pkg_setup() { - java-pkg-opt-2_pkg_setup - kde4-base_pkg_setup - python-single-r1_pkg_setup - - [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup -} - -src_unpack() { - local mod mod2 dest tmplfile tmplname mypv - - [[ -n ${PATCHSET} ]] && unpack ${PATCHSET} - use branding && unpack "${BRANDING}" - - if [[ ${PV} != *9999* ]]; then - unpack "${P}.tar.xz" - for mod in ${MODULES}; do - [[ ${mod} == core ]] && continue - unpack "${PN}-${mod}-${PV}.tar.xz" - done - else - for mod in ${MODULES}; do - mypv=${PV/.9999} - [[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}" - EGIT_PROJECT="${PN}/${mod}" - EGIT_SOURCEDIR="${WORKDIR}/${P}" - [[ ${mod} != core ]] && EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}" - EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}" - EGIT_NOUNPACK="true" - git-2_src_unpack - if [[ ${mod} != core ]]; then - mod2=${mod} - # mapping does not match on help - [[ ${mod} == help ]] && mod2="helpcontent2" - mkdir -p "${S}/${mod2}/" || die - mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die - rm -rf "${WORKDIR}/${PN}-${mod}-${PV}" - fi - done - unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH - fi -} - -src_prepare() { - # optimization flags - export GMAKE_OPTIONS="${MAKEOPTS}" - # System python 2.7 enablement: - export PYTHON_CFLAGS=$(python_get_CFLAGS) - export PYTHON_LIBS=$(python_get_LIBS) - - # patchset - if [[ -n ${PATCHSET} ]]; then - EPATCH_FORCE="yes" \ - EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \ - EPATCH_SUFFIX="patch" \ - epatch - fi - - base_src_prepare - - AT_M4DIR="m4" eautoreconf - # hack in the autogen.sh - touch autogen.lastrun - - # system pyuno mess - sed \ - -e "s:%eprefix%:${EPREFIX}:g" \ - -e "s:%libdir%:$(get_libdir):g" \ - -i pyuno/source/module/uno.py \ - -i scripting/source/pyprov/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 - - if use branding; then - # hack... - mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die - fi -} - -src_configure() { - local java_opts - local internal_libs - local lo_ext - local ext_opts - local jbs=$(sed -ne 's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}") - - # recheck that there is some value in jobs - [[ -z ${jbs} ]] && jbs="1" - - # sane: just sane.h header that is used for scan in writer, not - # linked or anything else, worthless to depend on - # vigra: just uses templates from there - # it is serious pain in the ass for packaging - # should be replaced by boost::gil if someone interested - internal_libs+=" - --without-system-sane - --without-system-vigra - " - - # libreoffice extensions handling - for lo_xt in ${LO_EXTS}; do - if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then - ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})" - else - ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})" - fi - done - - if use java; then - # hsqldb: system one is too new - java_opts=" - --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 && \ - java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)" - - 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) - --with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar) - " - fi - fi - - # system headers/libs/...: enforce using system packages - # --enable-cairo: ensure that cairo is always required - # --enable-graphite: disabling causes build breakages - # --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-{afms,fonts,myspell-dicts,ppsd}: prevent install of sys pkgs - # --disable-report-builder: too much java packages pulled in without pkgs - econf \ - --docdir="${EPREFIX}/usr/share/doc/${PF}/" \ - --with-system-headers \ - --with-system-libs \ - --with-system-jars \ - --with-system-dicts \ - --enable-cairo-canvas \ - --enable-graphite \ - --enable-largefile \ - --enable-mergelibs \ - --enable-python=system \ - --enable-randr \ - --enable-randr-link \ - --enable-release-build \ - --disable-hardlink-deliver \ - --disable-ccache \ - --disable-crashdump \ - --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="Kogaion 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=${jbs} \ - --with-system-ucpp \ - --with-vendor="Kogaion Foundation" \ - --with-x \ - --without-afms \ - --without-fonts \ - --without-myspell-dicts \ - --without-help \ - --with-helppack-integration \ - --without-sun-templates \ - $(use_enable bluetooth sdremote-bluetooth) \ - $(use_enable cups) \ - $(use_enable debug) \ - $(use_enable dbus) \ - $(use_enable eds evolution2) \ - $(use_enable firebird firebird-sdbc) \ - $(use_enable gnome gconf) \ - $(use_enable gnome gio) \ - $(use_enable gnome lockdown) \ - $(use_enable gstreamer) \ - $(use_enable gtk) \ - $(use_enable gtk3) \ - $(use_enable kde kde4) \ - $(use_enable mysql ext-mariadb-connector) \ - $(use_enable odk) \ - $(use_enable opengl) \ - $(use_enable postgres postgresql-sdbc) \ - $(use_enable telepathy) \ - $(use_enable vba) \ - $(use_enable vlc) \ - $(use_enable webdav neon) \ - $(use_with java) \ - $(use_with mysql system-mysql-cppconn) \ - $(use_with odk doxygen) \ - ${internal_libs} \ - ${java_opts} \ - ${ext_opts} -} - -src_compile() { - # 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" - 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=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\"" - perl "${S}/helpcontent2/helpers/create_ilst.pl" \ - -dir=icon-themes/galaxy/res/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 - - # Fix bash completion placement - newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN} - rm -rf "${ED}"/etc/ - - if use branding; then - insinto /usr/$(get_libdir)/${PN}/program - newins "${WORKDIR}/branding-sofficerc" sofficerc - echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} - fi - - # symlink the nsplugin to proper location - # use gtk && inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so - - # 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 for support to old installs that can't parse mime - rm -rf "${ED}"/usr/share/mimelnk/ - - # Remove files owned by libreoffice-l10n - rm "${ED}"/usr/$(get_libdir)/libreoffice/share/wordbook/en-GB.dic || die - rm "${ED}"/usr/$(get_libdir)/libreoffice/share/wordbook/en-US.dic || die - - # Remove files provided by x11-themes/kogaion-artwork-loo - rm "${ED}"/usr/$(get_libdir)/libreoffice/program/sofficerc || die "sofficerc rm failed" - rm "${ED}"/usr/$(get_libdir)/libreoffice/program/intro.png || die "sofficerc rm failed" - - pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin - pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin -} - -pkg_preinst() { - # Cache updates - all handled by kde eclass for all environments - kde4-base_pkg_preinst -} - -pkg_postinst() { - kde4-base_pkg_postinst - - use java || \ - ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.' -} - -pkg_postrm() { - kde4-base_pkg_postrm -} diff --git a/app-office/libreoffice/libreoffice-4.2.6.3.ebuild b/app-office/libreoffice/libreoffice-4.2.6.3.ebuild deleted file mode 100644 index c87f6483..00000000 --- a/app-office/libreoffice/libreoffice-4.2.6.3.ebuild +++ /dev/null @@ -1,598 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -KDE_REQUIRED="optional" -QT_MINIMAL="4.7.4" -KDE_SCM="git" -CMAKE_REQUIRED="never" - -PYTHON_COMPAT=( python2_7 python3_3 python3_4 ) -PYTHON_REQ_USE="threads,xml" - -# experimental ; release ; old -# Usually the tarballs are moved a lot so this should make -# everyone happy. -DEV_URI=" - http://dev-builds.libreoffice.org/pre-releases/src - 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" -# PATCHSET="${P}-patchset-01.tar.xz" - -[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2" -inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS} -unset SCM_ECLASS - -DESCRIPTION="LibreOffice, a full office productivity suite" -HOMEPAGE="http://www.libreoffice.org" -SRC_URI="branding? ( http://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 -MODULES="core help" -# Only release has the tarballs -if [[ ${PV} != *9999* ]]; then - for i in ${DEV_URI}; do - for mod in ${MODULES}; do - if [[ ${mod} == core ]]; then - SRC_URI+=" ${i}/${P}.tar.xz" - else - SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz" - fi - done - unset mod - 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+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz" -ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code -ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )" -ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it? -ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all -ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement of rhino -ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable -SRC_URI+=" ${ADDONS_SRC}" - -unset ADDONS_URI -unset EXT_URI -unset ADDONS_SRC - -IUSE="bluetooth +branding +cups dbus debug eds firebird gnome gstreamer +gtk -gtk3 jemalloc kde mysql odk opengl postgres telepathy test +vba vlc +webdav" - -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 - -LICENSE="|| ( LGPL-3 MPL-1.1 )" -SLOT="0" -[[ ${PV} == *9999* ]] || \ -KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" - -COMMON_DEPEND=" - ${PYTHON_DEPS} - app-arch/zip - app-arch/unzip - >=app-text/hunspell-1.3.2-r3 - app-text/mythes - =app-text/libabw-0.0* - >=app-text/libexttextcat-3.2 - =app-text/libebook-0.0* - =app-text/libetonyek-0.0* - app-text/liblangtag - =app-text/libmspub-0.0* - =app-text/libmwaw-0.2* - =app-text/libodfgen-0.0* - app-text/libwpd:0.9[tools] - app-text/libwpg:0.2 - =app-text/libwps-0.2* - >=app-text/poppler-0.16:=[xpdf-headers(+),cxx] - >=dev-cpp/clucene-2.3.3.4-r2 - dev-cpp/libcmis:0.4 - dev-db/unixODBC - >=dev-libs/boost-1.46:= - dev-libs/expat - >=dev-libs/hyphen-2.7.1 - >=dev-libs/icu-4.8.1.1:= - =dev-libs/liborcus-0.5* - >=dev-libs/nspr-4.8.8 - >=dev-libs/nss-3.12.9 - >=dev-lang/perl-5.0 - >=dev-libs/openssl-1.0.0d:0 - >=dev-libs/redland-1.0.16 - media-gfx/graphite2 - >=media-libs/fontconfig-2.8.0 - media-libs/freetype:2 - >=media-libs/harfbuzz-0.9.18:=[icu(+)] - media-libs/lcms:2 - >=media-libs/libpng-1.4 - =media-libs/libcdr-0.0* - =media-libs/libfreehand-0.0* - =media-libs/libvisio-0.0* - >=net-misc/curl-7.21.4 - net-nds/openldap - sci-mathematics/lpsolve - virtual/jpeg:0 - >=x11-libs/cairo-1.10.0[X] - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - bluetooth? ( net-wireless/bluez ) - cups? ( net-print/cups ) - dbus? ( >=dev-libs/dbus-glib-0.92 ) - eds? ( gnome-extra/evolution-data-server ) - firebird? ( >=dev-db/firebird-2.5 ) - gnome? ( gnome-base/gconf:2 ) - gtk? ( - x11-libs/gdk-pixbuf[X] - >=x11-libs/gtk+-2.24:2 - ) - gtk3? ( >=x11-libs/gtk+-3.2:3 ) - 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 - dev-java/tomcat-servlet-api:3.0 - ) - mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) - opengl? ( - virtual/glu - virtual/opengl - ) - postgres? ( >=dev-db/postgresql-base-9.0[kerberos] ) - telepathy? ( - dev-libs/glib:2 - >=net-libs/telepathy-glib-0.18.0 - >=x11-libs/gtk+-2.24:2 - ) - webdav? ( net-libs/neon ) -" - -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-ttf - media-fonts/liberation-fonts - media-fonts/urw-fonts - java? ( >=virtual/jre-1.6 ) - vlc? ( media-video/vlc ) -" - -# Force libreoffice-l10n-en_US installation -# This will install LibreOffice templates -L10N_VER="$(get_version_component_range 1-2)*" -PDEPEND="=app-office/libreoffice-l10n-en_US-${L10N_VER} - x11-themes/kogaion-artwork-loo" - -# FIXME: cppunit should be moved to test conditional -# after everything upstream is under gbuild -# as dmake execute tests right away -DEPEND="${COMMON_DEPEND} - >=dev-libs/libatomic_ops-7.2d - >=dev-libs/libxml2-2.7.8 - dev-libs/libxslt - dev-perl/Archive-Zip - dev-util/cppunit - >=dev-util/gperf-3 - dev-util/intltool - >=dev-util/mdds-0.10.3:= - virtual/pkgconfig - 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 - x11-libs/libXt - x11-libs/libXtst - x11-proto/randrproto - x11-proto/xextproto - x11-proto/xineramaproto - x11-proto/xproto - java? ( - >=virtual/jdk-1.6 - >=dev-java/ant-core-1.7 - ) - odk? ( >=app-doc/doxygen-1.8.4 ) - test? ( dev-util/cppunit ) -" - -PATCHES=( - # not upstreamable stuff - "${FILESDIR}/${PN}-3.7-system-pyuno.patch" - - # from libreoffice-4-3 branch - "${FILESDIR}/${PN}-4.2.6.3-jpeg9.patch" - - # staged for git master - "${FILESDIR}/${PN}-4.2.0.4-curl-config.patch" -) - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - bluetooth? ( dbus ) - gnome? ( gtk ) - eds? ( gnome ) - telepathy? ( gtk ) - libreoffice_extensions_nlpsolver? ( java ) - libreoffice_extensions_scripting-beanshell? ( java ) - libreoffice_extensions_scripting-javascript? ( java ) - libreoffice_extensions_wiki-publisher? ( java ) -" - -CHECKREQS_MEMORY="512M" -CHECKREQS_DISK_BUILD="6G" - -pkg_pretend() { - local pgslot - - 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" - die "Too old gcc found." - fi - fi - - # 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-base; then - pgslot=$(postgresql-config show) - if [[ ${pgslot//.} < 90 ]] ; then - eerror "PostgreSQL slot must be set to 9.0 or higher." - eerror " postgresql-config set 9.0" - die "PostgreSQL slot is not set to 9.0 or higher." - fi - fi -} - -pkg_setup() { - java-pkg-opt-2_pkg_setup - kde4-base_pkg_setup - python-single-r1_pkg_setup - - [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup -} - -src_unpack() { - local mod mod2 dest tmplfile tmplname mypv - - [[ -n ${PATCHSET} ]] && unpack ${PATCHSET} - use branding && unpack "${BRANDING}" - - if [[ ${PV} != *9999* ]]; then - unpack "${P}.tar.xz" - for mod in ${MODULES}; do - [[ ${mod} == core ]] && continue - unpack "${PN}-${mod}-${PV}.tar.xz" - done - else - for mod in ${MODULES}; do - mypv=${PV/.9999} - [[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}" - EGIT_PROJECT="${PN}/${mod}" - EGIT_SOURCEDIR="${WORKDIR}/${P}" - [[ ${mod} != core ]] && EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}" - EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}" - EGIT_NOUNPACK="true" - git-2_src_unpack - if [[ ${mod} != core ]]; then - mod2=${mod} - # mapping does not match on help - [[ ${mod} == help ]] && mod2="helpcontent2" - mkdir -p "${S}/${mod2}/" || die - mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die - rm -rf "${WORKDIR}/${PN}-${mod}-${PV}" - fi - done - unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH - fi -} - -src_prepare() { - # optimization flags - export GMAKE_OPTIONS="${MAKEOPTS}" - # System python 2.7 enablement: - export PYTHON_CFLAGS=$(python_get_CFLAGS) - export PYTHON_LIBS=$(python_get_LIBS) - - # patchset - if [[ -n ${PATCHSET} ]]; then - EPATCH_FORCE="yes" \ - EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \ - EPATCH_SUFFIX="patch" \ - epatch - fi - - base_src_prepare - - AT_M4DIR="m4" eautoreconf - # hack in the autogen.sh - touch autogen.lastrun - - # system pyuno mess - sed \ - -e "s:%eprefix%:${EPREFIX}:g" \ - -e "s:%libdir%:$(get_libdir):g" \ - -i pyuno/source/module/uno.py \ - -i scripting/source/pyprov/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 - - if use branding; then - # hack... - mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die - fi -} - -src_configure() { - local java_opts - local internal_libs - local lo_ext - local ext_opts - local jbs=$(sed -ne 's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}") - - # recheck that there is some value in jobs - [[ -z ${jbs} ]] && jbs="1" - - # sane: just sane.h header that is used for scan in writer, not - # linked or anything else, worthless to depend on - # vigra: just uses templates from there - # it is serious pain in the ass for packaging - # should be replaced by boost::gil if someone interested - internal_libs+=" - --without-system-sane - --without-system-vigra - " - - # libreoffice extensions handling - for lo_xt in ${LO_EXTS}; do - if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then - ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})" - else - ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})" - fi - done - - if use java; then - # hsqldb: system one is too new - java_opts=" - --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 && \ - java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)" - - 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) - --with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar) - " - fi - fi - - # system headers/libs/...: enforce using system packages - # --enable-cairo: ensure that cairo is always required - # --enable-graphite: disabling causes build breakages - # --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-{afms,fonts,myspell-dicts,ppsd}: prevent install of sys pkgs - # --disable-report-builder: too much java packages pulled in without pkgs - econf \ - --docdir="${EPREFIX}/usr/share/doc/${PF}/" \ - --with-system-headers \ - --with-system-libs \ - --with-system-jars \ - --with-system-dicts \ - --enable-cairo-canvas \ - --enable-graphite \ - --enable-largefile \ - --enable-mergelibs \ - --enable-python=system \ - --enable-randr \ - --enable-randr-link \ - --enable-release-build \ - --disable-hardlink-deliver \ - --disable-ccache \ - --disable-crashdump \ - --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="Kogaion 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=${jbs} \ - --with-system-ucpp \ - --with-vendor="Kogaion Foundation" \ - --with-x \ - --without-afms \ - --without-fonts \ - --without-myspell-dicts \ - --without-help \ - --with-helppack-integration \ - --without-sun-templates \ - $(use_enable bluetooth sdremote-bluetooth) \ - $(use_enable cups) \ - $(use_enable debug) \ - $(use_enable dbus) \ - $(use_enable eds evolution2) \ - $(use_enable firebird firebird-sdbc) \ - $(use_enable gnome gconf) \ - $(use_enable gnome gio) \ - $(use_enable gnome lockdown) \ - $(use_enable gstreamer) \ - $(use_enable gtk) \ - $(use_enable gtk3) \ - $(use_enable kde kde4) \ - $(use_enable mysql ext-mariadb-connector) \ - $(use_enable odk) \ - $(use_enable opengl) \ - $(use_enable postgres postgresql-sdbc) \ - $(use_enable telepathy) \ - $(use_enable vba) \ - $(use_enable vlc) \ - $(use_enable webdav neon) \ - $(use_with java) \ - $(use_with mysql system-mysql-cppconn) \ - $(use_with odk doxygen) \ - ${internal_libs} \ - ${java_opts} \ - ${ext_opts} -} - -src_compile() { - # 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" - 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=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\"" - perl "${S}/helpcontent2/helpers/create_ilst.pl" \ - -dir=icon-themes/galaxy/res/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 - - # Fix bash completion placement - newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN} - rm -rf "${ED}"/etc/ - - if use branding; then - insinto /usr/$(get_libdir)/${PN}/program - newins "${WORKDIR}/branding-sofficerc" sofficerc - echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} - fi - - # symlink the nsplugin to proper location - # use gtk && inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so - - # 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 for support to old installs that can't parse mime - rm -rf "${ED}"/usr/share/mimelnk/ - - # Remove files owned by libreoffice-l10n - rm "${ED}"/usr/$(get_libdir)/libreoffice/share/wordbook/en-GB.dic || die - rm "${ED}"/usr/$(get_libdir)/libreoffice/share/wordbook/en-US.dic || die - - # Remove files provided by x11-themes/kogaion-artwork-loo - rm "${ED}"/usr/$(get_libdir)/libreoffice/program/sofficerc || die "sofficerc rm failed" - rm "${ED}"/usr/$(get_libdir)/libreoffice/program/intro.png || die "sofficerc rm failed" - - pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin - pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin -} - -pkg_preinst() { - # Cache updates - all handled by kde eclass for all environments - kde4-base_pkg_preinst -} - -pkg_postinst() { - kde4-base_pkg_postinst - - use java || \ - ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.' -} - -pkg_postrm() { - kde4-base_pkg_postrm -} diff --git a/app-office/libreoffice/libreoffice-4.4.1.2.ebuild b/app-office/libreoffice/libreoffice-4.4.1.2.ebuild deleted file mode 100644 index aea33c98..00000000 --- a/app-office/libreoffice/libreoffice-4.4.1.2.ebuild +++ /dev/null @@ -1,622 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -KDE_REQUIRED="optional" -QT_MINIMAL="4.7.4" -KDE_SCM="git" -CMAKE_REQUIRED="never" - -PYTHON_COMPAT=( python2_7 python3_3 python3_4 ) -PYTHON_REQ_USE="threads,xml" - -# experimental ; release ; old -# Usually the tarballs are moved a lot so this should make -# everyone happy. -DEV_URI=" - http://dev-builds.libreoffice.org/pre-releases/src - 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" -# PATCHSET="${P}-patchset-01.tar.xz" - -[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3" -inherit base multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS} -unset SCM_ECLASS - -DESCRIPTION="LibreOffice, a full office productivity suite" -HOMEPAGE="http://www.libreoffice.org" -SRC_URI="branding? ( http://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 -MODULES="core help" -# Only release has the tarballs -if [[ ${PV} != *9999* ]]; then - for i in ${DEV_URI}; do - for mod in ${MODULES}; do - if [[ ${mod} == core ]]; then - SRC_URI+=" ${i}/${P}.tar.xz" - else - SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz" - fi - done - unset mod - 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+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz" -ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code -ADDONS_SRC+=" collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )" -ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )" -ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it? -ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all -ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement of rhino -ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable -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 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 - -LICENSE="|| ( LGPL-3 MPL-1.1 )" -SLOT="0" -[[ ${PV} == *9999* ]] || \ -KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" - -COMMON_DEPEND=" - ${PYTHON_DEPS} - app-arch/zip - app-arch/unzip - >=app-text/hunspell-1.3.2-r3 - app-text/mythes - >=app-text/libabw-0.1.0 - >=app-text/libexttextcat-3.2 - >=app-text/libebook-0.1.1 - >=app-text/libetonyek-0.1.1 - app-text/liblangtag - >=app-text/libmspub-0.1.0 - >=app-text/libmwaw-0.3.4 - >=app-text/libodfgen-0.1.0 - app-text/libwpd:0.10[tools] - app-text/libwpg:0.3 - >=app-text/libwps-0.3.0 - >=app-text/poppler-0.16:=[xpdf-headers(+),cxx] - >=dev-cpp/clucene-2.3.3.4-r2 - =dev-cpp/libcmis-0.5* - dev-db/unixODBC - >=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.0 - >=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/openssl-1.0.0d:0 - >=dev-libs/redland-1.0.16 - media-gfx/graphite2 - >=media-libs/fontconfig-2.8.0 - media-libs/freetype:2 - >=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/libvisio-0.1.0 - >=net-misc/curl-7.21.4 - net-libs/neon - net-nds/openldap - sci-mathematics/lpsolve - virtual/jpeg:0 - >=x11-libs/cairo-1.10.0[X] - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - virtual/glu - virtual/opengl - bluetooth? ( net-wireless/bluez ) - 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 ) - 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.2:3 ) - 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 - dev-java/tomcat-servlet-api:3.0 - ) - mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) - postgres? ( >=dev-db/postgresql-9.0[kerberos] ) - telepathy? ( - dev-libs/glib:2 - >=net-libs/telepathy-glib-0.18.0 - >=x11-libs/gtk+-2.24:2 - ) -" - -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/urw-fonts - java? ( >=virtual/jre-1.6 ) - kde? ( || ( $(add_kdeapps_dep kioclient) $(add_kdebase_dep kioclient) ) ) - vlc? ( media-video/vlc ) -" - -# Force libreoffice-l10n-en_US installation -# This will install LibreOffice templates -L10N_VER="$(get_version_component_range 1-2)*" -PDEPEND="=app-office/libreoffice-l10n-en_US-${L10N_VER} - x11-themes/kogaion-artwork-loo" - - -# FIXME: cppunit should be moved to test conditional -# after everything upstream is under gbuild -# as dmake execute tests right away -DEPEND="${COMMON_DEPEND} - >=dev-libs/libatomic_ops-7.2d - >=dev-libs/libxml2-2.7.8 - dev-libs/libxslt - dev-perl/Archive-Zip - dev-util/cppunit - >=dev-util/gperf-3 - dev-util/intltool - >=dev-util/mdds-0.10.3:= - 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 - x11-libs/libXt - x11-libs/libXtst - x11-proto/randrproto - x11-proto/xextproto - x11-proto/xineramaproto - x11-proto/xproto - java? ( - >=virtual/jdk-1.6 - >=dev-java/ant-core-1.7 - ) - odk? ( >=app-doc/doxygen-1.8.4 ) - test? ( dev-util/cppunit ) -" - -PATCHES=( - # not upstreamable stuff - "${FILESDIR}/${PN}-4.4-system-pyuno.patch" - - # from 4.4 branch - "${FILESDIR}/${PN}-4.4.0.3-gcc-4.9-Os-link-failure.patch" # bug 538348 - - # from master branch - "${FILESDIR}/${PN}-4.4.0.3-telepathy-build-fix.patch" - "${FILESDIR}/${PN}-4.4.1.2-add-kde4-open-url-script.patch" - "${FILESDIR}/${PN}-4.4.1.2-improve-KDE4FilePicker.patch" - "${FILESDIR}/${PN}-4.3.5.2-remove-bashisms.patch" # bug 525454 -) - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - bluetooth? ( dbus ) - collada? ( gltf ) - gnome? ( gtk ) - eds? ( gnome ) - telepathy? ( gtk ) - libreoffice_extensions_nlpsolver? ( java ) - libreoffice_extensions_scripting-beanshell? ( java ) - libreoffice_extensions_scripting-javascript? ( java ) - libreoffice_extensions_wiki-publisher? ( java ) -" - -CHECKREQS_MEMORY="512M" -CHECKREQS_DISK_BUILD="6G" - -pkg_pretend() { - local pgslot - - 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" - die "Too old gcc found." - fi - fi - - # 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) - if [[ ${pgslot//.} < 90 ]] ; then - eerror "PostgreSQL slot must be set to 9.0 or higher." - eerror " postgresql-config set 9.0" - die "PostgreSQL slot is not set to 9.0 or higher." - fi - fi -} - -pkg_setup() { - java-pkg-opt-2_pkg_setup - kde4-base_pkg_setup - python-single-r1_pkg_setup - - [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup -} - -src_unpack() { - local mod mod2 dest tmplfile tmplname mypv - - [[ -n ${PATCHSET} ]] && unpack ${PATCHSET} - use branding && unpack "${BRANDING}" - - if [[ ${PV} != *9999* ]]; then - unpack "${P}.tar.xz" - for mod in ${MODULES}; do - [[ ${mod} == core ]] && continue - unpack "${PN}-${mod}-${PV}.tar.xz" - done - else - for mod in ${MODULES}; do - mypv=${PV/.9999} - [[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}" - EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" - [[ ${mod} != core ]] && EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-${mod}-${PV}" - EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}" - git-r3_src_unpack - if [[ ${mod} != core ]]; then - mod2=${mod} - # mapping does not match on help - [[ ${mod} == help ]] && mod2="helpcontent2" - mkdir -p "${S}/${mod2}/" || die - mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die - rm -rf "${WORKDIR}/${PN}-${mod}-${PV}" - fi - done - unset EGIT_CHECKOUT_DIR EGIT_REPO_URI EGIT_BRANCH - fi -} - -src_prepare() { - # optimization flags - export GMAKE_OPTIONS="${MAKEOPTS}" - # System python 2.7 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 - - # patchset - if [[ -n ${PATCHSET} ]]; then - EPATCH_FORCE="yes" \ - EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \ - EPATCH_SUFFIX="patch" \ - epatch - fi - - base_src_prepare - - AT_M4DIR="m4" eautoreconf - # hack in the autogen.sh - touch autogen.lastrun - - # system pyuno mess - sed \ - -e "s:%eprefix%:${EPREFIX}:g" \ - -e "s:%libdir%:$(get_libdir):g" \ - -i pyuno/source/module/uno.py \ - -i 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 - - if use branding; then - # hack... - mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die - fi -} - -src_configure() { - local java_opts - local internal_libs - local lo_ext - local ext_opts - - # sane: just sane.h header that is used for scan in writer, not - # linked or anything else, worthless to depend on - # vigra: just uses templates from there - # it is serious pain in the ass for packaging - # should be replaced by boost::gil if someone interested - internal_libs+=" - --without-system-sane - --without-system-vigra - " - - # libreoffice extensions handling - for lo_xt in ${LO_EXTS}; do - if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then - ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})" - else - ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})" - fi - done - - if use java; then - # hsqldb: system one is too new - java_opts=" - --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 && \ - java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)" - - 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) - --with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar) - " - fi - fi - - # system headers/libs/...: enforce using system packages - # --enable-cairo: ensure that cairo is always required - # --enable-graphite: disabling causes build breakages - # --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 - econf \ - --docdir="${EPREFIX}/usr/share/doc/${PF}/" \ - --with-system-headers \ - --with-system-libs \ - --with-system-jars \ - --with-system-dicts \ - --enable-cairo-canvas \ - --enable-graphite \ - --enable-largefile \ - --enable-mergelibs \ - --enable-neon \ - --enable-python=system \ - --enable-randr \ - --enable-randr-link \ - --enable-release-build \ - --disable-hardlink-deliver \ - --disable-ccache \ - --disable-crashdump \ - --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="Kogaion 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 \ - --without-sun-templates \ - $(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 gnome gconf) \ - $(use_enable gnome gio) \ - $(use_enable gnome lockdown) \ - $(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 postgres postgresql-sdbc) \ - $(use_enable telepathy) \ - $(use_enable vlc) \ - $(use_with coinmp system-coinmp) \ - $(use_with collada system-opencollada) \ - $(use_with gltf system-libgltf) \ - $(use_with java) \ - $(use_with mysql system-mysql-cppconn) \ - $(use_with odk doxygen) \ - ${internal_libs} \ - ${java_opts} \ - ${ext_opts} -} - -src_compile() { - # more and more LO stuff tries to use OpenGL, including tests during build - # bug 501508, bug 540624 and probably more - addpredict /dev/dri - 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" - 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=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\"" - perl "${S}/helpcontent2/helpers/create_ilst.pl" \ - -dir=icon-themes/galaxy/res/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 - - # Fix bash completion placement - newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN} - bashcomp_alias \ - libreoffice \ - unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice - rm -rf "${ED}"/etc/ || die - - 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} - 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 for support to old installs that can't parse mime - rm -rf "${ED}"/usr/share/mimelnk/ - - # FIXME: Hack add missing file - insinto /usr/$(get_libdir)/${PN}/program - doins "${S}"/instdir/program/libsaxlo.so - - # Remove files owned by libreoffice-l10n - rm "${ED}"/usr/$(get_libdir)/libreoffice/share/wordbook/en-GB.dic || die - rm "${ED}"/usr/$(get_libdir)/libreoffice/share/wordbook/en-US.dic || die - - # Remove files provided by x11-themes/kogaion-artwork-loo - rm "${ED}"/usr/$(get_libdir)/libreoffice/program/sofficerc || die "sofficerc rm failed" - rm "${ED}"/usr/$(get_libdir)/libreoffice/program/intro.png || die "sofficerc rm failed" - - pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin - pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin -} - -pkg_preinst() { - # Cache updates - all handled by kde eclass for all environments - kde4-base_pkg_preinst -} - -pkg_postinst() { - kde4-base_pkg_postinst - - use java || \ - ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.' -} - -pkg_postrm() { - kde4-base_pkg_postrm -} diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml deleted file mode 100644 index 67504779..00000000 --- a/app-office/libreoffice/metadata.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>openoffice</herd> - <longdescription>LibreOffice is a fork of OpenOffice.org. -This ebuild allows you to compile it yourself. Unfortunately this -compilation can take up to a day depending on the speed of your -computer. It will however make a snappier openoffice than the binary -version</longdescription> - <use> - <flag name="binfilter">Enable support for legacy StarOffice 5.x and earlier file formats</flag> - <flag name="binfilterdebug">Generate debug info for binfilter code (not recommended, huge files result)</flag> - <flag name="graphite">Enable support for non-Roman fonts via <pkg>media-gfx/graphite2</pkg></flag> - <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag> - <flag name="nlpsolver">Build extension for non-linear solving in calc</flag> - <flag name="odk">Build the Office Development Kit</flag> - <flag name="pdfimport">Build pdf-import extension using <pkg>app-text/poppler</pkg>. Note that you don't need this for pdf-export!</flag> - <flag name="vba">Enable support for VBA compatibility and ActiveX embedding</flag> - <flag name="webdav">Adds support for HTTP content adding via <pkg>net-libs/neon</pkg></flag> - <flag name="xmlsec">Adds support for document signing using internal modified <pkg>dev-libs/xmlsec</pkg> and system <pkg>dev-libs/nss</pkg></flag> - </use> -</pkgmetadata> |