| 1 |
dilfridge 13/12/28 18:57:19 |
| 2 |
|
| 3 |
Modified: ChangeLog libreoffice-4.1.3.2-r2.ebuild |
| 4 |
Log: |
| 5 |
Backport fixes for bug 488846 and bug 406295 to stable |
| 6 |
|
| 7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 84AD142F) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.534 app-office/libreoffice/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.534&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.534&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.533&r2=1.534 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v |
| 19 |
retrieving revision 1.533 |
| 20 |
retrieving revision 1.534 |
| 21 |
diff -u -r1.533 -r1.534 |
| 22 |
--- ChangeLog 27 Dec 2013 18:15:15 -0000 1.533 |
| 23 |
+++ ChangeLog 28 Dec 2013 18:57:19 -0000 1.534 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for app-office/libreoffice |
| 26 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.533 2013/12/27 18:15:15 dilfridge Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.534 2013/12/28 18:57:19 dilfridge Exp $ |
| 29 |
+ |
| 30 |
+ 28 Dec 2013; Andreas K. Huettel <dilfridge@g.o> |
| 31 |
+ libreoffice-4.1.3.2-r2.ebuild: |
| 32 |
+ Backport fixes for bug 488846 and bug 406295 to stable |
| 33 |
|
| 34 |
27 Dec 2013; Andreas K. Huettel <dilfridge@g.o> |
| 35 |
libreoffice-4.1.4.2.ebuild, libreoffice-4.1.9999.ebuild, |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.5 app-office/libreoffice/libreoffice-4.1.3.2-r2.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.1.3.2-r2.ebuild?rev=1.5&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.1.3.2-r2.ebuild?rev=1.5&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.1.3.2-r2.ebuild?r1=1.4&r2=1.5 |
| 44 |
|
| 45 |
Index: libreoffice-4.1.3.2-r2.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.1.3.2-r2.ebuild,v |
| 48 |
retrieving revision 1.4 |
| 49 |
retrieving revision 1.5 |
| 50 |
diff -u -r1.4 -r1.5 |
| 51 |
--- libreoffice-4.1.3.2-r2.ebuild 17 Dec 2013 17:22:40 -0000 1.4 |
| 52 |
+++ libreoffice-4.1.3.2-r2.ebuild 28 Dec 2013 18:57:19 -0000 1.5 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# Copyright 1999-2013 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.1.3.2-r2.ebuild,v 1.4 2013/12/17 17:22:40 dilfridge Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.1.3.2-r2.ebuild,v 1.5 2013/12/28 18:57:19 dilfridge Exp $ |
| 58 |
|
| 59 |
EAPI=5 |
| 60 |
|
| 61 |
@@ -446,7 +446,7 @@ |
| 62 |
--enable-randr \ |
| 63 |
--enable-randr-link \ |
| 64 |
--enable-release-build \ |
| 65 |
- --enable-hardlink-deliver \ |
| 66 |
+ --disable-hardlink-deliver \ |
| 67 |
--disable-ccache \ |
| 68 |
--disable-crashdump \ |
| 69 |
--disable-dependency-tracking \ |
| 70 |
@@ -547,6 +547,7 @@ |
| 71 |
if use branding; then |
| 72 |
insinto /usr/$(get_libdir)/${PN}/program |
| 73 |
newins "${WORKDIR}/branding-sofficerc" sofficerc |
| 74 |
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} |
| 75 |
fi |
| 76 |
|
| 77 |
# symlink the nsplugin to proper location |
Archives