tetromino 14/04/05 08:55:42 Modified: ChangeLog gvfs-1.12.3-r1.ebuild Log: Apply paranoia.h hack from 1.14.2 ebuild to fix build against libcdio-paranoia, since libcdio-0.8x is now completely from the tree. Thanks to desultory for noticing. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
Revision Changes Path 1.238 gnome-base/gvfs/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gvfs/ChangeLog?rev=1.238&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gvfs/ChangeLog?rev=1.238&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gvfs/ChangeLog?r1=1.237&r2=1.238 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v retrieving revision 1.237 retrieving revision 1.238 diff -u -r1.237 -r1.238 --- ChangeLog 29 Mar 2014 22:32:41 -0000 1.237 +++ ChangeLog 5 Apr 2014 08:55:42 -0000 1.238 @@ -1,6 +1,12 @@ # ChangeLog for gnome-base/gvfs # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.237 2014/03/29 22:32:41 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.238 2014/04/05 08:55:42 tetromino Exp $ + + 05 Apr 2014; Alexandre Rostovtsev <[email protected]> + gvfs-1.12.3-r1.ebuild: + Apply paranoia.h hack from 1.14.2 ebuild to fix build against + libcdio-paranoia, since libcdio-0.8x is now completely gone from the tree. + Thanks to desultory for noticing. 29 Mar 2014; Alexandre Rostovtsev <[email protected]> gvfs-1.14.2.ebuild, gvfs-1.16.4.ebuild, gvfs-1.18.3.ebuild: 1.15 gnome-base/gvfs/gvfs-1.12.3-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gvfs/gvfs-1.12.3-r1.ebuild?rev=1.15&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gvfs/gvfs-1.12.3-r1.ebuild?rev=1.15&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gvfs/gvfs-1.12.3-r1.ebuild?r1=1.14&r2=1.15 Index: gvfs-1.12.3-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.12.3-r1.ebuild,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- gvfs-1.12.3-r1.ebuild 1 Mar 2014 22:33:49 -0000 1.14 +++ gvfs-1.12.3-r1.ebuild 5 Apr 2014 08:55:42 -0000 1.15 @@ -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/gnome-base/gvfs/gvfs-1.12.3-r1.ebuild,v 1.14 2014/03/01 22:33:49 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.12.3-r1.ebuild,v 1.15 2014/04/05 08:55:42 tetromino Exp $ EAPI=5 GCONF_DEBUG=no @@ -46,7 +46,7 @@ >=app-pda/libimobiledevice-1.1.0:= >=app-pda/libplist-1:= ) udev? ( - cdda? ( >=dev-libs/libcdio-0.78.2:=[-minimal] ) + cdda? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) ) virtual/udev:=[gudev] ) udisks? ( >=sys-fs/udisks-1.90:2 ) http? ( >=net-libs/libsoup-gnome-2.26.0:= ) @@ -82,6 +82,13 @@ $(use_enable samba) $(use_enable udisks udisks2)" + # Replace me with correct patch, see #452400 + if has_version dev-libs/libcdio-paranoia; then + sed -i \ + -e '/#include/s:cdio/paranoia.h:cdio/paranoia/paranoia.h:' \ + daemon/gvfsbackendcdda.c || die + fi + # Conditional patching purely to avoid eautoreconf if use gphoto2; then epatch "${FILESDIR}"/${PN}-1.12.3-gphoto2-stricter-checks.patch
