grilo-plugins: Fix "format not a string literal" errors.

Disable the bliptv plugin, the service has been shut down.

4 files changed, 141 insertions, 5 deletions

diff --git a/net/grilo-plugins/Makefile b/net/grilo-plugins/Makefile
index c75fe071852..eb5ef513282 100644
--- a/net/grilo-plugins/Makefile
+++ b/net/grilo-plugins/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2018/07/20 03:34:23 ryoon Exp $
+# $NetBSD: Makefile,v 1.27 2018/07/31 14:27:35 jperkin Exp $
 #
 
 DISTNAME=	grilo-plugins-0.2.9
@@ -16,6 +16,8 @@ GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config intltool xgettext
 
+CONFIGURE_ARGS+=	--disable-bliptv
+
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../net/grilo/buildlink3.mk"
 .include "../../net/gupnp/buildlink3.mk"
diff --git a/net/grilo-plugins/PLIST b/net/grilo-plugins/PLIST
index 317389e00e0..512bd930ae5 100644
--- a/net/grilo-plugins/PLIST
+++ b/net/grilo-plugins/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.5 2014/02/05 17:38:32 drochner Exp $
+@comment $NetBSD: PLIST,v 1.6 2018/07/31 14:27:35 jperkin Exp $
 lib/grilo-0.2/grl-apple-trailers.xml
-lib/grilo-0.2/grl-bliptv.xml
 lib/grilo-0.2/grl-bookmarks.xml
 lib/grilo-0.2/grl-filesystem.xml
 lib/grilo-0.2/grl-gravatar.xml
@@ -16,7 +15,6 @@ lib/grilo-0.2/grl-shoutcast.xml
 lib/grilo-0.2/grl-upnp.xml
 lib/grilo-0.2/grl-vimeo.xml
 lib/grilo-0.2/libgrlappletrailers.la
-lib/grilo-0.2/libgrlbliptv.la
 lib/grilo-0.2/libgrlbookmarks.la
 lib/grilo-0.2/libgrlfilesystem.la
 lib/grilo-0.2/libgrlgravatar.la
diff --git a/net/grilo-plugins/distinfo b/net/grilo-plugins/distinfo
index 7b0659d9f98..8da30436ee1 100644
--- a/net/grilo-plugins/distinfo
+++ b/net/grilo-plugins/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.6 2015/11/04 00:35:03 agc Exp $
+$NetBSD: distinfo,v 1.7 2018/07/31 14:27:35 jperkin Exp $
 
 SHA1 (grilo-plugins-0.2.9.tar.xz) = 4e16f3db4273ab8029642edb83de4abb08515205
 RMD160 (grilo-plugins-0.2.9.tar.xz) = 76338353548e4bdaa0c29e5eca873f0cc49cabca
 SHA512 (grilo-plugins-0.2.9.tar.xz) = 0fa558c5650ebbe963b6553b93efd03319c21c7b4d410a5186d3f5e25cd195fd2cd531b6142272d09ad4fcf996dd070be34d06910cfeb8484b5e9d7a8157669f
 Size (grilo-plugins-0.2.9.tar.xz) = 595308 bytes
+SHA1 (patch-src_jamendo_grl-jamendo.c) = 501719b611db7b146dfb4a265ce955a7f4e55ade
diff --git a/net/grilo-plugins/patches/patch-src_jamendo_grl-jamendo.c b/net/grilo-plugins/patches/patch-src_jamendo_grl-jamendo.c
new file mode 100644
index 00000000000..91b16ac8fde
--- /dev/null
+++ b/net/grilo-plugins/patches/patch-src_jamendo_grl-jamendo.c
@@ -0,0 +1,135 @@
+$NetBSD: patch-src_jamendo_grl-jamendo.c,v 1.1 2018/07/31 14:27:35 jperkin Exp $
+
+Apply upstream "format not a string literal" fixes.
+
+--- src/jamendo/grl-jamendo.c.orig	2018-07-31 14:15:42.805159862 +0000
++++ src/jamendo/grl-jamendo.c
+@@ -141,10 +141,12 @@ typedef struct {
+   gboolean cancelled;
+ } XmlParseEntries;
+ 
++/* Note: you'll also need to update
++ * grl_jamendo_source_browse() */
+ struct Feeds {
+   gchar *name;
+   JamendoCategory cat;
+-  gchar *url;
++  const gchar *url;
+ } feeds[] = {
+   { N_("Albums of the week"), JAMENDO_ALBUM_CAT,
+     JAMENDO_GET_ALBUMS "&order=ratingweek_desc", },
+@@ -1170,10 +1172,46 @@ grl_jamendo_source_browse (GrlSource *so
+ 
+         feed_id = atoi (container_split[1]);
+         jamendo_keys = get_jamendo_keys (feeds[feed_id].cat);
+-        url = g_strdup_printf (feeds[feed_id].url,
+-                               jamendo_keys,
+-                               page_size,
+-                               page_number);
++        switch (feed_id) {
++        case 0:
++          url = g_strdup_printf (JAMENDO_GET_ALBUMS "&order=ratingweek_desc",
++                                 jamendo_keys,
++                                 page_size,
++                                 page_number);
++          break;
++        case 1:
++          url = g_strdup_printf (JAMENDO_GET_TRACKS "&order=ratingweek_desc",
++                                 jamendo_keys,
++                                 page_size,
++                                 page_number);
++          break;
++        case 2:
++          url = g_strdup_printf (JAMENDO_GET_TRACKS "&order=releasedate_desc",
++                                 jamendo_keys,
++                                 page_size,
++                                 page_number);
++          break;
++        case 3:
++          url = g_strdup_printf (JAMENDO_GET_ARTISTS "&order=rating_desc",
++                                 jamendo_keys,
++                                 page_size,
++                                 page_number);
++          break;
++        case 4:
++          url = g_strdup_printf (JAMENDO_GET_ALBUMS "&order=rating_desc",
++                                 jamendo_keys,
++                                 page_size,
++                                 page_number);
++          break;
++        case 5:
++          url = g_strdup_printf (JAMENDO_GET_TRACKS "&order=rating_desc",
++                                 jamendo_keys,
++                                 page_size,
++                                 page_number);
++          break;
++        default:
++          g_assert_not_reached ();
++        }
+         g_free (jamendo_keys);
+       } else {
+         send_feeds (bs);
+@@ -1232,7 +1270,6 @@ grl_jamendo_source_query (GrlSource *sou
+   gchar *term = NULL;
+   gchar *url;
+   gchar *jamendo_keys = NULL;
+-  gchar *query = NULL;
+   XmlParseEntries *xpe = NULL;
+   guint page_size;
+   guint page_number;
+@@ -1250,33 +1287,40 @@ grl_jamendo_source_query (GrlSource *sou
+     goto send_error;
+   }
+ 
++  grl_paging_translate (skip,
++                        count,
++                        0,
++                        &page_size,
++                        &page_number,
++                        &page_offset);
++
+   jamendo_keys = get_jamendo_keys (category);
+   switch (category) {
+   case JAMENDO_ARTIST_CAT:
+-    query = JAMENDO_SEARCH_ARTIST;
++    url = g_strdup_printf (JAMENDO_SEARCH_ARTIST,
++                           jamendo_keys,
++                           page_size,
++                           page_number,
++                           term);
+     break;
+   case JAMENDO_ALBUM_CAT:
+-    query = JAMENDO_SEARCH_ALBUM;
++    url = g_strdup_printf (JAMENDO_SEARCH_ALBUM,
++                           jamendo_keys,
++                           page_size,
++                           page_number,
++                           term);
+     break;
+   case JAMENDO_TRACK_CAT:
+-    query = JAMENDO_SEARCH_TRACK;
++    url = g_strdup_printf (JAMENDO_SEARCH_TRACK,
++                           jamendo_keys,
++                           page_size,
++                           page_number,
++                           term);
+     break;
+   default:
+     g_return_if_reached ();
+   }
+ 
+-  grl_paging_translate (skip,
+-                        count,
+-                        0,
+-                        &page_size,
+-                        &page_number,
+-                        &page_offset);
+-
+-  url = g_strdup_printf (query,
+-                         jamendo_keys,
+-                         page_size,
+-                         page_number,
+-                         term);
+   g_free (term);
+   g_free (jamendo_keys);
+