[140867] trunk/dports/gnome/grilo-plugins

4 Oct 2015

Revision: 140867
          https://trac.macports.org/changeset/140867
Author:   devans@macports.org
Date:     2015-10-04 12:18:37 -0700 (Sun, 04 Oct 2015)
Log Message:
-----------
grilo-plugins: update to version 0.2.16, apple-trailers, pocket now part of lua-factory, bliptv is gone.

Modified Paths:
--------------
    trunk/dports/gnome/grilo-plugins/Portfile

Removed Paths:
-------------
    trunk/dports/gnome/grilo-plugins/files/patch-lua-factory-with-goa-disabled.diff
    trunk/dports/gnome/grilo-plugins/files/patch-requires-goa-3.17.91.diff

Property Changed:
----------------
    trunk/dports/gnome/grilo-plugins/


Property changes on: trunk/dports/gnome/grilo-plugins
___________________________________________________________________
Modified: svn:mergeinfo
   - /users/devans/GNOME-3/stable/dports/gnome/grilo-plugins:118155-140226
/users/devans/GNOME-3/unstable/dports/gnome/grilo-plugins:117700-118151
   + /users/devans/GNOME-3/stable/dports/gnome/grilo-plugins:118155-140741
/users/devans/GNOME-3/unstable/dports/gnome/grilo-plugins:117700-118151

Modified: trunk/dports/gnome/grilo-plugins/Portfile
===================================================================

--- trunk/dports/gnome/grilo-plugins/Portfile	2015-10-04 19:17:03 UTC (rev 140866)
+++ trunk/dports/gnome/grilo-plugins/Portfile	2015-10-04 19:18:37 UTC (rev 140867)
@@ -5,7 +5,7 @@
 PortGroup           compiler_blacklist_versions 1.0
 
 name                grilo-plugins
-version             0.2.15
+version             0.2.16
 license             LGPL-2.1
 set branch          [join [lrange [split ${version} .] 0 1] .]
 description         Framework for discovering and browsing media - Plugins.
@@ -20,8 +20,8 @@
 
 use_xz              yes
 
-checksums           rmd160  debff6129149be40b2543448625a95d19ac1a74e \
-                    sha256  9806a08f9b731f2b092acfc596aef21bf8ba47d8c671c5773d2dc3d65dc89e20
+checksums           rmd160  f6611c42e0b29cae93032f143da9b649dd7ab347 \
+                    sha256  80b4571f9db6df0d5f0873d30f2ee475204f5831d2974b89c58423d6ffac5203
 
 depends_build       port:pkgconfig \
                     port:intltool \
@@ -45,9 +45,6 @@
                     port:json-glib \
                     port:avahi
 
-patchfiles          patch-requires-goa-3.17.91.diff \
-                    patch-lua-factory-with-goa-disabled.diff
-
 # reconfigure using upstream autogen.sh for intltool 0.51 compatibility
 
 post-patch {
@@ -73,19 +70,16 @@
                     --enable-flickr \
                     --enable-podcasts \
                     --enable-shoutcast \
-                    --enable-apple-trailers \
                     --enable-magnatune \
                     --enable-metadata-store \
                     --enable-vimeo \
                     --enable-gravatar \
-                    --enable-bliptv \
                     --enable-raitv \
                     --enable-localmetadata \
                     --enable-tmdb \
                     --enable-freebox \
                     --disable-dleyna \
                     --disable-goa \
-                    --disable-pocket \
                     --disable-bookmarks \
                     --disable-dmap \
                     --disable-tracker
@@ -94,7 +88,6 @@
 #                    --enable-bookmarks \ # requires gom
 #                    --enable-dleyna \ # requires python-dbusmock
 #                    --enable-goa \ # as of grilo-plugins 0.2.15 requires goa-1.0 >= 3.17.91
-#                    --enable-pocket \ # requires goa
 #                    --enable-tracker \
 
 livecheck.type      gnome

Deleted: trunk/dports/gnome/grilo-plugins/files/patch-lua-factory-with-goa-disabled.diff
===================================================================
--- trunk/dports/gnome/grilo-plugins/files/patch-lua-factory-with-goa-disabled.diff	2015-10-04 19:17:03 UTC (rev 140866)
+++ trunk/dports/gnome/grilo-plugins/files/patch-lua-factory-with-goa-disabled.diff	2015-10-04 19:18:37 UTC (rev 140867)
@@ -1,91 +0,0 @@
-From 523fc0ec89c51d5c5c38cb60326ec2f3092fd9e6 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Thu, 10 Sep 2015 15:38:25 +0200
-Subject: [PATCH] lua-factory: Fix compilation with g-o-a disabled
-
-https://bugzilla.gnome.org/show_bug.cgi?id=754895
----
- src/lua-factory/grl-lua-factory.c | 8 ++++++++
- src/lua-factory/grl-lua-library.c | 7 +++----
- 2 files changed, 11 insertions(+), 4 deletions(-)
-
-diff --git a/src/lua-factory/grl-lua-factory.c b/src/lua-factory/grl-lua-factory.c
-index 1b18ca4..5d62656 100644
---- src/lua-factory/grl-lua-factory.c
-+++ src/lua-factory/grl-lua-factory.c
-@@ -272,7 +272,9 @@ static void
- grl_lua_factory_plugin_deinit (GrlPlugin *plugin)
- {
-   GCancellable *cancellable;
-+#ifdef GOA_ENABLED
-   GList *lua_init_sources, *it;
-+#endif
- 
-   cancellable = g_object_get_data (G_OBJECT (plugin), "cancellable");
-   if (cancellable) {
-@@ -281,11 +283,13 @@ grl_lua_factory_plugin_deinit (GrlPlugin *plugin)
-     g_object_set_data (G_OBJECT (plugin), "cancellable", NULL);
-   }
- 
-+#ifdef GOA_ENABLED
-   lua_init_sources = g_object_get_data (G_OBJECT (plugin), "lua-init-sources");
-   for (it = lua_init_sources; it != NULL; it = it->next)
-     grl_lua_goa_data_free (it->data);
-   g_list_free (lua_init_sources);
-   g_object_set_data (G_OBJECT (plugin), "lua-init-sources", NULL);
-+#endif
- }
- 
- GRL_PLUGIN_REGISTER (grl_lua_factory_plugin_init, grl_lua_factory_plugin_deinit, LUA_FACTORY_PLUGIN_ID);
-@@ -908,7 +912,9 @@ handle_goa_sources (GList  *lua_sources,
- 
-   for (it = lua_sources; it; it = g_list_next (it)) {
-     lua_State *L;
-+#ifdef GOA_ENABLED
-     GrlLuaGoaInitData *data;
-+#endif
-     const char *lua_account_provider;
-     const char *lua_account_feature;
-     int ret;
-@@ -980,12 +986,14 @@ handle_goa_sources (GList  *lua_sources,
-       continue;
-     }
- 
-+#ifdef GOA_ENABLED
-     data = g_new0 (GrlLuaGoaInitData, 1);
-     data->lua_source_path = g_strdup (it->data);
-     data->lua_account_provider = g_strdup (lua_account_provider);
-     data->lua_account_feature = g_strdup (lua_account_feature);
- 
-     new_goa_sources = g_list_prepend (new_goa_sources, data);
-+#endif
- 
-     lua_close (L);
-   }
-diff --git a/src/lua-factory/grl-lua-library.c b/src/lua-factory/grl-lua-library.c
-index b93260b..ed7130d 100644
---- src/lua-factory/grl-lua-library.c
-+++ src/lua-factory/grl-lua-library.c
-@@ -1321,7 +1321,7 @@ static gint
- grl_l_goa_consumer_key (lua_State *L)
- {
- #ifndef GOA_ENABLED
--  GRL_WARNING ("Source '%s' is broken as it tries to access gnome-online-accounts "
-+  GRL_WARNING ("Source is broken as it tries to access gnome-online-accounts "
-                "information, but it should not have been created");
-   return 0;
- #else
-@@ -1360,9 +1360,8 @@ static gint
- grl_l_goa_access_token (lua_State *L)
- {
- #ifndef GOA_ENABLED
--  GRL_WARNING ("Source '%s' is broken as it tries to access gnome-online-accounts "
--               "information, but it should not have been created",
--               grl_source_get_id (os->source));
-+  GRL_WARNING ("Source is broken as it tries to access gnome-online-accounts "
-+               "information, but it should not have been created");
-   return 0;
- #else
-   {
--- 
-2.4.3

Deleted: trunk/dports/gnome/grilo-plugins/files/patch-requires-goa-3.17.91.diff
===================================================================
--- trunk/dports/gnome/grilo-plugins/files/patch-requires-goa-3.17.91.diff	2015-10-04 19:17:03 UTC (rev 140866)
+++ trunk/dports/gnome/grilo-plugins/files/patch-requires-goa-3.17.91.diff	2015-10-04 19:18:37 UTC (rev 140867)
@@ -1,11 +0,0 @@
---- configure.ac.orig	2015-09-12 13:19:33.000000000 -0700
-+++ configure.ac	2015-09-12 13:20:09.000000000 -0700
-@@ -142,7 +142,7 @@
- 
- PKG_CHECK_MODULES(OAUTH, oauth, HAVE_OAUTH=yes, HAVE_OAUTH=no)
- 
--PKG_CHECK_MODULES(GOA, [goa-1.0 >= 3.7.2], HAVE_GOA=yes, HAVE_GOA=no)
-+PKG_CHECK_MODULES(GOA, [goa-1.0 >= 3.17.91], HAVE_GOA=yes, HAVE_GOA=no)
- 
- PKG_CHECK_MODULES(TOTEM_PL_PARSER, totem-plparser >= 3.4.1, HAVE_TOTEM_PL_PARSER=yes, HAVE_TOTEM_PL_PARSER=no)
-

    

devans＠macports.org

tags

participants (1)