diff --git a/audacious-2.4-rc1-albumart.patch b/audacious-2.4-rc1-albumart.patch new file mode 100644 index 0000000..1f6db10 --- /dev/null +++ b/audacious-2.4-rc1-albumart.patch @@ -0,0 +1,30 @@ +diff -Nur audacious-2.4-rc1-orig/src/audacious/ui_albumart.c audacious-2.4-rc1/src/audacious/ui_albumart.c +--- audacious-2.4-rc1-orig/src/audacious/ui_albumart.c 2010-08-10 17:41:57.000000000 +0200 ++++ audacious-2.4-rc1/src/audacious/ui_albumart.c 2010-08-13 21:56:56.000000000 +0200 +@@ -194,11 +194,23 @@ + + gchar * get_associated_image_file (const gchar * filename) + { +- gchar * path = g_path_get_dirname (filename); +- gchar * base = g_path_get_basename (filename); +- gchar * image_file = fileinfo_recursive_get_image (path, base, 0); ++ gchar *fn, *path, *base, *image_file; ++ ++ if (str_has_prefix_nocase(filename,"file://")) { ++ fn = g_filename_from_uri(filename,NULL,NULL); ++ } ++ else { ++ fn = g_strdup(filename); ++ } ++ if (!fn) { ++ return NULL; ++ } ++ path = g_path_get_dirname (fn); ++ base = g_path_get_basename (fn); ++ image_file = fileinfo_recursive_get_image (path, base, 0); + + g_free (path); + g_free (base); ++ g_free (fn); + return image_file; + } diff --git a/audacious.spec b/audacious.spec index c36132e..a19102f 100644 --- a/audacious.spec +++ b/audacious.spec @@ -5,7 +5,7 @@ Name: audacious Version: 2.4 -Release: 0.9.rc1%{?dist} +Release: 0.10.rc1%{?dist} License: GPLv3 Summary: GTK2 based media player similar to XMMS @@ -13,6 +13,8 @@ URL: http://audacious-media-player.org/ Group: Applications/Multimedia Source0: http://distfiles.atheme.org/audacious-%{version}-rc1.tgz +# reported upstream, AUD-255 +Patch0: audacious-2.4-rc1-albumart.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -67,6 +69,7 @@ Files needed when building software for the Audacious media player. %prep %setup -q -n %{name}-%{version}-rc1 +%patch0 -p1 -b .albumart sed -i '\,^.SILENT:,d' buildsys.mk.in # From .desktop files remove MIME types the base build of the @@ -175,6 +178,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Fri Aug 13 2010 Michael Schwendt - 2.4-0.10.rc1 +- Fix album art loader to convert file:// URIs into filenames. + * Tue Aug 10 2010 Michael Schwendt - 2.4-0.9.rc1 - Update to rc1.