Author: goetz
Date: Tue Feb 13 09:27:59 2007
New Revision: 120293
Added:
packages/cooker/audacious/current/SOURCES/audacious-4034-relative-paths.patch
Modified:
packages/cooker/audacious/current/SPECS/audacious.spec
Log:
fix audacious -e (bug #28685)
Added:
packages/cooker/audacious/current/SOURCES/audacious-4034-relative-paths.patch
==============================================================================
--- (empty file)
+++
packages/cooker/audacious/current/SOURCES/audacious-4034-relative-paths.patch
Tue Feb 13 09:27:59 2007
@@ -0,0 +1,50 @@
+Index: src/audacious/main.c
+===================================================================
+--- src/audacious/main.c (Revision 4033)
++++ src/audacious/main.c (Revision 4034)
+@@ -871,15 +871,23 @@
+
+ for (i = 0; filenames[i] != NULL; i++)
+ {
++ gchar *filename;
++ gchar *current_dir = g_get_current_dir();
++
++ if (filenames[i][0] == '/' || strstr(filenames[i], "://"))
++ filename = g_strdup(filenames[i]);
++ else
++ filename = g_build_filename(current_dir, filenames[i], NULL);
++
+ if (options->load_skins)
+ {
+- xmms_remote_set_skin(session, filenames[i]);
+- skin_install_skin(filenames[i]);
++ xmms_remote_set_skin(session, filename);
++ skin_install_skin(filename);
+ }
+ else
+ {
+ if (options->enqueue_to_temp)
+- xmms_remote_playlist_enqueue_to_temp(session,
filenames[i]);
++ xmms_remote_playlist_enqueue_to_temp(session, filename);
+
+ if (options->enqueue && options->play)
+ pos = xmms_remote_get_playlist_length(session);
+@@ -887,7 +895,7 @@
+ if (!options->enqueue)
+ xmms_remote_playlist_clear(session);
+
+- xmms_remote_playlist_add_url_string(session, filenames[i]);
++ xmms_remote_playlist_add_url_string(session, filename);
+
+ if (options->enqueue && options->play &&
+ xmms_remote_get_playlist_length(session) > pos)
+@@ -896,6 +904,9 @@
+ if (!options->enqueue)
+ xmms_remote_play(session);
+ }
++
++ g_free(filename);
++ g_free(current_dir);
+ }
+
+ g_strfreev(filenames);
Modified: packages/cooker/audacious/current/SPECS/audacious.spec
==============================================================================
--- packages/cooker/audacious/current/SPECS/audacious.spec (original)
+++ packages/cooker/audacious/current/SPECS/audacious.spec Tue Feb 13
09:27:59 2007
@@ -2,7 +2,7 @@
%define svn 0
%define pre alpha4
%if %pre
-%define release %mkrel 0.%pre.1
+%define release %mkrel 0.%pre.2
%define fname %name-%version-%pre
%else
%define fname %name-%version
@@ -20,6 +20,8 @@
Source0: http://audacious-media-player.org/release/%fname.tar.bz2
# Patch to make it check ~/.xmms for skins too
Patch1: audacious-1.3.0-alpha3-xmms-skins.patch
+# gw fix audacious -e
+Patch2: audacious-4034-relative-paths.patch
License: GPL
Group: Sound
Url: http://audacious-media-player.org/
@@ -72,6 +74,7 @@
%setup -q -n %fname
%endif
%patch1 -p1 -b .ski
+%patch2 -p0
%if %svn
sh ./autogen.sh
%endif
