gentoo resync : 06.04.2022

3 files changed, 174 insertions, 0 deletions

diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 34a051ab8510..5918f05ba868 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,5 +1,8 @@
 AUX 3.30.5-docs-build.patch 1054 BLAKE2B c4a9bbd1f63f74130d48737e430a4e3e5e894049df2dfdebf75f0f519eb715aba5bd590f4b57a718f78238ee50242215ef2b648fd3e3e8e8dddebc2ff1b45be2 SHA512 3a0925262643eb84d4c1731cad6b3c2c427def000503a3a680b06b68828f53492b4367d02ac6de36c35b6460e3d0967e3ce26203f8257271b222883990047459
 AUX 41.1-optional-gstreamer.patch 1592 BLAKE2B 877421d758d9b0911bc94b3d5132867e3a78532ce90c3e10017b164dcf4ae8f2cd8a49a23878936ed7adfe1112e5fbaff06542a62d7c6a0f515a53cff1dbb03e SHA512 3f1e0cb25237b5c9c6f29a7ac7a50afcf7a1b9844a4a9c6e134cbabebecf374846295de7b5d4416e1def8a1a2fb111e557caf27096836d8d19c51f9325799807
+AUX 42.0-optional-gstreamer.patch 1590 BLAKE2B eb251337ef8f2cba7b0fa9e1643c1155aa36bbc9234f4c5bf6baddd7f91d69e2713172685687a0bbf8fc646a97df857cfbce2a73768beb4eb5dae32ace893d07 SHA512 5f90d946c7bea63da2ca20397b0606747383b781dc972051082596d4fd0522a22c0d40440129e41ff4faeb5e9fcdfc5abb14318a9dade5b0343003bf86c7e339
 DIST nautilus-41.2.tar.xz 3248212 BLAKE2B be4e4e8fc03751259a1a5d4d1eb726e3026d24376da3fa680c412598219bfb3ced52f9b809004913dffdb9bb1c176dede07288c440c100487b3a337d8eaab417 SHA512 adb14fa1cf37a4797f57ae5162bddcd5b012de270cf955051b69276bc266b1dbfd8027b835f627ae19a1252356b344b1c8a4b7ca79a22512f3138a2c13fd2f3e
+DIST nautilus-42.0.tar.xz 3263108 BLAKE2B 0d06a72cc1ea1a227f6d92ee2841a2fdda9220ccb61bdb43cd5930a8f64393994a746e33a5451d460ca4c15810549c5d94f895ee861efa8ae46b98e25ed20f5f SHA512 c3b182f75f89a31ecb7b4f6b42dfb2f9792e195fdaf0e5f2b1a4dbe0f0d01071cf4ecb8408d6da476aa111ec891462e33c0d139d3423109bd5b4138ae822bd1e
 EBUILD nautilus-41.2.ebuild 3187 BLAKE2B 0ef6a93741ea846684150262e296a5775aef7af8395803ecf683ce093fff3d67df20c3786233afcc790d816996b54ac0d8b6c257f866c11edab76b6b980913ce SHA512 523a7f96bf4d2beed2f3906ee4ed8b73bad71de0b7ce6d1fa952778608b45e25cfebabc9674d1cfba875c18a4fcaa963e20da0a2ff238d9f37c85d5d7499e67e
+EBUILD nautilus-42.0.ebuild 3354 BLAKE2B 4b2e0323f3af8387b8f65917e75c30b01ed137423a60709fbd1768c4b67980a7a74b454ff32ecf24bda025b4283e8ed0a289d1dba2525df7156852e9b70e4f4a SHA512 63037e91cd78ed1dd4b73e30530e2014e29cfd3b1a914345ba968c76186d687c90f08e8c65a03bcfcf63c79b9244d41c3270f34c63409daea78162c3ea46d7db
 MISC metadata.xml 554 BLAKE2B 80d4d6da040c47ddd01a278a0ca8af3d371f9e88b7c1583a606701bc85331d853d41bcc3a6be73772ce5574a1c50e601b31fa125a5f4c8a6dc39b1308d78af5b SHA512 ad97897d6f8c9be9271c0204fafd3540ac0d798fc8d4a1de1e66503dbb714dfacf0fd4ce23e059044ab7a3a3b687228811aa9adfba16391e6a5dfe2fda11801c
diff --git a/gnome-base/nautilus/files/42.0-optional-gstreamer.patch b/gnome-base/nautilus/files/42.0-optional-gstreamer.patch
new file mode 100644
index 000000000000..84835d4ba959
--- /dev/null
+++ b/gnome-base/nautilus/files/42.0-optional-gstreamer.patch
@@ -0,0 +1,57 @@
+From 918ffe8e1be66f7451452431385095b4cc7e6801 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Thu, 19 Sep 2019 22:26:08 +0300
+Subject: [PATCH] build: Optional gstreamer
+
+---
+ extensions/meson.build | 4 +++-
+ meson.build            | 2 ++
+ meson_options.txt      | 6 ++++++
+ 3 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/extensions/meson.build b/extensions/meson.build
+index 46c7b0393..bcce4fbfe 100644
+--- a/extensions/meson.build
++++ b/extensions/meson.build
+@@ -1,3 +1,5 @@
+ subdir('image-properties')
+-subdir('audio-video-properties')
++if get_option('gstreamer')
++  subdir('audio-video-properties')
++endif
+ subdir('sendto')
+diff --git a/meson.build b/meson.build
+index e8b044490..10cf06fd6 100644
+--- a/meson.build
++++ b/meson.build
+@@ -99,8 +99,10 @@ libm = cc.find_library('m')
+ 
+ if get_option('extensions')
+   gexiv = dependency('gexiv2', version: '>= 0.14.0')
++ if get_option('gstreamer')
+   gst_tag_dep = dependency('gstreamer-tag-1.0')
+   gst_pbutils_dep = dependency('gstreamer-pbutils-1.0')
++ endif
+ endif
+ gio = dependency('gio-2.0', version: glib_ver)
+ gio_unix = dependency('gio-unix-2.0', version: glib_ver)
+diff --git a/meson_options.txt b/meson_options.txt
+index 6e781c4ef..9ad8d8196 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -13,6 +13,12 @@ option(
+   value: true,
+   description: 'Build stock extensions',
+ )
++option(
++  'gstreamer',
++  type: 'boolean',
++  value: true,
++  description: 'Build audio-video properties extension (requires "extensions")',
++)
+ option(
+   'introspection',
+   type: 'boolean',
+-- 
+2.34.1
+
diff --git a/gnome-base/nautilus/nautilus-42.0.ebuild b/gnome-base/nautilus/nautilus-42.0.ebuild
new file mode 100644
index 000000000000..cc5893b59ef3
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-42.0.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg
+
+DESCRIPTION="Default file manager for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
+
+LICENSE="GPL-3+ LGPL-2.1+"
+SLOT="0"
+IUSE="gnome +gstreamer gtk-doc +introspection +previewer selinux sendto"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	>=dev-libs/glib-2.67.1:2
+	>=media-libs/gexiv2-0.14.0
+	gstreamer? ( media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0 )
+	>=app-arch/gnome-autoar-0.4.0
+	>=gnome-base/gnome-desktop-3.0.0:3=
+	>=x11-libs/gtk+-3.22.27:3[X,introspection?]
+	>=gui-libs/libhandy-1.5.0:1
+	>=x11-libs/pango-1.28.3
+	selinux? ( >=sys-libs/libselinux-2.0 )
+	>=app-misc/tracker-3.0:3=
+	x11-libs/libX11
+	>=dev-libs/libxml2-2.7.8:2
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}
+	gstreamer? ( !<media-video/totem-3.31.91[nautilus] )
+	>=app-misc/tracker-miners-3.0:3=
+" # uses org.freedesktop.Tracker.Miner.Files gsettings schema from tracker-miners
+BDEPEND="
+	>=dev-util/gdbus-codegen-2.51.2
+	>=dev-util/meson-0.57.2
+	dev-util/glib-utils
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.10
+		app-text/docbook-xml-dtd:4.1.2 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+PDEPEND="
+	gnome? ( x11-themes/adwaita-icon-theme )
+	previewer? ( >=gnome-extra/sushi-0.1.9 )
+	sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
+	>=gnome-base/gvfs-1.14[gtk(+)]
+" # Need gvfs[gtk] for recent:/// support; always built (without USE=gtk) since gvfs-1.34
+
+PATCHES=(
+	"${FILESDIR}"/3.30.5-docs-build.patch # Always install pregenerated manpage, keeping docs option for gtk-doc
+	"${FILESDIR}"/42.0-optional-gstreamer.patch # Allow controlling audio-video-properties build
+)
+
+src_prepare() {
+	default
+	xdg_environment_reset
+
+	if use previewer; then
+		DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files.
+			To activate the previewer, select a file and press space; to
+			close the previewer, press space again."
+	fi
+
+	# Disable test-nautilus-search-engine-tracker; bug #831170
+	sed -e '/^tracker_tests = /{n;N;N;d}' -i test/automated/displayless/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc docs)
+		-Dextensions=true # image file properties, sendto support; also required for -Dgstreamer=true
+		$(meson_use gstreamer) # gstreamer audio-video-properties extension
+		$(meson_use introspection)
+		-Dlibportal=false # As of 40.2, all libportal usages are flatpak-specific
+		-Dpackagekit=false
+		$(meson_use selinux)
+		-Dprofiling=false
+		-Dtests=$(usex test all none)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	use previewer && readme.gentoo_create_doc
+	meson_src_install
+}
+
+src_test() {
+	gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
+	# TODO: Tests require tracker testutils (e.g. tracker-sandbox), which may need some sorting out with tracker use flag deps
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if use previewer; then
+		readme.gentoo_print_elog
+	else
+		elog "To preview media files, emerge nautilus with USE=previewer"
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}