| 1 |
scarabeus 12/08/23 21:47:42 |
| 2 |
|
| 3 |
Modified: libreoffice-3.6.9999.ebuild |
| 4 |
libreoffice-3.6.0.4.ebuild ChangeLog |
| 5 |
Log: |
| 6 |
Disable mergelibs. Should fix bug#430612. |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha122/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.23 app-office/libreoffice/libreoffice-3.6.9999.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild?rev=1.23&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild?rev=1.23&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild?r1=1.22&r2=1.23 |
| 16 |
|
| 17 |
Index: libreoffice-3.6.9999.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild,v |
| 20 |
retrieving revision 1.22 |
| 21 |
retrieving revision 1.23 |
| 22 |
diff -u -r1.22 -r1.23 |
| 23 |
--- libreoffice-3.6.9999.ebuild 13 Aug 2012 18:33:39 -0000 1.22 |
| 24 |
+++ libreoffice-3.6.9999.ebuild 23 Aug 2012 21:47:42 -0000 1.23 |
| 25 |
@@ -1,6 +1,6 @@ |
| 26 |
# Copyright 1999-2012 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild,v 1.22 2012/08/13 18:33:39 scarabeus Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild,v 1.23 2012/08/23 21:47:42 scarabeus Exp $ |
| 30 |
|
| 31 |
EAPI=4 |
| 32 |
|
| 33 |
@@ -421,6 +421,7 @@ |
| 34 |
# --disable-ldap: ldap requires internal mozilla stuff, same like mozab |
| 35 |
# --disable-mozilla: disable mozilla build that is used for adresbook, not |
| 36 |
# affecting the nsplugin that is always ON |
| 37 |
+ # --disable-mergelibs: cause build time failures |
| 38 |
# --disable-pch: precompiled headers cause build crashes |
| 39 |
# --disable-rpath: relative runtime path is not desired |
| 40 |
# --disable-systray: quickstarter does not actually work at all so do not |
| 41 |
@@ -440,7 +441,7 @@ |
| 42 |
--enable-graphite \ |
| 43 |
--enable-cairo-canvas \ |
| 44 |
--enable-largefile \ |
| 45 |
- --enable-mergelibs \ |
| 46 |
+ --disable-mergelibs \ |
| 47 |
--enable-python=system \ |
| 48 |
--enable-randr \ |
| 49 |
--enable-randr-link \ |
| 50 |
|
| 51 |
|
| 52 |
|
| 53 |
1.10 app-office/libreoffice/libreoffice-3.6.0.4.ebuild |
| 54 |
|
| 55 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.6.0.4.ebuild?rev=1.10&view=markup |
| 56 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.6.0.4.ebuild?rev=1.10&content-type=text/plain |
| 57 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.6.0.4.ebuild?r1=1.9&r2=1.10 |
| 58 |
|
| 59 |
Index: libreoffice-3.6.0.4.ebuild |
| 60 |
=================================================================== |
| 61 |
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.0.4.ebuild,v |
| 62 |
retrieving revision 1.9 |
| 63 |
retrieving revision 1.10 |
| 64 |
diff -u -r1.9 -r1.10 |
| 65 |
--- libreoffice-3.6.0.4.ebuild 13 Aug 2012 15:49:32 -0000 1.9 |
| 66 |
+++ libreoffice-3.6.0.4.ebuild 23 Aug 2012 21:47:42 -0000 1.10 |
| 67 |
@@ -1,6 +1,6 @@ |
| 68 |
# Copyright 1999-2012 Gentoo Foundation |
| 69 |
# Distributed under the terms of the GNU General Public License v2 |
| 70 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.0.4.ebuild,v 1.9 2012/08/13 15:49:32 scarabeus Exp $ |
| 71 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.0.4.ebuild,v 1.10 2012/08/23 21:47:42 scarabeus Exp $ |
| 72 |
|
| 73 |
EAPI=4 |
| 74 |
|
| 75 |
@@ -445,7 +445,7 @@ |
| 76 |
--with-system-dicts \ |
| 77 |
--enable-cairo-canvas \ |
| 78 |
--enable-largefile \ |
| 79 |
- --enable-mergelibs \ |
| 80 |
+ --disable-mergelibs \ |
| 81 |
--enable-python=system \ |
| 82 |
--enable-randr \ |
| 83 |
--enable-randr-link \ |
| 84 |
|
| 85 |
|
| 86 |
|
| 87 |
1.363 app-office/libreoffice/ChangeLog |
| 88 |
|
| 89 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.363&view=markup |
| 90 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.363&content-type=text/plain |
| 91 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.362&r2=1.363 |
| 92 |
|
| 93 |
Index: ChangeLog |
| 94 |
=================================================================== |
| 95 |
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v |
| 96 |
retrieving revision 1.362 |
| 97 |
retrieving revision 1.363 |
| 98 |
diff -u -r1.362 -r1.363 |
| 99 |
--- ChangeLog 21 Aug 2012 10:17:38 -0000 1.362 |
| 100 |
+++ ChangeLog 23 Aug 2012 21:47:42 -0000 1.363 |
| 101 |
@@ -1,6 +1,10 @@ |
| 102 |
# ChangeLog for app-office/libreoffice |
| 103 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 104 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.362 2012/08/21 10:17:38 scarabeus Exp $ |
| 105 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.363 2012/08/23 21:47:42 scarabeus Exp $ |
| 106 |
+ |
| 107 |
+ 23 Aug 2012; Tomáš Chvátal <scarabeus@g.o> libreoffice-3.6.0.4.ebuild, |
| 108 |
+ libreoffice-3.6.9999.ebuild: |
| 109 |
+ Disable mergelibs. Should fix bug#430612. |
| 110 |
|
| 111 |
21 Aug 2012; Tomáš Chvátal <scarabeus@g.o> libreoffice-3.5.6.2.ebuild: |
| 112 |
Fix the blocker to be same as on git. |
Archives