1 |
commit: 91a58bac644b1715b23214bd4977d1bdec7bcea2 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Aug 31 14:05:47 2019 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Aug 31 14:05:54 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91a58bac |
7 |
|
8 |
gnome-base/nautilus: security cleanup |
9 |
|
10 |
Bug: https://bugs.gentoo.org/692784 |
11 |
Package-Manager: Portage-2.3.69, Repoman-2.3.12 |
12 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
13 |
|
14 |
gnome-base/nautilus/Manifest | 2 - |
15 |
gnome-base/nautilus/files/3.28.1-docs-build.patch | 42 --------- |
16 |
gnome-base/nautilus/nautilus-3.28.1.ebuild | 104 --------------------- |
17 |
gnome-base/nautilus/nautilus-3.30.5.ebuild | 105 ---------------------- |
18 |
4 files changed, 253 deletions(-) |
19 |
|
20 |
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest |
21 |
index a410c4593bb..3ffae22617b 100644 |
22 |
--- a/gnome-base/nautilus/Manifest |
23 |
+++ b/gnome-base/nautilus/Manifest |
24 |
@@ -1,3 +1 @@ |
25 |
-DIST nautilus-3.28.1-patchset.tar.xz 129360 BLAKE2B 18e94e83132a8ce2e07491ce6b5cb9499141bf93e0c3ef44f2e5ac891e59d334cf310d863e8e7450fa385a6a49873d790e4f8c36a1ef8e009b1f2be2361586b4 SHA512 6c3385b4bc7020601f47dc66c0b1cabd6dadcd9f986bdaec42aeca9b43a6b8a2362651958d4e6a4738b78fbd546071678ba15ab87c268e33cfc1cca49229da48 |
26 |
-DIST nautilus-3.28.1.tar.xz 3262520 BLAKE2B 6f007e2327ffb108c5195737c02c7be12b874f5bc3bdfc1c84a3ba2176ff36e1843057522a54e569a7c09a056ccd888e1ddf099d6f2b527dfa109370cbe1a3a9 SHA512 6b695c097e5082062afe8cb036e819c837ce1e2570f581f81860f378e34f38f3020b8802e6a4285243c111d5208e892c419ac92621cdb1d35b2df205a3ccaa13 |
27 |
DIST nautilus-3.30.5.tar.xz 3254344 BLAKE2B 64da158ee661fc259a14f890bf6ad343f720245df6b9475ff047993570ea4e7234723eb242f057bc85b7ea95d38a99b5c2f5d546e982a3e3e32b7fc75cabb786 SHA512 e38a8bb380460d902e4ec6219d0e147a4245e790b18fb18ab9474ec2ae002a971243c6b09b8fec267e65c7ecc7bb1217191c4f5cb9547b3b9d5b0793068103cf |
28 |
|
29 |
diff --git a/gnome-base/nautilus/files/3.28.1-docs-build.patch b/gnome-base/nautilus/files/3.28.1-docs-build.patch |
30 |
deleted file mode 100644 |
31 |
index a2cb07aa23e..00000000000 |
32 |
--- a/gnome-base/nautilus/files/3.28.1-docs-build.patch |
33 |
+++ /dev/null |
34 |
@@ -1,42 +0,0 @@ |
35 |
-From eaf8435005e2637ce76690c71f729e6b3685d973 Mon Sep 17 00:00:00 2001 |
36 |
-From: Mart Raudsepp <leio@g.o> |
37 |
-Date: Tue, 5 Mar 2019 19:22:58 +0200 |
38 |
-Subject: [PATCH] build: Always install man page |
39 |
- |
40 |
-It's already generated and shouldn't be thrown in the same pot as |
41 |
-full gtk-doc generation. It should be either a separate `man` option, |
42 |
-or just always installed. |
43 |
---- |
44 |
- docs/meson.build | 4 +++- |
45 |
- meson.build | 4 +--- |
46 |
- 2 files changed, 4 insertions(+), 4 deletions(-) |
47 |
- |
48 |
-diff --git a/docs/meson.build b/docs/meson.build |
49 |
-index b039cb631..2b1800be6 100644 |
50 |
---- a/docs/meson.build |
51 |
-+++ b/docs/meson.build |
52 |
-@@ -1,3 +1,5 @@ |
53 |
- install_man('nautilus.1') |
54 |
- |
55 |
--subdir('reference') |
56 |
-+if get_option('docs') |
57 |
-+ subdir('reference') |
58 |
-+endif |
59 |
-diff --git a/meson.build b/meson.build |
60 |
-index 4b64239ac..88fe73237 100644 |
61 |
---- a/meson.build |
62 |
-+++ b/meson.build |
63 |
-@@ -152,9 +152,7 @@ if get_option('tests') != 'none' |
64 |
- endif |
65 |
- subdir('data') |
66 |
- subdir('po') |
67 |
--if get_option('docs') |
68 |
-- subdir('docs') |
69 |
--endif |
70 |
-+subdir('docs') |
71 |
- if get_option('extensions') |
72 |
- subdir('extensions') |
73 |
- endif |
74 |
--- |
75 |
-2.17.0 |
76 |
- |
77 |
|
78 |
diff --git a/gnome-base/nautilus/nautilus-3.28.1.ebuild b/gnome-base/nautilus/nautilus-3.28.1.ebuild |
79 |
deleted file mode 100644 |
80 |
index 40dd98c4c84..00000000000 |
81 |
--- a/gnome-base/nautilus/nautilus-3.28.1.ebuild |
82 |
+++ /dev/null |
83 |
@@ -1,104 +0,0 @@ |
84 |
-# Copyright 1999-2019 Gentoo Authors |
85 |
-# Distributed under the terms of the GNU General Public License v2 |
86 |
- |
87 |
-EAPI=6 |
88 |
- |
89 |
-inherit gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg |
90 |
- |
91 |
-DESCRIPTION="Default file manager for the GNOME desktop" |
92 |
-HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus" |
93 |
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" |
94 |
- |
95 |
-LICENSE="GPL-3+ LGPL-2.1+" |
96 |
-SLOT="0" |
97 |
-IUSE="gnome gtk-doc +introspection packagekit +previewer selinux sendto" |
98 |
- |
99 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" |
100 |
- |
101 |
-COMMON_DEPEND=" |
102 |
- >=dev-libs/glib-2.55.1:2 |
103 |
- >=media-libs/gexiv2-0.10.0 |
104 |
- >=app-arch/gnome-autoar-0.2.1 |
105 |
- >=gnome-base/gnome-desktop-3.0.0:3= |
106 |
- >=x11-libs/pango-1.28.3 |
107 |
- >=x11-libs/gtk+-3.22.26:3[X,introspection?] |
108 |
- selinux? ( >=sys-libs/libselinux-2.0 ) |
109 |
- >=app-misc/tracker-2.0:= |
110 |
- x11-libs/libX11 |
111 |
- >=dev-libs/libxml2-2.7.8:2 |
112 |
- introspection? ( >=dev-libs/gobject-introspection-1.54:= ) |
113 |
-" |
114 |
-DEPEND="${COMMON_DEPEND} |
115 |
- >=dev-util/gdbus-codegen-2.51.2 |
116 |
- dev-util/glib-utils |
117 |
- gtk-doc? ( |
118 |
- >=dev-util/gtk-doc-1.10 |
119 |
- app-text/docbook-xml-dtd:4.1.2 ) |
120 |
- >=sys-devel/gettext-0.19.8 |
121 |
- virtual/pkgconfig |
122 |
- x11-base/xorg-proto |
123 |
-" |
124 |
-RDEPEND="${COMMON_DEPEND} |
125 |
- packagekit? ( app-admin/packagekit-base ) |
126 |
- sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 ) |
127 |
-" |
128 |
- |
129 |
-PDEPEND=" |
130 |
- gnome? ( x11-themes/adwaita-icon-theme ) |
131 |
- previewer? ( >=gnome-extra/sushi-0.1.9 ) |
132 |
- sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 ) |
133 |
- >=gnome-base/gvfs-1.14[gtk(+)] |
134 |
-" # Need gvfs[gtk] for recent:/// support; always built (without USE=gtk) since gvfs-1.34 |
135 |
- |
136 |
-PATCHES=( |
137 |
- "${WORKDIR}"/patches # gnome-3-28 + optional introspection |
138 |
- "${FILESDIR}"/${PV}-docs-build.patch # Always install pregenerated manpage, keeping docs option for gtk-doc |
139 |
-) |
140 |
- |
141 |
-src_prepare() { |
142 |
- if use previewer; then |
143 |
- DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files. |
144 |
- To activate the previewer, select a file and press space; to |
145 |
- close the previewer, press space again." |
146 |
- fi |
147 |
- xdg_src_prepare |
148 |
-} |
149 |
- |
150 |
-src_configure() { |
151 |
- local emesonargs=( |
152 |
- $(meson_use gtk-doc docs) |
153 |
- $(meson_use introspection) |
154 |
- -Dprofiling=false |
155 |
- -Dextensions=true # image file properties, sendto support |
156 |
- $(meson_use packagekit) |
157 |
- $(meson_use selinux) |
158 |
- -Dtests=$(usex test all none) |
159 |
- -Dprofile=default |
160 |
- ) |
161 |
- meson_src_configure |
162 |
-} |
163 |
- |
164 |
-src_install() { |
165 |
- use previewer && readme.gentoo_create_doc |
166 |
- meson_src_install |
167 |
-} |
168 |
- |
169 |
-src_test() { |
170 |
- virtx meson_src_test |
171 |
-} |
172 |
- |
173 |
-pkg_postinst() { |
174 |
- xdg_pkg_postinst |
175 |
- gnome2_schemas_update |
176 |
- |
177 |
- if use previewer; then |
178 |
- readme.gentoo_print_elog |
179 |
- else |
180 |
- elog "To preview media files, emerge nautilus with USE=previewer" |
181 |
- fi |
182 |
-} |
183 |
- |
184 |
-pkg_postrm() { |
185 |
- xdg_pkg_postrm |
186 |
- gnome2_schemas_update |
187 |
-} |
188 |
|
189 |
diff --git a/gnome-base/nautilus/nautilus-3.30.5.ebuild b/gnome-base/nautilus/nautilus-3.30.5.ebuild |
190 |
deleted file mode 100644 |
191 |
index 4fd2e7af049..00000000000 |
192 |
--- a/gnome-base/nautilus/nautilus-3.30.5.ebuild |
193 |
+++ /dev/null |
194 |
@@ -1,105 +0,0 @@ |
195 |
-# Copyright 1999-2019 Gentoo Authors |
196 |
-# Distributed under the terms of the GNU General Public License v2 |
197 |
- |
198 |
-EAPI=6 |
199 |
- |
200 |
-inherit gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg |
201 |
- |
202 |
-DESCRIPTION="Default file manager for the GNOME desktop" |
203 |
-HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus" |
204 |
- |
205 |
-LICENSE="GPL-3+ LGPL-2.1+" |
206 |
-SLOT="0" |
207 |
-IUSE="gnome gtk-doc +introspection packagekit +previewer seccomp selinux sendto" |
208 |
- |
209 |
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux" |
210 |
- |
211 |
-COMMON_DEPEND=" |
212 |
- >=dev-libs/glib-2.55.1:2 |
213 |
- >=media-libs/gexiv2-0.10.0 |
214 |
- >=app-arch/gnome-autoar-0.2.1 |
215 |
- gnome-base/gsettings-desktop-schemas |
216 |
- >=x11-libs/gtk+-3.22.27:3[X,introspection?] |
217 |
- seccomp? ( sys-libs/libseccomp ) |
218 |
- >=x11-libs/pango-1.28.3 |
219 |
- selinux? ( >=sys-libs/libselinux-2.0 ) |
220 |
- >=app-misc/tracker-2.0:= |
221 |
- x11-libs/libX11 |
222 |
- >=dev-libs/libxml2-2.7.8:2 |
223 |
- introspection? ( >=dev-libs/gobject-introspection-1.54:= ) |
224 |
-" |
225 |
-DEPEND="${COMMON_DEPEND} |
226 |
- >=dev-util/gdbus-codegen-2.51.2 |
227 |
- dev-util/glib-utils |
228 |
- gtk-doc? ( |
229 |
- >=dev-util/gtk-doc-1.10 |
230 |
- app-text/docbook-xml-dtd:4.1.2 ) |
231 |
- >=sys-devel/gettext-0.19.8 |
232 |
- virtual/pkgconfig |
233 |
- x11-base/xorg-proto |
234 |
-" |
235 |
-RDEPEND="${COMMON_DEPEND} |
236 |
- packagekit? ( app-admin/packagekit-base ) |
237 |
- seccomp? ( >=sys-apps/bubblewrap-0.3.1 ) |
238 |
- sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 ) |
239 |
-" |
240 |
- |
241 |
-PDEPEND=" |
242 |
- gnome? ( x11-themes/adwaita-icon-theme ) |
243 |
- previewer? ( >=gnome-extra/sushi-0.1.9 ) |
244 |
- sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 ) |
245 |
- >=gnome-base/gvfs-1.14[gtk(+)] |
246 |
-" # Need gvfs[gtk] for recent:/// support; always built (without USE=gtk) since gvfs-1.34 |
247 |
- |
248 |
-PATCHES=( |
249 |
- "${FILESDIR}"/${PV}-docs-build.patch # Always install pregenerated manpage, keeping docs option for gtk-doc |
250 |
- "${FILESDIR}"/${PV}-thumbnailer-updates{,2}.patch # syncs with gnome-desktop; fixes the ld.so.cache for us |
251 |
- "${FILESDIR}"/${PV}-seccomp-sparc32.patch # 32-bit sparc doesn't have seccomp either |
252 |
-) |
253 |
- |
254 |
-src_prepare() { |
255 |
- if use previewer; then |
256 |
- DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files. |
257 |
- To activate the previewer, select a file and press space; to |
258 |
- close the previewer, press space again." |
259 |
- fi |
260 |
- xdg_src_prepare |
261 |
-} |
262 |
- |
263 |
-src_configure() { |
264 |
- local emesonargs=( |
265 |
- $(meson_use gtk-doc docs) |
266 |
- -Dextensions=true # image file properties, sendto support |
267 |
- $(meson_use introspection) |
268 |
- $(meson_use packagekit) |
269 |
- $(meson_use selinux) |
270 |
- -Dprofiling=false |
271 |
- -Dtests=$(usex test all none) |
272 |
- ) |
273 |
- meson_src_configure |
274 |
-} |
275 |
- |
276 |
-src_install() { |
277 |
- use previewer && readme.gentoo_create_doc |
278 |
- meson_src_install |
279 |
-} |
280 |
- |
281 |
-src_test() { |
282 |
- virtx meson_src_test |
283 |
-} |
284 |
- |
285 |
-pkg_postinst() { |
286 |
- xdg_pkg_postinst |
287 |
- gnome2_schemas_update |
288 |
- |
289 |
- if use previewer; then |
290 |
- readme.gentoo_print_elog |
291 |
- else |
292 |
- elog "To preview media files, emerge nautilus with USE=previewer" |
293 |
- fi |
294 |
-} |
295 |
- |
296 |
-pkg_postrm() { |
297 |
- xdg_pkg_postrm |
298 |
- gnome2_schemas_update |
299 |
-} |