summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMart Raudsepp <leio@gentoo.org>2019-08-31 17:05:47 +0300
committerMart Raudsepp <leio@gentoo.org>2019-08-31 17:05:54 +0300
commit91a58bac644b1715b23214bd4977d1bdec7bcea2 (patch)
treefb4e39bb6eba9bd8ed7e9fd6213ae9ae3a01ef4d
parentgnome-base/gnome-desktop: security cleanup (diff)
downloadgentoo-91a58bac644b1715b23214bd4977d1bdec7bcea2.tar.gz
gentoo-91a58bac644b1715b23214bd4977d1bdec7bcea2.tar.bz2
gentoo-91a58bac644b1715b23214bd4977d1bdec7bcea2.zip
gnome-base/nautilus: security cleanup
Bug: https://bugs.gentoo.org/692784 Package-Manager: Portage-2.3.69, Repoman-2.3.12 Signed-off-by: Mart Raudsepp <leio@gentoo.org>
-rw-r--r--gnome-base/nautilus/Manifest2
-rw-r--r--gnome-base/nautilus/files/3.28.1-docs-build.patch42
-rw-r--r--gnome-base/nautilus/nautilus-3.28.1.ebuild104
-rw-r--r--gnome-base/nautilus/nautilus-3.30.5.ebuild105
4 files changed, 0 insertions, 253 deletions
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index a410c4593bb..3ffae22617b 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,3 +1 @@
-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
DIST nautilus-3.30.5.tar.xz 3254344 BLAKE2B 64da158ee661fc259a14f890bf6ad343f720245df6b9475ff047993570ea4e7234723eb242f057bc85b7ea95d38a99b5c2f5d546e982a3e3e32b7fc75cabb786 SHA512 e38a8bb380460d902e4ec6219d0e147a4245e790b18fb18ab9474ec2ae002a971243c6b09b8fec267e65c7ecc7bb1217191c4f5cb9547b3b9d5b0793068103cf
diff --git a/gnome-base/nautilus/files/3.28.1-docs-build.patch b/gnome-base/nautilus/files/3.28.1-docs-build.patch
deleted file mode 100644
index a2cb07aa23e..00000000000
--- a/gnome-base/nautilus/files/3.28.1-docs-build.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From eaf8435005e2637ce76690c71f729e6b3685d973 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-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
deleted file mode 100644
index 40dd98c4c84..00000000000
--- a/gnome-base/nautilus/nautilus-3.28.1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# 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.26: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
-}
diff --git a/gnome-base/nautilus/nautilus-3.30.5.ebuild b/gnome-base/nautilus/nautilus-3.30.5.ebuild
deleted file mode 100644
index 4fd2e7af049..00000000000
--- a/gnome-base/nautilus/nautilus-3.30.5.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# 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"
-
-LICENSE="GPL-3+ LGPL-2.1+"
-SLOT="0"
-IUSE="gnome gtk-doc +introspection packagekit +previewer seccomp 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/gsettings-desktop-schemas
- >=x11-libs/gtk+-3.22.27:3[X,introspection?]
- seccomp? ( sys-libs/libseccomp )
- >=x11-libs/pango-1.28.3
- 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 )
- seccomp? ( >=sys-apps/bubblewrap-0.3.1 )
- 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=(
- "${FILESDIR}"/${PV}-docs-build.patch # Always install pregenerated manpage, keeping docs option for gtk-doc
- "${FILESDIR}"/${PV}-thumbnailer-updates{,2}.patch # syncs with gnome-desktop; fixes the ld.so.cache for us
- "${FILESDIR}"/${PV}-seccomp-sparc32.patch # 32-bit sparc doesn't have seccomp either
-)
-
-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)
- -Dextensions=true # image file properties, sendto support
- $(meson_use introspection)
- $(meson_use packagekit)
- $(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() {
- 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
-}