1 |
commit: ad75d19be298e48823d06d01a3bfc61501fc6350 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Mar 30 22:15:47 2019 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Mar 30 22:15:47 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad75d19b |
7 |
|
8 |
gnome-base/nautilus: remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
11 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
12 |
|
13 |
gnome-base/nautilus/Manifest | 1 - |
14 |
.../files/3.26.4-file-view-crash-fix.patch | 81 ------- |
15 |
.../files/3.26.4-optional-introspection.patch | 49 ---- |
16 |
.../nautilus/files/3.26.4-optional-tracker.patch | 264 --------------------- |
17 |
gnome-base/nautilus/nautilus-3.26.4-r2.ebuild | 109 --------- |
18 |
5 files changed, 504 deletions(-) |
19 |
|
20 |
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest |
21 |
index c7b79491984..1fd2b7d2b62 100644 |
22 |
--- a/gnome-base/nautilus/Manifest |
23 |
+++ b/gnome-base/nautilus/Manifest |
24 |
@@ -1,5 +1,4 @@ |
25 |
DIST nautilus-3.24.2.1.tar.xz 5143440 BLAKE2B 731046b6bdd0817b770cf3e2f0667187bfde613cf1a15611e6ec06e74bc3c2432ca66894119f224023fe46b01fd777d3dde2d2ac7bba0a9eb0fd71d38e1756ff SHA512 f6868600bcdc82071b3a63f4e4a0f7decf0d72e021eb3d0c26e914413c858163ee4403c4f3ef7689556a0fc91394f30cff9a3db14da030b277b50972c7b80a07 |
26 |
-DIST nautilus-3.26.4.tar.xz 3267652 BLAKE2B 56986b8d87afc0ea7ce6f1f56ae06c7cfb05d060414aad428145a6c2cb631b9d4ebbeaefabb0f0ceeb5f930ae94737f8dfcabb300554a59c2b7d5a53d1ee3cd1 SHA512 2a50a2a9ae6ffbe4b706d46fb47e5f54f42e645189b3548d1904c3ddf882ef4a94819740c6821fe50c662a9013ab43bb9b7b3dbdfc779ecc82f16170b4867973 |
27 |
DIST nautilus-3.28.1-patchset.tar.xz 129360 BLAKE2B 18e94e83132a8ce2e07491ce6b5cb9499141bf93e0c3ef44f2e5ac891e59d334cf310d863e8e7450fa385a6a49873d790e4f8c36a1ef8e009b1f2be2361586b4 SHA512 6c3385b4bc7020601f47dc66c0b1cabd6dadcd9f986bdaec42aeca9b43a6b8a2362651958d4e6a4738b78fbd546071678ba15ab87c268e33cfc1cca49229da48 |
28 |
DIST nautilus-3.28.1.tar.xz 3262520 BLAKE2B 6f007e2327ffb108c5195737c02c7be12b874f5bc3bdfc1c84a3ba2176ff36e1843057522a54e569a7c09a056ccd888e1ddf099d6f2b527dfa109370cbe1a3a9 SHA512 6b695c097e5082062afe8cb036e819c837ce1e2570f581f81860f378e34f38f3020b8802e6a4285243c111d5208e892c419ac92621cdb1d35b2df205a3ccaa13 |
29 |
DIST nautilus-3.30.5.tar.xz 3254344 BLAKE2B 64da158ee661fc259a14f890bf6ad343f720245df6b9475ff047993570ea4e7234723eb242f057bc85b7ea95d38a99b5c2f5d546e982a3e3e32b7fc75cabb786 SHA512 e38a8bb380460d902e4ec6219d0e147a4245e790b18fb18ab9474ec2ae002a971243c6b09b8fec267e65c7ecc7bb1217191c4f5cb9547b3b9d5b0793068103cf |
30 |
|
31 |
diff --git a/gnome-base/nautilus/files/3.26.4-file-view-crash-fix.patch b/gnome-base/nautilus/files/3.26.4-file-view-crash-fix.patch |
32 |
deleted file mode 100644 |
33 |
index 72077f4a9fa..00000000000 |
34 |
--- a/gnome-base/nautilus/files/3.26.4-file-view-crash-fix.patch |
35 |
+++ /dev/null |
36 |
@@ -1,81 +0,0 @@ |
37 |
-From 834c4e7fe39f7053efdb126f9e1835e6b8e529f4 Mon Sep 17 00:00:00 2001 |
38 |
-From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@×××××.net> |
39 |
-Date: Thu, 26 Jul 2018 02:55:19 +0000 |
40 |
-Subject: [PATCH 1/3] file-view: Always unset pending_selection after freeing |
41 |
- it |
42 |
- |
43 |
-When a file view was loaded with a pending selection, and not all the files were |
44 |
-seen yet, the private pending_selection list was properly free'd, but the pointer |
45 |
-was not cleared, causing a crash when `nautilus_files_view_set_selection` was |
46 |
-called again, as it was trying to deeply copy a list pointed by this invalid |
47 |
-reference. |
48 |
- |
49 |
-So, removing the unneeded `pending_selection` temporary pointer from the main |
50 |
-function scope, as it only confuses, while use it (with an autolist) when we |
51 |
-need to pass the previous `priv->pending_selection` (stealing its ownership) |
52 |
-to set_selection again. |
53 |
- |
54 |
-Eventually use a g_clear_pointer to free the list and nullify its priv reference |
55 |
- |
56 |
-Fixes #295 |
57 |
- |
58 |
-(cherry picked from commit ae3382a281b018337a8032ef13663ec2d9c7fd6c) |
59 |
---- |
60 |
- src/nautilus-files-view.c | 16 +++++++--------- |
61 |
- 1 file changed, 7 insertions(+), 9 deletions(-) |
62 |
- |
63 |
-diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c |
64 |
-index 8784f63f8..36d791f80 100644 |
65 |
---- a/src/nautilus-files-view.c |
66 |
-+++ b/src/nautilus-files-view.c |
67 |
-@@ -3556,7 +3556,6 @@ done_loading (NautilusFilesView *view, |
68 |
- gboolean all_files_seen) |
69 |
- { |
70 |
- NautilusFilesViewPrivate *priv; |
71 |
-- GList *pending_selection; |
72 |
- GList *selection; |
73 |
- gboolean do_reveal = FALSE; |
74 |
- |
75 |
-@@ -3577,21 +3576,23 @@ done_loading (NautilusFilesView *view, |
76 |
- nautilus_files_view_update_toolbar_menus (view); |
77 |
- reset_update_interval (view); |
78 |
- |
79 |
-- pending_selection = priv->pending_selection; |
80 |
- selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); |
81 |
- |
82 |
- if (nautilus_view_is_searching (NAUTILUS_VIEW (view)) && |
83 |
-- all_files_seen && !selection && !pending_selection) |
84 |
-+ all_files_seen && selection == NULL && priv->pending_selection == NULL) |
85 |
- { |
86 |
- nautilus_files_view_select_first (view); |
87 |
- do_reveal = TRUE; |
88 |
- } |
89 |
-- else if (pending_selection != NULL && all_files_seen) |
90 |
-+ else if (priv->pending_selection != NULL && all_files_seen) |
91 |
- { |
92 |
-- priv->pending_selection = NULL; |
93 |
-+ GList *pending_selection; |
94 |
-+ pending_selection = g_steal_pointer (&priv->pending_selection); |
95 |
- |
96 |
- nautilus_files_view_call_set_selection (view, pending_selection); |
97 |
- do_reveal = TRUE; |
98 |
-+ |
99 |
-+ nautilus_file_list_free (pending_selection); |
100 |
- } |
101 |
- |
102 |
- if (selection) |
103 |
-@@ -3599,10 +3600,7 @@ done_loading (NautilusFilesView *view, |
104 |
- g_list_free_full (selection, g_object_unref); |
105 |
- } |
106 |
- |
107 |
-- if (pending_selection) |
108 |
-- { |
109 |
-- g_list_free_full (pending_selection, g_object_unref); |
110 |
-- } |
111 |
-+ g_clear_pointer (&priv->pending_selection, nautilus_file_list_free); |
112 |
- |
113 |
- if (do_reveal) |
114 |
- { |
115 |
--- |
116 |
-2.17.0 |
117 |
- |
118 |
|
119 |
diff --git a/gnome-base/nautilus/files/3.26.4-optional-introspection.patch b/gnome-base/nautilus/files/3.26.4-optional-introspection.patch |
120 |
deleted file mode 100644 |
121 |
index 54bf5ac95fe..00000000000 |
122 |
--- a/gnome-base/nautilus/files/3.26.4-optional-introspection.patch |
123 |
+++ /dev/null |
124 |
@@ -1,49 +0,0 @@ |
125 |
-From 5058b09996181fbd398c799eeba6a1d83b083186 Mon Sep 17 00:00:00 2001 |
126 |
-From: Mart Raudsepp <leio@g.o> |
127 |
-Date: Tue, 11 Dec 2018 16:14:11 +0200 |
128 |
-Subject: [PATCH 3/3] Make introspection support optional |
129 |
- |
130 |
-Upstream has it optional again with commit 200a5869b5c1dc8 as well, |
131 |
-but that's included only since nautilus-3.29.90 |
132 |
---- |
133 |
- libnautilus-extension/meson.build | 2 ++ |
134 |
- meson_options.txt | 4 ++++ |
135 |
- 2 files changed, 6 insertions(+) |
136 |
- |
137 |
-diff --git a/libnautilus-extension/meson.build b/libnautilus-extension/meson.build |
138 |
-index 067ad2414..4702964a9 100644 |
139 |
---- a/libnautilus-extension/meson.build |
140 |
-+++ b/libnautilus-extension/meson.build |
141 |
-@@ -41,12 +41,14 @@ libnautilus_extension = shared_library ('nautilus-extension', |
142 |
- version: nautilus_extension_version, |
143 |
- install: true) |
144 |
- |
145 |
-+if get_option('introspection') |
146 |
- gnome.generate_gir (libnautilus_extension, |
147 |
- sources: libnautilus_extension_headers + libnautilus_extension_sources, |
148 |
- nsversion: '3.0', |
149 |
- namespace: 'Nautilus', |
150 |
- includes: ['Gtk-3.0', 'Gio-2.0', 'GLib-2.0'], |
151 |
- install: true) |
152 |
-+endif |
153 |
- |
154 |
- nautilus_extension = declare_dependency (link_with: libnautilus_extension, |
155 |
- dependencies: libnautilus_extension_deps, |
156 |
-diff --git a/meson_options.txt b/meson_options.txt |
157 |
-index 0c23c7921..6ad3a72de 100644 |
158 |
---- a/meson_options.txt |
159 |
-+++ b/meson_options.txt |
160 |
-@@ -1,6 +1,10 @@ |
161 |
- option ('enable-profiling', |
162 |
- type: 'boolean', |
163 |
- value: false) |
164 |
-+option ('introspection', |
165 |
-+ type: 'boolean', |
166 |
-+ value: true, |
167 |
-+ description: 'Build GObject introspection data for extension library') |
168 |
- option ('enable-nst-extension', |
169 |
- type: 'boolean', |
170 |
- value: true) |
171 |
--- |
172 |
-2.17.0 |
173 |
- |
174 |
|
175 |
diff --git a/gnome-base/nautilus/files/3.26.4-optional-tracker.patch b/gnome-base/nautilus/files/3.26.4-optional-tracker.patch |
176 |
deleted file mode 100644 |
177 |
index 03791996770..00000000000 |
178 |
--- a/gnome-base/nautilus/files/3.26.4-optional-tracker.patch |
179 |
+++ /dev/null |
180 |
@@ -1,264 +0,0 @@ |
181 |
-From 74a7d02eb342416194dcc3c676199d8f5266a481 Mon Sep 17 00:00:00 2001 |
182 |
-From: Gilles Dartiguelongue <eva@g.o> |
183 |
-Date: Sun, 27 May 2018 13:54:38 +0200 |
184 |
-Subject: [PATCH 2/3] Make tracker support optional |
185 |
- |
186 |
---- |
187 |
- config.h.meson | 1 + |
188 |
- meson.build | 9 ++++++--- |
189 |
- meson_options.txt | 4 ++++ |
190 |
- src/meson.build | 19 ++++++++++++------- |
191 |
- src/nautilus-file-undo-operations.c | 4 ++++ |
192 |
- src/nautilus-file.c | 2 ++ |
193 |
- src/nautilus-files-view.c | 4 ++++ |
194 |
- src/nautilus-search-engine.c | 14 ++++++++++++++ |
195 |
- 8 files changed, 47 insertions(+), 10 deletions(-) |
196 |
- |
197 |
-diff --git a/config.h.meson b/config.h.meson |
198 |
-index 4f5cb5848..58d71e96f 100644 |
199 |
---- a/config.h.meson |
200 |
-+++ b/config.h.meson |
201 |
-@@ -4,6 +4,7 @@ |
202 |
- #mesondefine HAVE_EXEMPI |
203 |
- #mesondefine HAVE_EXIF |
204 |
- #mesondefine HAVE_SELINUX |
205 |
-+#mesondefine HAVE_TRACKER |
206 |
- #mesondefine ENABLE_DESKTOP |
207 |
- #mesondefine ENABLE_PACKAGEKIT |
208 |
- #mesondefine LOCALEDIR |
209 |
-diff --git a/meson.build b/meson.build |
210 |
-index 0b8a6f1b0..559c3dbfd 100644 |
211 |
---- a/meson.build |
212 |
-+++ b/meson.build |
213 |
-@@ -81,9 +81,12 @@ if get_option ('enable-selinux') |
214 |
- conf.set10 ('HAVE_SELINUX', true) |
215 |
- endif |
216 |
- |
217 |
--tracker_sparql = dependency ('tracker-sparql-2.0', required: false) |
218 |
--if not tracker_sparql.found() |
219 |
-- tracker_sparql = dependency ('tracker-sparql-1.0') |
220 |
-+if get_option ('tracker') |
221 |
-+ tracker_sparql = dependency ('tracker-sparql-2.0', required: false) |
222 |
-+ if not tracker_sparql.found() |
223 |
-+ tracker_sparql = dependency ('tracker-sparql-1.0') |
224 |
-+ endif |
225 |
-+ conf.set10 ('HAVE_TRACKER', true) |
226 |
- endif |
227 |
- |
228 |
- if get_option ('enable-xmp') |
229 |
-diff --git a/meson_options.txt b/meson_options.txt |
230 |
-index c934dd8b1..0c23c7921 100644 |
231 |
---- a/meson_options.txt |
232 |
-+++ b/meson_options.txt |
233 |
-@@ -8,6 +8,10 @@ option ('enable-exif', |
234 |
- type: 'boolean', |
235 |
- value: false, |
236 |
- description: 'enable EXIF support') |
237 |
-+option ('tracker', |
238 |
-+ type: 'boolean', |
239 |
-+ value: true, |
240 |
-+ description: 'enable bulk renames and search using Tracker') |
241 |
- option ('enable-xmp', |
242 |
- type: 'boolean', |
243 |
- value: false, |
244 |
-diff --git a/src/meson.build b/src/meson.build |
245 |
-index cc08345d8..8ea10b16b 100644 |
246 |
---- a/src/meson.build |
247 |
-+++ b/src/meson.build |
248 |
-@@ -254,12 +254,6 @@ libnautilus_sources = [ |
249 |
- 'nautilus-file-undo-operations.h', |
250 |
- 'nautilus-file-undo-manager.c', |
251 |
- 'nautilus-file-undo-manager.h', |
252 |
-- 'nautilus-batch-rename-dialog.c', |
253 |
-- 'nautilus-batch-rename-dialog.h', |
254 |
-- 'nautilus-batch-rename-utilities.c', |
255 |
-- 'nautilus-batch-rename-utilities.h', |
256 |
-- 'nautilus-search-engine-tracker.c', |
257 |
-- 'nautilus-search-engine-tracker.h' |
258 |
- ] |
259 |
- |
260 |
- nautilus_deps = [glib, |
261 |
-@@ -274,7 +268,6 @@ nautilus_deps = [glib, |
262 |
- nautilus_extension, |
263 |
- x11, |
264 |
- gmodule_no_export, |
265 |
-- tracker_sparql, |
266 |
- gio_unix] |
267 |
- |
268 |
- if get_option ('enable-exif') |
269 |
-@@ -289,6 +282,18 @@ if get_option ('enable-xmp') |
270 |
- nautilus_deps += exempi |
271 |
- endif |
272 |
- |
273 |
-+if get_option ('tracker') |
274 |
-+ libnautilus_sources += [ |
275 |
-+ 'nautilus-batch-rename-dialog.c', |
276 |
-+ 'nautilus-batch-rename-dialog.h', |
277 |
-+ 'nautilus-batch-rename-utilities.c', |
278 |
-+ 'nautilus-batch-rename-utilities.h', |
279 |
-+ 'nautilus-search-engine-tracker.c', |
280 |
-+ 'nautilus-search-engine-tracker.h' |
281 |
-+ ] |
282 |
-+ nautilus_deps += tracker_sparql |
283 |
-+endif |
284 |
-+ |
285 |
- libnautilus = static_library ('nautilus', |
286 |
- libnautilus_sources, |
287 |
- dependencies: nautilus_deps, |
288 |
-diff --git a/src/nautilus-file-undo-operations.c b/src/nautilus-file-undo-operations.c |
289 |
-index e833d0578..d6e407ca5 100644 |
290 |
---- a/src/nautilus-file-undo-operations.c |
291 |
-+++ b/src/nautilus-file-undo-operations.c |
292 |
-@@ -31,8 +31,10 @@ |
293 |
- #include "nautilus-file-operations.h" |
294 |
- #include "nautilus-file.h" |
295 |
- #include "nautilus-file-undo-manager.h" |
296 |
-+#ifdef HAVE_TRACKER |
297 |
- #include "nautilus-batch-rename-dialog.h" |
298 |
- #include "nautilus-batch-rename-utilities.h" |
299 |
-+#endif |
300 |
- |
301 |
- |
302 |
- /* Since we use g_get_current_time for setting "orig_trash_time" in the undo |
303 |
-@@ -1087,6 +1089,7 @@ nautilus_file_undo_info_rename_set_data_post (NautilusFileUndoInfoRename *self, |
304 |
- } |
305 |
- |
306 |
- /* batch rename */ |
307 |
-+#ifdef HAVE_TRACKER |
308 |
- G_DEFINE_TYPE (NautilusFileUndoInfoBatchRename, nautilus_file_undo_info_batch_rename, NAUTILUS_TYPE_FILE_UNDO_INFO); |
309 |
- |
310 |
- struct _NautilusFileUndoInfoBatchRenameDetails |
311 |
-@@ -1303,6 +1306,7 @@ nautilus_file_undo_info_batch_rename_set_data_post (NautilusFileUndoInfoBatchRen |
312 |
- |
313 |
- self->priv->new_display_names = g_list_reverse (self->priv->new_display_names); |
314 |
- } |
315 |
-+#endif |
316 |
- |
317 |
- /* trash */ |
318 |
- G_DEFINE_TYPE (NautilusFileUndoInfoTrash, nautilus_file_undo_info_trash, NAUTILUS_TYPE_FILE_UNDO_INFO) |
319 |
-diff --git a/src/nautilus-file.c b/src/nautilus-file.c |
320 |
-index 0ac53984b..549e1eb39 100644 |
321 |
---- a/src/nautilus-file.c |
322 |
-+++ b/src/nautilus-file.c |
323 |
-@@ -2407,6 +2407,7 @@ real_batch_rename (GList *files, |
324 |
- } |
325 |
- } |
326 |
- |
327 |
-+#ifdef HAVE_TRACKER |
328 |
- /* Tell the undo manager a batch rename is taking place if at least |
329 |
- * a file has been renamed*/ |
330 |
- if (!nautilus_file_undo_manager_is_operating () && op->skipped_files != g_list_length (files)) |
331 |
-@@ -2421,6 +2422,7 @@ real_batch_rename (GList *files, |
332 |
- |
333 |
- nautilus_file_undo_manager_set_action (op->undo_info); |
334 |
- } |
335 |
-+#endif |
336 |
- |
337 |
- if (op->skipped_files == g_list_length (files)) |
338 |
- { |
339 |
-diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c |
340 |
-index 36d791f80..691d5606d 100644 |
341 |
---- a/src/nautilus-files-view.c |
342 |
-+++ b/src/nautilus-files-view.c |
343 |
-@@ -28,8 +28,10 @@ |
344 |
- #include "nautilus-files-view.h" |
345 |
- |
346 |
- #include "nautilus-application.h" |
347 |
-+#ifdef HAVE_TRACKER |
348 |
- #include "nautilus-batch-rename-dialog.h" |
349 |
- #include "nautilus-batch-rename-utilities.h" |
350 |
-+#endif |
351 |
- #include "nautilus-error-reporting.h" |
352 |
- #include "nautilus-file-undo-manager.h" |
353 |
- #include "nautilus-floating-bar.h" |
354 |
-@@ -6264,6 +6266,7 @@ real_action_rename (NautilusFilesView *view) |
355 |
- { |
356 |
- invoke_external_bulk_rename_utility (view, selection); |
357 |
- } |
358 |
-+#ifdef HAVE_TRACKER |
359 |
- else |
360 |
- { |
361 |
- GdkCursor *cursor; |
362 |
-@@ -6281,6 +6284,7 @@ real_action_rename (NautilusFilesView *view) |
363 |
- |
364 |
- gtk_widget_show (GTK_WIDGET (dialog)); |
365 |
- } |
366 |
-+#endif |
367 |
- } |
368 |
- else |
369 |
- { |
370 |
-diff --git a/src/nautilus-search-engine.c b/src/nautilus-search-engine.c |
371 |
-index 209bd4f80..436cd7471 100644 |
372 |
---- a/src/nautilus-search-engine.c |
373 |
-+++ b/src/nautilus-search-engine.c |
374 |
-@@ -28,11 +28,15 @@ |
375 |
- #include "nautilus-search-engine-model.h" |
376 |
- #define DEBUG_FLAG NAUTILUS_DEBUG_SEARCH |
377 |
- #include "nautilus-debug.h" |
378 |
-+#ifdef HAVE_TRACKER |
379 |
- #include "nautilus-search-engine-tracker.h" |
380 |
-+#endif |
381 |
- |
382 |
- typedef struct |
383 |
- { |
384 |
-+#ifdef HAVE_TRACKER |
385 |
- NautilusSearchEngineTracker *tracker; |
386 |
-+#endif |
387 |
- NautilusSearchEngineSimple *simple; |
388 |
- NautilusSearchEngineModel *model; |
389 |
- |
390 |
-@@ -73,7 +77,9 @@ nautilus_search_engine_set_query (NautilusSearchProvider *provider, |
391 |
- engine = NAUTILUS_SEARCH_ENGINE (provider); |
392 |
- priv = nautilus_search_engine_get_instance_private (engine); |
393 |
- |
394 |
-+#ifdef HAVE_TRACKER |
395 |
- nautilus_search_provider_set_query (NAUTILUS_SEARCH_PROVIDER (priv->tracker), query); |
396 |
-+#endif |
397 |
- nautilus_search_provider_set_query (NAUTILUS_SEARCH_PROVIDER (priv->model), query); |
398 |
- nautilus_search_provider_set_query (NAUTILUS_SEARCH_PROVIDER (priv->simple), query); |
399 |
- } |
400 |
-@@ -95,8 +101,10 @@ search_engine_start_real (NautilusSearchEngine *engine) |
401 |
- |
402 |
- g_object_ref (engine); |
403 |
- |
404 |
-+#ifdef HAVE_TRACKER |
405 |
- nautilus_search_provider_start (NAUTILUS_SEARCH_PROVIDER (priv->tracker)); |
406 |
- priv->providers_running++; |
407 |
-+#endif |
408 |
- |
409 |
- if (nautilus_search_engine_model_get_model (priv->model)) |
410 |
- { |
411 |
-@@ -158,7 +166,9 @@ nautilus_search_engine_stop (NautilusSearchProvider *provider) |
412 |
- |
413 |
- DEBUG ("Search engine stop"); |
414 |
- |
415 |
-+#ifdef HAVE_TRACKER |
416 |
- nautilus_search_provider_stop (NAUTILUS_SEARCH_PROVIDER (priv->tracker)); |
417 |
-+#endif |
418 |
- nautilus_search_provider_stop (NAUTILUS_SEARCH_PROVIDER (priv->model)); |
419 |
- nautilus_search_provider_stop (NAUTILUS_SEARCH_PROVIDER (priv->simple)); |
420 |
- |
421 |
-@@ -333,7 +343,9 @@ nautilus_search_engine_finalize (GObject *object) |
422 |
- |
423 |
- g_hash_table_destroy (priv->uris); |
424 |
- |
425 |
-+#ifdef HAVE_TRACKER |
426 |
- g_clear_object (&priv->tracker); |
427 |
-+#endif |
428 |
- g_clear_object (&priv->model); |
429 |
- g_clear_object (&priv->simple); |
430 |
- |
431 |
-@@ -387,8 +399,10 @@ nautilus_search_engine_init (NautilusSearchEngine *engine) |
432 |
- priv = nautilus_search_engine_get_instance_private (engine); |
433 |
- priv->uris = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); |
434 |
- |
435 |
-+#ifdef HAVE_TRACKER |
436 |
- priv->tracker = nautilus_search_engine_tracker_new (); |
437 |
- connect_provider_signals (engine, NAUTILUS_SEARCH_PROVIDER (priv->tracker)); |
438 |
-+#endif |
439 |
- |
440 |
- priv->model = nautilus_search_engine_model_new (); |
441 |
- connect_provider_signals (engine, NAUTILUS_SEARCH_PROVIDER (priv->model)); |
442 |
--- |
443 |
-2.17.0 |
444 |
- |
445 |
|
446 |
diff --git a/gnome-base/nautilus/nautilus-3.26.4-r2.ebuild b/gnome-base/nautilus/nautilus-3.26.4-r2.ebuild |
447 |
deleted file mode 100644 |
448 |
index aef38545ec0..00000000000 |
449 |
--- a/gnome-base/nautilus/nautilus-3.26.4-r2.ebuild |
450 |
+++ /dev/null |
451 |
@@ -1,109 +0,0 @@ |
452 |
-# Copyright 1999-2018 Gentoo Authors |
453 |
-# Distributed under the terms of the GNU General Public License v2 |
454 |
- |
455 |
-EAPI=6 |
456 |
- |
457 |
-inherit gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg |
458 |
- |
459 |
-DESCRIPTION="A file manager for the GNOME desktop" |
460 |
-HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus" |
461 |
- |
462 |
-LICENSE="GPL-3+ LGPL-2.1+" |
463 |
-SLOT="0" |
464 |
-IUSE="exif gnome gtk-doc +introspection packagekit +previewer selinux sendto tracker xmp" |
465 |
- |
466 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" |
467 |
- |
468 |
-COMMON_DEPEND=" |
469 |
- >=dev-libs/glib-2.51.2:2 |
470 |
- >=gnome-base/gnome-desktop-3.0.0:3= |
471 |
- >=x11-libs/pango-1.28.3 |
472 |
- >=x11-libs/gtk+-3.22.6:3[X,introspection?] |
473 |
- >=dev-libs/libxml2-2.7.8:2 |
474 |
- exif? ( >=media-libs/libexif-0.6.20 ) |
475 |
- xmp? ( >=media-libs/exempi-2.1.0:2 ) |
476 |
- >=gnome-base/gsettings-desktop-schemas-3.8.0 |
477 |
- >=app-arch/gnome-autoar-0.2.1 |
478 |
- selinux? ( >=sys-libs/libselinux-2.0 ) |
479 |
- x11-libs/libX11 |
480 |
- tracker? ( >=app-misc/tracker-1:= ) |
481 |
- introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) |
482 |
-" |
483 |
-DEPEND="${COMMON_DEPEND} |
484 |
- >=dev-util/gdbus-codegen-2.51.2 |
485 |
- dev-util/glib-utils |
486 |
- gtk-doc? ( >=dev-util/gtk-doc-1.10 ) |
487 |
- >=sys-devel/gettext-0.19.8 |
488 |
- virtual/pkgconfig |
489 |
- x11-base/xorg-proto |
490 |
-" |
491 |
-RDEPEND="${COMMON_DEPEND} |
492 |
- packagekit? ( app-admin/packagekit-base ) |
493 |
- sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 ) |
494 |
-" |
495 |
- |
496 |
-PDEPEND=" |
497 |
- gnome? ( x11-themes/adwaita-icon-theme ) |
498 |
- previewer? ( >=gnome-extra/sushi-0.1.9 ) |
499 |
- sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 ) |
500 |
- >=gnome-base/gvfs-1.14[gtk(+)] |
501 |
-" |
502 |
-# Need gvfs[gtk] for recent:/// support; always built (without USE=gtk) since gvfs-1.34 |
503 |
- |
504 |
-PATCHES=( |
505 |
- "${FILESDIR}"/${PV}-file-view-crash-fix.patch |
506 |
- "${FILESDIR}"/${PV}-optional-tracker.patch |
507 |
- "${FILESDIR}"/${PV}-optional-introspection.patch |
508 |
-) |
509 |
- |
510 |
-src_prepare() { |
511 |
- if use previewer; then |
512 |
- DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files. |
513 |
- To activate the previewer, select a file and press space; to |
514 |
- close the previewer, press space again." |
515 |
- fi |
516 |
- xdg_src_prepare |
517 |
-} |
518 |
- |
519 |
-src_configure() { |
520 |
- local emesonargs=( |
521 |
- -Denable-profiling=false |
522 |
- $(meson_use introspection) |
523 |
- $(meson_use sendto enable-nst-extension) |
524 |
- $(meson_use exif enable-exif) |
525 |
- $(meson_use tracker) |
526 |
- $(meson_use xmp enable-xmp) |
527 |
- $(meson_use selinux enable-selinux) |
528 |
- -Denable-desktop=true |
529 |
- $(meson_use packagekit enable-packagekit) |
530 |
- $(meson_use gtk-doc enable-gtk-doc) |
531 |
- ) |
532 |
- meson_src_configure |
533 |
-} |
534 |
- |
535 |
-src_install() { |
536 |
- use previewer && readme.gentoo_create_doc |
537 |
- meson_src_install |
538 |
-} |
539 |
- |
540 |
-src_test() { |
541 |
- virtx meson_src_test |
542 |
-} |
543 |
- |
544 |
-pkg_postinst() { |
545 |
- xdg_pkg_postinst |
546 |
- gnome2_icon_cache_update |
547 |
- gnome2_schemas_update |
548 |
- |
549 |
- if use previewer; then |
550 |
- readme.gentoo_print_elog |
551 |
- else |
552 |
- elog "To preview media files, emerge nautilus with USE=previewer" |
553 |
- fi |
554 |
-} |
555 |
- |
556 |
-pkg_postrm() { |
557 |
- xdg_pkg_postrm |
558 |
- gnome2_icon_cache_update |
559 |
- gnome2_schemas_update |
560 |
-} |