Update metadata-writefail patch to fix bug 250201

(Portage version: 2.2_rc17/cvs/Linux 2.6.28-rc6 x86_64)

3 files changed, 78 insertions, 12 deletions

diff --git a/media-sound/banshee/ChangeLog b/media-sound/banshee/ChangeLog
index e58b05a0bb6f..9e98711942d6 100644
--- a/media-sound/banshee/ChangeLog
+++ b/media-sound/banshee/ChangeLog
@@ -1,6 +1,13 @@
 # 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.75 2008/12/09 21:24:34 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/ChangeLog,v 1.76 2008/12/11 00:37:50 loki_val Exp $
+
+*banshee-1.4.1-r3 (11 Dec 2008)
+
+  11 Dec 2008; Peter Alfredsen <loki_val@gentoo.org>
+  files/banshee-1.4.1-metadata-writefail.patch, -banshee-1.4.1-r2.ebuild,
+  +banshee-1.4.1-r3.ebuild:
+  Update metadata-writefail patch to fix bug 250201
 
 *banshee-1.4.1-r2 (09 Dec 2008)
 
diff --git a/media-sound/banshee/banshee-1.4.1-r2.ebuild b/media-sound/banshee/banshee-1.4.1-r3.ebuild
index 9fc9bc2489f8..09ae22a8af9e 100644
--- a/media-sound/banshee/banshee-1.4.1-r2.ebuild
+++ b/media-sound/banshee/banshee-1.4.1-r3.ebuild
@@ -1,6 +1,6 @@
 # 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.4.1-r2.ebuild,v 1.1 2008/12/09 21:24:34 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/banshee-1.4.1-r3.ebuild,v 1.1 2008/12/11 00:37:50 loki_val Exp $
 
 EAPI=2
 
diff --git a/media-sound/banshee/files/banshee-1.4.1-metadata-writefail.patch b/media-sound/banshee/files/banshee-1.4.1-metadata-writefail.patch
index b7f1c3b8eb2b..8ac299a490fb 100644
--- a/media-sound/banshee/files/banshee-1.4.1-metadata-writefail.patch
+++ b/media-sound/banshee/files/banshee-1.4.1-metadata-writefail.patch
@@ -1,5 +1,55 @@
---- src/Core/Banshee.Core/Banshee.Streaming/StreamTagger.cs	2008-10-06 10:27:31.000000000 -0600
-+++ src/Core/Banshee.Core/Banshee.Streaming/StreamTagger.cs.new	2008-12-05 16:01:22.513964625 -0700
+--- src/Core/Banshee.Core/Banshee.Streaming/SaveTrackMetadataJob.cs.orig	2008-12-10 16:03:27.913232707 -0700
++++ src/Core/Banshee.Core/Banshee.Streaming/SaveTrackMetadataJob.cs	2008-12-10 16:16:00.617267829 -0700
+@@ -29,6 +29,7 @@
+ using System;
+ using Mono.Unix;
+ 
++using Banshee.Base;
+ using Banshee.Collection;
+ using Banshee.Configuration.Schema;
+ 
+@@ -86,24 +87,26 @@
+             file.Tag.DiscCount = (uint)track.DiscCount;
+             file.Tag.Year = (uint)track.Year;
+             file.Tag.BeatsPerMinute = (uint)track.Bpm;
+-            
+-            SaveIsCompilation (file.Tag, track.IsCompilation);
++
++            SaveIsCompilation (file, track.IsCompilation);
+             file.Save ();
+         }
+         
+-        private static void SaveIsCompilation (TagLib.Tag tag, bool is_compilation)
++        private static void SaveIsCompilation (TagLib.File file, bool is_compilation)
+         {
+-            TagLib.Id3v2.Tag id3v2_tag = tag as TagLib.Id3v2.Tag;
+-            if (id3v2_tag != null) {
+-                id3v2_tag.IsCompilation = is_compilation;
+-                return;
+-            }
++            try {
++                 TagLib.Id3v2.Tag id3v2_tag = file.GetTag(TagLib.TagTypes.Id3v2, true) as TagLib.Id3v2.Tag;
++                 if (id3v2_tag != null) {
++                     id3v2_tag.IsCompilation = is_compilation;
++                 }
++            } catch {}
+ 
+-            TagLib.Mpeg4.AppleTag apple_tag = tag as TagLib.Mpeg4.AppleTag;
+-            if (apple_tag != null) {
+-                apple_tag.IsCompilation = is_compilation;
+-                return;
+-            }
++            try {
++                 TagLib.Mpeg4.AppleTag apple_tag = file.GetTag(TagLib.TagTypes.Apple,true) as TagLib.Mpeg4.AppleTag;
++                 if (apple_tag != null) {
++                     apple_tag.IsCompilation = is_compilation;
++                 }
++            } catch {}
+         }
+     }
+ }
+--- src/Core/Banshee.Core/Banshee.Streaming/StreamTagger.cs.orig	2008-10-06 10:27:31.000000000 -0600
++++ src/Core/Banshee.Core/Banshee.Streaming/StreamTagger.cs	2008-12-10 16:17:49.355233640 -0700
 @@ -130,7 +130,7 @@
                  track.ArtistName = Choose (file.Tag.JoinedPerformers, track.ArtistName, preferTrackInfo);
                  track.AlbumTitle = Choose (file.Tag.Album, track.AlbumTitle, preferTrackInfo);
@@ -9,7 +59,7 @@
                  
                  track.TrackTitle = Choose (file.Tag.Title, track.TrackTitle, preferTrackInfo);
                  track.Genre = Choose (file.Tag.FirstGenre, track.Genre, preferTrackInfo);
-@@ -171,18 +171,18 @@
+@@ -171,18 +171,22 @@
              // TODO these ideas could also be done in an extension that collects such hacks
          }
              
@@ -17,14 +67,23 @@
 +        private static bool IsCompilation (TagLib.File file)
          {
 -            TagLib.Id3v2.Tag id3v2_tag = tag as TagLib.Id3v2.Tag;
-+            TagLib.Id3v2.Tag id3v2_tag = file.GetTag(TagLib.TagTypes.Id3v2, true) as TagLib.Id3v2.Tag;
-             if (id3v2_tag != null && id3v2_tag.IsCompilation)
-                 return true;
- 
+-            if (id3v2_tag != null && id3v2_tag.IsCompilation)
+-                return true;
+-
 -            TagLib.Mpeg4.AppleTag apple_tag = tag as TagLib.Mpeg4.AppleTag;
-+            TagLib.Mpeg4.AppleTag apple_tag = file.GetTag(TagLib.TagTypes.Apple,true) as TagLib.Mpeg4.AppleTag;
-             if (apple_tag != null && apple_tag.IsCompilation)
-                 return true;
+-            if (apple_tag != null && apple_tag.IsCompilation)
+-                return true;
++            try {
++                 TagLib.Id3v2.Tag id3v2_tag = file.GetTag(TagLib.TagTypes.Id3v2, true) as TagLib.Id3v2.Tag;
++                 if (id3v2_tag != null && id3v2_tag.IsCompilation)
++                      return true;
++            } catch {}
++            
++            try {
++                 TagLib.Mpeg4.AppleTag apple_tag = file.GetTag(TagLib.TagTypes.Apple,true) as TagLib.Mpeg4.AppleTag;
++                 if (apple_tag != null && apple_tag.IsCompilation)
++                     return true;
++            } catch {}
              
 -            if (tag.Performers.Length > 0 && tag.AlbumArtists.Length > 0 &&
 -                (tag.Performers.Length != tag.AlbumArtists.Length || tag.FirstAlbumArtist != tag.FirstPerformer)) {