diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2014-04-05 08:55:42 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2014-04-05 08:55:42 +0000 |
| commit | 9d77809f0b3d789ef188ce5d1ecefeb6f08767f0 (patch) | |
| tree | 46391214211e7519bb0208d51133c5375a7d84d9 /gnome-base | |
| parent | Add unit file and rely on tmpfiles.d to create needed cache dirs at runtime (... (diff) | |
| download | gentoo-2-9d77809f0b3d789ef188ce5d1ecefeb6f08767f0.tar.gz gentoo-2-9d77809f0b3d789ef188ce5d1ecefeb6f08767f0.tar.bz2 gentoo-2-9d77809f0b3d789ef188ce5d1ecefeb6f08767f0.zip | |
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)
Diffstat (limited to 'gnome-base')
| -rw-r--r-- | gnome-base/gvfs/ChangeLog | 8 | ||||
| -rw-r--r-- | gnome-base/gvfs/gvfs-1.12.3-r1.ebuild | 11 |
2 files changed, 16 insertions, 3 deletions
diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog index 8687f9321ccd..fb576dae1ac2 100644 --- a/gnome-base/gvfs/ChangeLog +++ b/gnome-base/gvfs/ChangeLog @@ -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 <tetromino@gentoo.org> + 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 <tetromino@gentoo.org> gvfs-1.14.2.ebuild, gvfs-1.16.4.ebuild, gvfs-1.18.3.ebuild: diff --git a/gnome-base/gvfs/gvfs-1.12.3-r1.ebuild b/gnome-base/gvfs/gvfs-1.12.3-r1.ebuild index 2d17e0ce4844..7e0de135fcc5 100644 --- a/gnome-base/gvfs/gvfs-1.12.3-r1.ebuild +++ b/gnome-base/gvfs/gvfs-1.12.3-r1.ebuild @@ -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 @@ RDEPEND=">=dev-libs/glib-2.31.0:2 >=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 @@ src_prepare() { $(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 |