[jhbuild] core-deps-3.0: Update Tracker to 0.10 branch and fix nautilus plugin



commit e7c4b981377460c25ee6031e2801c84fe2f33f2a
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Feb 24 02:53:54 2011 +0900

    core-deps-3.0: Update Tracker to 0.10 branch and fix nautilus plugin
    
    The nautilus plugin can be seen here:
    
      http://git.gnome.org/browse/tracker/commit/?id=440f7d72677ec1949af22afe273acf4dd43cac13
    
    It is not yet in a release for tracker so the patch is applied here instead.

 modulesets/gnome-suites-core-deps-3.0.modules      |   18 ++++----
 ...extension-dont-implement-get_toolbar_item.patch |   40 ++++++++++++++++++++
 2 files changed, 49 insertions(+), 9 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.0.modules b/modulesets/gnome-suites-core-deps-3.0.modules
index b40efaf..3f16012 100644
--- a/modulesets/gnome-suites-core-deps-3.0.modules
+++ b/modulesets/gnome-suites-core-deps-3.0.modules
@@ -1104,14 +1104,17 @@
     </suggests>
   </autotools>
 
-  <tarball id="tracker" version="0.9.36"
-           autogenargs="--enable-miner-evolution=no --disable-unit-tests">
+  <autotools id="tracker" skip-autogen="never" autogen-sh="configure" autogenargs="--enable-miner-evolution=no --disable-unit-tests" check-target="false">
+    <branch module="tracker/0.10/tracker-0.10.0.tar.bz2" version="1.10.0" repo="gnome.org"
+            hash="sha256:f50724501204801ffcc4916b873edac07ef7c7bc7666cddb381ecb2edd61a9cd"
+            md5sum="03084485bdc91af0924121950e3f20db" size="8014824">
+
+      <patch file="tracker-nautilus-extension-dont-implement-get_toolbar_item.patch" strip="1" />
+    </branch>
+
     <!-- unit tests are broken:
     ld: tracker-sparql-test.o: undefined reference to symbol 'g_object_unref'
     -->
-    <source href="http://download.gnome.org/sources/tracker/0.9/tracker-0.9.36.tar.bz2";
-            hash="sha256:705b848f8e21f0ca37b1a181575ac82ae98bb17a8fd206dfd48d7e1d2919ce60"
-            md5sum="74d9cda375aae6ec528f911369ef4ccb" size="7178213"/>
     <dependencies>
       <dep package="dbus-glib"/>
       <dep package="nautilus"/>
@@ -1128,10 +1131,7 @@
       <dep package="libgsf"/>
       <dep package="gdk-pixbuf"/>
     </suggests>
-    <after>
-      <dep package="deskbar-applet"/>
-    </after>
-  </tarball>
+  </autotools>
 
   <tarball id="vala" version="0.11.6" autogenargs="--enable-vapigen">
     <source href="http://download.gnome.org/sources/vala/0.11/vala-0.11.6.tar.bz2";
diff --git a/patches/tracker-nautilus-extension-dont-implement-get_toolbar_item.patch b/patches/tracker-nautilus-extension-dont-implement-get_toolbar_item.patch
new file mode 100644
index 0000000..eeb6e80
--- /dev/null
+++ b/patches/tracker-nautilus-extension-dont-implement-get_toolbar_item.patch
@@ -0,0 +1,40 @@
+From 440f7d72677ec1949af22afe273acf4dd43cac13 Mon Sep 17 00:00:00 2001
+From: Cosimo Cecchi <cosimoc gnome org>
+Date: Wed, 23 Feb 2011 11:44:32 -0500
+Subject: [PATCH 2/5] nautilus-extension: don't implement _get_toolbar_items()
+
+It got removed from nautilus 2.91.90, and that code does nothing anyway.
+---
+ src/plugins/nautilus/tracker-tags-extension.c |    9 ---------
+ 1 files changed, 0 insertions(+), 9 deletions(-)
+
+diff --git a/src/plugins/nautilus/tracker-tags-extension.c b/src/plugins/nautilus/tracker-tags-extension.c
+index 6331667..e505f77 100644
+--- a/src/plugins/nautilus/tracker-tags-extension.c
++++ b/src/plugins/nautilus/tracker-tags-extension.c
+@@ -206,14 +206,6 @@ extension_get_file_items (NautilusMenuProvider *provider,
+ }
+ 
+ static GList *
+-extension_get_toolbar_items (NautilusMenuProvider *provider,
+-                             GtkWidget            *window,
+-                             NautilusFileInfo     *current_folder)
+-{
+-	return NULL;
+-}
+-
+-static GList *
+ extension_get_pages (NautilusPropertyPageProvider *provider,
+                      GList                        *files)
+ {
+@@ -238,7 +230,6 @@ static void
+ tracker_tags_extension_menu_provider_iface_init (NautilusMenuProviderIface *iface)
+ {
+ 	iface->get_file_items = extension_get_file_items;
+-	iface->get_toolbar_items = extension_get_toolbar_items;
+ 
+ 	if (0) {
+ 		iface->get_background_items = extension_get_background_items;
+-- 
+1.7.1
+



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]