Probably definitely fix bug #233869, thanks again to Salah Colonya. Also fix bug #236886 with fix from upstream.

(Portage version: 2.2_rc8/cvs/Linux 2.6.25.8 i686)

4 files changed, 58 insertions, 25 deletions

diff --git a/media-sound/banshee/ChangeLog b/media-sound/banshee/ChangeLog
index 7c0c8f4080a8..7ff5b77907d8 100644
--- a/media-sound/banshee/ChangeLog
+++ b/media-sound/banshee/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-sound/banshee
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/ChangeLog,v 1.70 2008/09/03 10:13:52 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/ChangeLog,v 1.71 2008/09/10 13:51:47 loki_val Exp $
+
+*banshee-1.2.1-r2 (10 Sep 2008)
+
+  10 Sep 2008; Peter Alfredsen <loki_val@gentoo.org>
+  files/banshee-1.2.1-libmtp-0.3.0-API.patch,
+  +files/banshee-1.2.1-notification-crash.patch, -banshee-1.2.1-r1.ebuild,
+  +banshee-1.2.1-r2.ebuild:
+  Probably definitely fix bug #233869, thanks again to Salah Colonya. Also
+  fix bug #236886 with fix from upstream.
 
 *banshee-1.2.1-r1 (03 Sep 2008)
 
diff --git a/media-sound/banshee/banshee-1.2.1-r1.ebuild b/media-sound/banshee/banshee-1.2.1-r2.ebuild
index d4d220964c1f..4e0edb9368ea 100644
--- a/media-sound/banshee/banshee-1.2.1-r1.ebuild
+++ b/media-sound/banshee/banshee-1.2.1-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/banshee-1.2.1-r1.ebuild,v 1.1 2008/09/03 10:13:52 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/banshee-1.2.1-r2.ebuild,v 1.1 2008/09/10 13:51:47 loki_val Exp $
 
 EAPI=1
 
-inherit base gnome2 mono
+inherit base gnome2 mono autotools
 
 GVER=0.10.3
 
@@ -77,7 +77,8 @@ DOCS="AUTHORS ChangeLog HACKING NEWS README"
 
 S=${WORKDIR}/${PN}-1-${PV}
 
-PATCHES=( "${FILESDIR}/${P}-libmtp-0.3.0-API.patch" )
+PATCHES=( "${FILESDIR}/${P}-libmtp-0.3.0-API.patch"
+	"${FILESDIR}/${P}-notification-crash.patch" )
 
 pkg_setup() {
 	G2CONF="${G2CONF}
@@ -94,6 +95,7 @@ pkg_setup() {
 
 src_unpack() {
 	base_src_unpack
+	cd "${S}"
 	gnome2_omf_fix
 	elibtoolize
 }
diff --git a/media-sound/banshee/files/banshee-1.2.1-libmtp-0.3.0-API.patch b/media-sound/banshee/files/banshee-1.2.1-libmtp-0.3.0-API.patch
index e97766ab166f..6fff6394c595 100644
--- a/media-sound/banshee/files/banshee-1.2.1-libmtp-0.3.0-API.patch
+++ b/media-sound/banshee/files/banshee-1.2.1-libmtp-0.3.0-API.patch
@@ -1,6 +1,6 @@
 diff -u -r banshee-1-1.2.1.old/src/Libraries/Mtp/Mtp/Album.cs banshee-1-1.2.1/src/Libraries/Mtp/Mtp/Album.cs
 --- banshee-1-1.2.1.old/src/Libraries/Mtp/Mtp/Album.cs	2008-05-21 09:17:47.000000000 -0500
-+++ banshee-1-1.2.1/src/Libraries/Mtp/Mtp/Album.cs	2008-09-03 00:57:00.000000000 -0500
++++ banshee-1-1.2.1/src/Libraries/Mtp/Mtp/Album.cs	2008-09-09 22:30:48.000000000 -0500
 @@ -131,7 +131,7 @@
              if (saved) {
                  saved = LIBMTP_Update_Album (device.Handle, ref album) == 0;
@@ -10,21 +10,8 @@ diff -u -r banshee-1-1.2.1.old/src/Libraries/Mtp/Mtp/Album.cs banshee-1-1.2.1/sr
              }
  
              if (album.tracks != IntPtr.Zero) {
-@@ -190,7 +190,7 @@
- 
-         public static Album GetById (MtpDevice device, uint id)
-         {
--            IntPtr ptr = Album.LIBMTP_Get_Album (device.Handle, id);
-+            IntPtr ptr = Album.LIBMTP_Get_Album (device.Handle);
-             if (ptr == IntPtr.Zero) {
-                 return null;
-             } else {
-@@ -208,10 +208,10 @@
- 		internal static extern IntPtr LIBMTP_Get_Album_List (MtpDeviceHandle handle); // LIBMTP_album_t*
- 
- 		[DllImport("libmtp.dll")]
--		internal static extern IntPtr LIBMTP_Get_Album (MtpDeviceHandle handle, uint albumId); // LIBMTP_album_t*
-+		internal static extern IntPtr LIBMTP_Get_Album (MtpDeviceHandle handle); // LIBMTP_album_t*
+@@ -211,7 +211,7 @@
+ 		internal static extern IntPtr LIBMTP_Get_Album (MtpDeviceHandle handle, uint albumId); // LIBMTP_album_t*
  
  		[DllImport("libmtp.dll")]
 -		internal static extern int LIBMTP_Create_New_Album (MtpDeviceHandle handle, ref AlbumStruct album, uint parentId);
@@ -43,7 +30,7 @@ diff -u -r banshee-1-1.2.1.old/src/Libraries/Mtp/Mtp/Album.cs banshee-1-1.2.1/sr
          public string name;
 diff -u -r banshee-1-1.2.1.old/src/Libraries/Mtp/Mtp/Folder.cs banshee-1-1.2.1/src/Libraries/Mtp/Mtp/Folder.cs
 --- banshee-1-1.2.1.old/src/Libraries/Mtp/Mtp/Folder.cs	2008-04-07 22:59:11.000000000 -0500
-+++ banshee-1-1.2.1/src/Libraries/Mtp/Mtp/Folder.cs	2008-09-03 00:11:53.000000000 -0500
++++ banshee-1-1.2.1/src/Libraries/Mtp/Mtp/Folder.cs	2008-09-09 22:30:48.000000000 -0500
 @@ -210,6 +210,7 @@
  	{
  		public uint folder_id;
@@ -54,8 +41,20 @@ diff -u -r banshee-1-1.2.1.old/src/Libraries/Mtp/Mtp/Folder.cs banshee-1-1.2.1/s
  		public IntPtr child;   // LIBMTP_folder_t*
 diff -u -r banshee-1-1.2.1.old/src/Libraries/Mtp/Mtp/Track.cs banshee-1-1.2.1/src/Libraries/Mtp/Mtp/Track.cs
 --- banshee-1-1.2.1.old/src/Libraries/Mtp/Mtp/Track.cs	2008-04-23 14:20:58.000000000 -0500
-+++ banshee-1-1.2.1/src/Libraries/Mtp/Mtp/Track.cs	2008-09-03 00:14:10.000000000 -0500
-@@ -195,7 +195,7 @@
++++ banshee-1-1.2.1/src/Libraries/Mtp/Mtp/Track.cs	2008-09-09 22:44:13.000000000 -0500
+@@ -129,6 +129,11 @@
+ 			set { trackStruct.usecount = value; }
+ 		}
+ 
++		public string Composer {
++			get { return trackStruct.composer; }
++			set { trackStruct.composer = value; }
++		}
++
+ 		public Track (string filename, ulong filesize) : this (new TrackStruct (), null)
+ 		{
+ 			this.trackStruct.filename = filename;
+@@ -195,7 +200,7 @@
  
  		internal static void SendTrack (MtpDeviceHandle handle, string path, ref TrackStruct metadata, ProgressFunction callback, IntPtr data, uint parent)
  		{
@@ -64,7 +63,7 @@ diff -u -r banshee-1-1.2.1.old/src/Libraries/Mtp/Mtp/Track.cs banshee-1-1.2.1/sr
  			{
  				LibMtpException.CheckErrorStack (handle);
  				throw new LibMtpException (ErrorCode.General, "Could not upload the track");
-@@ -227,7 +227,7 @@
+@@ -227,7 +232,7 @@
  		private static extern int LIBMTP_Get_Track_To_File (MtpDeviceHandle handle, uint trackId, string path, ProgressFunction callback, IntPtr data);
  
  		[DllImport("libmtp.dll")]
@@ -73,7 +72,7 @@ diff -u -r banshee-1-1.2.1.old/src/Libraries/Mtp/Mtp/Track.cs banshee-1-1.2.1/sr
  
  		[DllImport("libmtp.dll")]
  	    private static extern int LIBMTP_Update_Track_Metadata (MtpDeviceHandle handle, ref TrackStruct metadata);
-@@ -244,7 +244,8 @@
+@@ -244,9 +249,11 @@
  	{
  		public uint item_id;
  		public uint parent_id;
@@ -82,4 +81,7 @@ diff -u -r banshee-1-1.2.1.old/src/Libraries/Mtp/Mtp/Track.cs banshee-1-1.2.1/sr
 +
  		[MarshalAs(UnmanagedType.LPStr)] public string title;
  		[MarshalAs(UnmanagedType.LPStr)] public string artist;
++		[MarshalAs(UnmanagedType.LPStr)] public string composer;
  		[MarshalAs(UnmanagedType.LPStr)] public string genre;
+ 		[MarshalAs(UnmanagedType.LPStr)] public string album;
+ 		[MarshalAs(UnmanagedType.LPStr)] public string date;
diff --git a/media-sound/banshee/files/banshee-1.2.1-notification-crash.patch b/media-sound/banshee/files/banshee-1.2.1-notification-crash.patch
new file mode 100644
index 000000000000..7810410dc8ac
--- /dev/null
+++ b/media-sound/banshee/files/banshee-1.2.1-notification-crash.patch
@@ -0,0 +1,20 @@
+Index: src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs
+===================================================================
+--- src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs	(revision 4464)
++++ src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs	(working copy)
+@@ -276,10 +276,12 @@
+         {
+             if (rating_menu_item.Visible) {
+                 TrackInfo track = ServiceManager.PlayerEngine.CurrentTrack;
+-                if (track is DatabaseTrackInfo) {
+-                    (track as DatabaseTrackInfo).Refresh ();
++                if (track != null) {
++                    if (track is DatabaseTrackInfo) {
++                        (track as DatabaseTrackInfo).Refresh ();
++                    }
++                    rating_menu_item.Reset (track.Rating);
+                 }
+-                rating_menu_item.Reset (track.Rating);
+             }
+             menu.Popup (null, null, notif_area.PositionMenu, 3, Gtk.Global.CurrentEventTime);
+         }