diff options
| author |   Denis Dupeyron <calchan@gentoo.org> | 2013-01-07 22:18:09 +0000 |
|---|---|---|
| committer | Denis Dupeyron <calchan@gentoo.org> | 2013-01-07 22:18:09 +0000 |
| commit | e82cd928aa8878f27a1b3aca35ddfed30cca1219 (patch) | |
| tree | 33d93a8b6df7c0f93bc18a683dbae8d13180dd7b /media-sound/rhythmbox | |
| parent | One final unsafe use of TCP reads onto the stack in res_xmpp; also stops cach... (diff) | |
| download | gentoo-2-e82cd928aa8878f27a1b3aca35ddfed30cca1219.tar.gz gentoo-2-e82cd928aa8878f27a1b3aca35ddfed30cca1219.tar.bz2 gentoo-2-e82cd928aa8878f27a1b3aca35ddfed30cca1219.zip | |
Prevent rhythmbox from linking against a webkit-gtk which itself is linked against gstreamer 1.0.
(Portage version: 2.1.11.38/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'media-sound/rhythmbox')
| -rw-r--r-- | media-sound/rhythmbox/ChangeLog | 6 | ||||
| -rw-r--r-- | media-sound/rhythmbox/rhythmbox-2.97.ebuild | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog index f4ce149afa05..5466e0b30805 100644 --- a/media-sound/rhythmbox/ChangeLog +++ b/media-sound/rhythmbox/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/rhythmbox # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.236 2013/01/06 09:57:06 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.237 2013/01/07 22:18:09 calchan Exp $ + + 07 Jan 2013; Denis Dupeyron <calchan@gentoo.org> rhythmbox-2.97.ebuild: + Prevent rhythmbox from linking against a webkit-gtk which itself is linked + against gstreamer 1.0. 06 Jan 2013; Agostino Sarubbo <ago@gentoo.org> rhythmbox-2.97.ebuild, rhythmbox-2.98.ebuild: diff --git a/media-sound/rhythmbox/rhythmbox-2.97.ebuild b/media-sound/rhythmbox/rhythmbox-2.97.ebuild index bdb0f916b817..cf73fa751cc7 100644 --- a/media-sound/rhythmbox/rhythmbox-2.97.ebuild +++ b/media-sound/rhythmbox/rhythmbox-2.97.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-2.97.ebuild,v 1.13 2013/01/06 09:57:06 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-2.97.ebuild,v 1.14 2013/01/07 22:18:09 calchan Exp $ EAPI="4" GNOME2_LA_PUNT="yes" @@ -52,7 +52,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.28.0:2 >=net-libs/libdmapsharing-2.9.11:3.0 >=net-dns/avahi-0.6 ) gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 ) - html? ( >=net-libs/webkit-gtk-1.3.9:3 ) + html? ( <net-libs/webkit-gtk-1.10:3 ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) musicbrainz? ( @@ -90,7 +90,7 @@ RDEPEND="${COMMON_DEPEND} gnome-keyring? ( dev-python/gnome-keyring-python ) webkit? ( dev-python/mako - >=net-libs/webkit-gtk-1.3.9:3[introspection] ) ) + <net-libs/webkit-gtk-1.10:3[introspection] ) ) " DEPEND="${COMMON_DEPEND} virtual/pkgconfig |