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

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28 x86_64

4 files changed, 46 insertions, 4 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/Manifest b/media-sound/banshee/Manifest
index 40c4c3eb3274..63ca81397f05 100644
--- a/media-sound/banshee/Manifest
+++ b/media-sound/banshee/Manifest
@@ -2,6 +2,7 @@ AUX banshee-1.0.0-notification-icon.patch 1388 RMD160 dccac57924fad30d2b02ff4ce8
 AUX banshee-1.2.1-libmtp-0.3.0-API.patch 4166 RMD160 349747a7780fa23d8dd5ae8bc7ea77935664a49c SHA1 4f7475bef777a1f49c6d5840f9e31f9711ed03ac SHA256 d54d2ece34c72f0a3ed178c819b5f95df37b9e248fd4f384b9f769095d407a7a
 AUX banshee-1.2.1-notification-crash.patch 1096 RMD160 fa6debffc2aafcc58ddfc5ce5497ac40e04e9f13 SHA1 667e6cd02d556ac320785420cdc4482d6c57b2da SHA256 38d22284dc037138839991d46bf565591f8de05e3cbc6f5dd820d42e60ebef43
 AUX banshee-1.4.1-metadata-writefail.patch 4415 RMD160 031010de44c5bf9b1923a57d7fc5ee5632e4b8f6 SHA1 010e4bd359dcfba8daf24299c49610ac223a6663 SHA256 42a5ab6a2dac30a2f33a2bbe0d6aafd9ef9ddb2332c6bc3ae53dc7582a90c10d
+AUX banshee-1.4.1-startup-fail-g-s-d.patch 1198 RMD160 c786c339c224818c27865904f9e9744c6c84c255 SHA1 20d1f66496713dd9fa76b5938a6130ae7a0498f7 SHA256 fd529efe915c9f530bab6daad52c5959d54f44e7b5ee8a6392bab94c45c22209
 DIST banshee-0.12.1.tar.gz 3081707 RMD160 87b826cb306e57e08adf35d37fab5b3196d85686 SHA1 578077486d23368998f1e31a237db427f0968d37 SHA256 1d858b3c83d233790f62bc35440e900bcebf40964ad1aba9eae4cc017da74ed7
 DIST banshee-0.13.1.tar.gz 2999635 RMD160 fdefaeeb3e66bf6073e081e364270dcf912ebf6c SHA1 e39358c04ea38505ec626c4fef66312edd176c6a SHA256 ea095023f8c3f731aef3f96653e53c9dad6622f1113a2347aa10ebb269351a19
 DIST banshee-1-1.0.0.tar.bz2 1993777 RMD160 8148af02fc421b4d9f6716f96f65f10c4346876b SHA1 8467e114d6857cc1f37b3364cbde9618a2067e30 SHA256 0df0d12187752a27fa64037595491710e26be17e9ea87a73f751b8b686394012
@@ -12,6 +13,6 @@ EBUILD banshee-0.13.1.ebuild 2995 RMD160 ea90307f7745259bdb12b22dae8d428de7cba7b
 EBUILD banshee-1.0.0-r1.ebuild 2202 RMD160 1e2ec3f5442eb73b5118248972a23c29575106a4 SHA1 5b911de64185e317e4c19b88f6ea278ac00767db SHA256 0093858d4a420699251fdb2894e0eaf65c3a54941a6279cb6ff56d3dcd31745d
 EBUILD banshee-1.2.1-r2.ebuild 2334 RMD160 bb5bd11d2db41f518ed0a622c411f9690c3fd48a SHA1 1e6e9327944a6f099fdd00c9be88a836888612a7 SHA256 2ee91cbeb3a6c0e13cdbf29bd1ab3025befed9460e7fdadb9f99f9ed9899a0c2
 EBUILD banshee-1.2.1.ebuild 2209 RMD160 c74cc4ecdaedf2600fbab36052e2bc35cf7b822f SHA1 f6c51956bd6a6757858c0ebb458640996a9d205f SHA256 a815f55548d902582bb91e1900a18f24603d8a4e0d2969959a3f8b33f2651fe6
-EBUILD banshee-1.4.1-r3.ebuild 2659 RMD160 a8473b03d9e17de2e541ab2c4817c09c44eff220 SHA1 2eeb37a39394b43c8f4159861b8fd03197b2a0a1 SHA256 2dcb59c9688cee197e62853eb79f73b13f2f440b83725ad5a0f4bbbbb67cb113
-MISC ChangeLog 14997 RMD160 a80620bf89c465116f67e65607195734bbf1cdfb SHA1 5df25bd1ca2462562ff7fbadd3bf31df5070e20f SHA256 6614f7d334a7784c3720cda9561f8b9d68099cf0d6e2c09f683d1310206e27dd
+EBUILD banshee-1.4.1-r4.ebuild 2817 RMD160 ca80b94d362a083ca0f382a07fbb3c30b89992ef SHA1 78bc5b6fba088b606b56806f83670f4419e00e50 SHA256 4bf5ed903905bf85b2ba441bcee0533e677053c963e7c648e176a819d4de74d9
+MISC ChangeLog 15279 RMD160 61450ddfc3bcf1a78471a51246e8e351ed269368 SHA1 19dcfe98b949030de3b6cc4ce16d177ef0f4887a SHA256 5102297b21e66062bf24ce0d3cd013d27693317bfa7df556885999b43264815f
 MISC metadata.xml 499 RMD160 58c90a5fa64f948def14ea188bd7815294e36f35 SHA1 5d463e6bbad5600e2fb46e20dd35be871bcb48a8 SHA256 77f493966e62f6e00073371783c5234cee51f5a4462571c8214c6e301860cd5a
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