Ubuntu
nautilus package

Merge lp:~darkxst/ubuntu/utopic/nautilus/tracker into lp:~ubuntu-desktop/nautilus/ubuntu

  1. Utopic (14.10)
  2. tracker
  3. Merge into ubuntu
Proposed by Tim Lunn
Status: Merged
Merged at revision: 434
Proposed branch: lp:~darkxst/ubuntu/utopic/nautilus/tracker
Merge into: lp:~ubuntu-desktop/nautilus/ubuntu
Diff against target: 171 lines (+110/-3)
7 files modified
debian/changelog (+11/-0)
debian/control (+2/-1)
debian/control.in (+2/-1)
debian/patches/git_also_tracker-1.0.patch (+29/-0)
debian/patches/series (+2/-0)
debian/patches/ubuntu_tracker_only_on_GNOME.patch (+63/-0)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~darkxst/ubuntu/utopic/nautilus/tracker
Reviewer Review Type Date Requested Status
Ubuntu Desktop Pending
Review via email: mp+230728@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-08-13 14:08:01 +0000
3+++ debian/changelog 2014-08-13 22:45:07 +0000
4@@ -1,3 +1,14 @@
5+nautilus (1:3.10.1-0ubuntu13) utopic; urgency=medium
6+
7+ * debian/control.in: Add build-dep on libtracker-sparql-1.0-dev
8+ * debian/rules: enable tracker backend (LP: #1076232)
9+ * debian/patches:
10+ - ubuntu_tracker_only_on_GNOME.patch: only start the tracker
11+ index on GNOME sessions
12+ - git_also_tracker-1.0.patch, look for tracker-1.0
13+
14+ -- Tim Lunn <tim@feathertop.org> Wed, 13 Aug 2014 23:22:44 +1000
15+
16 nautilus (1:3.10.1-0ubuntu12) utopic; urgency=medium
17
18 * 0001-Don-t-try-to-open-a-selection-if-we-don-t-have-one.patch: Don't crash
19
20=== modified file 'debian/control'
21--- debian/control 2014-08-13 14:08:01 +0000
22+++ debian/control 2014-08-13 22:45:07 +0000
23@@ -36,7 +36,8 @@
24 libglib2.0-doc,
25 libgtk-3-doc,
26 libunity-dev (>= 5.0.0),
27- libzeitgeist-dev
28+ libzeitgeist-dev,
29+ libtracker-sparql-1.0-dev
30 Homepage: http://www.gnome.org/projects/nautilus/
31 Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/nautilus/ubuntu
32 Standards-Version: 3.9.3
33
34=== modified file 'debian/control.in'
35--- debian/control.in 2014-01-24 21:27:00 +0000
36+++ debian/control.in 2014-08-13 22:45:07 +0000
37@@ -32,7 +32,8 @@
38 libglib2.0-doc,
39 libgtk-3-doc,
40 libunity-dev (>= 5.0.0),
41- libzeitgeist-dev
42+ libzeitgeist-dev,
43+ libtracker-sparql-1.0-dev
44 Homepage: http://www.gnome.org/projects/nautilus/
45 Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/nautilus/ubuntu
46 Standards-Version: 3.9.3
47
48=== added file 'debian/patches/git_also_tracker-1.0.patch'
49--- debian/patches/git_also_tracker-1.0.patch 1970-01-01 00:00:00 +0000
50+++ debian/patches/git_also_tracker-1.0.patch 2014-08-13 22:45:07 +0000
51@@ -0,0 +1,29 @@
52+From b414bb50be1d752851742af3976de7410ea46edf Mon Sep 17 00:00:00 2001
53+From: Colin Walters <walters@verbum.org>
54+Date: Mon, 10 Feb 2014 16:50:46 -0500
55+Subject: build: Also look for Tracker 1.0
56+
57+See https://git.gnome.org/browse/tracker/commit/?id=b7a68152321e9251af0c4a2a9ba1978ca3a27b8c
58+
59+Index: nautilus-3.10.1/configure.ac
60+===================================================================
61+--- nautilus-3.10.1.orig/configure.ac
62++++ nautilus-3.10.1/configure.ac
63+@@ -274,8 +274,15 @@ AC_ARG_ENABLE(tracker,
64+ [enable_tracker=yes])
65+
66+ if test "x$enable_tracker" != "xno"; then
67+- PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.16)
68+- AC_DEFINE(ENABLE_TRACKER, 1, [Define to enable Tracker support])
69++ if $PKG_CONFIG --exists tracker-sparql-1.0; then
70++ PKG_CHECK_MODULES(TRACKER, tracker-sparql-1.0)
71++ else
72++ if $PKG_CONFIG --exists tracker-sparql-0.18; then
73++ PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.18)
74++ else
75++ PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.16)
76++ fi
77++ fi
78+ fi
79+
80+ AM_CONDITIONAL(ENABLE_TRACKER, test "x$enable_tracker" = "xyes")
81
82=== modified file 'debian/patches/series'
83--- debian/patches/series 2014-08-13 14:08:01 +0000
84+++ debian/patches/series 2014-08-13 22:45:07 +0000
85@@ -41,3 +41,5 @@
86 git_crash_network_reconnect.patch
87 git_revert_symlink_logic_change.patch
88 0001-Don-t-try-to-open-a-selection-if-we-don-t-have-one.patch
89+git_also_tracker-1.0.patch
90+ubuntu_tracker_only_on_GNOME.patch
91
92=== added file 'debian/patches/ubuntu_tracker_only_on_GNOME.patch'
93--- debian/patches/ubuntu_tracker_only_on_GNOME.patch 1970-01-01 00:00:00 +0000
94+++ debian/patches/ubuntu_tracker_only_on_GNOME.patch 2014-08-13 22:45:07 +0000
95@@ -0,0 +1,63 @@
96+Description: Only run tracker search engine on GNOME sessions
97+Author: Tim Lunn <tim@feathertop.org>
98+
99+Index: nautilus-3.10.1/libnautilus-private/nautilus-search-engine.c
100+===================================================================
101+--- nautilus-3.10.1.orig/libnautilus-private/nautilus-search-engine.c
102++++ nautilus-3.10.1/libnautilus-private/nautilus-search-engine.c
103+@@ -66,7 +66,8 @@ nautilus_search_engine_set_query (Nautil
104+ {
105+ NautilusSearchEngine *engine = NAUTILUS_SEARCH_ENGINE (provider);
106+ #ifdef ENABLE_TRACKER
107+- nautilus_search_provider_set_query (NAUTILUS_SEARCH_PROVIDER (engine->details->tracker), query);
108++ if (g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "GNOME") == 0)
109++ nautilus_search_provider_set_query (NAUTILUS_SEARCH_PROVIDER (engine->details->tracker), query);
110+ #endif
111+ nautilus_search_provider_set_query (NAUTILUS_SEARCH_PROVIDER (engine->details->model), query);
112+ nautilus_search_provider_set_query (NAUTILUS_SEARCH_PROVIDER (engine->details->simple), query);
113+@@ -86,8 +87,10 @@ search_engine_start_real (NautilusSearch
114+ g_object_ref (engine);
115+
116+ #ifdef ENABLE_TRACKER
117+- nautilus_search_provider_start (NAUTILUS_SEARCH_PROVIDER (engine->details->tracker));
118+- engine->details->providers_running++;
119++ if (g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "GNOME") == 0) {
120++ nautilus_search_provider_start (NAUTILUS_SEARCH_PROVIDER (engine->details->tracker));
121++ engine->details->providers_running++;
122++ }
123+ #endif
124+ if (nautilus_search_engine_model_get_model (engine->details->model)) {
125+ nautilus_search_provider_start (NAUTILUS_SEARCH_PROVIDER (engine->details->model));
126+@@ -134,7 +137,8 @@ nautilus_search_engine_stop (NautilusSea
127+ DEBUG ("Search engine stop");
128+
129+ #ifdef ENABLE_TRACKER
130+- nautilus_search_provider_stop (NAUTILUS_SEARCH_PROVIDER (engine->details->tracker));
131++ if (g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "GNOME") == 0)
132++ nautilus_search_provider_stop (NAUTILUS_SEARCH_PROVIDER (engine->details->tracker));
133+ #endif
134+ nautilus_search_provider_stop (NAUTILUS_SEARCH_PROVIDER (engine->details->model));
135+ nautilus_search_provider_stop (NAUTILUS_SEARCH_PROVIDER (engine->details->simple));
136+@@ -258,7 +262,8 @@ nautilus_search_engine_finalize (GObject
137+ g_hash_table_destroy (engine->details->uris);
138+
139+ #ifdef ENABLE_TRACKER
140+- g_clear_object (&engine->details->tracker);
141++ if (g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "GNOME") == 0)
142++ g_clear_object (&engine->details->tracker);
143+ #endif
144+ g_clear_object (&engine->details->model);
145+ g_clear_object (&engine->details->simple);
146+@@ -288,8 +293,10 @@ nautilus_search_engine_init (NautilusSea
147+ engine->details->uris = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
148+
149+ #ifdef ENABLE_TRACKER
150+- engine->details->tracker = nautilus_search_engine_tracker_new ();
151+- connect_provider_signals (engine, NAUTILUS_SEARCH_PROVIDER (engine->details->tracker));
152++ if (g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "GNOME") == 0) {
153++ engine->details->tracker = nautilus_search_engine_tracker_new ();
154++ connect_provider_signals (engine, NAUTILUS_SEARCH_PROVIDER (engine->details->tracker));
155++ }
156+ #endif
157+ engine->details->model = nautilus_search_engine_model_new ();
158+ connect_provider_signals (engine, NAUTILUS_SEARCH_PROVIDER (engine->details->model));
159
160=== modified file 'debian/rules'
161--- debian/rules 2013-03-08 15:55:47 +0000
162+++ debian/rules 2014-08-13 22:45:07 +0000
163@@ -12,7 +12,7 @@
164 --disable-update-mimedb \
165 --enable-introspection \
166 --disable-appindicator \
167- --enable-tracker=no
168+ --enable-tracker=yes
169 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
170 DEB_DH_MAKESHLIBS_ARGS_libnautilus-extension1a += -V 'libnautilus-extension1a (>= 1:2.91)'
171 DEB_DH_MAKESHLIBS_ARGS_nautilus += -Xusr/lib/nautilus/extensions-3.0/

Subscribers

People subscribed via source and target branches

to all changes: