| 1 |
commit: 9aca0eedfea36cb6a2a5203591f4d20291a06675 |
| 2 |
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Dec 11 13:54:24 2018 +0000 |
| 4 |
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 11 13:54:34 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=9aca0eed |
| 7 |
|
| 8 |
gnome-base/nautilus: turn tracker support into a boolean |
| 9 |
|
| 10 |
Signed-off-by: Gilles Dartiguelongue <eva <AT> gentoo.org> |
| 11 |
|
| 12 |
.../files/3.26.4-tracker-support-optional.patch | 30 +++++++++------------- |
| 13 |
gnome-base/nautilus/nautilus-3.26.4-r1.ebuild | 2 +- |
| 14 |
2 files changed, 13 insertions(+), 19 deletions(-) |
| 15 |
|
| 16 |
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 |
| 17 |
index 61eacc2a..f3b58689 100644 |
| 18 |
--- a/gnome-base/nautilus/files/3.26.4-tracker-support-optional.patch |
| 19 |
+++ b/gnome-base/nautilus/files/3.26.4-tracker-support-optional.patch |
| 20 |
@@ -1,18 +1,18 @@ |
| 21 |
-From 664c66bd231c5d0ac20f6f4f14be461bfb206a1e Mon Sep 17 00:00:00 2001 |
| 22 |
+From a87d6c0c7bdf52f5c1b73972e850c0ce0e1d3043 Mon Sep 17 00:00:00 2001 |
| 23 |
From: Gilles Dartiguelongue <eva@g.o> |
| 24 |
Date: Sun, 27 May 2018 13:54:38 +0200 |
| 25 |
Subject: [PATCH] Make tracker support optional |
| 26 |
|
| 27 |
--- |
| 28 |
config.h.meson | 1 + |
| 29 |
- meson.build | 15 ++++++++++++--- |
| 30 |
- meson_options.txt | 5 +++++ |
| 31 |
+ meson.build | 10 +++++++--- |
| 32 |
+ meson_options.txt | 4 ++++ |
| 33 |
src/meson.build | 19 ++++++++++++------- |
| 34 |
src/nautilus-file-undo-operations.c | 4 ++++ |
| 35 |
src/nautilus-file.c | 2 ++ |
| 36 |
src/nautilus-files-view.c | 4 ++++ |
| 37 |
src/nautilus-search-engine.c | 14 ++++++++++++++ |
| 38 |
- 8 files changed, 54 insertions(+), 10 deletions(-) |
| 39 |
+ 8 files changed, 48 insertions(+), 10 deletions(-) |
| 40 |
|
| 41 |
diff --git a/config.h.meson b/config.h.meson |
| 42 |
index 4f5cb5848..58d71e96f 100644 |
| 43 |
@@ -27,10 +27,10 @@ index 4f5cb5848..58d71e96f 100644 |
| 44 |
#mesondefine ENABLE_PACKAGEKIT |
| 45 |
#mesondefine LOCALEDIR |
| 46 |
diff --git a/meson.build b/meson.build |
| 47 |
-index 6256193cc..776111f81 100644 |
| 48 |
+index 6256193cc..7258e00e1 100644 |
| 49 |
--- a/meson.build |
| 50 |
+++ b/meson.build |
| 51 |
-@@ -81,9 +81,18 @@ if get_option ('enable-selinux') |
| 52 |
+@@ -81,9 +81,13 @@ if get_option ('enable-selinux') |
| 53 |
conf.set10 ('HAVE_SELINUX', true) |
| 54 |
endif |
| 55 |
|
| 56 |
@@ -38,32 +38,26 @@ index 6256193cc..776111f81 100644 |
| 57 |
-if not tracker_sparql.found() |
| 58 |
- tracker_sparql = dependency ('tracker-sparql-1.0') |
| 59 |
+tracker_api = get_option ('tracker') |
| 60 |
-+if tracker_api == 'disabled' |
| 61 |
-+ # pass |
| 62 |
-+elif tracker_api == 'auto' |
| 63 |
++if tracker_api |
| 64 |
+ tracker_sparql = dependency ('tracker-sparql-2.0', required: false) |
| 65 |
+ if not tracker_sparql.found() |
| 66 |
+ tracker_sparql = dependency ('tracker-sparql-1.0') |
| 67 |
+ endif |
| 68 |
-+ conf.set10 ('HAVE_TRACKER', true) |
| 69 |
-+else |
| 70 |
-+ tracker_sparql = dependency ('tracker-sparql-@0@'.format(tracker_api)) |
| 71 |
+ conf.set10 ('HAVE_TRACKER', true) |
| 72 |
endif |
| 73 |
|
| 74 |
if get_option ('enable-xmp') |
| 75 |
diff --git a/meson_options.txt b/meson_options.txt |
| 76 |
-index c934dd8b1..d2ba885a2 100644 |
| 77 |
+index c934dd8b1..0c23c7921 100644 |
| 78 |
--- a/meson_options.txt |
| 79 |
+++ b/meson_options.txt |
| 80 |
-@@ -8,6 +8,11 @@ option ('enable-exif', |
| 81 |
+@@ -8,6 +8,10 @@ option ('enable-exif', |
| 82 |
type: 'boolean', |
| 83 |
value: false, |
| 84 |
description: 'enable EXIF support') |
| 85 |
+option ('tracker', |
| 86 |
-+ type: 'combo', |
| 87 |
-+ choices: ['auto', '1.0', '2.0', 'disabled'], |
| 88 |
-+ value: 'auto', |
| 89 |
++ type: 'boolean', |
| 90 |
++ value: true, |
| 91 |
+ description: 'enable bulk renames and search using Tracker') |
| 92 |
option ('enable-xmp', |
| 93 |
type: 'boolean', |
| 94 |
@@ -267,5 +261,5 @@ index 209bd4f80..436cd7471 100644 |
| 95 |
priv->model = nautilus_search_engine_model_new (); |
| 96 |
connect_provider_signals (engine, NAUTILUS_SEARCH_PROVIDER (priv->model)); |
| 97 |
-- |
| 98 |
-2.17.0 |
| 99 |
+2.19.2 |
| 100 |
|
| 101 |
|
| 102 |
diff --git a/gnome-base/nautilus/nautilus-3.26.4-r1.ebuild b/gnome-base/nautilus/nautilus-3.26.4-r1.ebuild |
| 103 |
index 716a0347..80e0ab5a 100644 |
| 104 |
--- a/gnome-base/nautilus/nautilus-3.26.4-r1.ebuild |
| 105 |
+++ b/gnome-base/nautilus/nautilus-3.26.4-r1.ebuild |
| 106 |
@@ -77,7 +77,7 @@ src_configure() { |
| 107 |
local emesonargs=( |
| 108 |
"-Denable-desktop=true" |
| 109 |
"-Denable-profiling=false" |
| 110 |
- "-Dtracker=$(usex tracker auto disabled)" |
| 111 |
+ $(meson_use tracker) |
| 112 |
$(meson_use gtk-doc enable-gtk-doc) |
| 113 |
$(meson_use exif enable-exif) |
| 114 |
$(meson_use packagekit enable-packagekit) |
Archives