diff --git a/audacious-1.1.0-amidi-backend.patch b/audacious-1.1.0-amidi-backend.patch deleted file mode 100644 index bbac0f1..0000000 --- a/audacious-1.1.0-amidi-backend.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr audacious-fedora-1.1.0-orig/configure audacious-fedora-1.1.0/configure ---- audacious-fedora-1.1.0-orig/configure 2006-07-21 19:18:05.000000000 +0200 -+++ audacious-fedora-1.1.0/configure 2006-07-21 21:08:29.000000000 +0200 -@@ -15045,7 +15045,7 @@ - { (exit 1); exit 1; }; } - fi - -- AMIDIPLUGDATADIR=${datadir}/amidi-plug/audacious -+ AMIDIPLUGDATADIR=${libdir}/amidi-plug/audacious - - if test "x$enable_amidiplug_alsa" = "xauto" -o "x$enable_amidiplug_alsa" = "xyes"; then - if test "x$alsalib_available" = "xcheck"; then diff --git a/audacious-1.1.0-no-rpath.patch b/audacious-1.1.0-no-rpath.patch deleted file mode 100644 index 082d8fa..0000000 --- a/audacious-1.1.0-no-rpath.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -uNr audacious-fedora-1.1.0-orig/audacious/Makefile audacious-fedora-1.1.0/audacious/Makefile ---- audacious-fedora-1.1.0-orig/audacious/Makefile 2006-07-21 19:18:05.000000000 +0200 -+++ audacious-fedora-1.1.0/audacious/Makefile 2006-07-21 20:33:37.000000000 +0200 -@@ -102,5 +102,5 @@ - fi; - - audacious: $(OBJECTS) -- $(CC) $(LDFLAGS) $(OBJECTS) $(LDADD) -o $@ -Wl,-rpath,${libdir} -+ $(CC) $(LDFLAGS) $(OBJECTS) $(LDADD) -o $@ - @printf "%10s %-20s\n" LINK $@ -diff -uNr audacious-fedora-1.1.0-orig/audtool/Makefile audacious-fedora-1.1.0/audtool/Makefile ---- audacious-fedora-1.1.0-orig/audtool/Makefile 2006-07-21 19:18:05.000000000 +0200 -+++ audacious-fedora-1.1.0/audtool/Makefile 2006-07-21 20:33:22.000000000 +0200 -@@ -25,5 +25,5 @@ - OBJECTS = ${SOURCES:.c=.o} - - audtool: $(OBJECTS) -- $(CC) $(LDFLAGS) $(OBJECTS) $(LDADD) -o $@ -Wl,-rpath,${libdir} -+ $(CC) $(LDFLAGS) $(OBJECTS) $(LDADD) -o $@ - @printf "%10s %-20s\n" LINK $@ diff --git a/audacious-1.1.0-quoting.patch b/audacious-1.1.0-quoting.patch deleted file mode 100644 index d84bfec..0000000 --- a/audacious-1.1.0-quoting.patch +++ /dev/null @@ -1,94 +0,0 @@ -diff -uNr audacious-1.1.0-dr2-orig/audacious/main.c audacious-1.1.0-dr2/audacious/main.c ---- audacious-1.1.0-dr2-orig/audacious/main.c 2006-06-11 06:29:02.000000000 +0200 -+++ audacious-1.1.0-dr2/audacious/main.c 2006-07-09 16:35:43.000000000 +0200 -@@ -47,6 +47,10 @@ - #include - #include - -+#ifdef HAVE_GNOME_VFS -+#include -+#endif -+ - #include "libaudacious/configdb.h" - #include "libaudacious/beepctrl.h" - #include "libaudacious/util.h" -@@ -727,6 +731,47 @@ - exit(EXIT_SUCCESS); - } - -+static gchar* -+quote_filename(gchar* filename) { -+ -+ /* -+ * Quote a filename for usage with gnome vfs. -+ * Since we get the filenames from the command line, we can -+ * not determine if they are already quoted or not. -+ * -+ * The algorithm employed here is as follows: -+ * - If the filename contains "://", it is treated as an URI -+ * - If the filename is an URI and contains "%" it is considered quoted. -+ * - If the filenname is not an URI, or an unquoted URI, it is quoted. -+ * -+ * This function does nothing if gnome VFS is not used. -+ */ -+ -+#ifdef HAVE_GNOME_VFS -+ gchar* quoted_filename; -+ char quote = 0; -+ -+ if (strstr(filename, "://")) { -+ if (!strstr(filename, "%")) { -+ quote = 1; -+ } -+ } else { -+ quote = 1; -+ } -+ -+ if (quote) { -+ gnome_vfs_init(); -+ quoted_filename = gnome_vfs_escape_path_string(filename); -+ free(filename); -+ return quoted_filename; -+ } else { -+ return filename; -+ } -+#else -+ return filename; -+#endif -+} -+ - static void - parse_cmd_line(gint argc, - gchar ** argv, -@@ -820,6 +865,8 @@ - else - filename = g_build_filename(current_dir, argv[i], NULL); - -+ filename = quote_filename(filename); -+ - options->filenames = g_list_prepend(options->filenames, filename); - } - -diff -uNr audacious-1.1.0-dr2-orig/audacious/Makefile audacious-1.1.0-dr2/audacious/Makefile ---- audacious-1.1.0-dr2-orig/audacious/Makefile 2006-05-28 17:27:54.000000000 +0200 -+++ audacious-1.1.0-dr2/audacious/Makefile 2006-07-09 16:53:21.000000000 +0200 -@@ -18,6 +18,7 @@ - CFLAGS += \ - $(GTK_CFLAGS) \ - $(LIBGLADE_CFLAGS) \ -+ $(GNOMEVFS_CFLAGS) \ - $(BEEP_DEFINES) \ - $(ARCH_DEFINES) \ - -I.. \ -diff -uNr audacious-1.1.0-dr2-orig/libaudacious/vfs_gnome.c audacious-1.1.0-dr2/libaudacious/vfs_gnome.c ---- audacious-1.1.0-dr2-orig/libaudacious/vfs_gnome.c 2006-03-12 06:06:47.000000000 +0100 -+++ audacious-1.1.0-dr2/libaudacious/vfs_gnome.c 2006-07-09 18:01:35.000000000 +0200 -@@ -56,7 +56,7 @@ - file->eof = FALSE; - - mode_to_gnome_vfs(mode, &g_mode, &truncate, &append); -- gchar *escaped_file = gnome_vfs_escape_path_string(path); -+ gchar *escaped_file = g_strdup(path); - - if (!truncate) { - g_result = gnome_vfs_open(&(file->handle), escaped_file, g_mode); diff --git a/audacious-1.1.1-controlsocket-name.patch b/audacious-1.1.1-controlsocket-name.patch deleted file mode 100644 index e363b8b..0000000 --- a/audacious-1.1.1-controlsocket-name.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr audacious-fedora-1.1.1-orig/audacious/controlsocket.h audacious-fedora-1.1.1/audacious/controlsocket.h ---- audacious-fedora-1.1.1-orig/audacious/controlsocket.h 2006-06-24 18:20:48.000000000 +0200 -+++ audacious-fedora-1.1.1/audacious/controlsocket.h 2006-07-30 20:11:35.000000000 +0200 -@@ -26,7 +26,7 @@ - - #define XMMS_PROTOCOL_VERSION 1 - --#define CTRLSOCKET_NAME "audacious" -+#define CTRLSOCKET_NAME "xmms" - #define CTRLSOCKET_IO_TIMEOUT_USEC 100000 - - enum { diff --git a/audacious-1.1.1-playlist-twenty.patch b/audacious-1.1.1-playlist-twenty.patch deleted file mode 100644 index 8286d3d..0000000 --- a/audacious-1.1.1-playlist-twenty.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr audacious-fedora-1.1.1-orig/audacious/playlist_list.c audacious-fedora-1.1.1/audacious/playlist_list.c ---- audacious-fedora-1.1.1-orig/audacious/playlist_list.c 2006-07-21 19:18:05.000000000 +0200 -+++ audacious-fedora-1.1.1/audacious/playlist_list.c 2006-08-17 20:29:35.000000000 +0200 -@@ -618,6 +618,8 @@ - else - title = str_to_utf8(entry->title); - -+ title = convert_title_text(title); -+ - pos = playlist_get_queue_position(entry); - - tail[0] = 0; diff --git a/audacious-1.2.1-relative-links.patch b/audacious-1.2.1-relative-links.patch deleted file mode 100644 index c52ecb3..0000000 --- a/audacious-1.2.1-relative-links.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -uNr audacious-1.2.1-orig/libaudacious/Makefile audacious-1.2.1/libaudacious/Makefile ---- audacious-1.2.1-orig/libaudacious/Makefile 2006-10-29 11:35:12.000000000 +0100 -+++ audacious-1.2.1/libaudacious/Makefile 2006-10-29 11:35:50.000000000 +0100 -@@ -47,7 +47,7 @@ - - install-posthook: - @mv ${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX) ${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX).4.0.0 -- @ln -sf ${LIBDIR}/libaudacious$(SHARED_SUFFIX).4.0.0 \ -+ @ln -sf libaudacious$(SHARED_SUFFIX).4.0.0 \ - ${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX).4 -- @ln -sf ${LIBDIR}/libaudacious$(SHARED_SUFFIX).4 \ -+ @ln -sf libaudacious$(SHARED_SUFFIX).4 \ - ${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX) diff --git a/audacious-1.2.1-shaded-skin.patch b/audacious-1.2.1-shaded-skin.patch deleted file mode 100644 index c3ca724..0000000 --- a/audacious-1.2.1-shaded-skin.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr audacious-1.2.1-orig/audacious/widgets/skin.c audacious-1.2.1/audacious/widgets/skin.c ---- audacious-1.2.1-orig/audacious/widgets/skin.c 2006-10-29 11:35:14.000000000 +0100 -+++ audacious-1.2.1/audacious/widgets/skin.c 2006-10-29 12:40:56.000000000 +0100 -@@ -1795,7 +1795,7 @@ - (i * 25) + 25, 0, 25, 14); - - /* right corner */ -- skin_draw_pixmap(skin, drawable, gc, SKIN_PLEDIT, 99, focus ? 57 : 42, -+ skin_draw_pixmap(skin, drawable, gc, SKIN_PLEDIT, 99, focus ? 42 : 57, - width - 50, 0, 50, 14); - } - diff --git a/audacious-1.4.2-id3tag-close-file.patch b/audacious-1.4.2-id3tag-close-file.patch deleted file mode 100644 index 0b722ae..0000000 --- a/audacious-1.4.2-id3tag-close-file.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -r 8a260b322dc9 -r 20736bb2e7f6 src/libid3tag/file.c ---- a/src/libid3tag/file.c Wed Nov 28 06:02:59 2007 +0900 -+++ b/src/libid3tag/file.c Wed Nov 28 16:55:02 2007 +0100 -@@ -494,6 +494,7 @@ struct id3_file *id3_file_vfsopen(VFSFil - file = new_file(iofile, mode, path); - if (file == 0){ - printf("id3_file_vfsopen: file failed\n"); -+ aud_vfs_fclose(iofile); - } - - aud_vfs_fseek(iofile, curpos, SEEK_SET); diff --git a/audacious.spec b/audacious.spec index fddec99..089fadd 100644 --- a/audacious.spec +++ b/audacious.spec @@ -14,14 +14,6 @@ URL: http://audacious-media-player.org/ Source0: http://distfiles.atheme.org/audacious-%{version}.tgz Patch0: audacious-1.5.1-xmms-skins.patch Patch1: audacious-1.5.1-default-skin.patch -# Patch2: audacious-1.1.0-no-rpath.patch -Patch3: audacious-1.2.1-relative-links.patch -# Patch4: audacious-1.1.0-quoting.patch -# Patch5: audacious-1.1.0-amidi-backend.patch -Patch6: audacious-1.2.1-shaded-skin.patch -# Patch7: audacious-1.1.1-controlsocket-name.patch -# Patch8: audacious-1.1.1-playlist-twenty.patch -Patch9: audacious-1.4.2-id3tag-close-file.patch Patch10: audacious-1.5.1-libsad-header.patch Patch11: audacious-1.5.1-playlist-length.patch Patch12: audacious-1.5.1-playlist-play-clicked.patch @@ -81,30 +73,6 @@ Files needed when building software for the Audacious media player. # Use bluecurve as default skin %patch1 -p1 -b .default-skin -# No rpath in binaries -# %patch2 -p1 -b .no-rpath - -# Relative symlink paths -# %patch3 -p1 -b .relative-links - -# Filename quoting -# %patch4 -p1 -b .quoting - -# Amidi backends path -# %patch5 -p1 -b .amidi-backend - -# Shaded playlist window decorations -# %patch6 -p1 -b .shaded-skin - -# Controlsocket named "xmms" instead of "audacious" -# %patch7 -p1 -b controlsocket-name - -# Fix "%20" in playlist entries -# %patch8 -p1 -b playlist-twenty - -# Fix files left open on non-seekable mp3 streams -# %patch9 -p1 -b id3tag-close-file - # Remove libSAD references from the public headers %patch10 -p1 -b libsad-header @@ -203,6 +171,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Sat Jun 6 2009 Michael Schwendt +- Remove unapplied patches and verify that they have been merged. + * Fri Jun 5 2009 Michael Schwendt - 1.5.1-9 - update post/postun/posttrans scriptlets to match guidelines - drop BR GConf2-devel