[gentoo-commits] repo/gentoo:master commit in: gnome-base/nautilus/, gnome-base/nautilus/files/

[Mart Raudsepp]

commit:     d7a5555d5b2a6453521948b57e2e248b78a04d9d
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  5 17:50:56 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Tue Mar  5 17:51:46 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7a5555d

gnome-base/nautilus: bump to 3.28.1

nautilus-desktop is now gone. Suggested alternative: "Desktop Icons"
from https://extensions.gnome.org

Tracker support is not optional anymore. It is theoretically possible
to patch it, but very cumbersome and hard to maintain on bumps - it
uses tracker for new "Starred" files feature and that is intertwined
a lot more than batch rename and tracker search were.
However, if one doesn't care for "tracker search" bits, one could avoid
tracker-miners and only have the core - the miners are not used for
batch rename and (probably) starring, as tracker provides more than
mining metadata from your files, and this is what nautilus relies on
to not NIH it.

nautilus-sendto extension code also not optional anymore, as it's a
rather tiny thing and better to have it always built, so no need to
rebuild all of nautilus after deciding to install nautilus-sendto for
its feature. It will probably go away with GNOME 3.34 in favor of
desktop portals for mail sending, etc, so it would work in flatpak too.

XMP and EXIF support isn't gone, it's just done via gexiv2 now.

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 gnome-base/nautilus/Manifest                      |   2 +
 gnome-base/nautilus/files/3.28.1-docs-build.patch |  42 +++++++++
 gnome-base/nautilus/nautilus-3.28.1.ebuild        | 104 ++++++++++++++++++++++
 3 files changed, 148 insertions(+)

diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 14a2ae53b9e..5397c7fa99d 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,2 +1,4 @@
 DIST nautilus-3.24.2.1.tar.xz 5143440 BLAKE2B 731046b6bdd0817b770cf3e2f0667187bfde613cf1a15611e6ec06e74bc3c2432ca66894119f224023fe46b01fd777d3dde2d2ac7bba0a9eb0fd71d38e1756ff SHA512 f6868600bcdc82071b3a63f4e4a0f7decf0d72e021eb3d0c26e914413c858163ee4403c4f3ef7689556a0fc91394f30cff9a3db14da030b277b50972c7b80a07
 DIST nautilus-3.26.4.tar.xz 3267652 BLAKE2B 56986b8d87afc0ea7ce6f1f56ae06c7cfb05d060414aad428145a6c2cb631b9d4ebbeaefabb0f0ceeb5f930ae94737f8dfcabb300554a59c2b7d5a53d1ee3cd1 SHA512 2a50a2a9ae6ffbe4b706d46fb47e5f54f42e645189b3548d1904c3ddf882ef4a94819740c6821fe50c662a9013ab43bb9b7b3dbdfc779ecc82f16170b4867973
+DIST nautilus-3.28.1-patchset.tar.xz 129360 BLAKE2B 18e94e83132a8ce2e07491ce6b5cb9499141bf93e0c3ef44f2e5ac891e59d334cf310d863e8e7450fa385a6a49873d790e4f8c36a1ef8e009b1f2be2361586b4 SHA512 6c3385b4bc7020601f47dc66c0b1cabd6dadcd9f986bdaec42aeca9b43a6b8a2362651958d4e6a4738b78fbd546071678ba15ab87c268e33cfc1cca49229da48
+DIST nautilus-3.28.1.tar.xz 3262520 BLAKE2B 6f007e2327ffb108c5195737c02c7be12b874f5bc3bdfc1c84a3ba2176ff36e1843057522a54e569a7c09a056ccd888e1ddf099d6f2b527dfa109370cbe1a3a9 SHA512 6b695c097e5082062afe8cb036e819c837ce1e2570f581f81860f378e34f38f3020b8802e6a4285243c111d5208e892c419ac92621cdb1d35b2df205a3ccaa13

diff --git a/gnome-base/nautilus/files/3.28.1-docs-build.patch b/gnome-base/nautilus/files/3.28.1-docs-build.patch
new file mode 100644
index 00000000000..a2cb07aa23e
--- /dev/null
+++ b/gnome-base/nautilus/files/3.28.1-docs-build.patch
@@ -0,0 +1,42 @@
+From eaf8435005e2637ce76690c71f729e6b3685d973 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@g.o>
+Date: Tue, 5 Mar 2019 19:22:58 +0200
+Subject: [PATCH] build: Always install man page
+
+It's already generated and shouldn't be thrown in the same pot as
+full gtk-doc generation. It should be either a separate `man` option,
+or just always installed.
+---
+ docs/meson.build | 4 +++-
+ meson.build      | 4 +---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/docs/meson.build b/docs/meson.build
+index b039cb631..2b1800be6 100644
+--- a/docs/meson.build
++++ b/docs/meson.build
+@@ -1,3 +1,5 @@
+ install_man('nautilus.1')
+ 
+-subdir('reference')
++if get_option('docs')
++  subdir('reference')
++endif
+diff --git a/meson.build b/meson.build
+index 4b64239ac..88fe73237 100644
+--- a/meson.build
++++ b/meson.build
+@@ -152,9 +152,7 @@ if get_option('tests') != 'none'
+ endif
+ subdir('data')
+ subdir('po')
+-if get_option('docs')
+-  subdir('docs')
+-endif
++subdir('docs')
+ if get_option('extensions')
+   subdir('extensions')
+ endif
+-- 
+2.17.0
+

diff --git a/gnome-base/nautilus/nautilus-3.28.1.ebuild b/gnome-base/nautilus/nautilus-3.28.1.ebuild
new file mode 100644
index 00000000000..77031b8ffd3
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-3.28.1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
+
+LICENSE="GPL-3+ LGPL-2.1+"
+SLOT="0"
+IUSE="gnome gtk-doc +introspection packagekit +previewer selinux sendto"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.55.1:2
+	>=media-libs/gexiv2-0.10.0
+	>=app-arch/gnome-autoar-0.2.1
+	>=gnome-base/gnome-desktop-3.0.0:3=
+	>=x11-libs/pango-1.28.3
+	>=x11-libs/gtk+-3.22.6:3[X,introspection?]
+	selinux? ( >=sys-libs/libselinux-2.0 )
+	>=app-misc/tracker-2.0:=
+	x11-libs/libX11
+	>=dev-libs/libxml2-2.7.8:2
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/gdbus-codegen-2.51.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
+"
+RDEPEND="${COMMON_DEPEND}
+	packagekit? ( app-admin/packagekit-base )
+	sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
+"
+
+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=(
+	"${WORKDIR}"/patches # gnome-3-28 + optional introspection
+	"${FILESDIR}"/${PV}-docs-build.patch # Always install pregenerated manpage, keeping docs option for gtk-doc
+)
+
+src_prepare() {
+	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
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc docs)
+		$(meson_use introspection)
+		-Dprofiling=false
+		-Dextensions=true # image file properties, sendto support
+		$(meson_use packagekit)
+		$(meson_use selinux)
+		-Dtests=$(usex test all none)
+		-Dprofile=default
+	)
+	meson_src_configure
+}
+
+src_install() {
+	use previewer && readme.gentoo_create_doc
+	meson_src_install
+}
+
+src_test() {
+	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
+}