Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-base/nautilus/, gnome-base/nautilus/files/
Date: Sun, 27 Mar 2022 18:58:35
Message-Id: 1648406818.c0aa0dd46966297dd899be20e7d65b940a08b1d7.mattst88@gentoo
1 commit: c0aa0dd46966297dd899be20e7d65b940a08b1d7
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Sun Mar 27 18:31:55 2022 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Sun Mar 27 18:46:58 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0aa0dd4
7
8 gnome-base/nautilus: Version bump to 42.0
9
10 Bug: https://bugs.gentoo.org/831170
11 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
12
13 gnome-base/nautilus/Manifest | 1 +
14 .../nautilus/files/42.0-optional-gstreamer.patch | 57 +++++++++++
15 gnome-base/nautilus/nautilus-42.0.ebuild | 114 +++++++++++++++++++++
16 3 files changed, 172 insertions(+)
17
18 diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
19 index a1d203650dfc..3a500bc4f4b3 100644
20 --- a/gnome-base/nautilus/Manifest
21 +++ b/gnome-base/nautilus/Manifest
22 @@ -1 +1,2 @@
23 DIST nautilus-41.2.tar.xz 3248212 BLAKE2B be4e4e8fc03751259a1a5d4d1eb726e3026d24376da3fa680c412598219bfb3ced52f9b809004913dffdb9bb1c176dede07288c440c100487b3a337d8eaab417 SHA512 adb14fa1cf37a4797f57ae5162bddcd5b012de270cf955051b69276bc266b1dbfd8027b835f627ae19a1252356b344b1c8a4b7ca79a22512f3138a2c13fd2f3e
24 +DIST nautilus-42.0.tar.xz 3263108 BLAKE2B 0d06a72cc1ea1a227f6d92ee2841a2fdda9220ccb61bdb43cd5930a8f64393994a746e33a5451d460ca4c15810549c5d94f895ee861efa8ae46b98e25ed20f5f SHA512 c3b182f75f89a31ecb7b4f6b42dfb2f9792e195fdaf0e5f2b1a4dbe0f0d01071cf4ecb8408d6da476aa111ec891462e33c0d139d3423109bd5b4138ae822bd1e
25
26 diff --git a/gnome-base/nautilus/files/42.0-optional-gstreamer.patch b/gnome-base/nautilus/files/42.0-optional-gstreamer.patch
27 new file mode 100644
28 index 000000000000..84835d4ba959
29 --- /dev/null
30 +++ b/gnome-base/nautilus/files/42.0-optional-gstreamer.patch
31 @@ -0,0 +1,57 @@
32 +From 918ffe8e1be66f7451452431385095b4cc7e6801 Mon Sep 17 00:00:00 2001
33 +From: Mart Raudsepp <leio@g.o>
34 +Date: Thu, 19 Sep 2019 22:26:08 +0300
35 +Subject: [PATCH] build: Optional gstreamer
36 +
37 +---
38 + extensions/meson.build | 4 +++-
39 + meson.build | 2 ++
40 + meson_options.txt | 6 ++++++
41 + 3 files changed, 11 insertions(+), 1 deletion(-)
42 +
43 +diff --git a/extensions/meson.build b/extensions/meson.build
44 +index 46c7b0393..bcce4fbfe 100644
45 +--- a/extensions/meson.build
46 ++++ b/extensions/meson.build
47 +@@ -1,3 +1,5 @@
48 + subdir('image-properties')
49 +-subdir('audio-video-properties')
50 ++if get_option('gstreamer')
51 ++ subdir('audio-video-properties')
52 ++endif
53 + subdir('sendto')
54 +diff --git a/meson.build b/meson.build
55 +index e8b044490..10cf06fd6 100644
56 +--- a/meson.build
57 ++++ b/meson.build
58 +@@ -99,8 +99,10 @@ libm = cc.find_library('m')
59 +
60 + if get_option('extensions')
61 + gexiv = dependency('gexiv2', version: '>= 0.14.0')
62 ++ if get_option('gstreamer')
63 + gst_tag_dep = dependency('gstreamer-tag-1.0')
64 + gst_pbutils_dep = dependency('gstreamer-pbutils-1.0')
65 ++ endif
66 + endif
67 + gio = dependency('gio-2.0', version: glib_ver)
68 + gio_unix = dependency('gio-unix-2.0', version: glib_ver)
69 +diff --git a/meson_options.txt b/meson_options.txt
70 +index 6e781c4ef..9ad8d8196 100644
71 +--- a/meson_options.txt
72 ++++ b/meson_options.txt
73 +@@ -13,6 +13,12 @@ option(
74 + value: true,
75 + description: 'Build stock extensions',
76 + )
77 ++option(
78 ++ 'gstreamer',
79 ++ type: 'boolean',
80 ++ value: true,
81 ++ description: 'Build audio-video properties extension (requires "extensions")',
82 ++)
83 + option(
84 + 'introspection',
85 + type: 'boolean',
86 +--
87 +2.34.1
88 +
89
90 diff --git a/gnome-base/nautilus/nautilus-42.0.ebuild b/gnome-base/nautilus/nautilus-42.0.ebuild
91 new file mode 100644
92 index 000000000000..cc5893b59ef3
93 --- /dev/null
94 +++ b/gnome-base/nautilus/nautilus-42.0.ebuild
95 @@ -0,0 +1,114 @@
96 +# Copyright 1999-2022 Gentoo Authors
97 +# Distributed under the terms of the GNU General Public License v2
98 +
99 +EAPI=8
100 +
101 +inherit gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg
102 +
103 +DESCRIPTION="Default file manager for the GNOME desktop"
104 +HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
105 +
106 +LICENSE="GPL-3+ LGPL-2.1+"
107 +SLOT="0"
108 +IUSE="gnome +gstreamer gtk-doc +introspection +previewer selinux sendto"
109 +
110 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
111 +
112 +DEPEND="
113 + >=dev-libs/glib-2.67.1:2
114 + >=media-libs/gexiv2-0.14.0
115 + gstreamer? ( media-libs/gstreamer:1.0
116 + media-libs/gst-plugins-base:1.0 )
117 + >=app-arch/gnome-autoar-0.4.0
118 + >=gnome-base/gnome-desktop-3.0.0:3=
119 + >=x11-libs/gtk+-3.22.27:3[X,introspection?]
120 + >=gui-libs/libhandy-1.5.0:1
121 + >=x11-libs/pango-1.28.3
122 + selinux? ( >=sys-libs/libselinux-2.0 )
123 + >=app-misc/tracker-3.0:3=
124 + x11-libs/libX11
125 + >=dev-libs/libxml2-2.7.8:2
126 + introspection? ( >=dev-libs/gobject-introspection-1.54:= )
127 +"
128 +RDEPEND="${DEPEND}
129 + gstreamer? ( !<media-video/totem-3.31.91[nautilus] )
130 + >=app-misc/tracker-miners-3.0:3=
131 +" # uses org.freedesktop.Tracker.Miner.Files gsettings schema from tracker-miners
132 +BDEPEND="
133 + >=dev-util/gdbus-codegen-2.51.2
134 + >=dev-util/meson-0.57.2
135 + dev-util/glib-utils
136 + gtk-doc? (
137 + >=dev-util/gtk-doc-1.10
138 + app-text/docbook-xml-dtd:4.1.2 )
139 + >=sys-devel/gettext-0.19.8
140 + virtual/pkgconfig
141 + x11-base/xorg-proto
142 +"
143 +PDEPEND="
144 + gnome? ( x11-themes/adwaita-icon-theme )
145 + previewer? ( >=gnome-extra/sushi-0.1.9 )
146 + sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
147 + >=gnome-base/gvfs-1.14[gtk(+)]
148 +" # Need gvfs[gtk] for recent:/// support; always built (without USE=gtk) since gvfs-1.34
149 +
150 +PATCHES=(
151 + "${FILESDIR}"/3.30.5-docs-build.patch # Always install pregenerated manpage, keeping docs option for gtk-doc
152 + "${FILESDIR}"/42.0-optional-gstreamer.patch # Allow controlling audio-video-properties build
153 +)
154 +
155 +src_prepare() {
156 + default
157 + xdg_environment_reset
158 +
159 + if use previewer; then
160 + DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files.
161 + To activate the previewer, select a file and press space; to
162 + close the previewer, press space again."
163 + fi
164 +
165 + # Disable test-nautilus-search-engine-tracker; bug #831170
166 + sed -e '/^tracker_tests = /{n;N;N;d}' -i test/automated/displayless/meson.build || die
167 +}
168 +
169 +src_configure() {
170 + local emesonargs=(
171 + $(meson_use gtk-doc docs)
172 + -Dextensions=true # image file properties, sendto support; also required for -Dgstreamer=true
173 + $(meson_use gstreamer) # gstreamer audio-video-properties extension
174 + $(meson_use introspection)
175 + -Dlibportal=false # As of 40.2, all libportal usages are flatpak-specific
176 + -Dpackagekit=false
177 + $(meson_use selinux)
178 + -Dprofiling=false
179 + -Dtests=$(usex test all none)
180 + )
181 + meson_src_configure
182 +}
183 +
184 +src_install() {
185 + use previewer && readme.gentoo_create_doc
186 + meson_src_install
187 +}
188 +
189 +src_test() {
190 + gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
191 + # TODO: Tests require tracker testutils (e.g. tracker-sandbox), which may need some sorting out with tracker use flag deps
192 + virtx meson_src_test
193 +}
194 +
195 +pkg_postinst() {
196 + xdg_pkg_postinst
197 + gnome2_schemas_update
198 +
199 + if use previewer; then
200 + readme.gentoo_print_elog
201 + else
202 + elog "To preview media files, emerge nautilus with USE=previewer"
203 + fi
204 +}
205 +
206 +pkg_postrm() {
207 + xdg_pkg_postrm
208 + gnome2_schemas_update
209 +}