Merge ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic

Proposed by Marco Trevisan (Treviño) on 2019-10-25
Status: Merged
Merged at revision: 2900d5082ba2c79f01b8d78d43677e01a779e778
Proposed branch: ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic
Merge into: ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic
Diff against target: 74 lines (+18/-8)
2 files modified
debian/changelog (+8/-0)
debian/patches/0015-tracker-search-engine-don-t-start-it-if-not-availabl.patch (+10/-8)
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve on 2019-10-28
Ubuntu Server Dev import team 2019-10-25 Pending
Review via email: mp+374710@code.launchpad.net

This proposal supersedes a proposal from 2019-10-25.

Commit message

Sync VCS with packaging

To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 17553e8..ad6d1f5 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,11 @@
6+nautilus (1:3.26.4-0~ubuntu18.04.4) bionic; urgency=medium
7+
8+ * d/p/0015-tracker-search-engine-don-t-start-it-if-not-availabl.patch:
9+ - update the patch to fix a logic error in the code which made tracker
10+ never being used even if it's installed (lp: #1767817)
11+
12+ -- Sebastien Bacher <seb128@ubuntu.com> Wed, 06 Mar 2019 17:31:08 +0100
13+
14 nautilus (1:3.26.4-0~ubuntu18.04.3) bionic; urgency=medium
15
16 * debian/patches/git_captions_order.patch
17diff --git a/debian/patches/0015-tracker-search-engine-don-t-start-it-if-not-availabl.patch b/debian/patches/0015-tracker-search-engine-don-t-start-it-if-not-availabl.patch
18index 4cc55ed..d24e83c 100644
19--- a/debian/patches/0015-tracker-search-engine-don-t-start-it-if-not-availabl.patch
20+++ b/debian/patches/0015-tracker-search-engine-don-t-start-it-if-not-availabl.patch
21@@ -6,10 +6,10 @@ Subject: tracker-search-engine: don't start it if not available on system
22 src/nautilus-search-engine-tracker.c | 24 ++++++++++++++++++++----
23 1 file changed, 20 insertions(+), 4 deletions(-)
24
25-diff --git a/src/nautilus-search-engine-tracker.c b/src/nautilus-search-engine-tracker.c
26-index 8885ca4..050716d 100644
27---- a/src/nautilus-search-engine-tracker.c
28-+++ b/src/nautilus-search-engine-tracker.c
29+Index: nautilus-3.26.4/src/nautilus-search-engine-tracker.c
30+===================================================================
31+--- nautilus-3.26.4.orig/src/nautilus-search-engine-tracker.c
32++++ nautilus-3.26.4/src/nautilus-search-engine-tracker.c
33 @@ -42,6 +42,7 @@ struct _NautilusSearchEngineTracker
34 gboolean query_pending;
35 GQueue *hits_pending;
36@@ -18,7 +18,7 @@ index 8885ca4..050716d 100644
37 gboolean recursive;
38 gboolean fts_enabled;
39
40-@@ -304,8 +305,15 @@ nautilus_search_engine_tracker_start (NautilusSearchProvider *provider)
41+@@ -304,8 +305,15 @@ nautilus_search_engine_tracker_start (Na
42 return;
43 }
44
45@@ -35,7 +35,7 @@ index 8885ca4..050716d 100644
46 tracker->query_pending = TRUE;
47
48 g_object_notify (G_OBJECT (provider), "running");
49-@@ -471,6 +479,9 @@ nautilus_search_engine_tracker_set_query (NautilusSearchProvider *provider,
50+@@ -471,6 +479,9 @@ nautilus_search_engine_tracker_set_query
51
52 g_clear_object (&tracker->query);
53
54@@ -45,7 +45,7 @@ index 8885ca4..050716d 100644
55 tracker->query = g_object_ref (query);
56 tracker->recursive = is_recursive_search (NAUTILUS_SEARCH_ENGINE_TYPE_INDEXED,
57 nautilus_query_get_recursive (query),
58-@@ -539,16 +550,21 @@ static void
59+@@ -539,16 +550,23 @@ static void
60 nautilus_search_engine_tracker_init (NautilusSearchEngineTracker *engine)
61 {
62 GError *error = NULL;
63@@ -54,8 +54,10 @@ index 8885ca4..050716d 100644
64 - engine->hits_pending = g_queue_new ();
65 -
66 - engine->connection = tracker_sparql_connection_get (NULL, &error);
67-+ if (!tracker_available)
68++ if (tracker_available)
69 + engine->connection = tracker_sparql_connection_get (NULL, &error);
70++ else
71++ return;
72
73 if (error)
74 {

Subscribers

People subscribed via source and target branches