| 1 |
commit: 4e0d15fc16e0c8adb2af52a19d5c9fa3114fe60f |
| 2 |
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Dec 11 13:57:05 2018 +0000 |
| 4 |
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 11 13:57:22 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=4e0d15fc |
| 7 |
|
| 8 |
gnome-base/nautilus: cleanup tracker patch |
| 9 |
|
| 10 |
Signed-off-by: Gilles Dartiguelongue <eva <AT> gentoo.org> |
| 11 |
|
| 12 |
.../nautilus/files/3.26.4-tracker-support-optional.patch | 13 ++++++------- |
| 13 |
1 file changed, 6 insertions(+), 7 deletions(-) |
| 14 |
|
| 15 |
diff --git a/gnome-base/nautilus/files/3.26.4-tracker-support-optional.patch b/gnome-base/nautilus/files/3.26.4-tracker-support-optional.patch |
| 16 |
index f3b58689..d02ebe7c 100644 |
| 17 |
--- a/gnome-base/nautilus/files/3.26.4-tracker-support-optional.patch |
| 18 |
+++ b/gnome-base/nautilus/files/3.26.4-tracker-support-optional.patch |
| 19 |
@@ -1,18 +1,18 @@ |
| 20 |
-From a87d6c0c7bdf52f5c1b73972e850c0ce0e1d3043 Mon Sep 17 00:00:00 2001 |
| 21 |
+From 75c1aca1128bf29c9d195abfb8184f8c20b05b15 Mon Sep 17 00:00:00 2001 |
| 22 |
From: Gilles Dartiguelongue <eva@g.o> |
| 23 |
Date: Sun, 27 May 2018 13:54:38 +0200 |
| 24 |
Subject: [PATCH] Make tracker support optional |
| 25 |
|
| 26 |
--- |
| 27 |
config.h.meson | 1 + |
| 28 |
- meson.build | 10 +++++++--- |
| 29 |
+ meson.build | 9 ++++++--- |
| 30 |
meson_options.txt | 4 ++++ |
| 31 |
src/meson.build | 19 ++++++++++++------- |
| 32 |
src/nautilus-file-undo-operations.c | 4 ++++ |
| 33 |
src/nautilus-file.c | 2 ++ |
| 34 |
src/nautilus-files-view.c | 4 ++++ |
| 35 |
src/nautilus-search-engine.c | 14 ++++++++++++++ |
| 36 |
- 8 files changed, 48 insertions(+), 10 deletions(-) |
| 37 |
+ 8 files changed, 47 insertions(+), 10 deletions(-) |
| 38 |
|
| 39 |
diff --git a/config.h.meson b/config.h.meson |
| 40 |
index 4f5cb5848..58d71e96f 100644 |
| 41 |
@@ -27,18 +27,17 @@ index 4f5cb5848..58d71e96f 100644 |
| 42 |
#mesondefine ENABLE_PACKAGEKIT |
| 43 |
#mesondefine LOCALEDIR |
| 44 |
diff --git a/meson.build b/meson.build |
| 45 |
-index 6256193cc..7258e00e1 100644 |
| 46 |
+index 6256193cc..d6418d770 100644 |
| 47 |
--- a/meson.build |
| 48 |
+++ b/meson.build |
| 49 |
-@@ -81,9 +81,13 @@ if get_option ('enable-selinux') |
| 50 |
+@@ -81,9 +81,12 @@ if get_option ('enable-selinux') |
| 51 |
conf.set10 ('HAVE_SELINUX', true) |
| 52 |
endif |
| 53 |
|
| 54 |
-tracker_sparql = dependency ('tracker-sparql-2.0', required: false) |
| 55 |
-if not tracker_sparql.found() |
| 56 |
- tracker_sparql = dependency ('tracker-sparql-1.0') |
| 57 |
-+tracker_api = get_option ('tracker') |
| 58 |
-+if tracker_api |
| 59 |
++if get_option ('tracker') |
| 60 |
+ tracker_sparql = dependency ('tracker-sparql-2.0', required: false) |
| 61 |
+ if not tracker_sparql.found() |
| 62 |
+ tracker_sparql = dependency ('tracker-sparql-1.0') |
Archives