rpms/audacious/F-13 audacious-2.2-doc-enqueue.patch, NONE, 1.1 audacious-2.2-coverart-2.patch, 1.1, 1.2 audacious.spec, 1.73, 1.74
Michael Schwendt
mschwendt at fedoraproject.org
Wed Jun 9 09:52:42 UTC 2010
Author: mschwendt
Update of /cvs/pkgs/rpms/audacious/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12242/F-13
Modified Files:
audacious-2.2-coverart-2.patch audacious.spec
Added Files:
audacious-2.2-doc-enqueue.patch
Log Message:
* Wed Jun 9 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-16
- Enhance the coverart patch to not crash in URI conversion (#602113).
audacious-2.2-doc-enqueue.patch:
man/audacious2.1.in | 6 +++---
src/audacious/main.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE audacious-2.2-doc-enqueue.patch ---
diff -Nur audacious-2.2-orig/man/audacious2.1.in audacious-2.2/man/audacious2.1.in
--- audacious-2.2-orig/man/audacious2.1.in 2009-11-22 23:43:46.000000000 +0100
+++ audacious-2.2/man/audacious2.1.in 2010-04-16 12:41:56.000000000 +0200
@@ -37,12 +37,12 @@
.TP
.I -e, --enqueue
-Do not clear the current playlist before adding the files on the command line to
-it.
+Add the files on the command line to the current playlist but do not start
+playback.
.TP
.I -E, --enqueue-to-temp
-Add the files on the command line to a new playlist.
+Add the files on the command line to a temporary playlist and start playback.
.PP
.B Controlling playback:
diff -Nur audacious-2.2-orig/src/audacious/main.c audacious-2.2/src/audacious/main.c
--- audacious-2.2-orig/src/audacious/main.c 2009-11-22 23:43:47.000000000 +0100
+++ audacious-2.2/src/audacious/main.c 2010-04-16 12:43:53.000000000 +0200
@@ -165,7 +165,7 @@
{"play-pause", 't', 0, G_OPTION_ARG_NONE, &options.play_pause, N_("Pause if playing, play otherwise"), NULL},
{"fwd", 'f', 0, G_OPTION_ARG_NONE, &options.fwd, N_("Skip forward in playlist"), NULL},
{"show-jump-box", 'j', 0, G_OPTION_ARG_NONE, &options.show_jump_box, N_("Display Jump to File dialog"), NULL},
- {"enqueue", 'e', 0, G_OPTION_ARG_NONE, &options.enqueue, N_("Don't clear the playlist"), NULL},
+ {"enqueue", 'e', 0, G_OPTION_ARG_NONE, &options.enqueue, N_("Add files to the playlist"), NULL},
{"enqueue-to-temp", 'E', 0, G_OPTION_ARG_NONE, &options.enqueue_to_temp, N_("Add new files to a temporary playlist"), NULL},
{"show-main-window", 'm', 0, G_OPTION_ARG_NONE, &options.mainwin, N_("Display the main window"), NULL},
{"activate", 'a', 0, G_OPTION_ARG_NONE, &options.activate, N_("Display all open Audacious windows"), NULL},
audacious-2.2-coverart-2.patch:
ui_albumart.c | 2 ++
ui_fileinfo.c | 17 ++++++++++-------
ui_fileinfopopup.c | 16 ++++++++++++----
3 files changed, 24 insertions(+), 11 deletions(-)
Index: audacious-2.2-coverart-2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/F-13/audacious-2.2-coverart-2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- audacious-2.2-coverart-2.patch 20 Mar 2010 18:10:54 -0000 1.1
+++ audacious-2.2-coverart-2.patch 9 Jun 2010 09:52:41 -0000 1.2
@@ -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/audacio
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/audacio
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";
Index: audacious.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/F-13/audacious.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- audacious.spec 20 Mar 2010 18:10:22 -0000 1.73
+++ audacious.spec 9 Jun 2010 09:52:42 -0000 1.74
@@ -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
@@ -31,6 +31,8 @@ Patch5: audacious-2.2-libm.patch
Patch6: audacious-2.2-coverart-2.patch
#
Patch7: audacious-2.2-unescape-fileinfo.patch
+#
+Patch8: audacious-2.2-doc-enqueue.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -97,6 +99,7 @@ sed -i -e 's!\(build_stamp.*\)UNSUPPORTE
%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 +156,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 +216,12 @@ gtk-update-icon-cache %{_datadir}/icons/
%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