rpms/rhythmbox/devel rb-ddkit-monitor.patch, 1.1, 1.2 rhythmbox.spec, 1.240, 1.241
Bastien Nocera
hadess at fedoraproject.org
Thu Apr 9 17:02:54 UTC 2009
Author: hadess
Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14055
Modified Files:
rb-ddkit-monitor.patch rhythmbox.spec
Log Message:
Backport patch to 0.12.0, the optimist in me didn't see that happening
rb-ddkit-monitor.patch:
Index: rb-ddkit-monitor.patch
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rb-ddkit-monitor.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rb-ddkit-monitor.patch 9 Apr 2009 16:48:33 -0000 1.1
+++ rb-ddkit-monitor.patch 9 Apr 2009 17:02:53 -0000 1.2
@@ -1,7 +1,19 @@
-Index: lib/rb-util.c
-===================================================================
---- lib/rb-util.c (revision 6281)
-+++ lib/rb-util.c (working copy)
+diff -upr rhythmbox-0.12.0.old/lib/Makefile.am rhythmbox-0.12.0/lib/Makefile.am
+--- rhythmbox-0.12.0.old/lib/Makefile.am 2009-03-12 02:26:11.000000000 +0000
++++ rhythmbox-0.12.0/lib/Makefile.am 2009-04-09 18:00:18.000000000 +0100
+@@ -44,7 +44,7 @@ INCLUDES = \
+ $(SOUP_CFLAGS) \
+ $(RHYTHMBOX_CFLAGS)
+
+-librb_la_LIBADD = $(SOUP_LIBS)
++librb_la_LIBADD = $(SOUP_LIBS) $(HAL_LIBS)
+
+ BUILT_SOURCES=
+
+Only in rhythmbox-0.12.0/lib: Makefile.am.orig
+diff -upr rhythmbox-0.12.0.old/lib/rb-util.c rhythmbox-0.12.0/lib/rb-util.c
+--- rhythmbox-0.12.0.old/lib/rb-util.c 2009-03-12 02:26:12.000000000 +0000
++++ rhythmbox-0.12.0/lib/rb-util.c 2009-04-09 17:59:56.000000000 +0100
@@ -38,6 +38,11 @@
#include <gobject/gvaluecollector.h>
#include <gio/gio.h>
@@ -14,7 +26,7 @@
#include "rb-util.h"
#include "rb-debug.h"
-@@ -991,3 +996,39 @@
+@@ -991,3 +996,39 @@ rb_scale_pixbuf_to_size (GdkPixbuf *pixb
return gdk_pixbuf_scale_simple (pixbuf, d_width, d_height, GDK_INTERP_BILINEAR);
}
@@ -54,11 +66,10 @@
+}
+#endif /* HAVE_HAL */
+
-Index: lib/rb-util.h
-===================================================================
---- lib/rb-util.h (revision 6281)
-+++ lib/rb-util.h (working copy)
-@@ -100,6 +100,8 @@
+diff -upr rhythmbox-0.12.0.old/lib/rb-util.h rhythmbox-0.12.0/lib/rb-util.h
+--- rhythmbox-0.12.0.old/lib/rb-util.h 2009-03-12 02:26:12.000000000 +0000
++++ rhythmbox-0.12.0/lib/rb-util.h 2009-04-09 17:59:56.000000000 +0100
+@@ -100,6 +100,8 @@ void rb_set_tree_view_column_fixed_width
GdkPixbuf *rb_scale_pixbuf_to_size (GdkPixbuf *pixbuf,
GtkIconSize size);
@@ -67,27 +78,22 @@
G_END_DECLS
#endif /* __RB_UTIL_H */
-Index: lib/Makefile.am
-===================================================================
---- lib/Makefile.am (revision 6281)
-+++ lib/Makefile.am (working copy)
-@@ -49,9 +49,10 @@
- -I$(top_srcdir) \
- -I$(top_srcdir)/widgets \
- $(SOUP_CFLAGS) \
-+ $(HAL_CFLAGS) \
- $(RHYTHMBOX_CFLAGS)
-
--librb_la_LIBADD = $(SOUP_LIBS) -lSM -lICE
-+librb_la_LIBADD = $(SOUP_LIBS) $(HAL_LIBS) -lSM -lICE
+diff -upr rhythmbox-0.12.0.old/plugins/generic-player/rb-generic-player-source.c rhythmbox-0.12.0/plugins/generic-player/rb-generic-player-source.c
+--- rhythmbox-0.12.0.old/plugins/generic-player/rb-generic-player-source.c 2009-03-12 02:26:13.000000000 +0000
++++ rhythmbox-0.12.0/plugins/generic-player/rb-generic-player-source.c 2009-04-09 17:59:56.000000000 +0100
+@@ -1468,7 +1468,7 @@ get_hal_udi_for_player (LibHalContext *c
+ return NULL;
+ }
- BUILT_SOURCES=
+- udi = g_volume_get_identifier (volume, G_VOLUME_IDENTIFIER_KIND_HAL_UDI);
++ udi = rhythmbox_get_volume_udi (volume, ctx);
-Index: plugins/generic-player/rb-nokia770-source.c
-===================================================================
---- plugins/generic-player/rb-nokia770-source.c (revision 6281)
-+++ plugins/generic-player/rb-nokia770-source.c (working copy)
-@@ -136,14 +136,12 @@
+ if (udi == NULL) {
+ g_object_unref (volume);
+diff -upr rhythmbox-0.12.0.old/plugins/generic-player/rb-nokia770-source.c rhythmbox-0.12.0/plugins/generic-player/rb-nokia770-source.c
+--- rhythmbox-0.12.0.old/plugins/generic-player/rb-nokia770-source.c 2009-04-09 17:59:08.000000000 +0100
++++ rhythmbox-0.12.0/plugins/generic-player/rb-nokia770-source.c 2009-04-09 17:59:56.000000000 +0100
+@@ -136,14 +136,12 @@ impl_uri_from_playlist_uri (RBGenericPla
}
@@ -104,7 +110,7 @@
char *parent_name;
gboolean result;
DBusError error;
-@@ -153,6 +151,7 @@
+@@ -153,6 +151,7 @@ hal_udi_is_nokia770 (const char *udi)
dbus_error_init (&error);
conn = NULL;
@@ -112,7 +118,7 @@
parent_udi = NULL;
parent_name = NULL;
-@@ -169,6 +168,10 @@
+@@ -169,6 +168,10 @@ hal_udi_is_nokia770 (const char *udi)
if (!libhal_ctx_init (ctx, &error) || dbus_error_is_set (&error))
goto end;
@@ -123,7 +129,7 @@
inited = TRUE;
parent_udi = libhal_device_get_property_string (ctx,
udi,
-@@ -206,6 +209,7 @@
+@@ -206,6 +209,7 @@ hal_udi_is_nokia770 (const char *udi)
}
end:
@@ -131,7 +137,7 @@
g_free (parent_name);
g_free (parent_udi);
-@@ -225,25 +229,20 @@
+@@ -225,24 +229,19 @@ end:
return result;
}
@@ -156,19 +162,17 @@
- }
+ if (volume == NULL)
+ return FALSE;
-
++
+ result = volume_is_nokia770 (volume);
+ g_object_unref (volume);
-+
- return result;
- }
-Index: plugins/generic-player/rb-psp-source.c
-===================================================================
---- plugins/generic-player/rb-psp-source.c (revision 6281)
-+++ plugins/generic-player/rb-psp-source.c (working copy)
-@@ -272,11 +272,11 @@
+ return result;
}
+diff -upr rhythmbox-0.12.0.old/plugins/generic-player/rb-psp-source.c rhythmbox-0.12.0/plugins/generic-player/rb-psp-source.c
+--- rhythmbox-0.12.0.old/plugins/generic-player/rb-psp-source.c 2009-04-09 17:59:08.000000000 +0100
++++ rhythmbox-0.12.0/plugins/generic-player/rb-psp-source.c 2009-04-09 18:01:16.000000000 +0100
+@@ -276,11 +276,11 @@ rb_psp_source_create_playlists (RBGeneri
+ #ifdef HAVE_HAL
static gboolean
-hal_udi_is_psp (const char *udi)
@@ -181,7 +185,7 @@
char *parent_name;
gboolean result;
DBusError error;
-@@ -285,6 +285,7 @@
+@@ -289,6 +289,7 @@ hal_udi_is_psp (const char *udi)
result = FALSE;
dbus_error_init (&error);
@@ -189,7 +193,7 @@
parent_udi = NULL;
parent_name = NULL;
-@@ -302,6 +303,10 @@
+@@ -306,6 +307,10 @@ hal_udi_is_psp (const char *udi)
if (!libhal_ctx_init (ctx, &error) || dbus_error_is_set (&error))
goto end;
@@ -200,7 +204,7 @@
inited = TRUE;
parent_udi = libhal_device_get_property_string (ctx, udi,
"info.parent", &error);
-@@ -318,6 +323,7 @@
+@@ -322,6 +327,7 @@ hal_udi_is_psp (const char *udi)
}
end:
@@ -208,49 +212,25 @@
g_free (parent_udi);
g_free (parent_name);
-@@ -342,19 +348,15 @@
- rb_psp_is_mount_player (GMount *mount)
- {
- GVolume *volume;
-- gboolean result = FALSE;
-+ gboolean result;
-
+@@ -362,13 +368,7 @@ rb_psp_is_mount_player (GMount *mount)
+ #else
volume = g_mount_get_volume (mount);
-- if (volume != NULL) {
+ if (volume != NULL) {
- char *str;
-+ if (volume == NULL)
-+ return FALSE;
-
+-
- str = g_volume_get_identifier (volume, G_VOLUME_IDENTIFIER_KIND_HAL_UDI);
- if (str != NULL) {
- result = hal_udi_is_psp (str);
- g_free (str);
- }
-- g_object_unref (volume);
-- }
-+ result = volume_is_psp (volume);
-+ g_object_unref (volume);
-+
- return result;
- }
-
-Index: plugins/generic-player/rb-generic-player-source.c
-===================================================================
---- plugins/generic-player/rb-generic-player-source.c (revision 6281)
-+++ plugins/generic-player/rb-generic-player-source.c (working copy)
-@@ -1468,7 +1468,7 @@
- return NULL;
- }
-
-- udi = g_volume_get_identifier (volume, G_VOLUME_IDENTIFIER_KIND_HAL_UDI);
-+ udi = rhythmbox_get_volume_udi (volume, ctx);
-
- if (udi == NULL) {
++ result = volume_is_psp (volume);
g_object_unref (volume);
-Index: plugins/ipod/rb-ipod-helpers.c
-===================================================================
---- plugins/ipod/rb-ipod-helpers.c (revision 6281)
-+++ plugins/ipod/rb-ipod-helpers.c (working copy)
+ }
+ #endif
+Only in rhythmbox-0.12.0/plugins/generic-player: rb-psp-source.c.orig
+diff -upr rhythmbox-0.12.0.old/plugins/ipod/rb-ipod-helpers.c rhythmbox-0.12.0/plugins/ipod/rb-ipod-helpers.c
+--- rhythmbox-0.12.0.old/plugins/ipod/rb-ipod-helpers.c 2009-03-13 02:13:52.000000000 +0000
++++ rhythmbox-0.12.0/plugins/ipod/rb-ipod-helpers.c 2009-04-09 17:59:56.000000000 +0100
@@ -44,6 +44,7 @@
#endif
@@ -259,7 +239,7 @@
#include "rb-debug.h"
#include "rb-dialog.h"
-@@ -402,11 +403,11 @@
+@@ -402,11 +403,11 @@ rb_ipod_helpers_mount_has_ipod_db (GMoun
#ifdef HAVE_HAL
static gboolean
@@ -273,7 +253,7 @@
char **methods_list;
guint i;
gboolean result;
-@@ -416,6 +417,7 @@
+@@ -416,6 +417,7 @@ hal_udi_is_ipod (const char *udi)
result = FALSE;
dbus_error_init (&error);
@@ -281,7 +261,7 @@
conn = NULL;
parent_udi = NULL;
methods_list = NULL;
-@@ -436,6 +438,10 @@
+@@ -436,6 +438,10 @@ hal_udi_is_ipod (const char *udi)
if (!libhal_ctx_init (ctx, &error) || dbus_error_is_set (&error))
goto end;
@@ -292,7 +272,7 @@
inited = TRUE;
parent_udi = libhal_device_get_property_string (ctx, udi,
"info.parent", &error);
-@@ -453,6 +459,7 @@
+@@ -453,6 +459,7 @@ hal_udi_is_ipod (const char *udi)
}
end:
@@ -300,7 +280,7 @@
g_free (parent_udi);
libhal_free_string_array (methods_list);
-@@ -476,24 +483,16 @@
+@@ -476,24 +483,16 @@ end:
gboolean
rb_ipod_helpers_is_ipod (GMount *mount)
{
Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -r1.240 -r1.241
--- rhythmbox.spec 9 Apr 2009 16:48:33 -0000 1.240
+++ rhythmbox.spec 9 Apr 2009 17:02:53 -0000 1.241
@@ -95,7 +95,7 @@
%patch0 -p0 -b .dont-disable-suspend
%patch1 -p0 -b .decodebin2
%patch2 -p1 -b .psp-crasher
-%patch3 -p0 -b .ddkit
+%patch3 -p1 -b .ddkit
# Use the installed louie, not the one in Coherence
find plugins/coherence/upnp_coherence/ -type f -exec sed -i 's/coherence.extern.louie as louie/louie/' '{}' ';'
More information about the fedora-extras-commits
mailing list