dilfridge 14/09/18 20:59:56 Modified: libreoffice-4.2.6.3.ebuild ChangeLog libreoffice-4.2.9999.ebuild Log: Add backported compatibility patch for libjpeg-9, bug 479946 (Portage version: 2.2.13/cvs/Linux x86_64, signed Manifest commit with key 84AD142F)
Revision Changes Path 1.11 app-office/libreoffice/libreoffice-4.2.6.3.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.2.6.3.ebuild?rev=1.11&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.2.6.3.ebuild?rev=1.11&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.2.6.3.ebuild?r1=1.10&r2=1.11 Index: libreoffice-4.2.6.3.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.2.6.3.ebuild,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libreoffice-4.2.6.3.ebuild 18 Sep 2014 10:10:32 -0000 1.10 +++ libreoffice-4.2.6.3.ebuild 18 Sep 2014 20:59:56 -0000 1.11 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.2.6.3.ebuild,v 1.10 2014/09/18 10:10:32 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.2.6.3.ebuild,v 1.11 2014/09/18 20:59:56 dilfridge Exp $ EAPI=5 @@ -238,6 +238,9 @@ # not upstreamable stuff "${FILESDIR}/${PN}-3.7-system-pyuno.patch" + # from libreoffice-4-3 branch + "${FILESDIR}/${PN}-4.2.6.3-jpeg9.patch" + # staged for git master "${FILESDIR}/${PN}-4.2.0.4-curl-config.patch" ) 1.585 app-office/libreoffice/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.585&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.585&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.584&r2=1.585 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v retrieving revision 1.584 retrieving revision 1.585 diff -u -r1.584 -r1.585 --- ChangeLog 18 Sep 2014 10:10:32 -0000 1.584 +++ ChangeLog 18 Sep 2014 20:59:56 -0000 1.585 @@ -1,6 +1,11 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.584 2014/09/18 10:10:32 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.585 2014/09/18 20:59:56 dilfridge Exp $ + + 18 Sep 2014; Andreas K. Huettel <dilfri...@gentoo.org> + libreoffice-4.2.6.3.ebuild, libreoffice-4.2.9999.ebuild, + +files/libreoffice-4.2.6.3-jpeg9.patch: + Add backported compatibility patch for libjpeg-9, bug 479946 18 Sep 2014; Agostino Sarubbo <a...@gentoo.org> libreoffice-4.2.6.3.ebuild: Stable for amd64, wrt bug #522060 1.26 app-office/libreoffice/libreoffice-4.2.9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.2.9999.ebuild?rev=1.26&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.2.9999.ebuild?rev=1.26&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.2.9999.ebuild?r1=1.25&r2=1.26 Index: libreoffice-4.2.9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.2.9999.ebuild,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- libreoffice-4.2.9999.ebuild 14 Sep 2014 09:11:47 -0000 1.25 +++ libreoffice-4.2.9999.ebuild 18 Sep 2014 20:59:56 -0000 1.26 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.2.9999.ebuild,v 1.25 2014/09/14 09:11:47 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.2.9999.ebuild,v 1.26 2014/09/18 20:59:56 dilfridge Exp $ EAPI=5 @@ -238,6 +238,9 @@ # not upstreamable stuff "${FILESDIR}/${PN}-3.7-system-pyuno.patch" + # from libreoffice-4-3 branch + "${FILESDIR}/${PN}-4.2.6.3-jpeg9.patch" + # staged for git master "${FILESDIR}/${PN}-4.2.0.4-curl-config.patch" )