[gentoo-commits] proj/gnome:master commit in: media-video/totem/

["Nirbheek Chauhan" <nirbheek@gentoo.org>]

commit:     50d3b44a26705269e80f5aa7636680d5134a2530
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue May  3 16:11:56 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue May  3 16:12:00 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=50d3b44a

media-video/totem: work around bug 358755

* Access violations

---
 media-video/totem/totem-3.0.1.ebuild |    4 ++++
 media-video/totem/totem-9999.ebuild  |    4 ++++
 2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/media-video/totem/totem-3.0.1.ebuild b/media-video/totem/totem-3.0.1.ebuild
index cc352c8..3fee120 100644
--- a/media-video/totem/totem-3.0.1.ebuild
+++ b/media-video/totem/totem-3.0.1.ebuild
@@ -142,6 +142,10 @@ src_prepare() {
 	# AC_CONFIG_AUX_DIR_DEFAULT doesn't exist, and eautoreconf/aclocal fails
 	mkdir -p m4
 
+	# Don't check for gconf sinks, causes access violations that we can't fix.
+	# See bug 358755
+	sed -ri -e 's/gconf[a-z]+sink //g' configure* || die "gconf sed failed"
+
 	# Fix broken smclient option passing
 	# FIXME: File a bug for this
 	epatch "${FILESDIR}/${PN}-2.90.0-smclient-target-detection.patch"

diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-9999.ebuild
index cc352c8..3fee120 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-9999.ebuild
@@ -142,6 +142,10 @@ src_prepare() {
 	# AC_CONFIG_AUX_DIR_DEFAULT doesn't exist, and eautoreconf/aclocal fails
 	mkdir -p m4
 
+	# Don't check for gconf sinks, causes access violations that we can't fix.
+	# See bug 358755
+	sed -ri -e 's/gconf[a-z]+sink //g' configure* || die "gconf sed failed"
+
 	# Fix broken smclient option passing
 	# FIXME: File a bug for this
 	epatch "${FILESDIR}/${PN}-2.90.0-smclient-target-detection.patch"