rpms/audacious/F-12 audacious-2.2-set_tuple_cb.patch, 1.2, 1.3 audacious.spec, 1.62, 1.63

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16245

Modified Files:
	audacious-2.2-set_tuple_cb.patch audacious.spec 
Log Message:
* Thu Jan 28 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-10
- Fix tuple_copy() further (it was completely broken as the mowgli
  dict wasn't copied at all).


audacious-2.2-set_tuple_cb.patch:
 audacious/playback.c |    4 +++-
 libaudcore/tuple.c   |   14 +++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

Index: audacious-2.2-set_tuple_cb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/F-12/audacious-2.2-set_tuple_cb.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- audacious-2.2-set_tuple_cb.patch	28 Jan 2010 22:17:24 -0000	1.2
+++ audacious-2.2-set_tuple_cb.patch	29 Jan 2010 00:48:51 -0000	1.3
@@ -15,7 +15,7 @@ diff -Nur audacious-2.2-orig/src/audacio
  void ip_set_info (const gchar * title, gint length, gint bitrate, gint
 diff -Nur audacious-2.2-orig/src/libaudcore/tuple.c audacious-2.2/src/libaudcore/tuple.c
 --- audacious-2.2-orig/src/libaudcore/tuple.c	2009-11-22 23:43:47.000000000 +0100
-+++ audacious-2.2/src/libaudcore/tuple.c	2010-01-28 23:01:53.000000000 +0100
++++ audacious-2.2/src/libaudcore/tuple.c	2010-01-29 01:41:29.000000000 +0100
 @@ -234,6 +234,7 @@
      if (src == NULL) return NULL;
  
@@ -24,3 +24,39 @@ diff -Nur audacious-2.2-orig/src/libaudc
      switch (src->type) {
      case TUPLE_STRING:
          res->value.string = stringpool_get(src->value.string);
+@@ -242,6 +243,7 @@
+         res->value.integer = src->value.integer;
+         break;
+     default:
++        mowgli_heap_free(tuple_value_heap, res);
+         return NULL;
+     }
+     return res;
+@@ -257,8 +259,8 @@
+ tuple_copy(const Tuple *src)
+ {
+     Tuple *dst;
++    TupleValue *tv;
+     mowgli_dictionary_iteration_state_t state;
+-    mowgli_dictionary_elem_t *elem;
+     gint i;
+ 
+     TUPLE_LOCK_WRITE();
+@@ -270,11 +272,13 @@
+         dst->values[i] = tuple_copy_value(src->values[i]);
+ 
+     /* Copy dictionary contents */
+-    MOWGLI_DICTIONARY_FOREACH(elem, &state, src->dict)
++    MOWGLI_DICTIONARY_FOREACH(tv, &state, src->dict)
+     {
+-        TupleValue *value = tuple_copy_value(elem->data);
+-        if (value != NULL && elem->key != NULL)
+-            mowgli_dictionary_add(dst->dict, elem->key, value);
++        gchar *key = state.cur->key;
++        TupleValue *value = tuple_copy_value(tv);
++        if (value != NULL && key != NULL) {
++            mowgli_dictionary_add(dst->dict, key, value);
++        }
+     }
+ 
+     /* Copy subtune number information */


Index: audacious.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/F-12/audacious.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- audacious.spec	28 Jan 2010 22:17:24 -0000	1.62
+++ audacious.spec	29 Jan 2010 00:48:51 -0000	1.63
@@ -5,7 +5,7 @@
 
 Name: audacious
 Version: 2.2
-Release: 9%{?dist}
+Release: 10%{?dist}
 
 License: GPLv3
 Summary: GTK2 based media player similar to XMMS
@@ -23,7 +23,7 @@ Patch2: audacious-2.2-pkgconfig-libs.pat
 # 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
-# 2nd half fixed upstream (and revised)
+#
 Patch4: audacious-2.2-set_tuple_cb.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -203,6 +203,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Thu Jan 28 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-10
+- Fix tuple_copy() further (it was completely broken as the mowgli
+  dict wasn't copied at all).
+
 * Thu Jan 28 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-9
 - Let set_tuple_cb() work on a copied tuple
   (the metadata updates flood is too racy IMO).