Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 546890 | Differences between
and this patch

Collapse All | Expand All

(-)a/app-office/libreoffice/Manifest (+22 lines)
Line 0 Link Here
1
AUX libreoffice-4.3.5.2-remove-bashisms.patch 1330 SHA256 b477a07738fae7dadd324f1b792707cdda35b1f477cee43386b8a71ddbd090ea SHA512 850c1a252b141c6b32737f12766d7d6d9f0028eddcbc0b63bcfcaa70555a3a23f9e798c339176188c56e3769c1583a0b8c78feeade4f1120b0ddb2d02e2de6ed WHIRLPOOL ae5b0febeee433b82a55e130625ec52f8dbd859dfa39e4130ec16d7ca2deef061bd9c8a34e9ce96fdf3c6b18bf4c5fa48a382dfb7c22c069678ebaffd4252cba
2
AUX libreoffice-4.4-system-pyuno.patch 1598 SHA256 444ba9a06a548952cd82f7ea2ff17e5bd7b04788dc894ef5376bf3440749de9e SHA512 043c78f923b941a1e8985ee16d8e6b23859207eac0f4fdc52fedbce0103d62309aa7aae14e19f8bb26bef9d4213dee9871fcc3770f99be84f3405573e32ced78 WHIRLPOOL 51f85f39847a587551b6887362557771a81b6abc59b926eace36f8e2eb61cd4895486c28d44fe38e77fc1b77b0ed4e142d65f4793bf2161c9d0c5c0abeca07f7
3
AUX libreoffice-4.4.0.3-gcc-4.9-Os-link-failure.patch 4304 SHA256 33c662ee9a0645b2827c3810f373b5fd84eafbfc9a0fb434cc8d0973daa4ae13 SHA512 6f001ce7dbca593a9c1c91e375df7e0631c2bdf87f84b3ec03fcfb460a698beaa2e99d5a79669aa2de549c47ba8faeb74947d855685db4475fd6f818ac38c5f2 WHIRLPOOL 488b28df2db267affcbe4b6ec956312b7da52d3deb51f64ee2e49388b2f29909c9994a8f597727a72383c81973c115539a8a47d74f5efeaa370aee2eada8367f
4
AUX libreoffice-4.4.0.3-telepathy-build-fix.patch 1503 SHA256 d23431960aa3898331b0e80f827c2eb224c3586bdaf9d2bb9dc10e2aa58ae6f3 SHA512 cf76698e851e31646ad7e6f9547d8c0917a047fa93b5132d00f0ea246945344f3e1df2376a9e3ffcd7ee7a4a200e24e213330482fddf50fc47558b5a9b949426 WHIRLPOOL 92e870da0ea77954d2b04e39887909a0cf20fe4277388be0074c01fac5c7adfa1cfed84333b3e7ae26f7866082bb1711ba453f877b8bc2b390d74a17d41830c0
5
AUX libreoffice-4.4.1.2-add-kde4-open-url-script.patch 2144 SHA256 d35630cffc304652ad4e7df6d88dbd2ea499ae7a904a6b4c6a7eec9570ebee23 SHA512 2999f66d65e50cd06f8df1a48727407a6f4d0259d5d7dffedb3b750ed4876f93374b1a1a0aaa7d8e223e3a25ccbf05ca05d1a919fe36fc0eee0f7cd956a5949d WHIRLPOOL dbdd05bd29dcc37c94ee67ba4b1856b970a735af2ee3a468440f1edcb760a008fef2f62fb43ce2fef3626953786456652c8b606dea2b24650c72c1be66a976ef
6
AUX libreoffice-4.4.1.2-fix-includes.patch 1149 SHA256 2044d4c997472a46e95c68fa8bec19c1424e9074fad05df9f1c0d220dec00281 SHA512 15defc8362fb0e53db32b75d9c4ece73e1ee8bd1cc05b4dd8f072f808e6943b385a5415513b237d3daa130dedce3c6ac6370e05ec0b4a25065ce27aadd269e92 WHIRLPOOL a643af5504f09003409cdbb4e9445481b448fc67c35ef5dc2e35a71301b138c3007e1d78f4bac6128137e37c41d4c6363447eeee44b6aeba8ac68729e4661ea7
7
AUX libreoffice-4.4.1.2-improve-KDE4FilePicker.patch 5561 SHA256 b9ff37b20bd73011cda137d1dce5ef87c79972718019ae16e525bf5c1fd9cc56 SHA512 3deb4211367320fcbe59acc62083245267b7637758a06996d0e14f4db1e37c53fa282363de83177fd0b756e736d725cbbbfeac2059254bfa02748c23ecf8e4df WHIRLPOOL 6acf13a6d271fdc5f549028eb8c032f41e55c9e128c7c11f97931b6cbdd3c621ae76e58b1ea0bae343afd4b51b6deadd932db893f4134ed01b4b56cd8d63a4e4
8
AUX libreoffice-4.4.1.2-linux-musl.patch 1962 SHA256 5cf5a446e5769f6a2df01c5c10702514fe9178334d1e53d3c7df843ca72c6fa2 SHA512 5fb4d5bf5cab21a0c95a9e51a4a138b427a08677c34bc14287c3eb74926b606345d5185c76bbe8957043d79dc33d46cf4aaa5182642c7fb9136dc48ed9e7fabb WHIRLPOOL 3e089da32a5425f1e892c80635489fde99198a5b15e1be94b996c49f2cf77e45144f624d68d9c11aef921bce0ce0ac632d52af348335ba5d61ae6049e9c4282b
9
AUX libreoffice-4.4.1.2-musl-fix-execinfo.patch 736 SHA256 7171dfa651a7ee81b4e13a9fd9131428d9a65af138cac4cb428ae6c3e4bcb1f3 SHA512 567123f990c4a47c2e4cebf99f3486150740015e647ca2b2521e606f3350fc55ceda6c7ac031302da34e8fc90747d66619334fcfda4e7b8998456fe3619ab860 WHIRLPOOL d25df4d89e5739f3586296569345c38d44aeb59c1f6ed83ddd9c76139e6e5b639506c5d761838c2faa70e8a30bb6b68b15c4bdf3255f7658542f70c91bffeb32
10
DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 SHA256 d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a WHIRLPOOL c4b3b0c3e10171155e1d3431e8ab9b495dbf2fb924882024306bfb53f533f5b0231c06f47e3cfa77052013a816ea4cc5f237cc76fdb44a048fb6d5c177729aec
11
DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 SHA256 eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c WHIRLPOOL 16eb79e3674250fcb760b9698b4980414052d20f720d946701d1915c9b8915b4af75378668653d29581b77c19fcdba8f51d1f834c286cfcefcf4a420f8fcc1d5
12
DIST 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz 1652670 SHA256 390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a SHA512 5664203e6426880041cdb227e91f79f00d2ca7ae28c6997f61b72cc599aac55838d082d2b2b551bd7a228424c350ddea5d41599b8ca58d444a2cd46c9206ea91 WHIRLPOOL 6486c48b73a4f79760b443cfd397b704eca0fd32b72304ae7e7cfa0f43583b0af15c7384548b5215ae57513ed8366c8f3a74630ab466ba19a63b346af8c5eaca
13
DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 SHA256 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a WHIRLPOOL a5156d06323699d2cbf539f14f5f44f54ebf33e86c7f14e98acd4c6e29c3e496f91dd6792401148ffa32e3dcb1cd4f087ed804e306b241cef86de0aa347d25d4
14
DIST 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 555291 SHA256 b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb SHA512 1e8a39205f21206d239871bd636f17768eb3997e08ba065c1111a537564bec2b4e97bcb2f7cd9e652a1d9b4f31cb0662010303c393aedc84b920bb5f41b27be8 WHIRLPOOL d809712c3fcaca922d64f67a14d9dc3e750ecf359687c7ba0e8c6c7fc7750e43721a21ce29d5a3b0b87b83bfe7b71947e701ba4aed0a337ec35ecbb22d8dec34
15
DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 SHA256 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f WHIRLPOOL 8e446eb44188046b0e90694feba232f42c2e9f13d0f43783a18de37c94b86ff919b994931125c5d8001ecd320c1f4db5da482847304aa61646600a3bb33144b4
16
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a WHIRLPOOL 60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c
17
DIST d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz 16525605 SHA256 1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f SHA512 d08a7fe432e8df47d1d8992a45bb5f33149cb75b90eb74b2f2e457628d21a94b17eae0045096b053d2a866bf7710c775581c3e417b5dfaf66601aa18071b7305 WHIRLPOOL 95dc6ec0fb293c3538c1d51241283edf4e21647dcfd10229233ab7c3f13f7c78e6bb02c4d292a7cd2a2ec95575d775f0395e837bbc88ab4ddbaa5adfd62be2f0
18
DIST libreoffice-4.4.1.2.tar.xz 164055640 SHA256 4ed40b6554674dc0b010af0599b94066334fe80f3dc8a3fb34543f9d847b475d SHA512 0a7166ec0f3ce920e3473af14bb48568e88cb03f4c9a9d1c93fde70ca7f8518fcbb2e9e1df3177ed05408253b1737f7702e714553dd0c05c110a71ac27deace6 WHIRLPOOL ec85d5e56d4d96fdcc48d9a855c394d64404d189ae6e3f34ee8c1cab5226608dee78f29664d9f2fd2747357debe0505377189520594e0b19b8264cd00ac87990
19
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
20
DIST libreoffice-help-4.4.1.2.tar.xz 1875832 SHA256 07be8ca80e3552668f496584c2d9fbc3cce8a5e3947531c62c67bdf1bbb95d10 SHA512 a955c512535f85bfd21b03fa17c6431e7190002497c66f39022a0a37c022a81c6a07da2b212d9a844b11c28d0802f8ac75086ebfeff51d36ef962394c911d4e8 WHIRLPOOL 04d9f0794fd3677a5642197dd7abcb2e6d687adf4c6320ea2ddfc2a4fdaba3f07e18d04ac489a2e73c9c8fc247bc50aaa9f2bbc672664d4c03a7992eb31af720
21
EBUILD libreoffice-4.4.1.2-r99.ebuild 19273 SHA256 563963155dddd39a6a58415aa556c9582655cd9ee7eefcf1a6e3ec8c53ba32be SHA512 792bcf9aa5942a1ecd12e147aa538b0e1f767f72f2c54038a11e5b2338256ce138d86f33f1cf1de74cac02361258be72065a1b1cb3b0c5e5bb7f653ebbf919a4 WHIRLPOOL e78034f4abd33acb14ba380573bcc2d68794b2a3277f09bd7e1043d9566e7ab9953fb58de5ab909e288475f694989aa9fb0aee4c73df4f21b934f4a538500661
22
MISC metadata.xml 1170 SHA256 94d12aad619c0489c65857246c536b65ae98f1cd7fd698fc0cc3a59972887c6e SHA512 3baf086b2cb75fd88d1044df055e443d46824041d9741172769707f25b7e284ce96dd16292454c1321e0078546dd694770c4111669a4ad394cea7c5e4b5e1a5f WHIRLPOOL 4c326355000a944206b8b85a8a40f7467fb6012d38b2934c8534003e4a4c20046363fd6fa07f189a5cf082887771e581a28cf2910d78a1158f11be37324f7c87
(-)a/app-office/libreoffice/files/libreoffice-4.3.5.2-remove-bashisms.patch (+38 lines)
Line 0 Link Here
1
From f53e79acd0d42f5c41e1104056af9cf23e9e2e2a Mon Sep 17 00:00:00 2001
2
From: "Andreas K. Huettel (dilfridge)" <dilfridge@gentoo.org>
3
Date: Sun, 4 Jan 2015 15:33:35 +0100
4
Subject: [PATCH] Replace bash-specific code from configure.ac, fixes build for
5
 sh=dash users
6
MIME-Version: 1.0
7
Content-Type: text/plain; charset=UTF-8
8
Content-Transfer-Encoding: 8bit
9
10
Original patch by Rémi Cardona <remi@gentoo.org>
11
12
Change-Id: I815567df8a868c3997e8ac357b8529fded28c950
13
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=525454
14
Reviewed-on: https://gerrit.libreoffice.org/13731
15
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
16
Tested-by: Caolán McNamara <caolanm@redhat.com>
17
---
18
 configure.ac | 3 +--
19
 1 file changed, 1 insertion(+), 2 deletions(-)
20
21
diff --git a/configure.ac b/configure.ac
22
index 8aa33d0..5dbe640 100644
23
--- a/configure.ac
24
+++ b/configure.ac
25
@@ -11483,9 +11483,8 @@ test_font_map()
26
     FONTFILE_LOWER="$(echo $FONTFILE | $AWK '{print tolower($0)}')"
27
 
28
     TESTEXPR="'${FONTFILE_LOWER}' = '$(echo $FONT | $AWK '{print tolower($0)}').ttf'"
29
-    while true ; do
30
+    while test "$#" -ge 1 ; do
31
         MAPPING="$(echo $1 | $AWK '{print tolower($0)}')"; shift
32
-        test -n "$MAPPING" || break
33
         TESTEXPR="${TESTEXPR} -o '${FONTFILE_LOWER}' = '$MAPPING-regular.ttf'"
34
     done
35
     if test $TESTEXPR
36
-- 
37
2.3.0
38
(-)a/app-office/libreoffice/files/libreoffice-4.4-system-pyuno.patch (+44 lines)
Line 0 Link Here
1
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
2
index a259bf6..672fa23 100755
3
--- a/desktop/scripts/soffice.sh
4
+++ b/desktop/scripts/soffice.sh
5
@@ -129,6 +129,9 @@ if echo "$checks" | grep -q "cc" ; then
6
     exit 1;
7
 fi
8
 
9
+PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH}
10
+export PYTHONPATH
11
+
12
 case "`uname -s`" in
13
 NetBSD|OpenBSD|FreeBSD|DragonFly)
14
 # this is a temporary hack until we can live with the default search paths
15
diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py
16
index 4ff2606..6a05eed 100644
17
--- a/pyuno/source/module/uno.py
18
+++ b/pyuno/source/module/uno.py
19
@@ -16,8 +16,12 @@
20
 #   except in compliance with the License. You may obtain a copy of
21
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
22
 #
23
+import os
24
 import sys
25
 
26
+sys.path.append('%eprefix%/usr/%libdir%/libreoffice/program')
27
+if getattr(os.environ, 'URE_BOOTSTRAP', None) is None:
28
+    os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:%eprefix%/usr/%libdir%/libreoffice/program/fundamentalrc"
29
 import pyuno
30
 
31
 try:
32
diff --git a/pyuno/source/officehelper.py b/pyuno/source/officehelper.py
33
index 99d3b03..704edab 100755
34
--- a/pyuno/source/officehelper.py
35
+++ b/pyuno/source/officehelper.py
36
@@ -44,7 +44,7 @@ def bootstrap():
37
         if "UNO_PATH" in os.environ:
38
             sOffice = os.environ["UNO_PATH"]
39
         else:
40
-            sOffice = "" # lets hope for the best
41
+            sOffice = "%eprefix%/usr/%libdir%/libreoffice/program"
42
         sOffice = os.path.join(sOffice, "soffice")
43
         if platform.startswith("win"): 
44
             sOffice += ".exe"
(-)a/app-office/libreoffice/files/libreoffice-4.4.0.3-gcc-4.9-Os-link-failure.patch (+80 lines)
Line 0 Link Here
1
From 0e4b1d2127957459b79f41a96f1fa0061d399b3b Mon Sep 17 00:00:00 2001
2
From: Michael Stahl <mstahl@redhat.com>
3
Date: Sat, 14 Feb 2015 00:17:06 +0100
4
Subject: tdf#78174: toolkit: work around GCC 4.9 -Os link failure
5
6
A build with gcc (GCC) 4.9.2 20141101 (Red Hat 4.9.2-1) for 32-bit x86
7
fails because of these undefined symbols:
8
9
> nm --demangle workdir/CxxObject/svx/source/fmcomp/fmgridif.o | grep
10
 \\bWindowListenerMultiplexer::acquire
11
         U non-virtual thunk to WindowListenerMultiplexer::acquire()
12
13
They should probably be generated inline.  Work around by out-lining the
14
definition of the methods.
15
16
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64812
17
18
Change-Id: I318f7c39bdf1243be385bc6dc0a47862b22e92c5
19
(cherry picked from commit 6b3aa0fe4094e87290bd33a30bd6cd99ee78ce38)
20
Reviewed-on: https://gerrit.libreoffice.org/14509
21
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
22
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
23
24
diff --git a/include/toolkit/helper/macros.hxx b/include/toolkit/helper/macros.hxx
25
index e048e75..b212dff 100644
26
--- a/include/toolkit/helper/macros.hxx
27
+++ b/include/toolkit/helper/macros.hxx
28
@@ -112,8 +112,8 @@ class ClassName : public ListenerMultiplexerBase, public InterfaceName \
29
 public: \
30
     ClassName( ::cppu::OWeakObject& rSource ); \
31
     ::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; \
32
-    void                        SAL_CALL acquire() throw() SAL_OVERRIDE  { ListenerMultiplexerBase::acquire(); } \
33
-    void                        SAL_CALL release() throw() SAL_OVERRIDE  { ListenerMultiplexerBase::release(); } \
34
+    void                        SAL_CALL acquire() throw() SAL_OVERRIDE; \
35
+    void                        SAL_CALL release() throw() SAL_OVERRIDE; \
36
     void                        SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
37
 
38
 
39
@@ -124,8 +124,8 @@ class TOOLKIT_DLLPUBLIC ClassName : public ListenerMultiplexerBase, public Inter
40
 public: \
41
     ClassName( ::cppu::OWeakObject& rSource ); \
42
     ::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; \
43
-    void                        SAL_CALL acquire() throw() SAL_OVERRIDE  { ListenerMultiplexerBase::acquire(); } \
44
-    void                        SAL_CALL release() throw() SAL_OVERRIDE  { ListenerMultiplexerBase::release(); } \
45
+    void                        SAL_CALL acquire() throw() SAL_OVERRIDE; \
46
+    void                        SAL_CALL release() throw() SAL_OVERRIDE; \
47
     void                        SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
48
 
49
 
50
@@ -140,6 +140,8 @@ ClassName::ClassName( ::cppu::OWeakObject& rSource ) \
51
     : ListenerMultiplexerBase( rSource ) \
52
 { \
53
 } \
54
+void SAL_CALL ClassName::acquire() throw() { ListenerMultiplexerBase::acquire(); } \
55
+void SAL_CALL ClassName::release() throw() { ListenerMultiplexerBase::release(); } \
56
 ::com::sun::star::uno::Any ClassName::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) \
57
 { \
58
     ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, \
59
diff --git a/toolkit/source/helper/listenermultiplexer.cxx b/toolkit/source/helper/listenermultiplexer.cxx
60
index 797fad2..b109c5f 100644
61
--- a/toolkit/source/helper/listenermultiplexer.cxx
62
+++ b/toolkit/source/helper/listenermultiplexer.cxx
63
@@ -47,6 +47,15 @@ EventListenerMultiplexer::EventListenerMultiplexer( ::cppu::OWeakObject& rSource
64
 {
65
 }
66
 
67
+void SAL_CALL EventListenerMultiplexer::acquire() throw ()
68
+{
69
+    return ListenerMultiplexerBase::acquire();
70
+}
71
+void SAL_CALL EventListenerMultiplexer::release() throw ()
72
+{
73
+    return ListenerMultiplexerBase::release();
74
+}
75
+
76
 // ::com::sun::star::uno::XInterface
77
 ::com::sun::star::uno::Any EventListenerMultiplexer::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception)
78
 {
79
-- 
80
cgit v0.10.2
(-)a/app-office/libreoffice/files/libreoffice-4.4.0.3-telepathy-build-fix.patch (+40 lines)
Line 0 Link Here
1
From 623b38fa5769f8cdec10b54b2a600bc4c4e077e6 Mon Sep 17 00:00:00 2001
2
From: David Tardon <dtardon@redhat.com>
3
Date: Sun, 11 Jan 2015 13:08:37 +0100
4
Subject: OSL_ENSURE was not declared in this scope
5
6
Change-Id: I426c0feee7b76fe02473e07fa209a61967af3e99
7
8
diff --git a/tubes/source/conference.cxx b/tubes/source/conference.cxx
9
index 86986fc..df4a63f 100644
10
--- a/tubes/source/conference.cxx
11
+++ b/tubes/source/conference.cxx
12
@@ -248,7 +248,7 @@ static void channel_closed_cb( TpChannel *channel, gpointer user_data, GObject *
13
 
14
 void TeleConference::setChannel( TpAccount *pAccount, TpDBusTubeChannel* pChannel )
15
 {
16
-    OSL_ENSURE( !mpChannel, "TeleConference::setChannel: already have channel");
17
+    SAL_WARN_IF( mpChannel, "tubes", "TeleConference::setChannel: already have channel");
18
     if (mpChannel)
19
         g_object_unref( mpChannel);
20
     if (mpAccount)
21
@@ -297,7 +297,7 @@ bool TeleConference::offerTube()
22
 {
23
     INFO_LOGGER( "TeleConference::offerTube");
24
 
25
-    OSL_ENSURE( mpChannel, "TeleConference::offerTube: no channel");
26
+    SAL_WARN_IF( !mpChannel, "tubes", "TeleConference::offerTube: no channel");
27
     if (!mpChannel)
28
         return false;
29
 
30
@@ -319,7 +319,7 @@ bool TeleConference::setTube( GDBusConnection* pTube)
31
 {
32
     INFO_LOGGER( "TeleConference::setTube");
33
 
34
-    OSL_ENSURE( !pImpl->mpTube, "TeleConference::setTube: already tubed");
35
+    SAL_WARN_IF( pImpl->mpTube, "tubes", "TeleConference::setTube: already tubed");
36
 
37
     pImpl->mpTube = pTube;
38
 
39
-- 
40
cgit v0.10.2
(-)a/app-office/libreoffice/files/libreoffice-4.4.1.2-add-kde4-open-url-script.patch (+56 lines)
Line 0 Link Here
1
From f7db2461292be3e23f5b3af47e488eaa8105d8db Mon Sep 17 00:00:00 2001
2
From: Jan-Marek Glogowski <glogow@fbihome.de>
3
Date: Wed, 26 Nov 2014 13:35:42 +0100
4
Subject: Add kde4-open-url script
5
6
Adds a KDE4 specific URL processing script.
7
8
Change-Id: I0116fa95f076a5772e88c616e93de542fe4fe4e4
9
10
diff --git a/shell/Package_scripts_kde.mk b/shell/Package_scripts_kde.mk
11
index c5e4978..162bcc5 100644
12
--- a/shell/Package_scripts_kde.mk
13
+++ b/shell/Package_scripts_kde.mk
14
@@ -9,6 +9,12 @@
15
 
16
 $(eval $(call gb_Package_Package,shell_scripts_kde,$(SRCDIR)/shell/source/unix/misc))
17
 
18
+ifeq ($(ENABLE_KDE),TRUE)
19
 $(eval $(call gb_Package_add_file,shell_scripts_kde,$(LIBO_BIN_FOLDER)/kde-open-url,kde-open-url.sh))
20
+endif
21
+
22
+ifeq ($(ENABLE_KDE4),TRUE)
23
+$(eval $(call gb_Package_add_file,shell_scripts_kde,$(LIBO_BIN_FOLDER)/kde4-open-url,kde4-open-url.sh))
24
+endif
25
 
26
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:
27
diff --git a/shell/source/unix/misc/kde4-open-url.sh b/shell/source/unix/misc/kde4-open-url.sh
28
new file mode 100755
29
index 0000000..e5b8125
30
--- /dev/null
31
+++ b/shell/source/unix/misc/kde4-open-url.sh
32
@@ -0,0 +1,22 @@
33
+#!/bin/sh
34
+#
35
+# This file is part of the LibreOffice project.
36
+#
37
+# This Source Code Form is subject to the terms of the Mozilla Public
38
+# License, v. 2.0. If a copy of the MPL was not distributed with this
39
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
40
+#
41
+# This file incorporates work covered by the following license notice:
42
+#
43
+#   Licensed to the Apache Software Foundation (ASF) under one or more
44
+#   contributor license agreements. See the NOTICE file distributed
45
+#   with this work for additional information regarding copyright
46
+#   ownership. The ASF licenses this file to you under the Apache
47
+#   License, Version 2.0 (the "License"); you may not use this file
48
+#   except in compliance with the License. You may obtain a copy of
49
+#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
50
+#
51
+
52
+# use kde-open or xdg-open if available, falling back to our own open-url
53
+kde-open "$1" 2>/dev/null || xdg-open "$1" 2>/dev/null || `dirname "$0"`/open-url "$1" 2>/dev/null
54
+exit 0
55
-- 
56
cgit v0.10.2
(-)a/app-office/libreoffice/files/libreoffice-4.4.1.2-improve-KDE4FilePicker.patch (+193 lines)
Line 0 Link Here
1
--- libreoffice-4.4.0.3/vcl/inc/headless/svpinst.hxx	2015-02-02 20:38:46.879497689 -0200
Line 0 Link Here
1
Merged upstream commits:
2
3
6fc55b9abd783b624241d56e34751ea495adbd7d	"KDE4: actually apply file dialog operation mode"
4
b613270a730ace29dd1b16b29be2222b34f34a5d	"KDE4: improve default load and save dialog titles"
5
6
7
diff -u b/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
8
--- b/vcl/unx/kde4/KDE4FilePicker.cxx
9
+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
10
@@ -58,6 +58,8 @@
11
 
12
 #include "generic/geninst.h"
13
 
14
+#include "svids.hrc"
15
+
16
 using namespace ::com::sun::star;
17
 using namespace ::com::sun::star::ui::dialogs;
18
 using namespace ::com::sun::star::ui::dialogs::TemplateDescription;
19
@@ -109,7 +111,6 @@
20
 
21
 KDE4FilePicker::KDE4FilePicker( const uno::Reference<uno::XComponentContext>& )
22
     : KDE4FilePicker_Base(_helperMutex)
23
-    , _resMgr( ResMgr::CreateResMgr("fps_office") )
24
     , allowRemoteUrls( false )
25
 {
26
     _extraControls = new QWidget();
27
@@ -128,8 +129,7 @@
28
 #endif
29
 
30
     setMultiSelectionMode( false );
31
-    //default mode
32
-    _dialog->setOperationMode(KFileDialog::Opening);
33
+    _dialog->setConfirmOverwrite( true );
34
 
35
     // XExecutableDialog functions
36
     connect( this, SIGNAL( setTitleSignal( const OUString & ) ),
37
@@ -202,7 +202,6 @@
38
         SalYieldMutexReleaser aReleaser;
39
         return Q_EMIT cleanupProxySignal();
40
     }
41
-    delete _resMgr;
42
     delete _dialog;
43
 }
44
 
45
@@ -524,6 +523,24 @@
46
     return toOUString(label);
47
 }
48
 
49
+QString KDE4FilePicker::getResString( sal_Int16 aRedId )
50
+{
51
+    QString aResString;
52
+
53
+    if( aRedId < 0 )
54
+        return aResString;
55
+
56
+    try
57
+    {
58
+        aResString = toQString(ResId(aRedId, *ImplGetResMgr()).toString());
59
+    }
60
+    catch(...)
61
+    {
62
+    }
63
+
64
+    return aResString.replace('~', '&');
65
+}
66
+
67
 void KDE4FilePicker::addCustomControl(sal_Int16 controlId)
68
 {
69
     QWidget* widget = 0;
70
@@ -532,37 +549,37 @@
71
     switch (controlId)
72
     {
73
         case CHECKBOX_AUTOEXTENSION:
74
-            resId = STR_SVT_FILEPICKER_AUTO_EXTENSION;
75
+            resId = STR_FPICKER_AUTO_EXTENSION;
76
             break;
77
         case CHECKBOX_PASSWORD:
78
-            resId = STR_SVT_FILEPICKER_PASSWORD;
79
+            resId = STR_FPICKER_PASSWORD;
80
             break;
81
         case CHECKBOX_FILTEROPTIONS:
82
-            resId = STR_SVT_FILEPICKER_FILTER_OPTIONS;
83
+            resId = STR_FPICKER_FILTER_OPTIONS;
84
             break;
85
         case CHECKBOX_READONLY:
86
-            resId = STR_SVT_FILEPICKER_READONLY;
87
+            resId = STR_FPICKER_READONLY;
88
             break;
89
         case CHECKBOX_LINK:
90
-            resId = STR_SVT_FILEPICKER_INSERT_AS_LINK;
91
+            resId = STR_FPICKER_INSERT_AS_LINK;
92
             break;
93
         case CHECKBOX_PREVIEW:
94
-            resId = STR_SVT_FILEPICKER_SHOW_PREVIEW;
95
+            resId = STR_FPICKER_SHOW_PREVIEW;
96
             break;
97
         case CHECKBOX_SELECTION:
98
-            resId = STR_SVT_FILEPICKER_SELECTION;
99
+            resId = STR_FPICKER_SELECTION;
100
             break;
101
         case PUSHBUTTON_PLAY:
102
-            resId = STR_SVT_FILEPICKER_PLAY;
103
+            resId = STR_FPICKER_PLAY;
104
             break;
105
         case LISTBOX_VERSION:
106
-            resId = STR_SVT_FILEPICKER_VERSION;
107
+            resId = STR_FPICKER_VERSION;
108
             break;
109
         case LISTBOX_TEMPLATE:
110
-            resId = STR_SVT_FILEPICKER_TEMPLATES;
111
+            resId = STR_FPICKER_TEMPLATES;
112
             break;
113
         case LISTBOX_IMAGE_TEMPLATE:
114
-            resId = STR_SVT_FILEPICKER_IMAGE_TEMPLATE;
115
+            resId = STR_FPICKER_IMAGE_TEMPLATE;
116
             break;
117
         case LISTBOX_VERSION_LABEL:
118
         case LISTBOX_TEMPLATE_LABEL:
119
@@ -581,16 +598,7 @@
120
         case CHECKBOX_PREVIEW:
121
         case CHECKBOX_SELECTION:
122
         {
123
-            QString label;
124
-
125
-            if (_resMgr && resId != -1)
126
-            {
127
-                OUString s(ResId(resId, *_resMgr).toString());
128
-                label = toQString(s);
129
-                label.replace("~", "&");
130
-            }
131
-
132
-            widget = new QCheckBox(label, _extraControls);
133
+            widget = new QCheckBox(getResString(resId), _extraControls);
134
 
135
             // the checkbox is created even for CHECKBOX_AUTOEXTENSION to simplify
136
             // code, but the checkbox is hidden and ignored
137
@@ -719,8 +727,22 @@
138
                     1 );
139
     }
140
 
141
-    _dialog->setOperationMode(operationMode);
142
-    _dialog->setConfirmOverwrite(true);
143
+    _dialog->setOperationMode( operationMode );
144
+
145
+    sal_Int16 resId = -1;
146
+    switch (_dialog->operationMode())
147
+    {
148
+    case KFileDialog::Opening:
149
+        resId = STR_FPICKER_OPEN;
150
+        break;
151
+    case KFileDialog::Saving:
152
+        resId = STR_FPICKER_SAVE;
153
+        break;
154
+    default:
155
+        break;
156
+    }
157
+
158
+    _dialog->setCaption(getResString(resId));
159
 }
160
 
161
 void SAL_CALL KDE4FilePicker::cancel()
162
only in patch2:
163
unchanged:
164
--- a/vcl/unx/kde4/KDE4FilePicker.hxx
165
+++ b/vcl/unx/kde4/KDE4FilePicker.hxx
166
@@ -41,8 +41,6 @@ class KFileDialog;
167
 class QWidget;
168
 class QLayout;
169
 
170
-class ResMgr;
171
-
172
 typedef ::cppu::WeakComponentImplHelper5
173
 <   ::com::sun::star::ui::dialogs::XFilePicker2
174
 ,   ::com::sun::star::ui::dialogs::XFilePicker3
175
@@ -61,8 +59,6 @@ protected:
176
 
177
     ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener > m_xListener;
178
 
179
-    ResMgr *_resMgr;
180
-
181
     //the dialog to display
182
     KFileDialog* _dialog;
183
 
184
@@ -225,6 +221,8 @@ private:
185
     //add a custom control widget to the file dialog
186
     void addCustomControl(sal_Int16 controlId);
187
 
188
+    QString getResString( sal_Int16 aRedId );
189
+
190
 private Q_SLOTS:
191
     void cleanupProxy();
192
     void checkProtocol();
(-)a/app-office/libreoffice/libreoffice-4.4.1.2-r99.ebuild (+621 lines)
Line 0 Link Here
1
--- libreoffice-4.4.0.3/configure.ac.orig	2015-01-22 22:05:28.000000000 -0200
Line 0 Link Here
1
diff -ru sal.orig/osl/unx/backtrace.h sal/osl/unx/backtrace.h
2
--- a/sal/osl/unx/backtrace.h	2015-01-22 22:05:28.000000000 -0200
Line 0 Link Here
1
# Copyright 1999-2015 Gentoo Foundation
2
# Distributed under the terms of the GNU General Public License v2
3
# $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 $
4
5
EAPI=5
6
7
KDE_REQUIRED="optional"
8
QT_MINIMAL="4.7.4"
9
KDE_SCM="git"
10
CMAKE_REQUIRED="never"
11
12
PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
13
PYTHON_REQ_USE="threads,xml"
14
15
# experimental ; release ; old
16
# Usually the tarballs are moved a lot so this should make
17
# everyone happy.
18
DEV_URI="
19
	http://dev-builds.libreoffice.org/pre-releases/src
20
	http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
21
	http://download.documentfoundation.org/libreoffice/old/${PV}/
22
"
23
EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
24
ADDONS_URI="http://dev-www.libreoffice.org/src/"
25
26
BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
27
# PATCHSET="${P}-patchset-01.tar.xz"
28
29
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
30
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}
31
unset SCM_ECLASS
32
33
DESCRIPTION="LibreOffice, a full office productivity suite"
34
HOMEPAGE="http://www.libreoffice.org"
35
SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
36
[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
37
38
# Split modules following git/tarballs
39
# Core MUST be first!
40
# Help is used for the image generator
41
MODULES="core help"
42
# Only release has the tarballs
43
if [[ ${PV} != *9999* ]]; then
44
	for i in ${DEV_URI}; do
45
		for mod in ${MODULES}; do
46
			if [[ ${mod} == core ]]; then
47
				SRC_URI+=" ${i}/${P}.tar.xz"
48
			else
49
				SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
50
			fi
51
		done
52
		unset mod
53
	done
54
	unset i
55
fi
56
unset DEV_URI
57
58
# Really required addons
59
# These are bundles that can't be removed for now due to huge patchsets.
60
# If you want them gone, patches are welcome.
61
ADDONS_SRC+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
62
ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
63
ADDONS_SRC+=" collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
64
ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
65
ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it?
66
ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all
67
ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement of rhino
68
ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable
69
SRC_URI+=" ${ADDONS_SRC}"
70
71
unset ADDONS_URI
72
unset EXT_URI
73
unset ADDONS_SRC
74
75
IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
76
+gtk gtk3 jemalloc kde mysql odk postgres telepathy test vlc"
77
78
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
79
# Unpackaged separate extensions:
80
# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
81
# hunart: only on ooo extensions -> fubared download path somewhere on sf
82
# numbertext, typo, validator, watch-window: ^^
83
# oooblogger: no homepage or anything
84
# Extensions that need extra work:
85
for lo_xt in ${LO_EXTS}; do
86
	IUSE+=" libreoffice_extensions_${lo_xt}"
87
done
88
unset lo_xt
89
90
LICENSE="|| ( LGPL-3 MPL-1.1 )"
91
SLOT="0"
92
[[ ${PV} == *9999* ]] || \
93
KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
94
95
COMMON_DEPEND="
96
	${PYTHON_DEPS}
97
	app-arch/zip
98
	app-arch/unzip
99
	>=app-text/hunspell-1.3.2-r3
100
	app-text/mythes
101
	>=app-text/libabw-0.1.0
102
	>=app-text/libexttextcat-3.2
103
	>=app-text/libebook-0.1.1
104
	>=app-text/libetonyek-0.1.1
105
	>=app-text/libmspub-0.1.0
106
	>=app-text/libmwaw-0.3.4
107
	>=app-text/libodfgen-0.1.0
108
	app-text/libwpd:0.10[tools]
109
	app-text/libwpg:0.3
110
	>=app-text/libwps-0.3.0
111
	>=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
112
	>=dev-cpp/clucene-2.3.3.4-r2
113
	=dev-cpp/libcmis-0.5*
114
	dev-db/unixODBC
115
	>=dev-libs/boost-1.55:=
116
	dev-libs/expat
117
	>=dev-libs/hyphen-2.7.1
118
	>=dev-libs/icu-4.8.1.1:=
119
	>=dev-libs/liborcus-0.7.0
120
	>=dev-libs/librevenge-0.0.1
121
	>=dev-libs/nspr-4.8.8
122
	>=dev-libs/nss-3.12.9
123
	>=dev-lang/perl-5.0
124
	>=dev-libs/openssl-1.0.0d:0
125
	>=dev-libs/redland-1.0.16
126
	media-gfx/graphite2
127
	>=media-libs/fontconfig-2.8.0
128
	media-libs/freetype:2
129
	>=media-libs/glew-1.10
130
	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
131
	media-libs/lcms:2
132
	>=media-libs/libpng-1.4:0=
133
	>=media-libs/libcdr-0.1.0
134
	>=media-libs/libfreehand-0.1.0
135
	media-libs/libpagemaker
136
	>=media-libs/libvisio-0.1.0
137
	>=net-misc/curl-7.21.4
138
	net-libs/neon
139
	net-nds/openldap
140
	sci-mathematics/lpsolve
141
	virtual/jpeg:0
142
	>=x11-libs/cairo-1.10.0[X]
143
	x11-libs/libXinerama
144
	x11-libs/libXrandr
145
	x11-libs/libXrender
146
	virtual/glu
147
	virtual/opengl
148
	bluetooth? ( net-wireless/bluez )
149
	coinmp? ( sci-libs/coinor-mp )
150
	collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
151
	cups? ( net-print/cups )
152
	dbus? ( >=dev-libs/dbus-glib-0.92 )
153
	eds? ( gnome-extra/evolution-data-server )
154
	firebird? ( >=dev-db/firebird-2.5 )
155
	gltf? ( media-libs/libgltf )
156
	gnome? ( gnome-base/gconf:2 )
157
	gtk? (
158
		x11-libs/gdk-pixbuf[X]
159
		>=x11-libs/gtk+-2.24:2
160
	)
161
	gtk3? ( >=x11-libs/gtk+-3.2:3 )
162
	gstreamer? (
163
		media-libs/gstreamer:1.0
164
		media-libs/gst-plugins-base:1.0
165
	)
166
	jemalloc? ( dev-libs/jemalloc )
167
	libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
168
	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
169
	libreoffice_extensions_wiki-publisher? (
170
		dev-java/commons-codec:0
171
		dev-java/commons-httpclient:3
172
		dev-java/commons-lang:2.1
173
		dev-java/commons-logging:0
174
		dev-java/tomcat-servlet-api:3.0
175
	)
176
	mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
177
	postgres? ( >=dev-db/postgresql-9.0[kerberos] )
178
	telepathy? (
179
		dev-libs/glib:2
180
		>=net-libs/telepathy-glib-0.18.0
181
		>=x11-libs/gtk+-2.24:2
182
	)
183
"
184
185
RDEPEND="${COMMON_DEPEND}
186
	!app-office/libreoffice-bin
187
	!app-office/libreoffice-bin-debug
188
	!<app-office/openoffice-bin-3.4.0-r1
189
	!app-office/openoffice
190
	media-fonts/libertine
191
	media-fonts/liberation-fonts
192
	media-fonts/urw-fonts
193
	java? ( >=virtual/jre-1.6 )
194
	kde? ( || ( $(add_kdeapps_dep kioclient) $(add_kdebase_dep kioclient) ) )
195
	vlc? ( media-video/vlc )
196
"
197
198
if [[ ${PV} != *9999* ]]; then
199
	PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
200
else
201
	# Translations are not reliable on live ebuilds
202
	# rather force people to use english only.
203
	PDEPEND="!app-office/libreoffice-l10n"
204
fi
205
206
# FIXME: cppunit should be moved to test conditional
207
#        after everything upstream is under gbuild
208
#        as dmake execute tests right away
209
DEPEND="${COMMON_DEPEND}
210
	>=dev-libs/libatomic_ops-7.2d
211
	>=dev-libs/libxml2-2.7.8
212
	dev-libs/libxslt
213
	dev-perl/Archive-Zip
214
	dev-util/cppunit
215
	>=dev-util/gperf-3
216
	dev-util/intltool
217
	>=dev-util/mdds-0.10.3:=
218
	media-libs/glm
219
	net-misc/npapi-sdk
220
	>=sys-apps/findutils-4.4.2
221
	sys-devel/bison
222
	sys-apps/coreutils
223
	sys-devel/flex
224
	sys-devel/gettext
225
	>=sys-devel/make-3.82
226
	sys-devel/ucpp
227
	sys-libs/zlib
228
	virtual/pkgconfig
229
	x11-libs/libXt
230
	x11-libs/libXtst
231
	x11-proto/randrproto
232
	x11-proto/xextproto
233
	x11-proto/xineramaproto
234
	x11-proto/xproto
235
	java? (
236
		>=virtual/jdk-1.6
237
		>=dev-java/ant-core-1.7
238
	)
239
	odk? ( >=app-doc/doxygen-1.8.4 )
240
	test? ( dev-util/cppunit )
241
"
242
243
PATCHES=(
244
	# not upstreamable stuff
245
	"${FILESDIR}/${PN}-4.4-system-pyuno.patch"
246
247
	# from 4.4 branch
248
	"${FILESDIR}/${PN}-4.4.0.3-gcc-4.9-Os-link-failure.patch" # bug 538348
249
250
	# from master branch
251
	"${FILESDIR}/${PN}-4.4.0.3-telepathy-build-fix.patch"
252
	"${FILESDIR}/${PN}-4.4.1.2-add-kde4-open-url-script.patch"
253
	"${FILESDIR}/${PN}-4.4.1.2-improve-KDE4FilePicker.patch"
254
	"${FILESDIR}/${PN}-4.3.5.2-remove-bashisms.patch" # bug 525454
255
	"${FILESDIR}/${PN}-4.4.1.2-musl-fix-execinfo.patch"
256
	"${FILESDIR}/${PN}-4.4.1.2-fix-includes.patch"
257
	"${FILESDIR}/${PN}-4.4.1.2-linux-musl.patch"
258
)
259
260
REQUIRED_USE="
261
	${PYTHON_REQUIRED_USE}
262
	bluetooth? ( dbus )
263
	collada? ( gltf )
264
	gnome? ( gtk )
265
	eds? ( gnome )
266
	telepathy? ( gtk )
267
	libreoffice_extensions_nlpsolver? ( java )
268
	libreoffice_extensions_scripting-beanshell? ( java )
269
	libreoffice_extensions_scripting-javascript? ( java )
270
	libreoffice_extensions_wiki-publisher? ( java )
271
"
272
273
CHECKREQS_MEMORY="512M"
274
CHECKREQS_DISK_BUILD="6G"
275
276
pkg_pretend() {
277
	local pgslot
278
279
	if [[ ${MERGE_TYPE} != binary ]]; then
280
		check-reqs_pkg_pretend
281
282
		if [[ $(gcc-major-version) -lt 4 ]] || \
283
				 ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \
284
				; then
285
			eerror "Compilation with gcc older than 4.6 is not supported"
286
			die "Too old gcc found."
287
		fi
288
	fi
289
290
	# Ensure pg version but we have to be sure the pg is installed (first
291
	# install on clean system)
292
	if use postgres && has_version dev-db/postgresql; then
293
		 pgslot=$(postgresql-config show)
294
		 if [[ ${pgslot//.} < 90 ]] ; then
295
			eerror "PostgreSQL slot must be set to 9.0 or higher."
296
			eerror "    postgresql-config set 9.0"
297
			die "PostgreSQL slot is not set to 9.0 or higher."
298
		 fi
299
	fi
300
}
301
302
pkg_setup() {
303
	java-pkg-opt-2_pkg_setup
304
	kde4-base_pkg_setup
305
	python-single-r1_pkg_setup
306
307
	[[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
308
}
309
310
src_unpack() {
311
	local mod mod2 dest tmplfile tmplname mypv
312
313
	[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
314
	use branding && unpack "${BRANDING}"
315
316
	if [[ ${PV} != *9999* ]]; then
317
		unpack "${P}.tar.xz"
318
		for mod in ${MODULES}; do
319
			[[ ${mod} == core ]] && continue
320
			unpack "${PN}-${mod}-${PV}.tar.xz"
321
		done
322
	else
323
		for mod in ${MODULES}; do
324
			mypv=${PV/.9999}
325
			[[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
326
			EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
327
			[[ ${mod} != core ]] && EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-${mod}-${PV}"
328
			EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
329
			git-r3_src_unpack
330
			if [[ ${mod} != core ]]; then
331
				mod2=${mod}
332
				# mapping does not match on help
333
				[[ ${mod} == help ]] && mod2="helpcontent2"
334
				mkdir -p "${S}/${mod2}/" || die
335
				mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die
336
				rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
337
			fi
338
		done
339
		unset EGIT_CHECKOUT_DIR EGIT_REPO_URI EGIT_BRANCH
340
	fi
341
}
342
343
src_prepare() {
344
	# optimization flags
345
	export GMAKE_OPTIONS="${MAKEOPTS}"
346
	# System python 2.7 enablement:
347
	export PYTHON_CFLAGS=$(python_get_CFLAGS)
348
	export PYTHON_LIBS=$(python_get_LIBS)
349
350
	if use collada; then
351
		export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
352
		export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
353
	fi
354
355
	# patchset
356
	if [[ -n ${PATCHSET} ]]; then
357
		EPATCH_FORCE="yes" \
358
		EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
359
		EPATCH_SUFFIX="patch" \
360
		epatch
361
	fi
362
363
	base_src_prepare
364
365
	AT_M4DIR="m4" eautoreconf
366
	# hack in the autogen.sh
367
	touch autogen.lastrun
368
369
	# system pyuno mess
370
	sed \
371
		-e "s:%eprefix%:${EPREFIX}:g" \
372
		-e "s:%libdir%:$(get_libdir):g" \
373
		-i pyuno/source/module/uno.py \
374
		-i pyuno/source/officehelper.py || die
375
	# sed in the tests
376
	sed -i \
377
		-e 's#all : build unitcheck#all : build#g' \
378
		solenv/gbuild/Module.mk || die
379
	sed -i \
380
		-e 's#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g' \
381
		-e 's#Makefile.gbuild all slowcheck#Makefile.gbuild all#g' \
382
		Makefile.in || die
383
384
	if use branding; then
385
		# hack...
386
		mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
387
	fi
388
}
389
390
src_configure() {
391
	local java_opts
392
	local internal_libs
393
	local lo_ext
394
	local ext_opts
395
396
	# sane: just sane.h header that is used for scan in writer, not
397
	#       linked or anything else, worthless to depend on
398
	# vigra: just uses templates from there
399
	#        it is serious pain in the ass for packaging
400
	#        should be replaced by boost::gil if someone interested
401
	internal_libs+="
402
		--without-system-sane
403
		--without-system-vigra
404
	"
405
406
	# libreoffice extensions handling
407
	for lo_xt in ${LO_EXTS}; do
408
		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
409
			ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
410
		else
411
			ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
412
		fi
413
	done
414
415
	if use java; then
416
		# hsqldb: system one is too new
417
		java_opts="
418
			--without-junit
419
			--without-system-hsqldb
420
			--with-ant-home="${ANT_HOME}"
421
			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
422
			--with-jvm-path="${EPREFIX}/usr/lib/"
423
		"
424
425
		use libreoffice_extensions_scripting-beanshell && \
426
			java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
427
428
		use libreoffice_extensions_scripting-javascript && \
429
			java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
430
431
		if use libreoffice_extensions_wiki-publisher; then
432
			java_opts+="
433
				--with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar)
434
				--with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
435
				--with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
436
				--with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
437
				--with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar)
438
			"
439
		fi
440
	fi
441
442
	# system headers/libs/...: enforce using system packages
443
	# --enable-cairo: ensure that cairo is always required
444
	# --enable-graphite: disabling causes build breakages
445
	# --enable-*-link: link to the library rather than just dlopen on runtime
446
	# --enable-release-build: build the libreoffice as release
447
	# --disable-fetch-external: prevent dowloading during compile phase
448
	# --disable-gnome-vfs: old gnome virtual fs support
449
	# --disable-kdeab: kde3 adressbook
450
	# --disable-kde: kde3 support
451
	# --disable-systray: quickstarter does not actually work at all so do not
452
	#   promote it
453
	# --enable-extension-integration: enable any extension integration support
454
	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
455
	# --disable-report-builder: too much java packages pulled in without pkgs
456
	econf \
457
		--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
458
		--with-system-headers \
459
		--with-system-libs \
460
		--with-system-jars \
461
		--with-system-dicts \
462
		--enable-cairo-canvas \
463
		--enable-graphite \
464
		--enable-largefile \
465
		--enable-mergelibs \
466
		--enable-neon \
467
		--enable-python=system \
468
		--enable-randr \
469
		--enable-randr-link \
470
		--enable-release-build \
471
		--disable-hardlink-deliver \
472
		--disable-ccache \
473
		--disable-crashdump \
474
		--disable-dependency-tracking \
475
		--disable-epm \
476
		--disable-fetch-external \
477
		--disable-gnome-vfs \
478
		--disable-gstreamer-0-10 \
479
		--disable-report-builder \
480
		--disable-kdeab \
481
		--disable-kde \
482
		--disable-online-update \
483
		--disable-systray \
484
		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
485
		--with-build-version="Gentoo official package" \
486
		--enable-extension-integration \
487
		--with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
488
		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
489
		--with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
490
		--with-external-tar="${DISTDIR}" \
491
		--with-lang="" \
492
		--with-parallelism=$(makeopts_jobs) \
493
		--with-system-ucpp \
494
		--with-vendor="Gentoo Foundation" \
495
		--with-x \
496
		--without-fonts \
497
		--without-myspell-dicts \
498
		--without-help \
499
		--with-helppack-integration \
500
		--without-sun-templates \
501
		$(use_enable bluetooth sdremote-bluetooth) \
502
		$(use_enable coinmp) \
503
		$(use_enable collada) \
504
		$(use_enable cups) \
505
		$(use_enable debug) \
506
		$(use_enable dbus) \
507
		$(use_enable eds evolution2) \
508
		$(use_enable firebird firebird-sdbc) \
509
		$(use_enable gltf) \
510
		$(use_enable gnome gconf) \
511
		$(use_enable gnome gio) \
512
		$(use_enable gnome lockdown) \
513
		$(use_enable gstreamer gstreamer-1-0) \
514
		$(use_enable gtk) \
515
		$(use_enable gtk3) \
516
		$(use_enable kde kde4) \
517
		$(use_enable mysql ext-mariadb-connector) \
518
		$(use_enable odk) \
519
		$(use_enable postgres postgresql-sdbc) \
520
		$(use_enable telepathy) \
521
		$(use_enable vlc) \
522
		$(use_with coinmp system-coinmp) \
523
		$(use_with collada system-opencollada) \
524
		$(use_with gltf system-libgltf) \
525
		$(use_with java) \
526
		$(use_with mysql system-mysql-cppconn) \
527
		$(use_with odk doxygen) \
528
		${internal_libs} \
529
		${java_opts} \
530
		${ext_opts}
531
}
532
533
src_compile() {
534
	# more and more LO stuff tries to use OpenGL, including tests during build
535
	# bug 501508, bug 540624, bug 545974 and probably more
536
	addpredict /dev/dri
537
	addpredict /dev/ati
538
	addpredict /dev/nvidiactl
539
540
	# hack for offlinehelp, this needs fixing upstream at some point
541
	# it is broken because we send --without-help
542
	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
543
	(
544
		grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk"
545
		source "${T}/config_host.mk" 2&> /dev/null
546
547
		local path="${WORKDIR}/helpcontent2/source/auxiliary/"
548
		mkdir -p "${path}" || die
549
550
		echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
551
		perl "${S}/helpcontent2/helpers/create_ilst.pl" \
552
			-dir=icon-themes/galaxy/res/helpimg \
553
			> "${path}/helpimg.ilst"
554
		[[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug."
555
	)
556
557
	local target
558
	use test && target="build" || target="build-nocheck"
559
560
	# this is not a proper make script
561
	make ${target} || die
562
}
563
564
src_test() {
565
	make unitcheck || die
566
	make slowcheck || die
567
}
568
569
src_install() {
570
	# This is not Makefile so no buildserver
571
	make DESTDIR="${D}" distro-pack-install -o build -o check || die
572
573
	# Fix bash completion placement
574
	newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
575
	bashcomp_alias \
576
		libreoffice \
577
		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
578
	rm -rf "${ED}"/etc/ || die
579
580
	if use branding; then
581
		insinto /usr/$(get_libdir)/${PN}/program
582
		newins "${WORKDIR}/branding-sofficerc" sofficerc
583
		dodir /etc/env.d
584
		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN}
585
	fi
586
587
	# Hack for offlinehelp, this needs fixing upstream at some point.
588
	# It is broken because we send --without-help
589
	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
590
	insinto /usr/$(get_libdir)/libreoffice/help
591
	doins xmlhelp/util/*.xsl
592
593
	# Remove desktop files for support to old installs that can't parse mime
594
	rm -rf "${ED}"/usr/share/mimelnk/
595
596
	# FIXME: Hack add missing file
597
	insinto /usr/$(get_libdir)/${PN}/program
598
	doins "${S}"/instdir/program/libsaxlo.so
599
600
	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
601
	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
602
}
603
604
pkg_preinst() {
605
	# Cache updates - all handled by kde eclass for all environments
606
	kde4-base_pkg_preinst
607
}
608
609
pkg_postinst() {
610
	kde4-base_pkg_postinst
611
612
	use java || \
613
		ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
614
}
615
616
pkg_postrm() {
617
	kde4-base_pkg_postrm
618
}
(-)a/app-office/libreoffice/metadata.xml (+20 lines)
Line 0 Link Here
1
<?xml version="1.0" encoding="UTF-8"?>
2
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3
<pkgmetadata>
4
  <herd>openoffice</herd>
5
  <longdescription>LibreOffice is a fork of OpenOffice.org. 
6
This ebuild allows you to compile it yourself. Unfortunately this 
7
compilation can take up to a day depending on the speed of your 
8
computer. It will however make a snappier openoffice than the binary 
9
version</longdescription>
10
  <use>
11
    <flag name="coinmp">Use sci-libs/coinor-mp as alternative solver</flag>
12
    <flag name="collada">Enable Collada for rendering 3D models stored in *.dae and *.kmz format</flag>
13
    <flag name="gltf">Use media-libs/libgltf for inserting 3D models in the glTF format into presentations</flag>
14
    <flag name="gtk3">Enable highly experimental gtk3 frontend</flag>
15
    <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag>
16
    <flag name="odk">Build the Office Development Kit</flag>
17
    <flag name="telepathy">Enable document colaboration features using telepathy communication framework.</flag>
18
    <flag name="vlc">Use <pkg>media-video/vlc</pkg> for video embedding</flag>
19
  </use>
20
</pkgmetadata>

Return to bug 546890