Author: biebl
Date: Tue Apr 19 15:17:00 2016
New Revision: 48262
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=48262
Log:
Refresh grilo-0.3.patch
Modified:
packages/unstable/rhythmbox/debian/patches/grilo-0.3.patch
Modified: packages/unstable/rhythmbox/debian/patches/grilo-0.3.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/patches/grilo-0.3.patch?rev=48262&op=diff
==============================================================================
--- packages/unstable/rhythmbox/debian/patches/grilo-0.3.patch [utf-8] (original)
+++ packages/unstable/rhythmbox/debian/patches/grilo-0.3.patch [utf-8] Tue Apr 19 15:17:00 2016
@@ -10,11 +10,11 @@
plugins/grilo/rb-grilo-source.c | 10 +++++-----
3 files changed, 8 insertions(+), 8 deletions(-)
-diff --git a/configure.ac b/configure.ac
-index 4457182..1929905 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -54,7 +54,7 @@ LIBSOUP_REQS=2.34.0
+Index: rhythmbox-3.3.1/configure.ac
+===================================================================
+--- rhythmbox-3.3.1.orig/configure.ac 2016-04-19 17:00:55.903833675 +0200
++++ rhythmbox-3.3.1/configure.ac 2016-04-19 17:00:55.899833374 +0200
+@@ -54,7 +54,7 @@
GUDEV_REQS=143
LIBMTP_REQS=0.3.0
LIBPEAS_REQS=0.7.3
@@ -23,7 +23,7 @@
LIBXML2_REQS=2.7.8
LIBSECRET_REQS=0.18
-@@ -714,7 +714,7 @@ AC_ARG_ENABLE(grilo,
+@@ -722,7 +722,7 @@
[Disable Grilo support]),,
enable_grilo=auto)
if test "x$enable_grilo" != "xno"; then
@@ -32,11 +32,11 @@
if test "x$have_grilo" = "xno" -a "x$enable_grilo" = "xyes"; then
AC_MSG_ERROR([Grilo support explicitly requested, but grilo couldn not be found])
fi
-diff --git a/plugins/grilo/rb-grilo-plugin.c b/plugins/grilo/rb-grilo-plugin.c
-index 2816be2..5c56b93 100644
---- a/plugins/grilo/rb-grilo-plugin.c
-+++ b/plugins/grilo/rb-grilo-plugin.c
-@@ -213,7 +213,7 @@ impl_activate (PeasActivatable *plugin)
+Index: rhythmbox-3.3.1/plugins/grilo/rb-grilo-plugin.c
+===================================================================
+--- rhythmbox-3.3.1.orig/plugins/grilo/rb-grilo-plugin.c 2016-04-19 17:00:55.903833675 +0200
++++ rhythmbox-3.3.1/plugins/grilo/rb-grilo-plugin.c 2016-04-19 17:00:55.899833374 +0200
+@@ -213,7 +213,7 @@
pi->registry = grl_registry_get_default ();
g_signal_connect (pi->registry, "source-added", G_CALLBACK (grilo_source_added_cb), pi);
g_signal_connect (pi->registry, "source-removed", G_CALLBACK (grilo_source_removed_cb), pi);
@@ -45,11 +45,11 @@
g_warning ("Failed to load Grilo plugins: %s", error->message);
g_clear_error (&error);
}
-diff --git a/plugins/grilo/rb-grilo-source.c b/plugins/grilo/rb-grilo-source.c
-index 103e06b..22a9d11 100644
---- a/plugins/grilo/rb-grilo-source.c
-+++ b/plugins/grilo/rb-grilo-source.c
-@@ -524,7 +524,7 @@ make_operation_options (RBGriloSource *source, GrlSupportedOps op, int position)
+Index: rhythmbox-3.3.1/plugins/grilo/rb-grilo-source.c
+===================================================================
+--- rhythmbox-3.3.1.orig/plugins/grilo/rb-grilo-source.c 2016-04-19 17:00:55.903833675 +0200
++++ rhythmbox-3.3.1/plugins/grilo/rb-grilo-source.c 2016-04-19 17:00:55.899833374 +0200
+@@ -524,7 +524,7 @@
grl_operation_options_set_count (options,
CONTAINER_FETCH_SIZE);
grl_operation_options_set_type_filter (options, GRL_TYPE_FILTER_AUDIO);
@@ -58,7 +58,7 @@
return options;
}
-@@ -684,7 +684,7 @@ grilo_browse_cb (GrlSource *grilo_source, guint operation_id, GrlMedia *media, g
+@@ -684,7 +684,7 @@
source->priv->browse_position++;
}
@@ -67,7 +67,7 @@
GtkTreeIter new_row;
if (source->priv->browse_container == NULL) {
-@@ -724,7 +724,7 @@ grilo_browse_cb (GrlSource *grilo_source, guint operation_id, GrlMedia *media, g
+@@ -724,7 +724,7 @@
2, CONTAINER_MARKER,
3, 0,
-1);
@@ -76,7 +76,7 @@
source->priv->browse_got_media = TRUE;
}
-@@ -854,7 +854,7 @@ grilo_media_browse_cb (GrlSource *grilo_source, guint operation_id, GrlMedia *me
+@@ -854,7 +854,7 @@
source->priv->media_browse_got_results = TRUE;
source->priv->media_browse_position++;
@@ -85,7 +85,7 @@
RhythmDBEntry *entry;
entry = create_entry_for_media (source->priv->db,
source->priv->entry_type,
-@@ -863,7 +863,7 @@ grilo_media_browse_cb (GrlSource *grilo_source, guint operation_id, GrlMedia *me
+@@ -863,7 +863,7 @@
if (entry != NULL) {
rhythmdb_query_model_add_entry (source->priv->query_model, entry, -1);
}
@@ -94,5 +94,3 @@
source->priv->media_browse_got_containers = TRUE;
}
}
---
-2.5.0