From 6424bf91586d00a5f15174e58048fd9d3a10fe83 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Dec 18 2015 21:10:57 +0000 Subject: Build with grilo 0.3 --- diff --git a/0001-Update-to-grilo-0.3.patch b/0001-Update-to-grilo-0.3.patch new file mode 100644 index 0000000..7b35ebb --- /dev/null +++ b/0001-Update-to-grilo-0.3.patch @@ -0,0 +1,48 @@ +From ef859b37f53e97b593365b6bd2a5c74bd271ebf1 Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro +Date: Sat, 24 Oct 2015 20:30:58 -0500 +Subject: [PATCH 1/2] Update to grilo-0.3 + +--- + configure.ac | 4 ++-- + src/gom-flickr-miner.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 1ef4cfd..279971d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -23,7 +23,7 @@ GDATA_MIN_VERSION=0.15.2 + GFBGRAPH_MIN_VERSION=0.2.2 + GLIB_MIN_VERSION=2.35.1 + GOA_MIN_VERSION=3.13.3 +-GRILO_MIN_VERSION=0.2.6 ++GRILO_MIN_VERSION=0.3.0 + ZAPOJIT_MIN_VERSION=0.0.2 + + GNOME_COMPILE_WARNINGS([maximum]) +@@ -50,7 +50,7 @@ AM_CONDITIONAL(BUILD_FACEBOOK, [test x$enable_facebook != xno]) + # Flickr + AC_ARG_ENABLE([flickr], [AS_HELP_STRING([--enable-flickr], [Enable Flickr miner])], [], [enable_flickr=yes]) + if test "$enable_flickr" != "no"; then +- PKG_CHECK_MODULES(GRILO, [grilo-0.2 >= $GRILO_MIN_VERSION]) ++ PKG_CHECK_MODULES(GRILO, [grilo-0.3 >= $GRILO_MIN_VERSION]) + fi + AM_CONDITIONAL(BUILD_FLICKR, [test x$enable_flickr != xno]) + +diff --git a/src/gom-flickr-miner.c b/src/gom-flickr-miner.c +index 6e67ac3..199f880 100644 +--- a/src/gom-flickr-miner.c ++++ b/src/gom-flickr-miner.c +@@ -88,7 +88,7 @@ get_grl_options (GrlSource *source) + + g_return_val_if_fail (opts != NULL, NULL); + +- grl_operation_options_set_flags (opts, GRL_RESOLVE_FAST_ONLY); ++ grl_operation_options_set_resolution_flags (opts, GRL_RESOLVE_FAST_ONLY); + + return opts; + } +-- +2.5.0 + diff --git a/0002-flickr-use-the-new-API-from-grilo-0.3.patch b/0002-flickr-use-the-new-API-from-grilo-0.3.patch new file mode 100644 index 0000000..efe36fc --- /dev/null +++ b/0002-flickr-use-the-new-API-from-grilo-0.3.patch @@ -0,0 +1,59 @@ +From d2d0da90288a46cd51f92dc6c9859dfea4ac71de Mon Sep 17 00:00:00 2001 +From: "Juan A. Suarez Romero" +Date: Fri, 18 Dec 2015 18:52:24 +0100 +Subject: [PATCH 2/2] flickr: use the new API from grilo 0.3. + +--- + src/gom-flickr-miner.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/src/gom-flickr-miner.c b/src/gom-flickr-miner.c +index 199f880..19667d0 100644 +--- a/src/gom-flickr-miner.c ++++ b/src/gom-flickr-miner.c +@@ -109,19 +109,19 @@ account_miner_job_process_entry (GomAccountMinerJob *job, + gboolean resource_exists, mtime_changed; + gint64 new_mtime; + +- if (op_type == OP_CREATE_HIEARCHY && entry->parent == NULL && !GRL_IS_MEDIA_BOX (entry->media)) ++ if (op_type == OP_CREATE_HIEARCHY && entry->parent == NULL && !grl_media_is_container (entry->media)) + return TRUE; + + id = grl_media_get_id (entry->media); + identifier = g_strdup_printf ("%sflickr:%s", +- GRL_IS_MEDIA_BOX (entry->media) ? ++ grl_media_is_container (entry->media) ? + "photos:collection:" : "", + id); + + /* remove from the list of the previous resources */ + g_hash_table_remove (job->previous_resources, identifier); + +- if (GRL_IS_MEDIA_BOX (entry->media)) ++ if (grl_media_is_container (entry->media)) + class = "nfo:DataContainer"; + else + class = "nmm:Photo"; +@@ -307,7 +307,7 @@ source_browse_cb (GrlSource *source, + g_error_free (local_error); + } + +- if (GRL_IS_MEDIA_BOX (media)) ++ if (grl_media_is_container (media)) + g_queue_push_tail (self->priv->boxes, entry); + else + free_entry (entry); +@@ -551,8 +551,9 @@ gom_flickr_miner_class_init (GomFlickrMinerClass *klass) + + grl_init (NULL, NULL); + registry = grl_registry_get_default (); ++ grl_registry_load_all_plugins (registry, FALSE, &error); + +- if (!grl_registry_load_plugin_by_id (registry, "grl-flickr", &error)) ++ if (error || !grl_registry_activate_plugin_by_id (registry, "grl-flickr", &error)) + { + g_error ("%s", error->message); + g_error_free (error); +-- +2.5.0 + diff --git a/gnome-online-miners.spec b/gnome-online-miners.spec index 424e590..1533889 100644 --- a/gnome-online-miners.spec +++ b/gnome-online-miners.spec @@ -4,21 +4,28 @@ Name: gnome-online-miners Version: 3.14.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Crawls through your online content License: GPLv2+ and LGPLv2+ and MIT URL: https://wiki.gnome.org/Projects/GnomeOnlineMiners Source0: http://download.gnome.org/sources/%{name}/3.14/%{name}-%{version}.tar.xz +Patch0: 0001-Update-to-grilo-0.3.patch +Patch1: 0002-flickr-use-the-new-API-from-grilo-0.3.patch + BuildRequires: gfbgraph-devel BuildRequires: glib2-devel >= 2.35.1 BuildRequires: gnome-online-accounts-devel >= 3.8.0 -BuildRequires: grilo-devel >= 0.2.6 +BuildRequires: grilo-devel >= 0.3.0 BuildRequires: libgdata-devel >= 0.15.2 BuildRequires: libzapojit-devel >= 0.0.2 BuildRequires: pkgconfig BuildRequires: tracker-devel >= 0.17.2 +# For patch0 +BuildRequires: autoconf automake libtool +BuildRequires: gnome-common + Requires: dbus Requires: grilo-plugins Requires: gvfs >= 1.18.3 @@ -31,9 +38,14 @@ Google and OneDrive. %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build +# For patch0 +autoreconf -fi + %configure \ --disable-silent-rules \ --disable-static @@ -72,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name} %changelog +* Fri Dec 18 2015 Kalev Lember - 3.14.3-4 +- Build with grilo 0.3 + * Wed Jun 17 2015 Fedora Release Engineering - 3.14.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild