1 |
commit: f013b6af9fd854f1b027476c7b912c2cae21348d |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Sep 19 19:43:35 2019 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 19 20:10:12 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f013b6af |
7 |
|
8 |
gnome-base/nautilus: bump to 3.32.3 |
9 |
|
10 |
Package-Manager: Portage-2.3.69, Repoman-2.3.12 |
11 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
12 |
|
13 |
gnome-base/nautilus/Manifest | 1 + |
14 |
.../nautilus/files/3.32.3-optional-gstreamer.patch | 57 +++++++++++ |
15 |
gnome-base/nautilus/metadata.xml | 1 + |
16 |
gnome-base/nautilus/nautilus-3.32.3.ebuild | 110 +++++++++++++++++++++ |
17 |
4 files changed, 169 insertions(+) |
18 |
|
19 |
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest |
20 |
index 3ffae22617b..f39a559f56c 100644 |
21 |
--- a/gnome-base/nautilus/Manifest |
22 |
+++ b/gnome-base/nautilus/Manifest |
23 |
@@ -1 +1,2 @@ |
24 |
DIST nautilus-3.30.5.tar.xz 3254344 BLAKE2B 64da158ee661fc259a14f890bf6ad343f720245df6b9475ff047993570ea4e7234723eb242f057bc85b7ea95d38a99b5c2f5d546e982a3e3e32b7fc75cabb786 SHA512 e38a8bb380460d902e4ec6219d0e147a4245e790b18fb18ab9474ec2ae002a971243c6b09b8fec267e65c7ecc7bb1217191c4f5cb9547b3b9d5b0793068103cf |
25 |
+DIST nautilus-3.32.3.tar.xz 3197820 BLAKE2B 28140210a855fe62faba4f0833067a81c4d8f71c0cc870ba4fdcc016754b01df003e45f636836f67cced8515aba8c8fb7922de788a14bfe0f0cc4518010aed5f SHA512 f19710f02bd91edb2d2f6cb8f46be6bebea3edfed14a07612444d5990533bafd032b604d65533727eb377b574d6bd4c82dbe11894d85ad254ee1473b683c4392 |
26 |
|
27 |
diff --git a/gnome-base/nautilus/files/3.32.3-optional-gstreamer.patch b/gnome-base/nautilus/files/3.32.3-optional-gstreamer.patch |
28 |
new file mode 100644 |
29 |
index 00000000000..f28e9575d78 |
30 |
--- /dev/null |
31 |
+++ b/gnome-base/nautilus/files/3.32.3-optional-gstreamer.patch |
32 |
@@ -0,0 +1,57 @@ |
33 |
+From f2d55bc9a9398ed1c36e1b856bcb33080abbf7c0 Mon Sep 17 00:00:00 2001 |
34 |
+From: Mart Raudsepp <leio@g.o> |
35 |
+Date: Thu, 19 Sep 2019 22:26:08 +0300 |
36 |
+Subject: [PATCH] build: Optional gstreamer |
37 |
+ |
38 |
+--- |
39 |
+ extensions/meson.build | 4 +++- |
40 |
+ meson.build | 2 ++ |
41 |
+ meson_options.txt | 6 ++++++ |
42 |
+ 3 files changed, 11 insertions(+), 1 deletion(-) |
43 |
+ |
44 |
+diff --git a/extensions/meson.build b/extensions/meson.build |
45 |
+index 5c6f64cef..bd8c41d3e 100644 |
46 |
+--- a/extensions/meson.build |
47 |
++++ b/extensions/meson.build |
48 |
+@@ -1,3 +1,5 @@ |
49 |
+ subdir('image-properties') |
50 |
+-subdir('audio-video-properties') |
51 |
++if get_option('gstreamer') |
52 |
++ subdir('audio-video-properties') |
53 |
++endif |
54 |
+ subdir('sendto') |
55 |
+diff --git a/meson.build b/meson.build |
56 |
+index 0a267d670..ccb2b8cc1 100644 |
57 |
+--- a/meson.build |
58 |
++++ b/meson.build |
59 |
+@@ -122,8 +122,10 @@ libm = cc.find_library('m') |
60 |
+ |
61 |
+ if get_option('extensions') |
62 |
+ gexiv = dependency('gexiv2', version: '>= 0.10.0') |
63 |
++ if get_option('gstreamer') |
64 |
+ gst_tag_dep = dependency('gstreamer-tag-1.0') |
65 |
+ gst_pbutils_dep = dependency('gstreamer-pbutils-1.0') |
66 |
++ endif |
67 |
+ endif |
68 |
+ gio = dependency('gio-2.0', version: glib_ver) |
69 |
+ gio_unix = dependency('gio-unix-2.0', version: glib_ver) |
70 |
+diff --git a/meson_options.txt b/meson_options.txt |
71 |
+index fce5f16f9..1fa8f8952 100644 |
72 |
+--- a/meson_options.txt |
73 |
++++ b/meson_options.txt |
74 |
+@@ -13,6 +13,12 @@ option( |
75 |
+ value: true, |
76 |
+ description: 'Build stock extensions', |
77 |
+ ) |
78 |
++option( |
79 |
++ 'gstreamer', |
80 |
++ type: 'boolean', |
81 |
++ value: true, |
82 |
++ description: 'Build audio-video properties extension (requires "extensions")', |
83 |
++) |
84 |
+ option( |
85 |
+ 'introspection', |
86 |
+ type: 'boolean', |
87 |
+-- |
88 |
+2.20.1 |
89 |
+ |
90 |
|
91 |
diff --git a/gnome-base/nautilus/metadata.xml b/gnome-base/nautilus/metadata.xml |
92 |
index c5117d64948..6d7557c2caa 100644 |
93 |
--- a/gnome-base/nautilus/metadata.xml |
94 |
+++ b/gnome-base/nautilus/metadata.xml |
95 |
@@ -6,6 +6,7 @@ |
96 |
<name>Gentoo GNOME Desktop</name> |
97 |
</maintainer> |
98 |
<use> |
99 |
+ <flag name="gstreamer">Enable the Audio/Video file properties page</flag> |
100 |
<flag name="packagekit">Use packagekit to search for programs to open |
101 |
unknown file types</flag> |
102 |
<flag name="previewer">Use <pkg>gnome-extra/sushi</pkg> to preview files |
103 |
|
104 |
diff --git a/gnome-base/nautilus/nautilus-3.32.3.ebuild b/gnome-base/nautilus/nautilus-3.32.3.ebuild |
105 |
new file mode 100644 |
106 |
index 00000000000..b73d0c915cc |
107 |
--- /dev/null |
108 |
+++ b/gnome-base/nautilus/nautilus-3.32.3.ebuild |
109 |
@@ -0,0 +1,110 @@ |
110 |
+# Copyright 1999-2019 Gentoo Authors |
111 |
+# Distributed under the terms of the GNU General Public License v2 |
112 |
+ |
113 |
+EAPI=7 |
114 |
+ |
115 |
+inherit gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg |
116 |
+ |
117 |
+DESCRIPTION="Default file manager for the GNOME desktop" |
118 |
+HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus" |
119 |
+ |
120 |
+LICENSE="GPL-3+ LGPL-2.1+" |
121 |
+SLOT="0" |
122 |
+IUSE="gnome +gstreamer gtk-doc +introspection packagekit +previewer seccomp selinux sendto" |
123 |
+ |
124 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" |
125 |
+ |
126 |
+COMMON_DEPEND=" |
127 |
+ >=dev-libs/glib-2.58.1:2 |
128 |
+ >=media-libs/gexiv2-0.10.0 |
129 |
+ gstreamer? ( media-libs/gstreamer:1.0 |
130 |
+ media-libs/gst-plugins-base:1.0 ) |
131 |
+ >=app-arch/gnome-autoar-0.2.1 |
132 |
+ gnome-base/gsettings-desktop-schemas |
133 |
+ >=x11-libs/gtk+-3.22.27:3[X,introspection?] |
134 |
+ seccomp? ( sys-libs/libseccomp ) |
135 |
+ >=x11-libs/pango-1.28.3 |
136 |
+ selinux? ( >=sys-libs/libselinux-2.0 ) |
137 |
+ >=app-misc/tracker-2.0:= |
138 |
+ x11-libs/libX11 |
139 |
+ >=dev-libs/libxml2-2.7.8:2 |
140 |
+ introspection? ( >=dev-libs/gobject-introspection-1.54:= ) |
141 |
+" |
142 |
+RDEPEND="${COMMON_DEPEND} |
143 |
+ packagekit? ( app-admin/packagekit-base ) |
144 |
+ seccomp? ( >=sys-apps/bubblewrap-0.3.1 ) |
145 |
+ sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 ) |
146 |
+ gstreamer? ( !<media-video/totem-3.31.91[nautilus] ) |
147 |
+" |
148 |
+DEPEND="${COMMON_DEPEND} |
149 |
+ media-libs/fontconfig |
150 |
+" |
151 |
+BDEPEND=" |
152 |
+ >=dev-util/gdbus-codegen-2.51.2 |
153 |
+ dev-util/glib-utils |
154 |
+ gtk-doc? ( |
155 |
+ >=dev-util/gtk-doc-1.10 |
156 |
+ app-text/docbook-xml-dtd:4.1.2 ) |
157 |
+ >=sys-devel/gettext-0.19.8 |
158 |
+ virtual/pkgconfig |
159 |
+ x11-base/xorg-proto |
160 |
+" |
161 |
+PDEPEND=" |
162 |
+ gnome? ( x11-themes/adwaita-icon-theme ) |
163 |
+ previewer? ( >=gnome-extra/sushi-0.1.9 ) |
164 |
+ sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 ) |
165 |
+ >=gnome-base/gvfs-1.14[gtk(+)] |
166 |
+" # Need gvfs[gtk] for recent:/// support; always built (without USE=gtk) since gvfs-1.34 |
167 |
+ |
168 |
+PATCHES=( |
169 |
+ "${FILESDIR}"/3.30.5-docs-build.patch # Always install pregenerated manpage, keeping docs option for gtk-doc |
170 |
+ "${FILESDIR}"/${PV}-optional-gstreamer.patch # Allow controlling audio-video-properties build |
171 |
+) |
172 |
+ |
173 |
+src_prepare() { |
174 |
+ if use previewer; then |
175 |
+ DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files. |
176 |
+ To activate the previewer, select a file and press space; to |
177 |
+ close the previewer, press space again." |
178 |
+ fi |
179 |
+ xdg_src_prepare |
180 |
+} |
181 |
+ |
182 |
+src_configure() { |
183 |
+ local emesonargs=( |
184 |
+ $(meson_use gtk-doc docs) |
185 |
+ -Dextensions=true # image file properties, sendto support; also required for -Dgstreamer=true |
186 |
+ $(meson_use gstreamer) # gstreamer audio-video-properties extension |
187 |
+ $(meson_use introspection) |
188 |
+ $(meson_use packagekit) |
189 |
+ $(meson_use selinux) |
190 |
+ -Dprofiling=false |
191 |
+ -Dtests=$(usex test all none) |
192 |
+ ) |
193 |
+ meson_src_configure |
194 |
+} |
195 |
+ |
196 |
+src_install() { |
197 |
+ use previewer && readme.gentoo_create_doc |
198 |
+ meson_src_install |
199 |
+} |
200 |
+ |
201 |
+src_test() { |
202 |
+ virtx meson_src_test |
203 |
+} |
204 |
+ |
205 |
+pkg_postinst() { |
206 |
+ xdg_pkg_postinst |
207 |
+ gnome2_schemas_update |
208 |
+ |
209 |
+ if use previewer; then |
210 |
+ readme.gentoo_print_elog |
211 |
+ else |
212 |
+ elog "To preview media files, emerge nautilus with USE=previewer" |
213 |
+ fi |
214 |
+} |
215 |
+ |
216 |
+pkg_postrm() { |
217 |
+ xdg_pkg_postrm |
218 |
+ gnome2_schemas_update |
219 |
+} |