Punt extraneous patch file

(Portage version: 2.2_rc26/cvs/Linux x86_64)

2 files changed, 5 insertions, 95 deletions

diff --git a/media-sound/banshee/ChangeLog b/media-sound/banshee/ChangeLog
index 5c2fef182255..7b57d2238197 100644
--- a/media-sound/banshee/ChangeLog
+++ b/media-sound/banshee/ChangeLog
@@ -1,6 +1,10 @@
 # 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.86 2009/03/22 16:54:53 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/ChangeLog,v 1.87 2009/03/23 10:12:33 loki_val Exp $
+
+  23 Mar 2009; Peter Alfredsen <loki_val@gentoo.org>
+  -files/banshee-1.4.1-metadata-writefail.patch:
+  Punt extraneous patch file
 
   22 Mar 2009; Peter Alfredsen <loki_val@gentoo.org>
   -files/banshee-1.0.0-notification-icon.patch,
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
deleted file mode 100644
index 8ac299a490fb..000000000000
--- a/media-sound/banshee/files/banshee-1.4.1-metadata-writefail.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- 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);
-                 track.AlbumArtist = Choose (file.Tag.FirstAlbumArtist, track.AlbumArtist, preferTrackInfo);
--                track.IsCompilation = IsCompilation (file.Tag);
-+                track.IsCompilation = IsCompilation (file);
-                 
-                 track.TrackTitle = Choose (file.Tag.Title, track.TrackTitle, preferTrackInfo);
-                 track.Genre = Choose (file.Tag.FirstGenre, track.Genre, preferTrackInfo);
-@@ -171,18 +171,22 @@
-             // TODO these ideas could also be done in an extension that collects such hacks
-         }
-             
--        private static bool IsCompilation (TagLib.Tag tag)
-+        private static bool IsCompilation (TagLib.File file)
-         {
--            TagLib.Id3v2.Tag id3v2_tag = tag as TagLib.Id3v2.Tag;
--            if (id3v2_tag != null && id3v2_tag.IsCompilation)
--                return true;
--
--            TagLib.Mpeg4.AppleTag apple_tag = tag as TagLib.Mpeg4.AppleTag;
--            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)) {
-+            if (file.Tag.Performers.Length > 0 && file.Tag.AlbumArtists.Length > 0 &&
-+                (file.Tag.Performers.Length != file.Tag.AlbumArtists.Length || file.Tag.FirstAlbumArtist != file.Tag.FirstPerformer)) {
-                 return true;
-             }
-             return false;