<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[140285] trunk/dports/gnome/grilo-plugins</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/140285">140285</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2015-09-16 08:17:25 -0700 (Wed, 16 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>grilo-plugins: update to version 0.2.15, dependencies, configuration, apply upstream build fixes, GOA support now disabled due to dependency on goa-1.0 >= 3.17.91.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegrilopluginsPortfile">trunk/dports/gnome/grilo-plugins/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegrilopluginsfilespatchluafactorywithgoadisableddiff">trunk/dports/gnome/grilo-plugins/files/patch-lua-factory-with-goa-disabled.diff</a></li>
<li><a href="#trunkdportsgnomegrilopluginsfilespatchrequiresgoa31791diff">trunk/dports/gnome/grilo-plugins/files/patch-requires-goa-3.17.91.diff</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunkdportsgnomegriloplugins">trunk/dports/gnome/grilo-plugins/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgnomegriloplugins"></a>
<div class="propset"><h4>Property changes: trunk/dports/gnome/grilo-plugins</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/grilo-plugins:117700-118151
</span><span class="cx"> + /users/devans/GNOME-3/stable/dports/gnome/grilo-plugins:118155-140226
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/grilo-plugins:117700-118151
</span><a id="trunkdportsgnomegrilopluginsPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/grilo-plugins/Portfile (140284 => 140285)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/grilo-plugins/Portfile 2015-09-16 15:03:55 UTC (rev 140284)
+++ trunk/dports/gnome/grilo-plugins/Portfile 2015-09-16 15:17:25 UTC (rev 140285)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> PortGroup compiler_blacklist_versions 1.0
</span><span class="cx">
</span><span class="cx"> name grilo-plugins
</span><del>-version 0.2.14
</del><ins>+version 0.2.15
</ins><span class="cx"> license LGPL-2.1
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description Framework for discovering and browsing media - Plugins.
</span><span class="lines">@@ -20,8 +20,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 8ec4a1f6afe2daeaa392133d3956cdf110d77d90 \
- sha256 d0f18116675058c7e8c178b1fe26d6d73998a0452f85a73b1696df740c83d3ab
</del><ins>+checksums rmd160 debff6129149be40b2543448625a95d19ac1a74e \
+ sha256 9806a08f9b731f2b092acfc596aef21bf8ba47d8c671c5773d2dc3d65dc89e20
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><span class="lines">@@ -35,7 +35,6 @@
</span><span class="cx"> depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span class="cx"> port:libxml2 \
</span><span class="cx"> port:grilo \
</span><del>- port:gnome-online-accounts \
</del><span class="cx"> port:totem-pl-parser \
</span><span class="cx"> port:libgdata \
</span><span class="cx"> port:libmediaart \
</span><span class="lines">@@ -46,6 +45,9 @@
</span><span class="cx"> port:json-glib \
</span><span class="cx"> port:avahi
</span><span class="cx">
</span><ins>+patchfiles patch-requires-goa-3.17.91.diff \
+ patch-lua-factory-with-goa-disabled.diff
+
</ins><span class="cx"> # reconfigure using upstream autogen.sh for intltool 0.51 compatibility
</span><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="lines">@@ -61,38 +63,38 @@
</span><span class="cx"> compiler.blacklist *gcc* {clang < 300}
</span><span class="cx">
</span><span class="cx"> configure.args --disable-silent-rules \
</span><ins>+ --disable-debug \
</ins><span class="cx"> --enable-compile-warnings=no \
</span><del>- --disable-debug \
- --enable-goa \
</del><span class="cx"> --enable-filesystem \
</span><span class="cx"> --enable-optical-media \
</span><span class="cx"> --enable-jamendo \
</span><span class="cx"> --enable-lastfm-albumart \
</span><span class="cx"> --enable-youtube \
</span><span class="cx"> --enable-flickr \
</span><del>- --disable-pocket \
</del><span class="cx"> --enable-podcasts \
</span><del>- --disable-bookmarks \
</del><span class="cx"> --enable-shoutcast \
</span><span class="cx"> --enable-apple-trailers \
</span><span class="cx"> --enable-magnatune \
</span><span class="cx"> --enable-metadata-store \
</span><span class="cx"> --enable-vimeo \
</span><span class="cx"> --enable-gravatar \
</span><del>- --disable-tracker \
</del><span class="cx"> --enable-bliptv \
</span><span class="cx"> --enable-raitv \
</span><span class="cx"> --enable-localmetadata \
</span><del>- --disable-dmap \
</del><span class="cx"> --enable-tmdb \
</span><span class="cx"> --enable-freebox \
</span><del>- --disable-dleyna
</del><ins>+ --disable-dleyna \
+ --disable-goa \
+ --disable-pocket \
+ --disable-bookmarks \
+ --disable-dmap \
+ --disable-tracker
</ins><span class="cx">
</span><del>-# --enable-pocket \ # requires goa-1.0 >= 3.11.4
-# --enable-tracker \
</del><span class="cx"> # --enable-dmap \ # apparently there is a bug in libdmapsharing
</span><span class="cx"> # --enable-bookmarks \ # requires gom
</span><span class="cx"> # --enable-dleyna \ # requires python-dbusmock
</span><ins>+# --enable-goa \ # as of grilo-plugins 0.2.15 requires goa-1.0 >= 3.17.91
+# --enable-pocket \ # requires goa
+# --enable-tracker \
</ins><span class="cx">
</span><span class="cx"> livecheck.type gnome
</span><del>-
</del></span></pre></div>
<a id="trunkdportsgnomegrilopluginsfilespatchluafactorywithgoadisableddifffromrev140226usersdevansGNOME3stabledportsgnomegrilopluginsfilespatchluafactorywithgoadisableddiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/gnome/grilo-plugins/files/patch-lua-factory-with-goa-disabled.diff (from rev 140226, users/devans/GNOME-3/stable/dports/gnome/grilo-plugins/files/patch-lua-factory-with-goa-disabled.diff) (0 => 140285)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/grilo-plugins/files/patch-lua-factory-with-goa-disabled.diff (rev 0)
+++ trunk/dports/gnome/grilo-plugins/files/patch-lua-factory-with-goa-disabled.diff 2015-09-16 15:17:25 UTC (rev 140285)
</span><span class="lines">@@ -0,0 +1,91 @@
</span><ins>+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
</ins></span></pre></div>
<a id="trunkdportsgnomegrilopluginsfilespatchrequiresgoa31791difffromrev140226usersdevansGNOME3stabledportsgnomegrilopluginsfilespatchrequiresgoa31791diff"></a>
<div class="copfile"><h4>Copied: trunk/dports/gnome/grilo-plugins/files/patch-requires-goa-3.17.91.diff (from rev 140226, users/devans/GNOME-3/stable/dports/gnome/grilo-plugins/files/patch-requires-goa-3.17.91.diff) (0 => 140285)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/grilo-plugins/files/patch-requires-goa-3.17.91.diff (rev 0)
+++ trunk/dports/gnome/grilo-plugins/files/patch-requires-goa-3.17.91.diff 2015-09-16 15:17:25 UTC (rev 140285)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- 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)
+
</ins></span></pre>
</div>
</div>
</body>
</html>