update to 0.12.0

this is a major update, no changelog available

pkgsrc note: restored Python plugin support (got lost in a previous update)

3 files changed, 43 insertions, 69 deletions

diff --git a/audio/rhythmbox/patches/patch-ad b/audio/rhythmbox/patches/patch-ad
index a858f6eaf32..abd3dea9f4a 100644
--- a/audio/rhythmbox/patches/patch-ad
+++ b/audio/rhythmbox/patches/patch-ad
@@ -1,17 +1,8 @@
-$NetBSD: patch-ad,v 1.3 2008/10/29 01:39:57 wiz Exp $
+$NetBSD: patch-ad,v 1.4 2009/04/17 17:51:01 drochner Exp $
 
---- configure.orig	2008-10-29 00:42:46.000000000 +0000
+--- configure.orig	2009-03-19 10:02:53.000000000 +0100
 +++ configure
-@@ -14258,7 +14258,7 @@ else
- echo "${ECHO_T}yes" >&6; }
- 	have_gio=yes
- fi
--if test x$have_gio == "xyes"; then
-+if test x$have_gio = "xyes"; then
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_GIO 1
-@@ -14350,7 +14350,7 @@ echo "$as_me: error: HAL support explici
+@@ -14206,7 +14206,7 @@ $as_echo "$as_me: error: HAL support exp
     { (exit 1); exit 1; }; }
    fi
  
@@ -20,3 +11,20 @@ $NetBSD: patch-ad,v 1.3 2008/10/29 01:39:57 wiz Exp $
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_HAL 1
+@@ -20058,6 +20058,7 @@ if test "x$have_python" != "xno"; then
+ 
+ 
+ 
++if false; then
+ 
+ 		{ $as_echo "$as_me:$LINENO: checking whether we can build a shared library depending on libpython" >&5
+ $as_echo_n "checking whether we can build a shared library depending on libpython... " >&6; }
+@@ -20095,6 +20096,8 @@ $as_echo "$as_me: WARNING: Disabling pyt
+ $as_echo "$result" >&6; }
+ fi
+ 
++fi
++
+ if test "x$have_python" != "xno"; then
+ 	PYGTK_REQUIRED=2.8.0
+ 	GST_PYTHON_REQUIRED=0.10.1
diff --git a/audio/rhythmbox/patches/patch-ae b/audio/rhythmbox/patches/patch-ae
deleted file mode 100644
index 6ed50957817..00000000000
--- a/audio/rhythmbox/patches/patch-ae
+++ /dev/null
@@ -1,57 +0,0 @@
-$NetBSD: patch-ae,v 1.6 2008/12/26 20:42:26 jmcneill Exp $
-
-From http://svn.gnome.org/viewvc/rhythmbox?view=revision&revision=5992
-
---- plugins/generic-player/rb-generic-player-source.c.orig	2008-12-26 15:40:52.000000000 -0500
-+++ plugins/generic-player/rb-generic-player-source.c	2008-12-26 15:41:31.000000000 -0500
-@@ -774,21 +774,43 @@
- 		gchar *udi = get_hal_udi_for_player (ctx, volume);
- 		if (udi != NULL) {
- 			DBusError error;
-+			char **proplist;
- 			char *prop;
- 
- 			rb_debug ("Checking udi %s", udi);
- 			/* check that it can be accessed as mass-storage */
- 			dbus_error_init (&error);
--			prop = libhal_device_get_property_string (ctx, udi, "portable_audio_player.access_method", &error);
--			if (prop != NULL && strcmp (prop, "storage") == 0 && !dbus_error_is_set (&error)) {
--				/* the device has passed all tests, so it should be a usable player */
--				result = TRUE;
--			} else {
-+			proplist = libhal_device_get_property_strlist (ctx, udi, "portable_audio_player.access_method.protocols", &error);
-+			if (proplist != NULL && !dbus_error_is_set (&error)) {
-+				int i;
-+				for (i = 0; proplist[i] != NULL; i++) {
-+					rb_debug ("device access method: %s", proplist[i]);
-+					if (strcmp (proplist[i], "storage") == 0) {
-+						result = TRUE;
-+						break;
-+					}
-+				}
-+
-+				libhal_free_string_array (proplist);
-+			}
-+			free_dbus_error ("checking device access method", &error);
-+
-+			if (result == FALSE) {
-+				dbus_error_init (&error);
-+				prop = libhal_device_get_property_string (ctx, udi, "portable_audio_player.access_method", &error);
-+				if (prop != NULL && strcmp (prop, "storage") == 0 && !dbus_error_is_set (&error)) {
-+					/* the device has passed all tests, so it should be a usable player */
-+					result = TRUE;
-+				}
-+
-+				libhal_free_string (prop);
-+				free_dbus_error ("checking device access method", &error);
-+			}
-+
-+			if (result == FALSE) {
- 				rb_debug ("device cannot be accessed via storage");
- 			}
--			libhal_free_string (prop);
- 
--			free_dbus_error ("checking device access method", &error);
- 		} else {
- 			rb_debug ("device is not an audio player");
- 		}
diff --git a/audio/rhythmbox/patches/patch-af b/audio/rhythmbox/patches/patch-af
new file mode 100644
index 00000000000..d7d36c37e30
--- /dev/null
+++ b/audio/rhythmbox/patches/patch-af
@@ -0,0 +1,23 @@
+$NetBSD: patch-af,v 1.5 2009/04/17 17:51:01 drochner Exp $
+
+--- rhythmdb/rhythmdb.c.orig	2009-03-28 19:22:05.000000000 +0100
++++ rhythmdb/rhythmdb.c
+@@ -2997,8 +2997,9 @@ rhythmdb_add_to_stat_list (RhythmDB *db,
+ 	/* do we really need to check for duplicate requests here?  .. nah. */
+ 	result->uri = rb_refstring_new (uri);
+ 	db->priv->stat_list = g_list_prepend (db->priv->stat_list, result);
+-
++#if 0
+ 	g_mutex_unlock (db->priv->stat_mutex);
++#endif
+ }
+ 
+ 
+@@ -3052,6 +3053,7 @@ rhythmdb_add_uri_with_types (RhythmDB *d
+ 
+ 		entry = rhythmdb_entry_lookup_by_location (db, uri);
+ 		rhythmdb_add_to_stat_list (db, uri, entry, type, ignore_type, error_type);
++		g_mutex_unlock (db->priv->stat_mutex);
+ 	}
+ }
+