Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/base/, gnome-base/nautilus/, gnome-base/nautilus/files/
Date: Mon, 11 Mar 2019 21:47:19
Message-Id: 1552340827.8be74aaafdc6d71f7ed7d1244832030314455118.leio@gentoo
1 commit: 8be74aaafdc6d71f7ed7d1244832030314455118
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Mon Mar 11 21:40:20 2019 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Mon Mar 11 21:47:07 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8be74aaa
7
8 gnome-base/nautilus: bump to 3.30.5
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 gnome-base/nautilus/files/3.30.5-docs-build.patch | 42 ++++++++
15 .../nautilus/files/3.30.5-seccomp-sparc32.patch | 27 +++++
16 .../files/3.30.5-thumbnailer-updates.patch | 113 +++++++++++++++++++++
17 .../files/3.30.5-thumbnailer-updates2.patch | 46 +++++++++
18 gnome-base/nautilus/nautilus-3.28.1.ebuild | 2 +-
19 ...utilus-3.28.1.ebuild => nautilus-3.30.5.ebuild} | 19 ++--
20 profiles/base/package.use.force | 1 +
21 8 files changed, 241 insertions(+), 10 deletions(-)
22
23 diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
24 index 5397c7fa99d..c7b79491984 100644
25 --- a/gnome-base/nautilus/Manifest
26 +++ b/gnome-base/nautilus/Manifest
27 @@ -2,3 +2,4 @@ DIST nautilus-3.24.2.1.tar.xz 5143440 BLAKE2B 731046b6bdd0817b770cf3e2f0667187bf
28 DIST nautilus-3.26.4.tar.xz 3267652 BLAKE2B 56986b8d87afc0ea7ce6f1f56ae06c7cfb05d060414aad428145a6c2cb631b9d4ebbeaefabb0f0ceeb5f930ae94737f8dfcabb300554a59c2b7d5a53d1ee3cd1 SHA512 2a50a2a9ae6ffbe4b706d46fb47e5f54f42e645189b3548d1904c3ddf882ef4a94819740c6821fe50c662a9013ab43bb9b7b3dbdfc779ecc82f16170b4867973
29 DIST nautilus-3.28.1-patchset.tar.xz 129360 BLAKE2B 18e94e83132a8ce2e07491ce6b5cb9499141bf93e0c3ef44f2e5ac891e59d334cf310d863e8e7450fa385a6a49873d790e4f8c36a1ef8e009b1f2be2361586b4 SHA512 6c3385b4bc7020601f47dc66c0b1cabd6dadcd9f986bdaec42aeca9b43a6b8a2362651958d4e6a4738b78fbd546071678ba15ab87c268e33cfc1cca49229da48
30 DIST nautilus-3.28.1.tar.xz 3262520 BLAKE2B 6f007e2327ffb108c5195737c02c7be12b874f5bc3bdfc1c84a3ba2176ff36e1843057522a54e569a7c09a056ccd888e1ddf099d6f2b527dfa109370cbe1a3a9 SHA512 6b695c097e5082062afe8cb036e819c837ce1e2570f581f81860f378e34f38f3020b8802e6a4285243c111d5208e892c419ac92621cdb1d35b2df205a3ccaa13
31 +DIST nautilus-3.30.5.tar.xz 3254344 BLAKE2B 64da158ee661fc259a14f890bf6ad343f720245df6b9475ff047993570ea4e7234723eb242f057bc85b7ea95d38a99b5c2f5d546e982a3e3e32b7fc75cabb786 SHA512 e38a8bb380460d902e4ec6219d0e147a4245e790b18fb18ab9474ec2ae002a971243c6b09b8fec267e65c7ecc7bb1217191c4f5cb9547b3b9d5b0793068103cf
32
33 diff --git a/gnome-base/nautilus/files/3.30.5-docs-build.patch b/gnome-base/nautilus/files/3.30.5-docs-build.patch
34 new file mode 100644
35 index 00000000000..65ac29109e8
36 --- /dev/null
37 +++ b/gnome-base/nautilus/files/3.30.5-docs-build.patch
38 @@ -0,0 +1,42 @@
39 +From a62478c8e55bc6b1cd685f0c8c2094e1ed244c69 Mon Sep 17 00:00:00 2001
40 +From: Mart Raudsepp <leio@g.o>
41 +Date: Mon, 11 Mar 2019 20:52:53 +0200
42 +Subject: [PATCH] build: Always install man page
43 +
44 +It's already generated and shouldn't be thrown in the same pot as
45 +full gtk-doc generation. It should be either a separate `man` option,
46 +or just always installed.
47 +---
48 + docs/meson.build | 4 +++-
49 + meson.build | 4 +---
50 + 2 files changed, 4 insertions(+), 4 deletions(-)
51 +
52 +diff --git a/docs/meson.build b/docs/meson.build
53 +index b039cb631..2b1800be6 100644
54 +--- a/docs/meson.build
55 ++++ b/docs/meson.build
56 +@@ -1,3 +1,5 @@
57 + install_man('nautilus.1')
58 +
59 +-subdir('reference')
60 ++if get_option('docs')
61 ++ subdir('reference')
62 ++endif
63 +diff --git a/meson.build b/meson.build
64 +index 996360a62..50479f5f0 100644
65 +--- a/meson.build
66 ++++ b/meson.build
67 +@@ -222,9 +222,7 @@ subdirs = [
68 + # Conditional building #
69 + ########################
70 +
71 +-if get_option('docs')
72 +- subdirs += 'docs'
73 +-endif
74 ++subdirs += 'docs'
75 + if get_option('tests') != 'none'
76 + subdirs += 'test'
77 + endif
78 +--
79 +2.17.0
80 +
81
82 diff --git a/gnome-base/nautilus/files/3.30.5-seccomp-sparc32.patch b/gnome-base/nautilus/files/3.30.5-seccomp-sparc32.patch
83 new file mode 100644
84 index 00000000000..f67695b7f1d
85 --- /dev/null
86 +++ b/gnome-base/nautilus/files/3.30.5-seccomp-sparc32.patch
87 @@ -0,0 +1,27 @@
88 +From 3b0fd7dd26fa5af0b310650b2974d800ace80802 Mon Sep 17 00:00:00 2001
89 +From: Mart Raudsepp <leio@g.o>
90 +Date: Fri, 15 Feb 2019 21:34:34 +0200
91 +Subject: [PATCH 2/2] meson.build: Add 32-bit sparc to seccomp unsupported list
92 +
93 +32-bit sparc doesn't support seccomp either.
94 +
95 +(cherry picked from commit 44b49e6ca02add9592abac03a8578b9eea1a5088)
96 +---
97 + meson.build | 1 +
98 + 1 file changed, 1 insertion(+)
99 +
100 +diff --git a/meson.build b/meson.build
101 +index 50479f5f0..91915b31a 100644
102 +--- a/meson.build
103 ++++ b/meson.build
104 +@@ -72,6 +72,7 @@ unsupported_cpus = [
105 + 'parisc',
106 + 'parisc64',
107 + 'sh4',
108 ++ 'sparc',
109 + 'sparc64',
110 + ]
111 + system_supports_seccomp = host_system == 'linux'
112 +--
113 +2.17.0
114 +
115
116 diff --git a/gnome-base/nautilus/files/3.30.5-thumbnailer-updates.patch b/gnome-base/nautilus/files/3.30.5-thumbnailer-updates.patch
117 new file mode 100644
118 index 00000000000..84d0bfc1d5a
119 --- /dev/null
120 +++ b/gnome-base/nautilus/files/3.30.5-thumbnailer-updates.patch
121 @@ -0,0 +1,113 @@
122 +From 2e36d4bacc3cffebe62161adc375bb9ec64099f5 Mon Sep 17 00:00:00 2001
123 +From: Timothy OBrien <obrien.timothy.a@×××××.com>
124 +Date: Fri, 18 Jan 2019 19:42:46 +1100
125 +Subject: [PATCH 1/2] gnome-desktop: update to latest version of upstream
126 + thumbnail code
127 +
128 +The thumbnail code in gnome-desktop had recent bug fixes that needed to be carried across to the Nautilus implementation. Issues for the three related upstream fixes can be found at: https://gitlab.gnome.org/GNOME/gnome-desktop/issues/4 | https://gitlab.gnome.org/GNOME/gnome-desktop/issues/89 | https://gitlab.gnome.org/GNOME/gnome-desktop/issues/87
129 +
130 +This patch includes the latest thumbnail code from the gnome-desktop repository to include the fixes.
131 +
132 +Fixes #836
133 +
134 +(cherry picked from commit e88b2dc8783833c4263ad5d84567a67dbc7bc6de)
135 +---
136 + .../gnome-desktop-thumbnail-script.c | 54 +++++++++++++++++--
137 + src/gnome-desktop/gnome-desktop-thumbnail.c | 4 +-
138 + 2 files changed, 52 insertions(+), 6 deletions(-)
139 +
140 +diff --git a/src/gnome-desktop/gnome-desktop-thumbnail-script.c b/src/gnome-desktop/gnome-desktop-thumbnail-script.c
141 +index 14e2fed3a..525766388 100644
142 +--- a/src/gnome-desktop/gnome-desktop-thumbnail-script.c
143 ++++ b/src/gnome-desktop/gnome-desktop-thumbnail-script.c
144 +@@ -506,22 +506,68 @@ setup_seccomp (GPtrArray *argv_array,
145 + #endif
146 +
147 + #ifdef HAVE_BWRAP
148 ++static gboolean
149 ++path_is_usrmerged (const char *dir)
150 ++{
151 ++ /* does /dir point to /usr/dir? */
152 ++ g_autofree char *target = NULL;
153 ++ GStatBuf stat_buf_src, stat_buf_target;
154 ++
155 ++ if (g_stat (dir, &stat_buf_src) < 0)
156 ++ return FALSE;
157 ++
158 ++ target = g_strdup_printf ("/usr/%s", dir);
159 ++
160 ++ if (g_stat (target, &stat_buf_target) < 0)
161 ++ return FALSE;
162 ++
163 ++ return (stat_buf_src.st_dev == stat_buf_target.st_dev) &&
164 ++ (stat_buf_src.st_ino == stat_buf_target.st_ino);
165 ++}
166 ++
167 + static gboolean
168 + add_bwrap (GPtrArray *array,
169 + ScriptExec *script)
170 + {
171 ++ const char * const usrmerged_dirs[] = { "bin", "lib64", "lib", "sbin" };
172 ++ int i;
173 ++
174 + g_return_val_if_fail (script->outdir != NULL, FALSE);
175 + g_return_val_if_fail (script->s_infile != NULL, FALSE);
176 +
177 + add_args (array,
178 + "bwrap",
179 + "--ro-bind", "/usr", "/usr",
180 +- "--ro-bind", "/lib", "/lib",
181 +- "--ro-bind", "/lib64", "/lib64",
182 ++ "--ro-bind", "/etc/ld.so.cache", "/etc/ld.so.cache",
183 ++ NULL);
184 ++
185 ++ /* These directories might be symlinks into /usr/... */
186 ++ for (i = 0; i < G_N_ELEMENTS (usrmerged_dirs); i++)
187 ++ {
188 ++ g_autofree char *absolute_dir = g_strdup_printf ("/%s", usrmerged_dirs[i]);
189 ++
190 ++ if (!g_file_test (absolute_dir, G_FILE_TEST_EXISTS))
191 ++ continue;
192 ++
193 ++ if (path_is_usrmerged (absolute_dir))
194 ++ {
195 ++ g_autofree char *symlink_target = g_strdup_printf ("/usr/%s", absolute_dir);
196 ++
197 ++ add_args (array,
198 ++ "--symlink", symlink_target, absolute_dir,
199 ++ NULL);
200 ++ }
201 ++ else
202 ++ {
203 ++ add_args (array,
204 ++ "--ro-bind", absolute_dir, absolute_dir,
205 ++ NULL);
206 ++ }
207 ++ }
208 ++
209 ++ add_args (array,
210 + "--proc", "/proc",
211 + "--dev", "/dev",
212 +- "--symlink", "usr/bin", "/bin",
213 +- "--symlink", "usr/sbin", "/sbin",
214 + "--chdir", "/",
215 + "--setenv", "GIO_USE_VFS", "local",
216 + "--unshare-all",
217 +diff --git a/src/gnome-desktop/gnome-desktop-thumbnail.c b/src/gnome-desktop/gnome-desktop-thumbnail.c
218 +index b31bad58d..f48fd461a 100644
219 +--- a/src/gnome-desktop/gnome-desktop-thumbnail.c
220 ++++ b/src/gnome-desktop/gnome-desktop-thumbnail.c
221 +@@ -967,8 +967,8 @@ get_preview_thumbnail (const char *uri,
222 + if (file_info == NULL)
223 + return NULL;
224 +
225 +- object = g_file_info_get_attribute_object (file_info,
226 +- G_FILE_ATTRIBUTE_PREVIEW_ICON);
227 ++ object = g_object_ref (g_file_info_get_attribute_object (file_info,
228 ++ G_FILE_ATTRIBUTE_PREVIEW_ICON));
229 + g_object_unref (file_info);
230 +
231 + if (!object)
232 +--
233 +2.17.0
234 +
235
236 diff --git a/gnome-base/nautilus/files/3.30.5-thumbnailer-updates2.patch b/gnome-base/nautilus/files/3.30.5-thumbnailer-updates2.patch
237 new file mode 100644
238 index 00000000000..884deb42091
239 --- /dev/null
240 +++ b/gnome-base/nautilus/files/3.30.5-thumbnailer-updates2.patch
241 @@ -0,0 +1,46 @@
242 +From 87aa2520989bafbd861a03a32d6fdb0d2620faf5 Mon Sep 17 00:00:00 2001
243 +From: Mart Raudsepp <leio@g.o>
244 +Date: Mon, 11 Mar 2019 23:23:11 +0200
245 +Subject: [PATCH] Sync gnome-desktop code
246 +
247 +Brings in fontconfig cache bind mount and a small memory fix; cache path hardcoded to Gentoo for now
248 +---
249 + src/gnome-desktop/gnome-desktop-thumbnail-script.c | 4 ++++
250 + src/gnome-desktop/gnome-desktop-thumbnail.c | 6 ++++--
251 + 2 files changed, 8 insertions(+), 2 deletions(-)
252 +
253 +diff --git a/src/gnome-desktop/gnome-desktop-thumbnail-script.c b/src/gnome-desktop/gnome-desktop-thumbnail-script.c
254 +index 525766388..0331cb3c7 100644
255 +--- a/src/gnome-desktop/gnome-desktop-thumbnail-script.c
256 ++++ b/src/gnome-desktop/gnome-desktop-thumbnail-script.c
257 +@@ -565,6 +565,10 @@ add_bwrap (GPtrArray *array,
258 + }
259 + }
260 +
261 ++ /* fontconfig cache if necessary */
262 ++ if (!g_str_has_prefix ("/var/cache/fontconfig", "/usr/"))
263 ++ add_args (array, "--ro-bind-try", "/var/cache/fontconfig", "/var/cache/fontconfig", NULL);
264 ++
265 + add_args (array,
266 + "--proc", "/proc",
267 + "--dev", "/dev",
268 +diff --git a/src/gnome-desktop/gnome-desktop-thumbnail.c b/src/gnome-desktop/gnome-desktop-thumbnail.c
269 +index f48fd461a..566fbeb84 100644
270 +--- a/src/gnome-desktop/gnome-desktop-thumbnail.c
271 ++++ b/src/gnome-desktop/gnome-desktop-thumbnail.c
272 +@@ -967,8 +967,10 @@ get_preview_thumbnail (const char *uri,
273 + if (file_info == NULL)
274 + return NULL;
275 +
276 +- object = g_object_ref (g_file_info_get_attribute_object (file_info,
277 +- G_FILE_ATTRIBUTE_PREVIEW_ICON));
278 ++ object = g_file_info_get_attribute_object (file_info,
279 ++ G_FILE_ATTRIBUTE_PREVIEW_ICON);
280 ++ if (object)
281 ++ g_object_ref (object);
282 + g_object_unref (file_info);
283 +
284 + if (!object)
285 +--
286 +2.17.0
287 +
288
289 diff --git a/gnome-base/nautilus/nautilus-3.28.1.ebuild b/gnome-base/nautilus/nautilus-3.28.1.ebuild
290 index 77031b8ffd3..40dd98c4c84 100644
291 --- a/gnome-base/nautilus/nautilus-3.28.1.ebuild
292 +++ b/gnome-base/nautilus/nautilus-3.28.1.ebuild
293 @@ -21,7 +21,7 @@ COMMON_DEPEND="
294 >=app-arch/gnome-autoar-0.2.1
295 >=gnome-base/gnome-desktop-3.0.0:3=
296 >=x11-libs/pango-1.28.3
297 - >=x11-libs/gtk+-3.22.6:3[X,introspection?]
298 + >=x11-libs/gtk+-3.22.26:3[X,introspection?]
299 selinux? ( >=sys-libs/libselinux-2.0 )
300 >=app-misc/tracker-2.0:=
301 x11-libs/libX11
302
303 diff --git a/gnome-base/nautilus/nautilus-3.28.1.ebuild b/gnome-base/nautilus/nautilus-3.30.5.ebuild
304 similarity index 81%
305 copy from gnome-base/nautilus/nautilus-3.28.1.ebuild
306 copy to gnome-base/nautilus/nautilus-3.30.5.ebuild
307 index 77031b8ffd3..f7403a0a6dd 100644
308 --- a/gnome-base/nautilus/nautilus-3.28.1.ebuild
309 +++ b/gnome-base/nautilus/nautilus-3.30.5.ebuild
310 @@ -7,21 +7,21 @@ inherit gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg
311
312 DESCRIPTION="Default file manager for the GNOME desktop"
313 HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
314 -SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
315
316 LICENSE="GPL-3+ LGPL-2.1+"
317 SLOT="0"
318 -IUSE="gnome gtk-doc +introspection packagekit +previewer selinux sendto"
319 +IUSE="gnome gtk-doc +introspection packagekit +previewer seccomp selinux sendto"
320
321 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
322 +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
323
324 COMMON_DEPEND="
325 >=dev-libs/glib-2.55.1:2
326 >=media-libs/gexiv2-0.10.0
327 >=app-arch/gnome-autoar-0.2.1
328 - >=gnome-base/gnome-desktop-3.0.0:3=
329 + gnome-base/gsettings-desktop-schemas
330 + >=x11-libs/gtk+-3.22.27:3[X,introspection?]
331 + seccomp? ( sys-libs/libseccomp )
332 >=x11-libs/pango-1.28.3
333 - >=x11-libs/gtk+-3.22.6:3[X,introspection?]
334 selinux? ( >=sys-libs/libselinux-2.0 )
335 >=app-misc/tracker-2.0:=
336 x11-libs/libX11
337 @@ -40,6 +40,7 @@ DEPEND="${COMMON_DEPEND}
338 "
339 RDEPEND="${COMMON_DEPEND}
340 packagekit? ( app-admin/packagekit-base )
341 + seccomp? ( sys-apps/bubblewrap )
342 sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
343 "
344
345 @@ -51,8 +52,9 @@ PDEPEND="
346 " # Need gvfs[gtk] for recent:/// support; always built (without USE=gtk) since gvfs-1.34
347
348 PATCHES=(
349 - "${WORKDIR}"/patches # gnome-3-28 + optional introspection
350 "${FILESDIR}"/${PV}-docs-build.patch # Always install pregenerated manpage, keeping docs option for gtk-doc
351 + "${FILESDIR}"/${PV}-thumbnailer-updates{,2}.patch # syncs with gnome-desktop; fixes the ld.so.cache for us
352 + "${FILESDIR}"/${PV}-seccomp-sparc32.patch # 32-bit sparc doesn't have seccomp either
353 )
354
355 src_prepare() {
356 @@ -67,13 +69,12 @@ src_prepare() {
357 src_configure() {
358 local emesonargs=(
359 $(meson_use gtk-doc docs)
360 - $(meson_use introspection)
361 - -Dprofiling=false
362 -Dextensions=true # image file properties, sendto support
363 + $(meson_use introspection)
364 $(meson_use packagekit)
365 $(meson_use selinux)
366 + -Dprofiling=false
367 -Dtests=$(usex test all none)
368 - -Dprofile=default
369 )
370 meson_src_configure
371 }
372
373 diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
374 index ba93feb56ae..0e523f3f583 100644
375 --- a/profiles/base/package.use.force
376 +++ b/profiles/base/package.use.force
377 @@ -5,6 +5,7 @@
378 # Security is not optional if available for the architecture/kernel.
379 gnome-base/gnome-desktop seccomp
380 app-misc/tracker-miners seccomp
381 +>gnome-base/nautilus-3.29 seccomp
382
383 # Andreas K. Hüttel <dilfridge@g.o> (11 Sep 2018)
384 # All glibc versions that include RPC code are masked now.