public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Nirbheek Chauhan" <nirbheek@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: media-sound/rhythmbox/
Date: Tue,  5 Mar 2013 08:34:37 +0000 (UTC)	[thread overview]
Message-ID: <1362472466.9740c173b3b398daa2298f4e4b4d310d6327ba0b.nirbheek@gentoo> (raw)

commit:     9740c173b3b398daa2298f4e4b4d310d6327ba0b
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  5 08:34:26 2013 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Mar  5 08:34:26 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=9740c173

media-sound/rhythmbox: Pull in webkit-gtk-1.10 for gstreamer-1.0

Otherwise, we get symbol collisions

---
 media-sound/rhythmbox/rhythmbox-9999.ebuild |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/media-sound/rhythmbox/rhythmbox-9999.ebuild b/media-sound/rhythmbox/rhythmbox-9999.ebuild
index b66fd8d..c7fc2d4 100644
--- a/media-sound/rhythmbox/rhythmbox-9999.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-9999.ebuild
@@ -33,6 +33,7 @@ REQUIRED_USE="
 	webkit? ( python )"
 
 # FIXME: double check what to do with fm-radio plugin
+# webkit-gtk-1.10 is needed because it uses gstreamer-1.0
 COMMON_DEPEND=">=dev-libs/glib-2.32.0:2
 	dev-libs/json-glib
 	>=dev-libs/libxml2-2.7.8:2
@@ -59,7 +60,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.32.0:2
 		>=net-dns/avahi-0.6
 		media-plugins/gst-plugins-soup:1.0 )
 	keyring? ( >=app-crypt/libsecret-0.14 )
-	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 )
 	python? ( >=dev-python/pygobject-3.0:3 )
@@ -90,7 +91,7 @@ RDEPEND="${COMMON_DEPEND}
 		keyring? ( >=app-crypt/libsecret-0.14[introspection] )
 		webkit? (
 			dev-python/mako
-			>=net-libs/webkit-gtk-1.3.9:3[introspection] ) )
+			>=net-libs/webkit-gtk-1.10:3[introspection] ) )
 "
 # gtk-doc-am needed for eautoreconf
 #	dev-util/gtk-doc-am


             reply	other threads:[~2013-03-05  8:34 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-05  8:34 Nirbheek Chauhan [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-01-30 20:02 [gentoo-commits] proj/gnome:master commit in: media-sound/rhythmbox/ Mart Raudsepp
2019-03-22 10:07 Mart Raudsepp
2014-12-01 14:09 Michał Górny
2014-10-25 21:07 Gilles Dartiguelongue
2013-12-18 23:08 Gilles Dartiguelongue
2013-12-05 11:07 Priit Laes
2013-01-20 22:48 Nirbheek Chauhan
2013-01-20 22:37 Nirbheek Chauhan
2012-12-15 20:06 Alexandre Rostovtsev
2012-12-15 20:05 Alexandre Rostovtsev
2012-11-11  9:54 Priit Laes
2012-11-11  9:22 Priit Laes
2012-11-07 21:27 Alexandre Rostovtsev
2012-09-06  7:46 Priit Laes
2012-07-23 10:44 Nirbheek Chauhan
2012-06-15 17:08 Priit Laes
2012-06-04  7:05 Alexandre Restovtsev
2012-03-01 16:51 Priit Laes
2012-01-16  3:43 Nirbheek Chauhan
2012-01-03 11:56 Priit Laes
2011-10-02 16:56 Priit Laes
2011-09-13 10:48 Priit Laes
2011-07-29 18:35 Priit Laes
2011-06-16  7:54 Priit Laes
2011-04-12  2:51 Nirbheek Chauhan
2011-03-27 20:51 Priit Laes
2011-03-14 19:42 Nirbheek Chauhan
2011-03-08  4:48 Nirbheek Chauhan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1362472466.9740c173b3b398daa2298f4e4b4d310d6327ba0b.nirbheek@gentoo \
    --to=nirbheek@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox