1 |
commit: d2f81d64b40c0134450de226e32fd082331a5ca8 |
2 |
Author: Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de> |
3 |
AuthorDate: Sun Sep 18 12:09:14 2022 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 30 17:55:34 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2f81d64 |
7 |
|
8 |
gnome-base/nautilus: Version bump to 43.0 |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/27324 |
11 |
Signed-off-by: Pascal Jäger <pascal.jaeger <AT> leimstift.de> |
12 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
13 |
|
14 |
gnome-base/nautilus/Manifest | 1 + |
15 |
gnome-base/nautilus/files/43.0-docs-build.patch | 41 ++++++++ |
16 |
.../nautilus/files/43.0-optional-gstreamer.patch | 42 ++++++++ |
17 |
gnome-base/nautilus/nautilus-43.0.ebuild | 114 +++++++++++++++++++++ |
18 |
4 files changed, 198 insertions(+) |
19 |
|
20 |
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest |
21 |
index 9c7df2dbaf62..d825d4d0d9c1 100644 |
22 |
--- a/gnome-base/nautilus/Manifest |
23 |
+++ b/gnome-base/nautilus/Manifest |
24 |
@@ -1 +1,2 @@ |
25 |
DIST nautilus-42.2.tar.xz 3254912 BLAKE2B 303b52fe9bbdb8e437a447004dcd284ee0c66ecaa11db45c52cf8c831f52a764efa03476d69f74840289f200c49b917bc329487bd87d3e776ea5dc1a6ea9b413 SHA512 2b3ba2990b00bbc3abf771b83b9b0a7c1a8b107b1b4955a45879f7d28add713d326bbe84d70056058073edfc3c7b7891547af77b8a34f94fe1b9ca047c76e9c9 |
26 |
+DIST nautilus-43.0.tar.xz 3165200 BLAKE2B 460df75af37c1c038bbbc9442d061a45ef3fbf09b2af016cd8340674c6eddf59b37a92011cf6e46d84168c859d4cd543d95fe140b322a00e2866bfdf5421a909 SHA512 c880125c2339be02852470e45cd4d589470e0df7723acc44b80df35c18cb1375c5f85cb46c7e53efbab1b51eedb4fd51ffa455773d4913d44c59070dafa22b49 |
27 |
|
28 |
diff --git a/gnome-base/nautilus/files/43.0-docs-build.patch b/gnome-base/nautilus/files/43.0-docs-build.patch |
29 |
new file mode 100644 |
30 |
index 000000000000..653970dc26ad |
31 |
--- /dev/null |
32 |
+++ b/gnome-base/nautilus/files/43.0-docs-build.patch |
33 |
@@ -0,0 +1,41 @@ |
34 |
+From a62478c8e55bc6b1cd685f0c8c2094e1ed244c69 Mon Sep 17 00:00:00 2001 |
35 |
+From: Mart Raudsepp <leio@g.o> |
36 |
+Date: Mon, 11 Mar 2019 20:52:53 +0200 |
37 |
+Subject: [PATCH] build: Always install man page |
38 |
+ |
39 |
+It's already generated and shouldn't be thrown in the same pot as |
40 |
+full gtk-doc generation. It should be either a separate `man` option, |
41 |
+or just always installed. |
42 |
+--- |
43 |
+ docs/meson.build | 4 +++- |
44 |
+ meson.build | 4 +--- |
45 |
+ 2 files changed, 4 insertions(+), 4 deletions(-) |
46 |
+ |
47 |
+diff --git a/docs/meson.build b/docs/meson.build |
48 |
+index b039cb631..2b1800be6 100644 |
49 |
+--- a/docs/meson.build |
50 |
++++ b/docs/meson.build |
51 |
+@@ -1,4 +1,5 @@ |
52 |
+ install_man('nautilus.1') |
53 |
+ install_man('nautilus-autorun-software.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 996360a62..50479f5f0 100644 |
61 |
+--- a/meson.build |
62 |
++++ b/meson.build |
63 |
+@@ -205,9 +205,8 @@ subdirs = [ |
64 |
+ # Conditional building # |
65 |
+ ######################## |
66 |
+ |
67 |
+-if gi_docgen.found() |
68 |
+- subdirs += 'docs' |
69 |
+-endif |
70 |
++subdirs += 'docs' |
71 |
++ |
72 |
+ if get_option('tests') != 'none' |
73 |
+ subdirs += 'test' |
74 |
+ endif |
75 |
|
76 |
diff --git a/gnome-base/nautilus/files/43.0-optional-gstreamer.patch b/gnome-base/nautilus/files/43.0-optional-gstreamer.patch |
77 |
new file mode 100644 |
78 |
index 000000000000..de0e008fffb7 |
79 |
--- /dev/null |
80 |
+++ b/gnome-base/nautilus/files/43.0-optional-gstreamer.patch |
81 |
@@ -0,0 +1,42 @@ |
82 |
+diff --git a/extensions/meson.build b/extensions/meson.build |
83 |
+index a10349c..5494275 100644 |
84 |
+--- a/extensions/meson.build |
85 |
++++ b/extensions/meson.build |
86 |
+@@ -1,2 +1,4 @@ |
87 |
+ subdir('image-properties') |
88 |
+-subdir('audio-video-properties') |
89 |
++if get_option('gstreamer') |
90 |
++ subdir('audio-video-properties') |
91 |
++endif |
92 |
+diff --git a/meson.build b/meson.build |
93 |
+index 00f01f6..bdbd33a 100644 |
94 |
+--- a/meson.build |
95 |
++++ b/meson.build |
96 |
+@@ -102,8 +102,10 @@ libm = cc.find_library('m') |
97 |
+ if get_option('extensions') |
98 |
+ gexiv = dependency('gexiv2', version: '>= 0.14.0') |
99 |
+ gdkpixbuf = dependency('gdk-pixbuf-2.0', version: '>= 2.30.0') |
100 |
++ if get_option('gstreamer') |
101 |
+ gst_tag_dep = dependency('gstreamer-tag-1.0') |
102 |
+ gst_pbutils_dep = dependency('gstreamer-pbutils-1.0') |
103 |
++ endif |
104 |
+ endif |
105 |
+ gio = dependency('gio-2.0', version: glib_ver) |
106 |
+ gio_unix = dependency('gio-unix-2.0', version: glib_ver) |
107 |
+diff --git a/meson_options.txt b/meson_options.txt |
108 |
+index fce5f16..1fa8f89 100644 |
109 |
+--- a/meson_options.txt |
110 |
++++ b/meson_options.txt |
111 |
+@@ -13,6 +13,12 @@ option( |
112 |
+ value: true, |
113 |
+ description: 'Build stock extensions', |
114 |
+ ) |
115 |
++option( |
116 |
++ 'gstreamer', |
117 |
++ type: 'boolean', |
118 |
++ value: true, |
119 |
++ description: 'Build audio-video properties extension (requires "extensions")', |
120 |
++) |
121 |
+ option( |
122 |
+ 'introspection', |
123 |
+ type: 'boolean', |
124 |
|
125 |
diff --git a/gnome-base/nautilus/nautilus-43.0.ebuild b/gnome-base/nautilus/nautilus-43.0.ebuild |
126 |
new file mode 100644 |
127 |
index 000000000000..44ac74e4207e |
128 |
--- /dev/null |
129 |
+++ b/gnome-base/nautilus/nautilus-43.0.ebuild |
130 |
@@ -0,0 +1,114 @@ |
131 |
+# Copyright 1999-2022 Gentoo Authors |
132 |
+# Distributed under the terms of the GNU General Public License v2 |
133 |
+ |
134 |
+EAPI=8 |
135 |
+ |
136 |
+inherit gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg |
137 |
+ |
138 |
+DESCRIPTION="Default file manager for the GNOME desktop" |
139 |
+HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus" |
140 |
+ |
141 |
+LICENSE="GPL-3+ LGPL-2.1+" |
142 |
+SLOT="0" |
143 |
+IUSE="gnome +gstreamer gtk-doc +introspection +previewer selinux sendto" |
144 |
+ |
145 |
+KEYWORDS="~amd64" |
146 |
+ |
147 |
+DEPEND=" |
148 |
+ >=dev-libs/glib-2.72.0:2 |
149 |
+ >=media-libs/gexiv2-0.14.0 |
150 |
+ >=x11-libs/gdk-pixbuf-2.30.0:2 |
151 |
+ gstreamer? ( media-libs/gstreamer:1.0 |
152 |
+ media-libs/gst-plugins-base:1.0 ) |
153 |
+ >=app-arch/gnome-autoar-0.4.0 |
154 |
+ >=gnome-base/gnome-desktop-43:4= |
155 |
+ >=gnome-base/gsettings-desktop-schemas-42 |
156 |
+ >=gui-libs/gtk-4.7.2:4[X,introspection?] |
157 |
+ >=gui-libs/libadwaita-1.2:1 |
158 |
+ >=dev-libs/libportal-0.5:=[gtk] |
159 |
+ >=x11-libs/pango-1.28.3 |
160 |
+ selinux? ( >=sys-libs/libselinux-2.0 ) |
161 |
+ >=app-misc/tracker-3.0:3 |
162 |
+ >=dev-libs/libxml2-2.7.8:2 |
163 |
+ >=net-libs/libcloudproviders-0.3.1 |
164 |
+ introspection? ( >=dev-libs/gobject-introspection-1.54:= ) |
165 |
+" |
166 |
+RDEPEND="${DEPEND} |
167 |
+ >=app-misc/tracker-miners-3.0:3= |
168 |
+" # uses org.freedesktop.Tracker.Miner.Files gsettings schema from tracker-miners |
169 |
+BDEPEND=" |
170 |
+ >=dev-util/gdbus-codegen-2.51.2 |
171 |
+ dev-util/glib-utils |
172 |
+ gtk-doc? ( |
173 |
+ app-text/docbook-xml-dtd:4.1.2 |
174 |
+ dev-util/gi-docgen |
175 |
+ ) |
176 |
+ >=sys-devel/gettext-0.19.8 |
177 |
+ virtual/pkgconfig |
178 |
+" |
179 |
+PDEPEND=" |
180 |
+ gnome? ( x11-themes/adwaita-icon-theme ) |
181 |
+ previewer? ( >=gnome-extra/sushi-0.1.9 ) |
182 |
+ sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 ) |
183 |
+ >=gnome-base/gvfs-1.14[gtk(+)] |
184 |
+" # Need gvfs[gtk] for recent:/// support; always built (without USE=gtk) since gvfs-1.34 |
185 |
+ |
186 |
+PATCHES=( |
187 |
+ "${FILESDIR}"/43.0-docs-build.patch # Always install pregenerated manpage, keeping docs option for gtk-doc |
188 |
+ "${FILESDIR}"/43.0-optional-gstreamer.patch # Allow controlling audio-video-properties build |
189 |
+) |
190 |
+ |
191 |
+src_prepare() { |
192 |
+ default |
193 |
+ xdg_environment_reset |
194 |
+ |
195 |
+ if use previewer; then |
196 |
+ DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files. |
197 |
+ To activate the previewer, select a file and press space; to |
198 |
+ close the previewer, press space again." |
199 |
+ fi |
200 |
+ |
201 |
+ # Disable test-nautilus-search-engine-tracker; bug #831170 |
202 |
+ sed -e '/^tracker_tests = /{n;N;N;d}' -i test/automated/displayless/meson.build || die |
203 |
+} |
204 |
+ |
205 |
+src_configure() { |
206 |
+ local emesonargs=( |
207 |
+ $(meson_use gtk-doc docs) |
208 |
+ -Dextensions=true # image file properties, sendto support; also required for -Dgstreamer=true |
209 |
+ $(meson_use gstreamer) # gstreamer audio-video-properties extension |
210 |
+ $(meson_use introspection) |
211 |
+ -Dpackagekit=false |
212 |
+ $(meson_use selinux) |
213 |
+ -Dprofiling=false |
214 |
+ -Dtests=$(usex test all none) |
215 |
+ ) |
216 |
+ meson_src_configure |
217 |
+} |
218 |
+ |
219 |
+src_install() { |
220 |
+ use previewer && readme.gentoo_create_doc |
221 |
+ meson_src_install |
222 |
+} |
223 |
+ |
224 |
+src_test() { |
225 |
+ gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed |
226 |
+ # TODO: Tests require tracker testutils (e.g. tracker-sandbox), which may need some sorting out with tracker use flag deps |
227 |
+ virtx meson_src_test |
228 |
+} |
229 |
+ |
230 |
+pkg_postinst() { |
231 |
+ xdg_pkg_postinst |
232 |
+ gnome2_schemas_update |
233 |
+ |
234 |
+ if use previewer; then |
235 |
+ readme.gentoo_print_elog |
236 |
+ else |
237 |
+ elog "To preview media files, emerge nautilus with USE=previewer" |
238 |
+ fi |
239 |
+} |
240 |
+ |
241 |
+pkg_postrm() { |
242 |
+ xdg_pkg_postrm |
243 |
+ gnome2_schemas_update |
244 |
+} |