main/{audacious,audacious-plugins}: remove old patches

4 files changed, 0 insertions, 104 deletions

diff --git a/main/audacious-plugins/ffaudio-linker-fix.patch b/main/audacious-plugins/ffaudio-linker-fix.patch
deleted file mode 100644
index 06f670c1d0..0000000000
--- a/main/audacious-plugins/ffaudio-linker-fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-# HG changeset patch
-# User William Pitcock <nenolod@atheme.org>
-# Date 1293589809 21600
-# Node ID c770e450d8d504772b4144ca489f0025d4b61501
-# Parent  531718a9e02f0568e5e774d9c05ae764f1a49197
-ffaudio: Fix linking order when linked on non-GNU operating systems.
-
-diff -r 531718a9e02f -r c770e450d8d5 configure.ac
---- a/configure.ac	Tue Dec 28 17:43:07 2010 -0500
-+++ b/configure.ac	Tue Dec 28 20:30:09 2010 -0600
-@@ -843,7 +843,7 @@
- )
- 
- if test "x$enable_ffaudio" = "xyes"; then
--    PKG_CHECK_MODULES(FFMPEG, [libavformat >= 52.31.0  libavcodec >= 52.20.0  libavutil >= 49.15.0],
-+    PKG_CHECK_MODULES(FFMPEG, [libavcodec >= 52.20.0  libavutil >= 49.15.0  libavformat >= 52.31.0],
-                       [have_ffaudio="yes"], [have_ffaudio="no"])
- fi
- 
diff --git a/main/audacious-plugins/lyricwiki-memory-leak-fix.patch b/main/audacious-plugins/lyricwiki-memory-leak-fix.patch
deleted file mode 100644
index b5c78c9cb2..0000000000
--- a/main/audacious-plugins/lyricwiki-memory-leak-fix.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-# HG changeset patch
-# User William Pitcock <nenolod@atheme.org>
-# Date 1296458093 21600
-# Node ID 84dff6f177a9e286fa074dfbcb8e3f20722da88f
-# Parent  e55f7361877bc9d213413959f254b6c0de351553
-lyricwiki: memory leak cleanups
-
-diff -r e55f7361877b -r 84dff6f177a9 src/lyricwiki/lyricwiki.c
---- a/src/lyricwiki/lyricwiki.c	Mon Jan 31 14:11:35 2011 +0900
-+++ b/src/lyricwiki/lyricwiki.c	Mon Jan 31 01:14:53 2011 -0600
-@@ -120,10 +120,14 @@
- 					g_free(ret);
- 					ret = NULL;
- 				}
-+
-+				g_regex_unref(reg);
- 			}
- 
- 			xmlFree(lyric);
- 		}
-+
-+		xmlFreeDoc(doc);
- 	}
- 
- 	return ret;
-@@ -169,6 +173,8 @@
- 				xmlFree(lyric);
- 			}
- 		}
-+
-+		xmlFreeDoc(doc);
- 	}
- 
- 	return uri;
diff --git a/main/audacious/audacious-2.4.3-id3v1-memleak-AUD-286.patch b/main/audacious/audacious-2.4.3-id3v1-memleak-AUD-286.patch
deleted file mode 100644
index 7dd3cdf63b..0000000000
--- a/main/audacious/audacious-2.4.3-id3v1-memleak-AUD-286.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Nur audacious-2.4.3-orig/src/libaudtag/id3/id3v1.c audacious-2.4.3/src/libaudtag/id3/id3v1.c
---- audacious-2.4.3-orig/src/libaudtag/id3/id3v1.c	2011-01-12 12:07:37.000000000 +0100
-+++ audacious-2.4.3/src/libaudtag/id3/id3v1.c	2011-01-28 23:31:15.356395589 +0100
-@@ -96,8 +96,7 @@
-         gchar *tmp_artist = g_strconcat(artist, convert_to_utf8(read_char_data(f, 60)), NULL);
-         gchar *tmp_album = g_strconcat(album, convert_to_utf8(read_char_data(f, 60)), NULL);
-         vfs_fseek(f, -170, SEEK_END);
--        gchar *tmp_genre = g_new0(gchar, 30);
--        tmp_genre = convert_to_utf8(read_char_data(f, 30));
-+        gchar *tmp_genre = convert_to_utf8(read_char_data(f, 30));
-         g_free(title);
-         g_free(artist);
-         g_free(album);
-@@ -105,13 +104,12 @@
-         artist = tmp_artist;
-         album = tmp_album;
- 
--        if (g_strcmp0(tmp_genre, NULL) == 1)
-+        if (tmp_genre != NULL)
-         {
-             tuple_associate_string(tuple, FIELD_GENRE, NULL, tmp_genre);
-             genre_set = TRUE;
-+            g_free(tmp_genre);
-         }
--
--        g_free(tmp_genre);
-     }
- 
-     tuple_associate_string(tuple, FIELD_TITLE, NULL, title);
diff --git a/main/audacious/audacious-2.4.3-playlist-AUD-285.patch b/main/audacious/audacious-2.4.3-playlist-AUD-285.patch
deleted file mode 100644
index b0b620dd20..0000000000
--- a/main/audacious/audacious-2.4.3-playlist-AUD-285.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Nur audacious-2.4.3-orig/src/audacious/playlist-new.c audacious-2.4.3/src/audacious/playlist-new.c
---- audacious-2.4.3-orig/src/audacious/playlist-new.c	2011-01-12 12:07:37.000000000 +0100
-+++ audacious-2.4.3/src/audacious/playlist-new.c	2011-01-28 23:28:26.557658545 +0100
-@@ -1846,14 +1846,14 @@
-     if (entries == 0)
-         return FALSE;
- 
--    if (playlist->position != NULL && playlist->position->queued)
-+    /* If we have a song in queue, jump to it, _then_ remove it from queue */
-+    if (playlist->queued != NULL)
-     {
-+        set_position (playlist, playlist->queued->data);
-+
-         playlist->queued = g_list_remove(playlist->queued, playlist->position);
-         playlist->position->queued = FALSE;
-     }
--
--    if (playlist->queued != NULL)
--        set_position (playlist, playlist->queued->data);
-     else if (cfg.shuffle)
-     {
-         if (! shuffle_next (playlist))