From 52c172dcd0e8a580102db2aaf0ece0ba8fc29623 Mon Sep 17 00:00:00 2001 From: marcus Date: Wed, 26 Apr 2006 08:13:43 +0000 Subject: Update to 0.9.4.1. --- audio/rhythmbox/files/patch-configure | 66 +--------------------- .../files/patch-metadata_rb-metadata-dbus-client.c | 10 ---- .../patch-plugins_pythonconsole_pythonconsole.py | 10 ---- .../files/patch-rhythmdb_rhythmdb-query-model.c | 13 ----- 4 files changed, 2 insertions(+), 97 deletions(-) delete mode 100644 audio/rhythmbox/files/patch-metadata_rb-metadata-dbus-client.c delete mode 100644 audio/rhythmbox/files/patch-plugins_pythonconsole_pythonconsole.py delete mode 100644 audio/rhythmbox/files/patch-rhythmdb_rhythmdb-query-model.c (limited to 'audio/rhythmbox/files') diff --git a/audio/rhythmbox/files/patch-configure b/audio/rhythmbox/files/patch-configure index 17a15a5f11b3..197d077b6526 100644 --- a/audio/rhythmbox/files/patch-configure +++ b/audio/rhythmbox/files/patch-configure @@ -1,49 +1,5 @@ ---- 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 -@@ -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 --if test x$have_avahi_06 == xyes || test x$have_avahi_05 == xyes; then -+if test x$have_avahi_06 = xyes || test x$have_avahi_05 = xyes; then - have_avahi=yes - else - have_avahi=no -@@ -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 -+ if test x$have_avahi_06 = xyes; then - - cat >>confdefs.h <<\_ACEOF - #define HAVE_AVAHI_0_6 1 +--- configure.orig Tue Apr 25 17:51:39 2006 ++++ configure Tue Apr 25 17:51:45 2006 @@ -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;} @@ -53,21 +9,3 @@ cat >>confdefs.h <<\_ACEOF #define HAVE_AVAHI_0_6 1 -@@ -23289,7 +23289,7 @@ fi - - - if test x"$x_includes" != x"NONE" && test -n "$x_includes" ; then -- CFLAGS=$CFLAGS -I`echo $x_includes | sed -e "s/:/ -I/g"` -+ CFLAGS=$CFLAGS\ -I`echo $x_includes | sed -e "s/:/ -I/g"` - 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 deleted file mode 100644 index 12a66019dfec..000000000000 --- a/audio/rhythmbox/files/patch-metadata_rb-metadata-dbus-client.c +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 - #include - #include -+#include - #include - #include - diff --git a/audio/rhythmbox/files/patch-plugins_pythonconsole_pythonconsole.py b/audio/rhythmbox/files/patch-plugins_pythonconsole_pythonconsole.py deleted file mode 100644 index c0ae9e0a962b..000000000000 --- a/audio/rhythmbox/files/patch-plugins_pythonconsole_pythonconsole.py +++ /dev/null @@ -1,10 +0,0 @@ ---- plugins/pythonconsole/pythonconsole.py.orig Wed Apr 19 17:24:43 2006 -+++ plugins/pythonconsole/pythonconsole.py Wed Apr 19 17:24:53 2006 -@@ -31,6 +31,7 @@ - import gobject - import gtk - import pango -+import rhythmdb - from gettext import gettext as _ - import rb - diff --git a/audio/rhythmbox/files/patch-rhythmdb_rhythmdb-query-model.c b/audio/rhythmbox/files/patch-rhythmdb_rhythmdb-query-model.c deleted file mode 100644 index 18c4cc672562..000000000000 --- a/audio/rhythmbox/files/patch-rhythmdb_rhythmdb-query-model.c +++ /dev/null @@ -1,13 +0,0 @@ ---- 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 */ -- cgit