[audacious/f12/master] sync with f13
Michael Schwendt
mschwendt at fedoraproject.org
Fri Sep 3 18:18:59 UTC 2010
commit d65a7417294ff97ec4801057e988c63fe8396067
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date: Fri Sep 3 20:19:00 2010 +0200
sync with f13
audacious-2.2-coverart-2.patch | 32 +++++++++++++++++++++-----------
audacious.spec | 19 ++++++++++++++++---
2 files changed, 37 insertions(+), 14 deletions(-)
---
diff --git a/audacious-2.2-coverart-2.patch b/audacious-2.2-coverart-2.patch
index b1d0b69..de716cd 100644
--- a/audacious-2.2-coverart-2.patch
+++ b/audacious-2.2-coverart-2.patch
@@ -1,6 +1,6 @@
diff -Nur audacious-2.2-orig/src/audacious/ui_albumart.c audacious-2.2/src/audacious/ui_albumart.c
--- audacious-2.2-orig/src/audacious/ui_albumart.c 2009-11-22 23:43:47.000000000 +0100
-+++ audacious-2.2/src/audacious/ui_albumart.c 2010-03-06 19:24:16.000000000 +0100
++++ audacious-2.2/src/audacious/ui_albumart.c 2010-06-09 11:35:40.000000000 +0200
@@ -123,6 +123,8 @@
{
GDir *d;
@@ -12,7 +12,7 @@ diff -Nur audacious-2.2-orig/src/audacious/ui_albumart.c audacious-2.2/src/audac
diff -Nur audacious-2.2-orig/src/audacious/ui_fileinfo.c audacious-2.2/src/audacious/ui_fileinfo.c
--- audacious-2.2-orig/src/audacious/ui_fileinfo.c 2009-11-22 23:43:47.000000000 +0100
-+++ audacious-2.2/src/audacious/ui_fileinfo.c 2010-03-06 19:24:16.000000000 +0100
++++ audacious-2.2/src/audacious/ui_fileinfo.c 2010-06-09 11:40:16.000000000 +0200
@@ -790,7 +790,7 @@
fileinfo_show_for_tuple(Tuple *tuple, gboolean updating_enabled)
{
@@ -22,22 +22,32 @@ diff -Nur audacious-2.2-orig/src/audacious/ui_fileinfo.c audacious-2.2/src/audac
GtkTreeIter iter;
GtkListStore *store;
mowgli_dictionary_iteration_state_t state;
-@@ -849,9 +849,11 @@
+@@ -849,13 +849,16 @@
g_object_unref(icon);
}
-+ localpath = g_filename_from_uri( tuple_get_string(tuple, FIELD_FILE_PATH, NULL), NULL, NULL );
- tmp = fileinfo_recursive_get_image(
+- tmp = fileinfo_recursive_get_image(
- tuple_get_string(tuple, FIELD_FILE_PATH, NULL),
-+ localpath,
- tuple_get_string(tuple, FIELD_FILE_NAME, NULL), 0);
-+ g_free(localpath);
-
+- tuple_get_string(tuple, FIELD_FILE_NAME, NULL), 0);
+-
++ tmp = tuple_get_string(tuple, FIELD_FILE_PATH, NULL);
if (tmp) {
- fileinfo_entry_set_image(image_artwork, tmp);
+- fileinfo_entry_set_image(image_artwork, tmp);
+- g_free(tmp);
++ localpath = g_filename_from_uri( tmp, NULL, NULL );
++ tmp = fileinfo_recursive_get_image(localpath,
++ tuple_get_string(tuple, FIELD_FILE_NAME, NULL), 0);
++ g_free(localpath);
++ if (tmp) {
++ fileinfo_entry_set_image(image_artwork, tmp);
++ g_free(tmp);
++ }
+ }
+
+ gtk_widget_set_sensitive(btn_apply, FALSE);
diff -Nur audacious-2.2-orig/src/audacious/ui_fileinfopopup.c audacious-2.2/src/audacious/ui_fileinfopopup.c
--- audacious-2.2-orig/src/audacious/ui_fileinfopopup.c 2009-11-22 23:43:47.000000000 +0100
-+++ audacious-2.2/src/audacious/ui_fileinfopopup.c 2010-03-06 19:26:09.000000000 +0100
++++ audacious-2.2/src/audacious/ui_fileinfopopup.c 2010-06-09 11:35:40.000000000 +0200
@@ -340,6 +340,7 @@
gchar *last_artwork;
const static gchar default_artwork[] = DATA_DIR "/images/audio.png";
diff --git a/audacious.spec b/audacious.spec
index 3c7868b..5ec8314 100644
--- a/audacious.spec
+++ b/audacious.spec
@@ -5,7 +5,7 @@
Name: audacious
Version: 2.2
-Release: 14%{?dist}
+Release: 16%{?dist}
License: GPLv3
Summary: GTK2 based media player similar to XMMS
@@ -20,17 +20,22 @@ Patch0: audacious-2.2-disabled-iplugins.patch
Patch1: audacious-2.2-AUD-99.patch
# obsolete with version upgrade
Patch2: audacious-2.2-pkgconfig-libs.patch
+# won't apply with version upgrade
# for a problem that is known upstream, but 2.3-alpha1 doesn't fixed it yet
# iplugin sorting order is important, too
Patch3: audacious-2.2-multiple-decoders-per-ext.patch
# tuple.c part merged upstream
+# tuple copy creation not merged, upstream wants to rely on refcounting
Patch4: audacious-2.2-set_tuple_cb.patch
-#
+# merged upstream
Patch5: audacious-2.2-libm.patch
# obsolete with version upgrade
Patch6: audacious-2.2-coverart-2.patch
-#
+# obsolete with version upgrade
Patch7: audacious-2.2-unescape-fileinfo.patch
+# fix for manual merged upstream
+# fix for --help not merged yet
+Patch8: audacious-2.2-doc-enqueue.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -97,6 +102,7 @@ sed -i -e 's!\(build_stamp.*\)UNSUPPORTED VERSION!\1Fedora package!' src/audacio
%patch5 -p1 -b .libm
%patch6 -p1 -b .coverart
%patch7 -p1 -b .unescape-fileinfo
+%patch8 -p1 -b .doc-enqueue
# From .desktop files remove MIME types the base build of the
# Fedora audacious-plugins package does not understand.
@@ -153,6 +159,7 @@ desktop-file-install \
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/audacious2.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+# fixed post-2.3
# fix for: tarball installs softlinks that point into buildroot
cd $RPM_BUILD_ROOT%{_bindir}
rm -f audacious audtool
@@ -212,6 +219,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Wed Jun 9 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-16
+- Enhance the coverart patch to not crash in URI conversion (#602113).
+
+* Fri Apr 16 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-15
+- Fix manual and --help for options -e/-E (#581394 and AUD-174).
+
* Sat Mar 20 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-14
- Unescape filename uri in fileinfo dialog to avoid g_markup crash (#575387).
More information about the scm-commits
mailing list