Update to 0.9.4.

4 files changed, 83 insertions, 8 deletions

diff --git a/audio/rhythmbox/files/patch-configure b/audio/rhythmbox/files/patch-configure
index 16297b1..17a15a5 100644
--- a/audio/rhythmbox/files/patch-configure
+++ b/audio/rhythmbox/files/patch-configure
@@ -1,18 +1,32 @@
---- configure.orig	Thu Feb  2 02:03:39 2006
-+++ configure	Thu Feb  2 02:04:34 2006
-@@ -21318,9 +21318,9 @@
+--- configure.orig	Mon Apr 17 03:03:22 2006
++++ configure	Mon Apr 17 03:04:12 2006
+@@ -21375,14 +21375,14 @@ echo "${ECHO_T}yes" >&6
  	enable_hal02=yes
  fi
    fi
 -  if test x$enable_hal05 == xyes || test x$enable_hal02 == xyes; then
 +  if test x$enable_hal05 = xyes || test x$enable_hal02 = xyes; then
        enable_hal=yes
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_HAL 1
+ _ACEOF
+ 
 -      if test x$enable_hal05 == xyes; then
 +      if test x$enable_hal05 = xyes; then
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_HAL_0_5 1
-@@ -22121,7 +22121,7 @@
+@@ -22104,7 +22104,7 @@ echo "${ECHO_T}yes" >&6
+ 	have_gnome_media_profiles=yes
+ fi
+ 
+-   if test x$have_gnome_media_profiles == xno; then
++   if test x$have_gnome_media_profiles = xno; then
+       { { echo "$as_me:$LINENO: error: Track transfer support explicitly requested but gnome-media-profiles not found." >&5
+ echo "$as_me: error: Track transfer support explicitly requested but gnome-media-profiles not found." >&2;}
+    { (exit 1); exit 1; }; }
+@@ -22311,7 +22311,7 @@ echo "${ECHO_T}yes" >&6
  	have_avahi_05=yes
  fi
  fi
@@ -21,8 +35,8 @@
     have_avahi=yes
  else
     have_avahi=no
-@@ -22208,7 +22208,7 @@
- 
+@@ -22399,7 +22399,7 @@ _ACEOF
+       use_avahi=yes
        { echo "$as_me:$LINENO: Detected Avahi, using it for mDNS/DNS-SD" >&5
  echo "$as_me: Detected Avahi, using it for mDNS/DNS-SD" >&6;}
 -      if test x$have_avahi_06 == xyes; then
@@ -30,7 +44,7 @@
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_AVAHI_0_6 1
-@@ -22275,7 +22275,7 @@
+@@ -22468,7 +22468,7 @@ _ACEOF
     { echo "$as_me:$LINENO: Using Avahi for mDNS/DNS-SD" >&5
  echo "$as_me: Using Avahi for mDNS/DNS-SD" >&6;}
  
@@ -39,7 +53,7 @@
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_AVAHI_0_6 1
-@@ -23069,7 +23069,7 @@
+@@ -23289,7 +23289,7 @@ fi
  
  
  if test x"$x_includes" != x"NONE" && test -n "$x_includes" ; then
@@ -48,3 +62,12 @@
  fi
  if test x"$x_libraries" != x"NONE" && test -n "$x_libraries" ; then
  	LIBS=-L`echo $x_libraries | sed -e "s/:/ -L/g"`
+@@ -26298,7 +26298,7 @@ if test "${with_internal_libsexy+set}" =
+ else
+   with_internal_libsexy=no
+ fi;
+-if test "x$with_internal_libsexy" == "xno"; then
++if test "x$with_internal_libsexy" = "xno"; then
+ 
+ pkg_failed=no
+ echo "$as_me:$LINENO: checking for LIBSEXY" >&5
diff --git a/audio/rhythmbox/files/patch-metadata_rb-metadata-dbus-client.c b/audio/rhythmbox/files/patch-metadata_rb-metadata-dbus-client.c
new file mode 100644
index 0000000..12a6601
--- /dev/null
+++ b/audio/rhythmbox/files/patch-metadata_rb-metadata-dbus-client.c
@@ -0,0 +1,10 @@
+--- metadata/rb-metadata-dbus-client.c.orig	Mon Apr 17 03:08:10 2006
++++ metadata/rb-metadata-dbus-client.c	Mon Apr 17 03:08:25 2006
+@@ -53,6 +53,7 @@
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
++#include <signal.h>
+ #include <string.h>
+ #include <stdlib.h>
+ 
diff --git a/audio/rhythmbox/files/patch-rhythmdb_rhythmdb-query-model.c b/audio/rhythmbox/files/patch-rhythmdb_rhythmdb-query-model.c
new file mode 100644
index 0000000..18c4cc6
--- /dev/null
+++ b/audio/rhythmbox/files/patch-rhythmdb_rhythmdb-query-model.c
@@ -0,0 +1,13 @@
+--- rhythmdb/rhythmdb-query-model.c.orig	Mon Apr 17 03:09:23 2006
++++ rhythmdb/rhythmdb-query-model.c	Mon Apr 17 03:09:35 2006
+@@ -2191,8 +2191,8 @@ rhythmdb_query_model_album_sort_func (Rh
+ {
+ 	const char *a_val;
+ 	const char *b_val;
+-	ulong a_num;
+-	ulong b_num;
++	gulong a_num;
++	gulong b_num;
+ 	gint ret;
+ 
+ 	/* Sort by album name */
diff --git a/audio/rhythmbox/files/patch-widgets_rb-song-info.c b/audio/rhythmbox/files/patch-widgets_rb-song-info.c
new file mode 100644
index 0000000..e7a9db5
--- /dev/null
+++ b/audio/rhythmbox/files/patch-widgets_rb-song-info.c
@@ -0,0 +1,29 @@
+--- widgets/rb-song-info.c.orig	Mon Apr 17 03:10:40 2006
++++ widgets/rb-song-info.c	Mon Apr 17 03:11:42 2006
+@@ -750,7 +750,7 @@ rb_song_info_populate_dialog (RBSongInfo
+ {
+ 	const char *text;
+ 	char *tmp;
+-	ulong num;
++	gulong num;
+ 	
+ 	g_assert (song_info->priv->current_entry);
+ 
+@@ -1063,7 +1063,7 @@ rb_song_info_update_rating (RBSongInfo *
+ static void
+ rb_song_info_update_year (RBSongInfo *song_info)
+ {
+-	ulong year;
++	gulong year;
+ 	char *text;
+ 
+ 	year = rhythmdb_entry_get_ulong (song_info->priv->current_entry, RHYTHMDB_PROP_YEAR);
+@@ -1183,7 +1183,7 @@ rb_song_info_sync_entries_multiple (RBSo
+ 		g_value_set_ulong (&val, discn);
+ 
+ 		for (tem = dialog->priv->selected_entries; tem; tem = tem->next) {
+-			ulong entry_disc_num;
++			gulong entry_disc_num;
+ 			
+ 			entry = (RhythmDBEntry *)tem->data;
+ 			entry_disc_num = rhythmdb_entry_get_ulong (entry, RHYTHMDB_PROP_DISC_NUMBER);