r23831 - /desktop/experimental/totem/debian/patches/02_tracker_0.8.patch
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Fri Apr 16 00:27:59 UTC 2010
Author: biebl
Date: Fri Apr 16 00:27:58 2010
New Revision: 23831
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23831
Log:
Actually add the patch...
Added:
desktop/experimental/totem/debian/patches/02_tracker_0.8.patch
Added: desktop/experimental/totem/debian/patches/02_tracker_0.8.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/patches/02_tracker_0.8.patch?rev=23831&op=file
==============================================================================
--- desktop/experimental/totem/debian/patches/02_tracker_0.8.patch (added)
+++ desktop/experimental/totem/debian/patches/02_tracker_0.8.patch [utf-8] Fri Apr 16 00:27:58 2010
@@ -1,0 +1,176 @@
+commit f0119f724c1c72cda08f324154a02fa83ab9fa30
+Author: Martyn Russell <martyn at lanedo.com>
+Date: Tue Apr 13 11:26:35 2010 +0100
+
+ Fixes bug #614839 - Tracker-Plugin: Migrate to Tracker 0.8
+
+ - Only shows count and results for videos that exist (i.e. not for
+ memory cards which are not mounted)
+ - Orders results by rank then by url
+ - Fixes includes
+ - Fixes configure.in to work with 0.8 and 0.9
+
+Index: b/configure.in
+===================================================================
+--- a/configure.in
++++ b/configure.in
+@@ -527,7 +527,11 @@
+ fi
+ ;;
+ tracker)
+- PKG_CHECK_MODULES(TRACKER, tracker-client-0.7 >= 0.7.1, [HAVE_TRACKER=yes], [HAVE_TRACKER=no])
++ PKG_CHECK_MODULES(TRACKER, tracker-client-0.8 >= 0.8.1, [HAVE_TRACKER=yes], [HAVE_TRACKER=no])
++ if test "${HAVE_TRACKER}" != "yes" ; then
++ PKG_CHECK_MODULES(TRACKER, tracker-client-0.9 >= 0.9.0, [HAVE_TRACKER=yes], [HAVE_TRACKER=no])
++ fi
++
+ if test "${HAVE_TRACKER}" != "yes" ; then
+ plugin_error_or_ignore "you need the tracker development headers installed for the tracker plugin"
+ add_plugin="0"
+Index: b/src/plugins/tracker/totem-tracker-widget.c
+===================================================================
+--- a/src/plugins/tracker/totem-tracker-widget.c
++++ b/src/plugins/tracker/totem-tracker-widget.c
+@@ -1,8 +1,9 @@
+ /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
+ *
+ * The _get_result_count method taken from the tracker-client.h file from libtracker
+- * Copyright (C) 2006, Mr Jamie McCracken (jamiemcc at gnome.org)
+- * Copyright (C) 2007 Javier Goday <jgoday at gmail.com>
++ * Copyright (C) 2006, Jamie McCracken <jamiemcc at gnome.org>
++ * Copyright (C) 2007, Javier Goday <jgoday at gmail.com>
++ * Copyright (C) 2010, Martyn Russell <martyn at lanedo.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+@@ -19,7 +20,9 @@
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+- * Author : Javier Goday <jgoday at gmail.com>
++ * Author: Jamie McCracken <jamiemcc at gnome.org>
++ * Javier Goday <jgoday at gmail.com>
++ * Martyn Russell <martyn at lanedo.com>
+ */
+
+ #include "config.h"
+@@ -31,7 +34,7 @@
+ #include <glib/gi18n-lib.h>
+ #include <gio/gio.h>
+ #include <dbus/dbus.h>
+-#include <libtracker-client/tracker.h>
++#include <libtracker-client/tracker-client.h>
+
+ #include "totem-tracker-widget.h"
+ #include "totem-cell-renderer-video.h"
+@@ -188,7 +191,7 @@
+ return NULL;
+ }
+
+- client = tracker_connect (TRUE, G_MAXINT);
++ client = tracker_client_new (TRACKER_CLIENT_ENABLE_WARNINGS, G_MAXINT);
+ if (!client) {
+ return NULL;
+ }
+@@ -209,12 +212,16 @@
+ return;
+ }
+
++ if (srd->cookie != 0) {
++ tracker_cancel_call (srd->client, srd->cookie);
++ }
++
+ if (srd->widget) {
+ g_object_unref (srd->widget);
+ }
+
+ if (srd->client) {
+- tracker_disconnect (srd->client);
++ g_object_unref (srd->client);
+ }
+
+ g_free (srd->search_text);
+@@ -339,6 +346,9 @@
+ gchar *fts, *query;
+ guint offset;
+
++ /* Cancel previous searches */
++ /* tracker_cancel_call (widget->priv->cookie_id); */
++
+ /* Clear the list store */
+ gtk_list_store_clear (GTK_LIST_STORE (widget->priv->result_store));
+
+@@ -376,18 +386,18 @@
+ * music or some other specialised content.
+ */
+ if (fts) {
+- query = g_strdup_printf ("SELECT COUNT(?urn) AS items "
++ query = g_strdup_printf ("SELECT COUNT(?urn) "
+ "WHERE {"
+- " ?urn a ?type ."
+- " ?urn fts:match \"%s\" "
+- " FILTER (?type = nmm:Video) "
++ " ?urn a nmm:Video ;"
++ " fts:match \"%s\" ;"
++ " tracker:available true . "
+ "}",
+ fts);
+ } else {
+- query = g_strdup_printf ("SELECT COUNT(?urn) AS items "
++ query = g_strdup_printf ("SELECT COUNT(?urn) "
+ "WHERE {"
+- " ?urn a ?type ."
+- " FILTER (?type = nmm:Video) "
++ " ?urn a nmm:Video ;"
++ " tracker:available true . "
+ "}");
+ }
+
+@@ -408,25 +418,25 @@
+ }
+
+ if (fts) {
+- query = g_strdup_printf ("SELECT ?urn "
++ query = g_strdup_printf ("SELECT nie:url(?urn) "
+ "WHERE {"
+- " ?urn a ?type ."
+- " ?urn fts:match \"%s\" "
+- " FILTER (?type = nmm:Video) "
++ " ?urn a nmm:Video ;"
++ " fts:match \"%s\" ;"
++ " tracker:available true . "
+ "} "
+- "ORDER BY ASC(?urn) "
++ "ORDER BY DESC(fts:rank(?urn)) ASC(nie:url(?urn)) "
+ "OFFSET %d "
+ "LIMIT %d",
+ fts,
+ offset,
+ TOTEM_TRACKER_MAX_RESULTS_SIZE);
+ } else {
+- query = g_strdup_printf ("SELECT ?urn "
++ query = g_strdup_printf ("SELECT nie:url(?urn) "
+ "WHERE {"
+- " ?urn a ?type ."
+- " FILTER (?type = nmm:Video) "
++ " ?urn a nmm:Video ; "
++ " tracker:available true . "
+ "} "
+- "ORDER BY ASC(?urn) "
++ "ORDER BY DESC(fts:rank(?urn)) ASC(nie:url(?urn)) "
+ "OFFSET %d "
+ "LIMIT %d",
+ offset,
+Index: b/src/plugins/tracker/totem-tracker-widget.h
+===================================================================
+--- a/src/plugins/tracker/totem-tracker-widget.h
++++ b/src/plugins/tracker/totem-tracker-widget.h
+@@ -25,7 +25,7 @@
+ #include "totem.h"
+
+ #include <gtk/gtk.h>
+-#include <libtracker-client/tracker.h>
++#include <libtracker-client/tracker-client.h>
+
+ #define TOTEM_TYPE_TRACKER_WIDGET (totem_tracker_widget_get_type ())
+ #define TOTEM_TRACKER_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TOTEM_TYPE_TRACKER_WIDGET, TotemTrackerWidget))
More information about the pkg-gnome-commits
mailing list