Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Gilles Dartiguelongue <eva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/files/, gnome-base/nautilus/
Date: Sun, 27 May 2018 12:57:34
Message-Id: 1527425794.22215e85317f85cd469433b6e5a017d420247f33.eva@gentoo
1 commit: 22215e85317f85cd469433b6e5a017d420247f33
2 Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 27 12:44:47 2018 +0000
4 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
5 CommitDate: Sun May 27 12:56:34 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=22215e85
7
8 gnome-base/nautilus: 3.26.2 → 3.26.3.1
9
10 Cleanup unused dependencies.
11
12 Package-Manager: Portage-2.3.40, Repoman-2.3.9
13 Manifest-Sign-Key: 0x5A56C8CD0C13248A
14
15 ...tch => 3.26.3.1-tracker-support-optional.patch} | 32 ++++++++++------------
16 ...ilus-3.26.2.ebuild => nautilus-3.26.3.1.ebuild} | 14 ++--------
17 2 files changed, 18 insertions(+), 28 deletions(-)
18
19 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
20 similarity index 91%
21 rename from gnome-base/nautilus/files/3.26.2-tracker-support-optional.patch
22 rename to gnome-base/nautilus/files/3.26.3.1-tracker-support-optional.patch
23 index 4363cbbf..61eacc2a 100644
24 --- a/gnome-base/nautilus/files/3.26.2-tracker-support-optional.patch
25 +++ b/gnome-base/nautilus/files/3.26.3.1-tracker-support-optional.patch
26 @@ -1,4 +1,4 @@
27 -From 3e3d7621c6f8ec72e626701e3f55afc900a04a68 Mon Sep 17 00:00:00 2001
28 +From 664c66bd231c5d0ac20f6f4f14be461bfb206a1e Mon Sep 17 00:00:00 2001
29 From: Gilles Dartiguelongue <eva@g.o>
30 Date: Sun, 27 May 2018 13:54:38 +0200
31 Subject: [PATCH] Make tracker support optional
32 @@ -7,12 +7,12 @@ Subject: [PATCH] Make tracker support optional
33 config.h.meson | 1 +
34 meson.build | 15 ++++++++++++---
35 meson_options.txt | 5 +++++
36 - src/meson.build | 21 +++++++++++++--------
37 + src/meson.build | 19 ++++++++++++-------
38 src/nautilus-file-undo-operations.c | 4 ++++
39 src/nautilus-file.c | 2 ++
40 src/nautilus-files-view.c | 4 ++++
41 src/nautilus-search-engine.c | 14 ++++++++++++++
42 - 8 files changed, 55 insertions(+), 11 deletions(-)
43 + 8 files changed, 54 insertions(+), 10 deletions(-)
44
45 diff --git a/config.h.meson b/config.h.meson
46 index 4f5cb5848..58d71e96f 100644
47 @@ -27,7 +27,7 @@ index 4f5cb5848..58d71e96f 100644
48 #mesondefine ENABLE_PACKAGEKIT
49 #mesondefine LOCALEDIR
50 diff --git a/meson.build b/meson.build
51 -index 7b8f15cf5..b2f2ef438 100644
52 +index 6256193cc..776111f81 100644
53 --- a/meson.build
54 +++ b/meson.build
55 @@ -81,9 +81,18 @@ if get_option ('enable-selinux')
56 @@ -36,7 +36,7 @@ index 7b8f15cf5..b2f2ef438 100644
57
58 -tracker_sparql = dependency ('tracker-sparql-2.0', required: false)
59 -if not tracker_sparql.found()
60 -- tracker_sparql = dependency ('tracker-sparql-1.0')
61 +- tracker_sparql = dependency ('tracker-sparql-1.0')
62 +tracker_api = get_option ('tracker')
63 +if tracker_api == 'disabled'
64 + # pass
65 @@ -69,7 +69,7 @@ index c934dd8b1..d2ba885a2 100644
66 type: 'boolean',
67 value: false,
68 diff --git a/src/meson.build b/src/meson.build
69 -index 9f01f5ba2..c55f39c7d 100644
70 +index cc08345d8..40f337cde 100644
71 --- a/src/meson.build
72 +++ b/src/meson.build
73 @@ -254,12 +254,6 @@ libnautilus_sources = [
74 @@ -85,17 +85,15 @@ index 9f01f5ba2..c55f39c7d 100644
75 ]
76
77 nautilus_deps = [glib,
78 -@@ -273,8 +267,7 @@ nautilus_deps = [glib,
79 - eel_2,
80 +@@ -274,7 +268,6 @@ nautilus_deps = [glib,
81 nautilus_extension,
82 x11,
83 -- gmodule_no_export,
84 -- tracker_sparql]
85 -+ gmodule_no_export]
86 + gmodule_no_export,
87 +- tracker_sparql,
88 + gio_unix]
89
90 if get_option ('enable-exif')
91 - nautilus_deps += exif
92 -@@ -288,6 +281,18 @@ if get_option ('enable-xmp')
93 +@@ -289,6 +282,18 @@ if get_option ('enable-xmp')
94 nautilus_deps += exempi
95 endif
96
97 @@ -146,7 +144,7 @@ index e833d0578..d6e407ca5 100644
98 /* trash */
99 G_DEFINE_TYPE (NautilusFileUndoInfoTrash, nautilus_file_undo_info_trash, NAUTILUS_TYPE_FILE_UNDO_INFO)
100 diff --git a/src/nautilus-file.c b/src/nautilus-file.c
101 -index 536f83541..247334d5d 100644
102 +index d6ac35a44..752adc295 100644
103 --- a/src/nautilus-file.c
104 +++ b/src/nautilus-file.c
105 @@ -2392,6 +2392,7 @@ real_batch_rename (GList *files,
106 @@ -166,7 +164,7 @@ index 536f83541..247334d5d 100644
107 if (op->skipped_files == g_list_length (files))
108 {
109 diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
110 -index a79ecf20d..3b7bd4166 100644
111 +index 8784f63f8..af5605d68 100644
112 --- a/src/nautilus-files-view.c
113 +++ b/src/nautilus-files-view.c
114 @@ -28,8 +28,10 @@
115 @@ -180,7 +178,7 @@ index a79ecf20d..3b7bd4166 100644
116 #include "nautilus-error-reporting.h"
117 #include "nautilus-file-undo-manager.h"
118 #include "nautilus-floating-bar.h"
119 -@@ -6209,6 +6211,7 @@ real_action_rename (NautilusFilesView *view)
120 +@@ -6266,6 +6268,7 @@ real_action_rename (NautilusFilesView *view)
121 {
122 invoke_external_bulk_rename_utility (view, selection);
123 }
124 @@ -188,7 +186,7 @@ index a79ecf20d..3b7bd4166 100644
125 else
126 {
127 GdkCursor *cursor;
128 -@@ -6226,6 +6229,7 @@ real_action_rename (NautilusFilesView *view)
129 +@@ -6283,6 +6286,7 @@ real_action_rename (NautilusFilesView *view)
130
131 gtk_widget_show (GTK_WIDGET (dialog));
132 }
133
134 diff --git a/gnome-base/nautilus/nautilus-3.26.2.ebuild b/gnome-base/nautilus/nautilus-3.26.3.1.ebuild
135 similarity index 91%
136 rename from gnome-base/nautilus/nautilus-3.26.2.ebuild
137 rename to gnome-base/nautilus/nautilus-3.26.3.1.ebuild
138 index ac07418d..076cdce4 100644
139 --- a/gnome-base/nautilus/nautilus-3.26.2.ebuild
140 +++ b/gnome-base/nautilus/nautilus-3.26.3.1.ebuild
141 @@ -13,7 +13,7 @@ LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
142 SLOT="0"
143 IUSE="exif gnome +introspection packagekit +previewer selinux sendto tracker xmp"
144
145 -KEYWORDS="~amd64"
146 +KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
147
148 # FIXME: tests fails under Xvfb, but pass when building manually
149 # "FAIL: check failed in nautilus-file.c, line 8307"
150 @@ -30,11 +30,8 @@ COMMON_DEPEND="
151 >=dev-libs/libxml2-2.7.8:2
152 >=gnome-base/gnome-desktop-3:3=
153
154 - gnome-base/dconf
155 >=gnome-base/gsettings-desktop-schemas-3.8.0
156 x11-libs/libX11
157 - x11-libs/libXext
158 - x11-libs/libXrender
159
160 exif? ( >=media-libs/libexif-0.6.20 )
161 introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
162 @@ -43,21 +40,16 @@ COMMON_DEPEND="
163 xmp? ( >=media-libs/exempi-2.1.0:2 )
164 "
165 DEPEND="${COMMON_DEPEND}
166 - >=dev-lang/perl-5
167 >=dev-util/gdbus-codegen-2.33
168 - >=dev-util/gtk-doc-1.10
169 >=sys-devel/gettext-0.19.7
170 virtual/pkgconfig
171 x11-base/xorg-proto
172 "
173 RDEPEND="${COMMON_DEPEND}
174 + gnome-base/dconf
175 packagekit? ( app-admin/packagekit-base )
176 sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
177 "
178 -
179 -# FIXME: does nautilus tracker tags work with tracker 2? there seems to be
180 -# some automagic involved
181 -
182 PDEPEND="
183 gnome? ( x11-themes/adwaita-icon-theme )
184 tracker? ( >=gnome-extra/nautilus-tracker-tags-0.12 )
185 @@ -87,7 +79,7 @@ src_configure() {
186 -Denable-desktop=true \
187 -Denable-gtk-doc=false \
188 -Denable-profiling=false \
189 - -Dtracker=$(usex tracker 1.0 disabled) \
190 + -Dtracker=$(usex tracker auto disabled) \
191 $(meson_use exif enable-exif) \
192 $(meson_use packagekit enable-packagekit) \
193 $(meson_use sendto nst-extension) \
Report Message
Find on MARC Find on Google Groups