diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2013-01-16 05:12:34 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2013-01-16 05:12:34 +0000 |
| commit | a9a609a7099dcdf316129ab732ee14dc721836f0 (patch) | |
| tree | 43860a09c05db575325d75713c58d49a87d1ccd5 /gnome-base/gvfs | |
| parent | update of mangler to mangler-1.2.5 for bug 444046 (diff) | |
| download | gentoo-2-a9a609a7099dcdf316129ab732ee14dc721836f0.tar.gz gentoo-2-a9a609a7099dcdf316129ab732ee14dc721836f0.tar.bz2 gentoo-2-a9a609a7099dcdf316129ab732ee14dc721836f0.zip | |
Fix compability with dev-libs/libcdio-paranoia wrt #452400
(Portage version: 2.2.0_alpha151/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'gnome-base/gvfs')
| -rw-r--r-- | gnome-base/gvfs/ChangeLog | 7 | ||||
| -rw-r--r-- | gnome-base/gvfs/gvfs-1.14.2.ebuild | 13 |
2 files changed, 15 insertions, 5 deletions
diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog index e0d11bc15fda..6b353dde6ee3 100644 --- a/gnome-base/gvfs/ChangeLog +++ b/gnome-base/gvfs/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for gnome-base/gvfs -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.196 2012/12/27 22:54:52 tetromino Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.197 2013/01/16 05:12:34 ssuominen Exp $ + + 16 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> gvfs-1.14.2.ebuild: + Fix compability with dev-libs/libcdio-paranoia wrt #452400 27 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org> gvfs-1.14.2.ebuild: Add missing gdbus-codegen dependency (bug #448916, thanks to Mark). diff --git a/gnome-base/gvfs/gvfs-1.14.2.ebuild b/gnome-base/gvfs/gvfs-1.14.2.ebuild index c2da8420639b..d1bb9e297ea5 100644 --- a/gnome-base/gvfs/gvfs-1.14.2.ebuild +++ b/gnome-base/gvfs/gvfs-1.14.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.14.2.ebuild,v 1.4 2012/12/27 22:54:52 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.14.2.ebuild,v 1.5 2013/01/16 05:12:34 ssuominen Exp $ EAPI="5" GCONF_DEBUG="no" @@ -60,7 +60,7 @@ RDEPEND=">=dev-libs/glib-2.33.12:2 samba? ( >=net-fs/samba-3.4.6[smbclient] ) systemd? ( sys-apps/systemd ) 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.97:2[systemd?] )" DEPEND="${RDEPEND} @@ -74,6 +74,13 @@ DEPEND="${RDEPEND} REQUIRED_USE="cdda? ( udev )" src_prepare() { + # 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 + if use archive; then epatch "${FILESDIR}"/${PN}-1.2.2-expose-archive-backend.patch echo mount-archive.desktop.in >> po/POTFILES.in |