public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Matt Turner" <mattst88@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-base/nautilus/files/, gnome-base/nautilus/
Date: Mon, 19 Jun 2023 15:30:04 +0000 (UTC)	[thread overview]
Message-ID: <1687188596.0aa2f4d6fdd091dec071206c777d8cef57034237.mattst88@gentoo> (raw)

commit:     0aa2f4d6fdd091dec071206c777d8cef57034237
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 19 15:09:55 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Jun 19 15:29:56 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0aa2f4d6

gnome-base/nautilus: Drop old versions

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 gnome-base/nautilus/Manifest                       |   2 -
 gnome-base/nautilus/files/3.30.5-docs-build.patch  |  42 --------
 .../nautilus/files/42.0-optional-gstreamer.patch   |  57 ----------
 gnome-base/nautilus/nautilus-42.2.ebuild           | 114 --------------------
 gnome-base/nautilus/nautilus-44.2.ebuild           | 119 ---------------------
 5 files changed, 334 deletions(-)

diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 4d6ee35d8131..46a8acc86477 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,4 +1,2 @@
-DIST nautilus-42.2.tar.xz 3254912 BLAKE2B 303b52fe9bbdb8e437a447004dcd284ee0c66ecaa11db45c52cf8c831f52a764efa03476d69f74840289f200c49b917bc329487bd87d3e776ea5dc1a6ea9b413 SHA512 2b3ba2990b00bbc3abf771b83b9b0a7c1a8b107b1b4955a45879f7d28add713d326bbe84d70056058073edfc3c7b7891547af77b8a34f94fe1b9ca047c76e9c9
 DIST nautilus-44.1.tar.xz 3192400 BLAKE2B dfd02c6cdd23a723ba65a93953e80a859a22c6104cb1faeb24a81d9031b99ffc4cc9b3dd10743f928b36da3bf7c33500dc23f9f37530845b54cb250660513b9c SHA512 fa7c029db1c8c7e13d22e692e4e107dbadb136aa8313de1bc07b826bf681af012d9a4a70c3ad4def0f348b2acb103455edcb2f7b1c804f525e337b4417fb6db2
 DIST nautilus-44.2.1.tar.xz 3190824 BLAKE2B 159abd8fbaea3f372febb4c7f68f95d97b50ac19e31d6108c9588aa849f92ea82a2a04402c8ee78f223339ffe929ed3fc95e4606db7753adacf6edb49f340910 SHA512 35974f9d2d785c69d4199287f1b79aa83397b37b3ad3ebe97894ee5e5d9aa4a981808fa443d5c04d2c7223c290a2cad87e3eeb62787b1d241486c39d5e061769
-DIST nautilus-44.2.tar.xz 3190788 BLAKE2B 90447c51b044fd4afd2439a36c24a18cded2fac5117ea708355f25c0a28ea1974a16e05685ac2d34b5c97afbef59989241d90f53c263211255513adcf03d1cc6 SHA512 1bec622d204e9ae01dfcab37e3263927c723ab1e143729190777c45cae6f03d6f601fd30bc1a75dbba63b2b69f212e888bacf2eebad118f8b4c5e09134aac4b6

diff --git a/gnome-base/nautilus/files/3.30.5-docs-build.patch b/gnome-base/nautilus/files/3.30.5-docs-build.patch
deleted file mode 100644
index 65ac29109e8f..000000000000
--- a/gnome-base/nautilus/files/3.30.5-docs-build.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From a62478c8e55bc6b1cd685f0c8c2094e1ed244c69 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Mon, 11 Mar 2019 20:52:53 +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 996360a62..50479f5f0 100644
---- a/meson.build
-+++ b/meson.build
-@@ -222,9 +222,7 @@ subdirs = [
- # Conditional building #
- ########################
- 
--if get_option('docs')
--  subdirs += 'docs'
--endif
-+subdirs += 'docs'
- if get_option('tests') != 'none'
-   subdirs += 'test'
- endif
--- 
-2.17.0
-

diff --git a/gnome-base/nautilus/files/42.0-optional-gstreamer.patch b/gnome-base/nautilus/files/42.0-optional-gstreamer.patch
deleted file mode 100644
index 84835d4ba959..000000000000
--- a/gnome-base/nautilus/files/42.0-optional-gstreamer.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-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.2.ebuild b/gnome-base/nautilus/nautilus-42.2.ebuild
deleted file mode 100644
index 8cb207e691f8..000000000000
--- a/gnome-base/nautilus/nautilus-42.2.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# 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=
-	>=gnome-base/gsettings-desktop-schemas-42
-	>=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}
-	>=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
-}

diff --git a/gnome-base/nautilus/nautilus-44.2.ebuild b/gnome-base/nautilus/nautilus-44.2.ebuild
deleted file mode 100644
index 3499157c5eef..000000000000
--- a/gnome-base/nautilus/nautilus-44.2.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2023 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"
-REQUIRED_USE="gtk-doc? ( introspection )"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-DEPEND="
-	>=dev-libs/glib-2.72.0:2
-	>=media-libs/gexiv2-0.14.0
-	>=x11-libs/gdk-pixbuf-2.30.0:2
-	gstreamer? ( media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0 )
-	>=app-arch/gnome-autoar-0.4.4
-	>=gnome-base/gnome-desktop-43:4=
-	>=gnome-base/gsettings-desktop-schemas-42
-	>=gui-libs/gtk-4.10.3:4[introspection?]
-	>=gui-libs/libadwaita-1.3.0:1
-	>=dev-libs/libportal-0.5:=[gtk]
-	>=x11-libs/pango-1.28.3
-	selinux? ( >=sys-libs/libselinux-2.0 )
-	>=app-misc/tracker-3.0:3
-	>=dev-libs/libxml2-2.7.8:2
-	>=net-libs/libcloudproviders-0.3.1
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-RDEPEND="${DEPEND}
-	>=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/glib-utils
-	gtk-doc? (
-		app-text/docbook-xml-dtd:4.1.2
-		dev-util/gi-docgen
-	)
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-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}"/43.0-optional-gstreamer.patch # Allow controlling audio-video-properties build
-)
-
-src_prepare() {
-	default
-	xdg_environment_reset
-
-	# Disable -Werror
-	sed -e '/-Werror=/d' -i meson.build ||  die
-
-	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)
-		-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() {
-	# Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
-	gnome2_environment_reset
-	# 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
-}


             reply	other threads:[~2023-06-19 15:30 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-19 15:30 Matt Turner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-01-26 15:30 [gentoo-commits] repo/gentoo:master commit in: gnome-base/nautilus/files/, gnome-base/nautilus/ Pacho Ramos
2023-02-20 17:32 Matt Turner
2023-01-02 10:09 Pacho Ramos
2019-12-23 21:34 Mart Raudsepp
2019-09-19 20:16 Mart Raudsepp
2019-08-23 20:59 Mart Raudsepp
2019-05-18 20:46 Mart Raudsepp
2018-12-11 18:17 Mart Raudsepp
2016-11-01 17:31 Gilles Dartiguelongue
2015-11-14 13:48 Pacho Ramos

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1687188596.0aa2f4d6fdd091dec071206c777d8cef57034237.mattst88@gentoo \
    --to=mattst88@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox