r41670 - /desktop/unstable/gnome-documents/debian/patches/01-tracker-1.0.patch

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sat May 10 01:22:55 2014
New Revision: 41670

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=41670
Log:
A few more fixes for the tracker 1.0 patch

Fix building the miners which have not yet been split out in 3.8.

Modified:
    desktop/unstable/gnome-documents/debian/patches/01-tracker-1.0.patch

Modified: desktop/unstable/gnome-documents/debian/patches/01-tracker-1.0.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-documents/debian/patches/01-tracker-1.0.patch?rev=41670&op=diff
==============================================================================
--- desktop/unstable/gnome-documents/debian/patches/01-tracker-1.0.patch	[utf-8] (original)
+++ desktop/unstable/gnome-documents/debian/patches/01-tracker-1.0.patch	[utf-8] Sat May 10 01:22:55 2014
@@ -1,5 +1,5 @@
 diff --git a/configure.ac b/configure.ac
-index 3404888..89298ea 100644
+index 3404888..40ffbf7 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -66,7 +66,7 @@ GTK_MIN_VERSION=3.7.7
@@ -11,7 +11,7 @@
  ZAPOJIT_MIN_VERSION=0.0.2
  SOUP_MIN_VERSION=2.41.3
  
-@@ -82,8 +82,8 @@ PKG_CHECK_MODULES(DOCUMENTS,
+@@ -82,15 +82,15 @@ PKG_CHECK_MODULES(DOCUMENTS,
                    gtk+-3.0 >= $GTK_MIN_VERSION
                    libsoup-2.4 >= $SOUP_MIN_VERSION
                    gnome-desktop-3.0
@@ -22,6 +22,14 @@
                    goa-1.0 >= $GOA_MIN_VERSION
                    libgdata >= $GDATA_MIN_VERSION
                    zapojit-0.0 >= $ZAPOJIT_MIN_VERSION
+                   egg-list-box)
+ 
+ PKG_CHECK_MODULES(MINER,
+-                  tracker-sparql-0.16 >= $TRACKER_MIN_VERSION
++                  tracker-sparql-1.0 >= $TRACKER_MIN_VERSION
+                   glib-2.0 >= $GLIB_MIN_VERSION
+                   gio-2.0 >= $GLIB_MIN_VERSION
+                   goa-1.0 >= $GOA_MIN_VERSION
 diff --git a/src/Makefile-lib.am b/src/Makefile-lib.am
 index 6b7385f..51347b5 100644
 --- a/src/Makefile-lib.am
@@ -68,14 +76,15 @@
          let languages = GLib.get_language_names();
          let files = languages.map(
 diff --git a/src/lib/gd-utils.h b/src/lib/gd-utils.h
-index fe0bb6a..5595761 100644
+index fe0bb6a..71e61d0 100644
 --- a/src/lib/gd-utils.h
 +++ b/src/lib/gd-utils.h
-@@ -24,7 +24,6 @@
+@@ -24,7 +24,7 @@
  
  #include <gtk/gtk.h>
  #include <evince-view.h>
 -#include <libtracker-miner/tracker-miner.h>
++#include <libtracker-control/tracker-control.h>
  
  void gd_queue_thumbnail_job_for_file_async (GFile *file,
                                              GAsyncReadyCallback callback,