--- a/app-office/libreoffice/Manifest +++ a/app-office/libreoffice/Manifest @@ -0,0 +1,22 @@ +AUX libreoffice-4.3.5.2-remove-bashisms.patch 1330 SHA256 b477a07738fae7dadd324f1b792707cdda35b1f477cee43386b8a71ddbd090ea SHA512 850c1a252b141c6b32737f12766d7d6d9f0028eddcbc0b63bcfcaa70555a3a23f9e798c339176188c56e3769c1583a0b8c78feeade4f1120b0ddb2d02e2de6ed WHIRLPOOL ae5b0febeee433b82a55e130625ec52f8dbd859dfa39e4130ec16d7ca2deef061bd9c8a34e9ce96fdf3c6b18bf4c5fa48a382dfb7c22c069678ebaffd4252cba +AUX libreoffice-4.4-system-pyuno.patch 1598 SHA256 444ba9a06a548952cd82f7ea2ff17e5bd7b04788dc894ef5376bf3440749de9e SHA512 043c78f923b941a1e8985ee16d8e6b23859207eac0f4fdc52fedbce0103d62309aa7aae14e19f8bb26bef9d4213dee9871fcc3770f99be84f3405573e32ced78 WHIRLPOOL 51f85f39847a587551b6887362557771a81b6abc59b926eace36f8e2eb61cd4895486c28d44fe38e77fc1b77b0ed4e142d65f4793bf2161c9d0c5c0abeca07f7 +AUX libreoffice-4.4.0.3-gcc-4.9-Os-link-failure.patch 4304 SHA256 33c662ee9a0645b2827c3810f373b5fd84eafbfc9a0fb434cc8d0973daa4ae13 SHA512 6f001ce7dbca593a9c1c91e375df7e0631c2bdf87f84b3ec03fcfb460a698beaa2e99d5a79669aa2de549c47ba8faeb74947d855685db4475fd6f818ac38c5f2 WHIRLPOOL 488b28df2db267affcbe4b6ec956312b7da52d3deb51f64ee2e49388b2f29909c9994a8f597727a72383c81973c115539a8a47d74f5efeaa370aee2eada8367f +AUX libreoffice-4.4.0.3-telepathy-build-fix.patch 1503 SHA256 d23431960aa3898331b0e80f827c2eb224c3586bdaf9d2bb9dc10e2aa58ae6f3 SHA512 cf76698e851e31646ad7e6f9547d8c0917a047fa93b5132d00f0ea246945344f3e1df2376a9e3ffcd7ee7a4a200e24e213330482fddf50fc47558b5a9b949426 WHIRLPOOL 92e870da0ea77954d2b04e39887909a0cf20fe4277388be0074c01fac5c7adfa1cfed84333b3e7ae26f7866082bb1711ba453f877b8bc2b390d74a17d41830c0 +AUX libreoffice-4.4.1.2-add-kde4-open-url-script.patch 2144 SHA256 d35630cffc304652ad4e7df6d88dbd2ea499ae7a904a6b4c6a7eec9570ebee23 SHA512 2999f66d65e50cd06f8df1a48727407a6f4d0259d5d7dffedb3b750ed4876f93374b1a1a0aaa7d8e223e3a25ccbf05ca05d1a919fe36fc0eee0f7cd956a5949d WHIRLPOOL dbdd05bd29dcc37c94ee67ba4b1856b970a735af2ee3a468440f1edcb760a008fef2f62fb43ce2fef3626953786456652c8b606dea2b24650c72c1be66a976ef +AUX libreoffice-4.4.1.2-fix-includes.patch 1149 SHA256 2044d4c997472a46e95c68fa8bec19c1424e9074fad05df9f1c0d220dec00281 SHA512 15defc8362fb0e53db32b75d9c4ece73e1ee8bd1cc05b4dd8f072f808e6943b385a5415513b237d3daa130dedce3c6ac6370e05ec0b4a25065ce27aadd269e92 WHIRLPOOL a643af5504f09003409cdbb4e9445481b448fc67c35ef5dc2e35a71301b138c3007e1d78f4bac6128137e37c41d4c6363447eeee44b6aeba8ac68729e4661ea7 +AUX libreoffice-4.4.1.2-improve-KDE4FilePicker.patch 5561 SHA256 b9ff37b20bd73011cda137d1dce5ef87c79972718019ae16e525bf5c1fd9cc56 SHA512 3deb4211367320fcbe59acc62083245267b7637758a06996d0e14f4db1e37c53fa282363de83177fd0b756e736d725cbbbfeac2059254bfa02748c23ecf8e4df WHIRLPOOL 6acf13a6d271fdc5f549028eb8c032f41e55c9e128c7c11f97931b6cbdd3c621ae76e58b1ea0bae343afd4b51b6deadd932db893f4134ed01b4b56cd8d63a4e4 +AUX libreoffice-4.4.1.2-linux-musl.patch 1962 SHA256 5cf5a446e5769f6a2df01c5c10702514fe9178334d1e53d3c7df843ca72c6fa2 SHA512 5fb4d5bf5cab21a0c95a9e51a4a138b427a08677c34bc14287c3eb74926b606345d5185c76bbe8957043d79dc33d46cf4aaa5182642c7fb9136dc48ed9e7fabb WHIRLPOOL 3e089da32a5425f1e892c80635489fde99198a5b15e1be94b996c49f2cf77e45144f624d68d9c11aef921bce0ce0ac632d52af348335ba5d61ae6049e9c4282b +AUX libreoffice-4.4.1.2-musl-fix-execinfo.patch 736 SHA256 7171dfa651a7ee81b4e13a9fd9131428d9a65af138cac4cb428ae6c3e4bcb1f3 SHA512 567123f990c4a47c2e4cebf99f3486150740015e647ca2b2521e606f3350fc55ceda6c7ac031302da34e8fc90747d66619334fcfda4e7b8998456fe3619ab860 WHIRLPOOL d25df4d89e5739f3586296569345c38d44aeb59c1f6ed83ddd9c76139e6e5b639506c5d761838c2faa70e8a30bb6b68b15c4bdf3255f7658542f70c91bffeb32 +DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 SHA256 d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a WHIRLPOOL c4b3b0c3e10171155e1d3431e8ab9b495dbf2fb924882024306bfb53f533f5b0231c06f47e3cfa77052013a816ea4cc5f237cc76fdb44a048fb6d5c177729aec +DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 SHA256 eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c WHIRLPOOL 16eb79e3674250fcb760b9698b4980414052d20f720d946701d1915c9b8915b4af75378668653d29581b77c19fcdba8f51d1f834c286cfcefcf4a420f8fcc1d5 +DIST 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz 1652670 SHA256 390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a SHA512 5664203e6426880041cdb227e91f79f00d2ca7ae28c6997f61b72cc599aac55838d082d2b2b551bd7a228424c350ddea5d41599b8ca58d444a2cd46c9206ea91 WHIRLPOOL 6486c48b73a4f79760b443cfd397b704eca0fd32b72304ae7e7cfa0f43583b0af15c7384548b5215ae57513ed8366c8f3a74630ab466ba19a63b346af8c5eaca +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.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.4.1.2.tar.xz 1875832 SHA256 07be8ca80e3552668f496584c2d9fbc3cce8a5e3947531c62c67bdf1bbb95d10 SHA512 a955c512535f85bfd21b03fa17c6431e7190002497c66f39022a0a37c022a81c6a07da2b212d9a844b11c28d0802f8ac75086ebfeff51d36ef962394c911d4e8 WHIRLPOOL 04d9f0794fd3677a5642197dd7abcb2e6d687adf4c6320ea2ddfc2a4fdaba3f07e18d04ac489a2e73c9c8fc247bc50aaa9f2bbc672664d4c03a7992eb31af720 +EBUILD libreoffice-4.4.1.2-r99.ebuild 19294 SHA256 31183c9cfcd6956d96026a48c678c3bec7890f26954076c347a64ec17fd02406 SHA512 7e757e98ada7cc4a30077edd10aeba25605d0c852d3d75cfc496f946c01c9250efc6a40375cb0832ff2326047f5638404e6e878ea734edd999469dbf853997ad WHIRLPOOL 7154e18bcb9a2a5f6285239e3bc90ac6595a25751a1872077ac072e401f5867231afa5c55ac8d4da17880c13a1f1759661e9055c5e800c55a8ec309e4cd8b6c4 +MISC metadata.xml 1170 SHA256 94d12aad619c0489c65857246c536b65ae98f1cd7fd698fc0cc3a59972887c6e SHA512 3baf086b2cb75fd88d1044df055e443d46824041d9741172769707f25b7e284ce96dd16292454c1321e0078546dd694770c4111669a4ad394cea7c5e4b5e1a5f WHIRLPOOL 4c326355000a944206b8b85a8a40f7467fb6012d38b2934c8534003e4a4c20046363fd6fa07f189a5cf082887771e581a28cf2910d78a1158f11be37324f7c87 --- a/app-office/libreoffice/files/libreoffice-4.3.5.2-remove-bashisms.patch +++ a/app-office/libreoffice/files/libreoffice-4.3.5.2-remove-bashisms.patch @@ -0,0 +1,38 @@ +From f53e79acd0d42f5c41e1104056af9cf23e9e2e2a Mon Sep 17 00:00:00 2001 +From: "Andreas K. Huettel (dilfridge)" +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 + +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 +Tested-by: Caolán McNamara +--- + 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 + --- a/app-office/libreoffice/files/libreoffice-4.4-system-pyuno.patch +++ a/app-office/libreoffice/files/libreoffice-4.4-system-pyuno.patch @@ -0,0 +1,44 @@ +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" --- a/app-office/libreoffice/files/libreoffice-4.4.0.3-gcc-4.9-Os-link-failure.patch +++ a/app-office/libreoffice/files/libreoffice-4.4.0.3-gcc-4.9-Os-link-failure.patch @@ -0,0 +1,80 @@ +From 0e4b1d2127957459b79f41a96f1fa0061d399b3b Mon Sep 17 00:00:00 2001 +From: Michael Stahl +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 +Tested-by: Miklos Vajna + +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 --- a/app-office/libreoffice/files/libreoffice-4.4.0.3-telepathy-build-fix.patch +++ a/app-office/libreoffice/files/libreoffice-4.4.0.3-telepathy-build-fix.patch @@ -0,0 +1,40 @@ +From 623b38fa5769f8cdec10b54b2a600bc4c4e077e6 Mon Sep 17 00:00:00 2001 +From: David Tardon +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 --- a/app-office/libreoffice/files/libreoffice-4.4.1.2-add-kde4-open-url-script.patch +++ a/app-office/libreoffice/files/libreoffice-4.4.1.2-add-kde4-open-url-script.patch @@ -0,0 +1,56 @@ +From f7db2461292be3e23f5b3af47e488eaa8105d8db Mon Sep 17 00:00:00 2001 +From: Jan-Marek Glogowski +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 --- a/app-office/libreoffice/files/libreoffice-4.4.1.2-fix-includes.patch +++ a/app-office/libreoffice/files/libreoffice-4.4.1.2-fix-includes.patch @@ -0,0 +1,31 @@ +--- libreoffice-4.4.0.3/vcl/inc/headless/svpinst.hxx 2015-02-02 20:38:46.879497689 -0200 @@ -0,0 +1,192 @@ +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& ) + : 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(); --- a/app-office/libreoffice/files/libreoffice-4.4.1.2-linux-musl.patch +++ a/app-office/libreoffice/files/libreoffice-4.4.1.2-linux-musl.patch @@ -0,0 +1,68 @@ +--- libreoffice-4.4.0.3/configure.ac.orig 2015-01-22 22:05:28.000000000 -0200 @@ -0,0 +1,24 @@ +diff -ru sal.orig/osl/unx/backtrace.h sal/osl/unx/backtrace.h +--- a/sal/osl/unx/backtrace.h 2015-01-22 22:05:28.000000000 -0200 @@ -0,0 +1,619 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.4.1.2.ebuild,v 1.6 2015/04/11 20:43:16 dilfridge Exp $ + +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 + !=virtual/jre-1.6 ) + kde? ( || ( $(add_kdeapps_dep kioclient) $(add_kdebase_dep kioclient) ) ) + vlc? ( media-video/vlc ) +" + +if [[ ${PV} != *9999* ]]; then + PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*" +else + # Translations are not reliable on live ebuilds + # rather force people to use english only. + PDEPEND="!app-office/libreoffice-l10n" +fi + +# FIXME: cppunit should be moved to test conditional +# after everything upstream is under gbuild +# as dmake execute tests right away +DEPEND="${COMMON_DEPEND} + >=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 + "${FILESDIR}/${PN}-4.4.1.2-musl-fix-execinfo.patch" + "${FILESDIR}/${PN}-4.4.1.2-fix-includes.patch" + "${FILESDIR}/${PN}-4.4.1.2-linux-musl.patch" +) + +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="Gentoo official package" \ + --enable-extension-integration \ + --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \ + --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \ + --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \ + --with-external-tar="${DISTDIR}" \ + --with-lang="" \ + --with-parallelism=$(makeopts_jobs) \ + --with-system-ucpp \ + --with-vendor="Gentoo Foundation" \ + --with-x \ + --without-fonts \ + --without-myspell-dicts \ + --without-help \ + --with-helppack-integration \ + --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, bug 545974 and probably more + addpredict /dev/dri + addpredict /dev/ati + addpredict /dev/nvidiactl + + # hack for offlinehelp, this needs fixing upstream at some point + # it is broken because we send --without-help + # https://bugs.freedesktop.org/show_bug.cgi?id=46506 + ( + grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" + 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 + + 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 +} --- a/app-office/libreoffice/metadata.xml +++ a/app-office/libreoffice/metadata.xml @@ -0,0 +1,20 @@ + + + + openoffice + 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 + + Use sci-libs/coinor-mp as alternative solver + Enable Collada for rendering 3D models stored in *.dae and *.kmz format + Use media-libs/libgltf for inserting 3D models in the glTF format into presentations + Enable highly experimental gtk3 frontend + Use dev-libs/jemalloc for allocations + Build the Office Development Kit + Enable document colaboration features using telepathy communication framework. + Use media-video/vlc for video embedding + +