Add patch that fixes strange startup failure on non-gnome systems. Upstream bug 566846.

(Portage version: 2.2_rc20/cvs/Linux 2.6.28 x86_64)

3 files changed, 43 insertions, 2 deletions

diff --git a/media-sound/banshee/ChangeLog b/media-sound/banshee/ChangeLog
index da9dcea98f17..e5bcdd528411 100644
--- a/media-sound/banshee/ChangeLog
+++ b/media-sound/banshee/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/banshee
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/ChangeLog,v 1.81 2009/01/06 21:30:26 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/ChangeLog,v 1.82 2009/01/07 00:32:37 loki_val Exp $
+
+*banshee-1.4.1-r4 (07 Jan 2009)
+
+  07 Jan 2009; Peter Alfredsen <loki_val@gentoo.org>
+  +files/banshee-1.4.1-startup-fail-g-s-d.patch, -banshee-1.4.1-r3.ebuild,
+  +banshee-1.4.1-r4.ebuild:
+  Add patch that fixes strange startup failure on non-gnome systems.
+  Upstream bug 566846.
 
   06 Jan 2009; Peter Alfredsen <loki_val@gentoo.org>
   banshee-1.4.1-r3.ebuild:
diff --git a/media-sound/banshee/banshee-1.4.1-r3.ebuild b/media-sound/banshee/banshee-1.4.1-r4.ebuild
index cc8885c0976f..b864fe185492 100644
--- a/media-sound/banshee/banshee-1.4.1-r3.ebuild
+++ b/media-sound/banshee/banshee-1.4.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/banshee-1.4.1-r3.ebuild,v 1.7 2009/01/06 21:30:26 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/banshee-1.4.1-r4.ebuild,v 1.1 2009/01/07 00:32:37 loki_val Exp $
 
 EAPI=2
 
@@ -22,6 +22,8 @@ RDEPEND=">=dev-lang/mono-2
 	>=dev-dotnet/gconf-sharp-2.8
 	>=dev-dotnet/gnome-sharp-2.8
 	dev-dotnet/notify-sharp
+	gnome-base/gnome-settings-daemon
+	sys-apps/dbus
 	>=media-libs/gst-plugins-bad-${GVER}
 	>=media-libs/gst-plugins-good-${GVER}
 	>=media-libs/gst-plugins-ugly-${GVER}
@@ -102,6 +104,11 @@ src_unpack() {
 	#Upstream bug 563283
 	#Author is thansen on freenode.
 	epatch "${FILESDIR}/${P}-metadata-writefail.patch"
+
+	#Upstream bug 566846
+	#loki_val@gentoo.org is author.
+	epatch "${FILESDIR}/${P}-startup-fail-g-s-d.patch"
+
 }
 
 src_configure() {
diff --git a/media-sound/banshee/files/banshee-1.4.1-startup-fail-g-s-d.patch b/media-sound/banshee/files/banshee-1.4.1-startup-fail-g-s-d.patch
new file mode 100644
index 000000000000..00836dcb099f
--- /dev/null
+++ b/media-sound/banshee/files/banshee-1.4.1-startup-fail-g-s-d.patch
@@ -0,0 +1,26 @@
+diff -NrU5 banshee-1-1.4.1.orig/src/Clients/Booter/banshee-1.in banshee-1-1.4.1/src/Clients/Booter/banshee-1.in
+--- banshee-1-1.4.1.orig/src/Clients/Booter/banshee-1.in	2009-01-07 00:35:26.000000000 +0100
++++ banshee-1-1.4.1/src/Clients/Booter/banshee-1.in	2009-01-07 00:36:51.000000000 +0100
+@@ -34,10 +34,22 @@
+ if [ -n "$BANSHEE_DEBUG" -o -n "$BANSHEE_TRACE" -o -n "$BANSHEE_PROFILE" ]; then
+     MONO_OPTIONS="$BANSHEE_DEBUG $BANSHEE_TRACE $BANSHEE_PROFILE"
+     echo "** Running Mono with $MONO_OPTIONS **"
+ fi
+ 
++DBUS_CMD="dbus-send --session --dest=org.gnome.SettingsDaemon --type=method_call --print-reply --reply-timeout=2000 /org/gnome/SettingsDaemon org.gnome.SettingsDaemon.Awake"
++
++if ! ${DBUS_CMD} &> /dev/null
++then
++	echo "Debug: gnome-settings-daemon not running, kickstarting..."
++	sleep 1
++	${DBUS_CMD} &> /dev/null || { echo "** FATAL: gnome-settings-daemon could not start. Exiting...**"; return 1; }
++else
++	echo "Gnome-settings-daemon already running, no need to start it. Continuing.."
++fi
++
++
+ # Finally - environment is set up, time to run our beloved
+ exec_args="-a banshee-1 mono $MONO_OPTIONS $MONO_EXE $@"
+ 
+ if [ -z "$BANSHEE_REDIRECT_LOG" ]; then
+ 	exec $exec_args