[gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/files/, gnome-base/nautilus/
commit: 8f138b3343728af2545643d3d08745e30fe38d4a Author: Sobhan Mohammadpour gentoo org> AuthorDate: Sat Sep 14 19:24:48 2019 + Commit: Sobhan Mohammadpour gentoo org> CommitDate: Sat Sep 14 19:24:48 2019 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=8f138b33 gnome-base/nautilus: add 3.34.0 Package-Manager: Portage-2.3.76, Repoman-2.3.17 gnome-base/nautilus/files/3.34.0-docs-build.patch | 40 + gnome-base/nautilus/nautilus-3.34.0.ebuild| 103 ++ 2 files changed, 143 insertions(+) diff --git a/gnome-base/nautilus/files/3.34.0-docs-build.patch b/gnome-base/nautilus/files/3.34.0-docs-build.patch new file mode 100644 index ..3d700bdd --- /dev/null +++ b/gnome-base/nautilus/files/3.34.0-docs-build.patch @@ -0,0 +1,40 @@ +From 49d85c31346ff61afdd2c03b19b75c657416bacc Mon Sep 17 00:00:00 2001 +From: Sobhan Mohammadpour +Date: Sat, 14 Sep 2019 15:03:53 -0400 +Subject: [PATCH] [Patch] update 3.30-5: build: always install man pages + +originally by: Mart Raudsepp +--- + docs/meson.build | 5 +++-- + meson.build | 4 +--- + 2 files changed, 4 insertions(+), 5 deletions(-) + +diff --git a/docs/meson.build b/docs/meson.build +index a54574f..ae0b171 100644 +--- a/docs/meson.build b/docs/meson.build +@@ -1,4 +1,5 @@ + install_man('nautilus.1') + install_man('nautilus-autorun-software.1') +- +-subdir('reference') ++if get_option('docs') ++ subdir('reference') ++endif +diff --git a/meson.build b/meson.build +index 8ab4fb6..98cc73b 100644 +--- a/meson.build b/meson.build +@@ -196,9 +196,7 @@ subdirs = [ + # Conditional building # + + +-if get_option('docs') +- subdirs += 'docs' +-endif ++subdirs += 'docs' + if get_option('tests') != 'none' + subdirs += 'test' + endif +-- +2.23.0 diff --git a/gnome-base/nautilus/nautilus-3.34.0.ebuild b/gnome-base/nautilus/nautilus-3.34.0.ebuild new file mode 100644 index ..30c37296 --- /dev/null +++ b/gnome-base/nautilus/nautilus-3.34.0.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg + +DESCRIPTION="Default file manager for the GNOME desktop" +HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus; + +LICENSE="GPL-3+ LGPL-2.1+" +SLOT="0" +IUSE="gnome gtk-doc +introspection packagekit +previewer selinux sendto" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" + +COMMON_DEPEND=" + >=dev-libs/glib-2.55.1:2 + >=media-libs/gexiv2-0.10.0 + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + >=app-arch/gnome-autoar-0.2.1 + gnome-base/gnome-desktop:3 + >=x11-libs/gtk+-3.22.27:3[X,introspection?] + >=x11-libs/pango-1.28.3 + selinux? ( >=sys-libs/libselinux-2.0 ) + >=app-misc/tracker-2.0:= + x11-libs/libX11 + >=dev-libs/libxml2-2.7.8:2 + introspection? ( >=dev-libs/gobject-introspection-1.54:= ) +" +DEPEND="${COMMON_DEPEND} + >=dev-util/gdbus-codegen-2.51.2 + dev-util/glib-utils + gtk-doc? ( + >=dev-util/gtk-doc-1.10 + app-text/docbook-xml-dtd:4.1.2 ) + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + x11-base/xorg-proto +" +RDEPEND="${COMMON_DEPEND} + packagekit? ( app-admin/packagekit-base ) + sendto? ( !
[gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/files/
commit: c24fa3d782ee8fda6faa3e5dc06c2feb654d6a59 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Tue Dec 11 15:22:46 2018 + Commit: Gilles Dartiguelongue gentoo org> CommitDate: Tue Dec 11 15:23:43 2018 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=c24fa3d7 gnome-base/nautilus: one more typo fix for tracker patch Signed-off-by: Gilles Dartiguelongue gentoo.org> gnome-base/nautilus/files/3.26.4-tracker-support-optional.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 index d02ebe7c..96f89722 100644 --- a/gnome-base/nautilus/files/3.26.4-tracker-support-optional.patch +++ b/gnome-base/nautilus/files/3.26.4-tracker-support-optional.patch @@ -1,4 +1,4 @@ -From 75c1aca1128bf29c9d195abfb8184f8c20b05b15 Mon Sep 17 00:00:00 2001 +From 0008d41d0b3d75ba01ffa2ebfc2cfb9055f60f78 Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Sun, 27 May 2018 13:54:38 +0200 Subject: [PATCH] Make tracker support optional @@ -62,7 +62,7 @@ index c934dd8b1..0c23c7921 100644 type: 'boolean', value: false, diff --git a/src/meson.build b/src/meson.build -index cc08345d8..40f337cde 100644 +index cc08345d8..8ea10b16b 100644 --- a/src/meson.build +++ b/src/meson.build @@ -254,12 +254,6 @@ libnautilus_sources = [ @@ -90,7 +90,7 @@ index cc08345d8..40f337cde 100644 nautilus_deps += exempi endif -+if get_option ('tracker') != 'disabled' ++if get_option ('tracker') +libnautilus_sources += [ +'nautilus-batch-rename-dialog.c', +'nautilus-batch-rename-dialog.h',
[gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/files/
commit: 4e0d15fc16e0c8adb2af52a19d5c9fa3114fe60f Author: Gilles Dartiguelongue gentoo org> AuthorDate: Tue Dec 11 13:57:05 2018 + Commit: Gilles Dartiguelongue gentoo org> CommitDate: Tue Dec 11 13:57:22 2018 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=4e0d15fc gnome-base/nautilus: cleanup tracker patch Signed-off-by: Gilles Dartiguelongue gentoo.org> .../nautilus/files/3.26.4-tracker-support-optional.patch| 13 ++--- 1 file changed, 6 insertions(+), 7 deletions(-) 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 index f3b58689..d02ebe7c 100644 --- a/gnome-base/nautilus/files/3.26.4-tracker-support-optional.patch +++ b/gnome-base/nautilus/files/3.26.4-tracker-support-optional.patch @@ -1,18 +1,18 @@ -From a87d6c0c7bdf52f5c1b73972e850c0ce0e1d3043 Mon Sep 17 00:00:00 2001 +From 75c1aca1128bf29c9d195abfb8184f8c20b05b15 Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Sun, 27 May 2018 13:54:38 +0200 Subject: [PATCH] Make tracker support optional --- config.h.meson | 1 + - meson.build | 10 +++--- + meson.build | 9 ++--- meson_options.txt | 4 src/meson.build | 19 --- src/nautilus-file-undo-operations.c | 4 src/nautilus-file.c | 2 ++ src/nautilus-files-view.c | 4 src/nautilus-search-engine.c| 14 ++ - 8 files changed, 48 insertions(+), 10 deletions(-) + 8 files changed, 47 insertions(+), 10 deletions(-) diff --git a/config.h.meson b/config.h.meson index 4f5cb5848..58d71e96f 100644 @@ -27,18 +27,17 @@ index 4f5cb5848..58d71e96f 100644 #mesondefine ENABLE_PACKAGEKIT #mesondefine LOCALEDIR diff --git a/meson.build b/meson.build -index 6256193cc..7258e00e1 100644 +index 6256193cc..d6418d770 100644 --- a/meson.build +++ b/meson.build -@@ -81,9 +81,13 @@ if get_option ('enable-selinux') +@@ -81,9 +81,12 @@ if get_option ('enable-selinux') conf.set10 ('HAVE_SELINUX', true) endif -tracker_sparql = dependency ('tracker-sparql-2.0', required: false) -if not tracker_sparql.found() -tracker_sparql = dependency ('tracker-sparql-1.0') -+tracker_api = get_option ('tracker') -+if tracker_api ++if get_option ('tracker') +tracker_sparql = dependency ('tracker-sparql-2.0', required: false) +if not tracker_sparql.found() +tracker_sparql = dependency ('tracker-sparql-1.0')
[gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/files/, gnome-base/nautilus/
commit: 22215e85317f85cd469433b6e5a017d420247f33 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sun May 27 12:44:47 2018 + Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sun May 27 12:56:34 2018 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=22215e85 gnome-base/nautilus: 3.26.2 → 3.26.3.1 Cleanup unused dependencies. Package-Manager: Portage-2.3.40, Repoman-2.3.9 Manifest-Sign-Key: 0x5A56C8CD0C13248A ...tch => 3.26.3.1-tracker-support-optional.patch} | 32 ++ ...ilus-3.26.2.ebuild => nautilus-3.26.3.1.ebuild} | 14 ++ 2 files changed, 18 insertions(+), 28 deletions(-) diff --git a/gnome-base/nautilus/files/3.26.2-tracker-support-optional.patch b/gnome-base/nautilus/files/3.26.3.1-tracker-support-optional.patch similarity index 91% rename from gnome-base/nautilus/files/3.26.2-tracker-support-optional.patch rename to gnome-base/nautilus/files/3.26.3.1-tracker-support-optional.patch index 4363cbbf..61eacc2a 100644 --- a/gnome-base/nautilus/files/3.26.2-tracker-support-optional.patch +++ b/gnome-base/nautilus/files/3.26.3.1-tracker-support-optional.patch @@ -1,4 +1,4 @@ -From 3e3d7621c6f8ec72e626701e3f55afc900a04a68 Mon Sep 17 00:00:00 2001 +From 664c66bd231c5d0ac20f6f4f14be461bfb206a1e Mon Sep 17 00:00:00 2001 From: Gilles DartiguelongueDate: Sun, 27 May 2018 13:54:38 +0200 Subject: [PATCH] Make tracker support optional @@ -7,12 +7,12 @@ Subject: [PATCH] Make tracker support optional config.h.meson | 1 + meson.build | 15 --- meson_options.txt | 5 + - src/meson.build | 21 + + src/meson.build | 19 --- src/nautilus-file-undo-operations.c | 4 src/nautilus-file.c | 2 ++ src/nautilus-files-view.c | 4 src/nautilus-search-engine.c| 14 ++ - 8 files changed, 55 insertions(+), 11 deletions(-) + 8 files changed, 54 insertions(+), 10 deletions(-) diff --git a/config.h.meson b/config.h.meson index 4f5cb5848..58d71e96f 100644 @@ -27,7 +27,7 @@ index 4f5cb5848..58d71e96f 100644 #mesondefine ENABLE_PACKAGEKIT #mesondefine LOCALEDIR diff --git a/meson.build b/meson.build -index 7b8f15cf5..b2f2ef438 100644 +index 6256193cc..776111f81 100644 --- a/meson.build +++ b/meson.build @@ -81,9 +81,18 @@ if get_option ('enable-selinux') @@ -36,7 +36,7 @@ index 7b8f15cf5..b2f2ef438 100644 -tracker_sparql = dependency ('tracker-sparql-2.0', required: false) -if not tracker_sparql.found() -- tracker_sparql = dependency ('tracker-sparql-1.0') +-tracker_sparql = dependency ('tracker-sparql-1.0') +tracker_api = get_option ('tracker') +if tracker_api == 'disabled' +# pass @@ -69,7 +69,7 @@ index c934dd8b1..d2ba885a2 100644 type: 'boolean', value: false, diff --git a/src/meson.build b/src/meson.build -index 9f01f5ba2..c55f39c7d 100644 +index cc08345d8..40f337cde 100644 --- a/src/meson.build +++ b/src/meson.build @@ -254,12 +254,6 @@ libnautilus_sources = [ @@ -85,17 +85,15 @@ index 9f01f5ba2..c55f39c7d 100644 ] nautilus_deps = [glib, -@@ -273,8 +267,7 @@ nautilus_deps = [glib, - eel_2, +@@ -274,7 +268,6 @@ nautilus_deps = [glib, nautilus_extension, x11, -- gmodule_no_export, -- tracker_sparql] -+ gmodule_no_export] + gmodule_no_export, +- tracker_sparql, + gio_unix] if get_option ('enable-exif') - nautilus_deps += exif -@@ -288,6 +281,18 @@ if get_option ('enable-xmp') +@@ -289,6 +282,18 @@ if get_option ('enable-xmp') nautilus_deps += exempi endif @@ -146,7 +144,7 @@ index e833d0578..d6e407ca5 100644 /* trash */ G_DEFINE_TYPE (NautilusFileUndoInfoTrash, nautilus_file_undo_info_trash, NAUTILUS_TYPE_FILE_UNDO_INFO) diff --git a/src/nautilus-file.c b/src/nautilus-file.c -index 536f83541..247334d5d 100644 +index d6ac35a44..752adc295 100644 --- a/src/nautilus-file.c +++ b/src/nautilus-file.c @@ -2392,6 +2392,7 @@ real_batch_rename (GList *files, @@ -166,7 +164,7 @@ index 536f83541..247334d5d 100644 if (op->skipped_files == g_list_length (files)) { diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c -index a79ecf20d..3b7bd4166 100644 +index 8784f63f8..af5605d68 100644 --- a/src/nautilus-files-view.c +++ b/src/nautilus-files-view.c @@ -28,8 +28,10 @@ @@ -180,7 +178,7 @@ index a79ecf20d..3b7bd4166 100644 #include "nautilus-error-reporting.h" #include "nautilus-file-undo-manager.h" #include "nautilus-floating-bar.h" -@@ -6209,6 +6211,7 @@ real_action_rename (NautilusFilesView *view) +@@ -6266,6 +6268,7 @@ real_action_rename (NautilusFilesView *view) { invoke_external_bulk_rename_utility
[gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/files/, gnome-base/nautilus/
commit: b97b01ed40764ab5782ced32aac956d881a3cb54 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sun May 27 12:44:47 2018 + Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sun May 27 12:47:01 2018 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=b97b01ed gnome-base/nautilus: 3.26.2 → 3.26.3.1 Package-Manager: Portage-2.3.40, Repoman-2.3.9 Manifest-Sign-Key: 0x5A56C8CD0C13248A ...tch => 3.26.3.1-tracker-support-optional.patch} | 32 ++ ...ilus-3.26.2.ebuild => nautilus-3.26.3.1.ebuild} | 0 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/gnome-base/nautilus/files/3.26.2-tracker-support-optional.patch b/gnome-base/nautilus/files/3.26.3.1-tracker-support-optional.patch similarity index 91% rename from gnome-base/nautilus/files/3.26.2-tracker-support-optional.patch rename to gnome-base/nautilus/files/3.26.3.1-tracker-support-optional.patch index 4363cbbf..61eacc2a 100644 --- a/gnome-base/nautilus/files/3.26.2-tracker-support-optional.patch +++ b/gnome-base/nautilus/files/3.26.3.1-tracker-support-optional.patch @@ -1,4 +1,4 @@ -From 3e3d7621c6f8ec72e626701e3f55afc900a04a68 Mon Sep 17 00:00:00 2001 +From 664c66bd231c5d0ac20f6f4f14be461bfb206a1e Mon Sep 17 00:00:00 2001 From: Gilles DartiguelongueDate: Sun, 27 May 2018 13:54:38 +0200 Subject: [PATCH] Make tracker support optional @@ -7,12 +7,12 @@ Subject: [PATCH] Make tracker support optional config.h.meson | 1 + meson.build | 15 --- meson_options.txt | 5 + - src/meson.build | 21 + + src/meson.build | 19 --- src/nautilus-file-undo-operations.c | 4 src/nautilus-file.c | 2 ++ src/nautilus-files-view.c | 4 src/nautilus-search-engine.c| 14 ++ - 8 files changed, 55 insertions(+), 11 deletions(-) + 8 files changed, 54 insertions(+), 10 deletions(-) diff --git a/config.h.meson b/config.h.meson index 4f5cb5848..58d71e96f 100644 @@ -27,7 +27,7 @@ index 4f5cb5848..58d71e96f 100644 #mesondefine ENABLE_PACKAGEKIT #mesondefine LOCALEDIR diff --git a/meson.build b/meson.build -index 7b8f15cf5..b2f2ef438 100644 +index 6256193cc..776111f81 100644 --- a/meson.build +++ b/meson.build @@ -81,9 +81,18 @@ if get_option ('enable-selinux') @@ -36,7 +36,7 @@ index 7b8f15cf5..b2f2ef438 100644 -tracker_sparql = dependency ('tracker-sparql-2.0', required: false) -if not tracker_sparql.found() -- tracker_sparql = dependency ('tracker-sparql-1.0') +-tracker_sparql = dependency ('tracker-sparql-1.0') +tracker_api = get_option ('tracker') +if tracker_api == 'disabled' +# pass @@ -69,7 +69,7 @@ index c934dd8b1..d2ba885a2 100644 type: 'boolean', value: false, diff --git a/src/meson.build b/src/meson.build -index 9f01f5ba2..c55f39c7d 100644 +index cc08345d8..40f337cde 100644 --- a/src/meson.build +++ b/src/meson.build @@ -254,12 +254,6 @@ libnautilus_sources = [ @@ -85,17 +85,15 @@ index 9f01f5ba2..c55f39c7d 100644 ] nautilus_deps = [glib, -@@ -273,8 +267,7 @@ nautilus_deps = [glib, - eel_2, +@@ -274,7 +268,6 @@ nautilus_deps = [glib, nautilus_extension, x11, -- gmodule_no_export, -- tracker_sparql] -+ gmodule_no_export] + gmodule_no_export, +- tracker_sparql, + gio_unix] if get_option ('enable-exif') - nautilus_deps += exif -@@ -288,6 +281,18 @@ if get_option ('enable-xmp') +@@ -289,6 +282,18 @@ if get_option ('enable-xmp') nautilus_deps += exempi endif @@ -146,7 +144,7 @@ index e833d0578..d6e407ca5 100644 /* trash */ G_DEFINE_TYPE (NautilusFileUndoInfoTrash, nautilus_file_undo_info_trash, NAUTILUS_TYPE_FILE_UNDO_INFO) diff --git a/src/nautilus-file.c b/src/nautilus-file.c -index 536f83541..247334d5d 100644 +index d6ac35a44..752adc295 100644 --- a/src/nautilus-file.c +++ b/src/nautilus-file.c @@ -2392,6 +2392,7 @@ real_batch_rename (GList *files, @@ -166,7 +164,7 @@ index 536f83541..247334d5d 100644 if (op->skipped_files == g_list_length (files)) { diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c -index a79ecf20d..3b7bd4166 100644 +index 8784f63f8..af5605d68 100644 --- a/src/nautilus-files-view.c +++ b/src/nautilus-files-view.c @@ -28,8 +28,10 @@ @@ -180,7 +178,7 @@ index a79ecf20d..3b7bd4166 100644 #include "nautilus-error-reporting.h" #include "nautilus-file-undo-manager.h" #include "nautilus-floating-bar.h" -@@ -6209,6 +6211,7 @@ real_action_rename (NautilusFilesView *view) +@@ -6266,6 +6268,7 @@ real_action_rename (NautilusFilesView *view) { invoke_external_bulk_rename_utility (view, selection); } @@
[gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/files/, gnome-base/nautilus/
commit: b5b579892433c8fafd8b528a63b5fd74592ab2fc Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sun May 27 12:39:16 2018 + Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sun May 27 12:47:01 2018 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=b5b57989 gnome-base/nautilus: restore optional tracker support Disable gtk-doc building as it seems broken. Package-Manager: Portage-2.3.40, Repoman-2.3.9 Manifest-Sign-Key: 0x5A56C8CD0C13248A .../files/3.26.2-tracker-support-optional.patch| 273 + gnome-base/nautilus/nautilus-3.26.2.ebuild | 18 +- 2 files changed, 284 insertions(+), 7 deletions(-) diff --git a/gnome-base/nautilus/files/3.26.2-tracker-support-optional.patch b/gnome-base/nautilus/files/3.26.2-tracker-support-optional.patch new file mode 100644 index ..4363cbbf --- /dev/null +++ b/gnome-base/nautilus/files/3.26.2-tracker-support-optional.patch @@ -0,0 +1,273 @@ +From 3e3d7621c6f8ec72e626701e3f55afc900a04a68 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue+Date: Sun, 27 May 2018 13:54:38 +0200 +Subject: [PATCH] Make tracker support optional + +--- + config.h.meson | 1 + + meson.build | 15 --- + meson_options.txt | 5 + + src/meson.build | 21 + + src/nautilus-file-undo-operations.c | 4 + src/nautilus-file.c | 2 ++ + src/nautilus-files-view.c | 4 + src/nautilus-search-engine.c| 14 ++ + 8 files changed, 55 insertions(+), 11 deletions(-) + +diff --git a/config.h.meson b/config.h.meson +index 4f5cb5848..58d71e96f 100644 +--- a/config.h.meson b/config.h.meson +@@ -4,6 +4,7 @@ + #mesondefine HAVE_EXEMPI + #mesondefine HAVE_EXIF + #mesondefine HAVE_SELINUX ++#mesondefine HAVE_TRACKER + #mesondefine ENABLE_DESKTOP + #mesondefine ENABLE_PACKAGEKIT + #mesondefine LOCALEDIR +diff --git a/meson.build b/meson.build +index 7b8f15cf5..b2f2ef438 100644 +--- a/meson.build b/meson.build +@@ -81,9 +81,18 @@ if get_option ('enable-selinux') + conf.set10 ('HAVE_SELINUX', true) + endif + +-tracker_sparql = dependency ('tracker-sparql-2.0', required: false) +-if not tracker_sparql.found() +- tracker_sparql = dependency ('tracker-sparql-1.0') ++tracker_api = get_option ('tracker') ++if tracker_api == 'disabled' ++# pass ++elif tracker_api == 'auto' ++tracker_sparql = dependency ('tracker-sparql-2.0', required: false) ++if not tracker_sparql.found() ++tracker_sparql = dependency ('tracker-sparql-1.0') ++endif ++conf.set10 ('HAVE_TRACKER', true) ++else ++tracker_sparql = dependency ('tracker-sparql-@0@'.format(tracker_api)) ++conf.set10 ('HAVE_TRACKER', true) + endif + + if get_option ('enable-xmp') +diff --git a/meson_options.txt b/meson_options.txt +index c934dd8b1..d2ba885a2 100644 +--- a/meson_options.txt b/meson_options.txt +@@ -8,6 +8,11 @@ option ('enable-exif', + type: 'boolean', + value: false, + description: 'enable EXIF support') ++option ('tracker', ++type: 'combo', ++choices: ['auto', '1.0', '2.0', 'disabled'], ++value: 'auto', ++description: 'enable bulk renames and search using Tracker') + option ('enable-xmp', + type: 'boolean', + value: false, +diff --git a/src/meson.build b/src/meson.build +index 9f01f5ba2..c55f39c7d 100644 +--- a/src/meson.build b/src/meson.build +@@ -254,12 +254,6 @@ libnautilus_sources = [ + 'nautilus-file-undo-operations.h', + 'nautilus-file-undo-manager.c', + 'nautilus-file-undo-manager.h', +-'nautilus-batch-rename-dialog.c', +-'nautilus-batch-rename-dialog.h', +-'nautilus-batch-rename-utilities.c', +-'nautilus-batch-rename-utilities.h', +-'nautilus-search-engine-tracker.c', +-'nautilus-search-engine-tracker.h' + ] + + nautilus_deps = [glib, +@@ -273,8 +267,7 @@ nautilus_deps = [glib, + eel_2, + nautilus_extension, + x11, +- gmodule_no_export, +- tracker_sparql] ++ gmodule_no_export] + + if get_option ('enable-exif') + nautilus_deps += exif +@@ -288,6 +281,18 @@ if get_option ('enable-xmp') + nautilus_deps += exempi + endif + ++if get_option ('tracker') != 'disabled' ++libnautilus_sources += [ ++'nautilus-batch-rename-dialog.c', ++'nautilus-batch-rename-dialog.h', ++'nautilus-batch-rename-utilities.c', ++'nautilus-batch-rename-utilities.h', ++'nautilus-search-engine-tracker.c', ++'nautilus-search-engine-tracker.h' ++] ++nautilus_deps += tracker_sparql ++endif ++ + libnautilus = static_library ('nautilus', + libnautilus_sources, + dependencies: nautilus_deps, +diff --git