* [gentoo-commits] repo/gentoo:master commit in: gnome-base/nautilus/files/, gnome-base/nautilus/
@ 2019-12-23 21:34 Mart Raudsepp
0 siblings, 0 replies; 10+ messages in thread
From: Mart Raudsepp @ 2019-12-23 21:34 UTC (permalink / raw
To: gentoo-commits
commit: 483f64af56223e4b899c9468f6f51a22ad11b17e
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 23 21:28:47 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon Dec 23 21:28:47 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=483f64af
gnome-base/nautilus: remove old
Package-Manager: Portage-2.3.79, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
gnome-base/nautilus/Manifest | 1 -
.../nautilus/files/3.30.5-CVE-2019-11461.patch | 30 ------
.../nautilus/files/3.30.5-seccomp-sparc32.patch | 27 -----
.../files/3.30.5-thumbnailer-updates.patch | 113 ---------------------
.../files/3.30.5-thumbnailer-updates2.patch | 46 ---------
gnome-base/nautilus/nautilus-3.30.5-r1.ebuild | 106 -------------------
6 files changed, 323 deletions(-)
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index f39a559f56c..c27e9f9b5a9 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,2 +1 @@
-DIST nautilus-3.30.5.tar.xz 3254344 BLAKE2B 64da158ee661fc259a14f890bf6ad343f720245df6b9475ff047993570ea4e7234723eb242f057bc85b7ea95d38a99b5c2f5d546e982a3e3e32b7fc75cabb786 SHA512 e38a8bb380460d902e4ec6219d0e147a4245e790b18fb18ab9474ec2ae002a971243c6b09b8fec267e65c7ecc7bb1217191c4f5cb9547b3b9d5b0793068103cf
DIST nautilus-3.32.3.tar.xz 3197820 BLAKE2B 28140210a855fe62faba4f0833067a81c4d8f71c0cc870ba4fdcc016754b01df003e45f636836f67cced8515aba8c8fb7922de788a14bfe0f0cc4518010aed5f SHA512 f19710f02bd91edb2d2f6cb8f46be6bebea3edfed14a07612444d5990533bafd032b604d65533727eb377b574d6bd4c82dbe11894d85ad254ee1473b683c4392
diff --git a/gnome-base/nautilus/files/3.30.5-CVE-2019-11461.patch b/gnome-base/nautilus/files/3.30.5-CVE-2019-11461.patch
deleted file mode 100644
index 6c2d061123f..00000000000
--- a/gnome-base/nautilus/files/3.30.5-CVE-2019-11461.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 83949ed5800ec99953f5ee8d2bf8b90a69daa850 Mon Sep 17 00:00:00 2001
-From: Michael Catanzaro <mcatanzaro@igalia.com>
-Date: Sat, 13 Apr 2019 13:57:36 -0500
-Subject: [PATCH] thumbnailer: fix incomplete TIOCSTI filtering
-
-Fixes #112
-
-See also: https://github.com/flatpak/flatpak/issues/2782
----
- libgnome-desktop/gnome-desktop-thumbnail-script.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-leio: Adjusted to apply to nautilus copy
-
-diff --git a/libgnome-desktop/gnome-desktop-thumbnail-script.c b/libgnome-desktop/gnome-desktop-thumbnail-script.c
-index 9468b51c..3b3d1ea9 100644
---- a/src/gnome-desktop/gnome-desktop-thumbnail-script.c
-+++ b/src/gnome-desktop/gnome-desktop-thumbnail-script.c
-@@ -343,7 +343,7 @@ setup_seccomp (GPtrArray *argv_array,
- {SCMP_SYS (clone), &SCMP_A0 (SCMP_CMP_MASKED_EQ, CLONE_NEWUSER, CLONE_NEWUSER)},
-
- /* Don't allow faking input to the controlling tty (CVE-2017-5226) */
-- {SCMP_SYS (ioctl), &SCMP_A1(SCMP_CMP_EQ, (int)TIOCSTI)},
-+ {SCMP_SYS (ioctl), &SCMP_A1(SCMP_CMP_MASKED_EQ, 0xFFFFFFFFu, (int)TIOCSTI)},
- };
-
- struct
---
-2.20.1
-
diff --git a/gnome-base/nautilus/files/3.30.5-seccomp-sparc32.patch b/gnome-base/nautilus/files/3.30.5-seccomp-sparc32.patch
deleted file mode 100644
index f67695b7f1d..00000000000
--- a/gnome-base/nautilus/files/3.30.5-seccomp-sparc32.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 3b0fd7dd26fa5af0b310650b2974d800ace80802 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Fri, 15 Feb 2019 21:34:34 +0200
-Subject: [PATCH 2/2] meson.build: Add 32-bit sparc to seccomp unsupported list
-
-32-bit sparc doesn't support seccomp either.
-
-(cherry picked from commit 44b49e6ca02add9592abac03a8578b9eea1a5088)
----
- meson.build | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/meson.build b/meson.build
-index 50479f5f0..91915b31a 100644
---- a/meson.build
-+++ b/meson.build
-@@ -72,6 +72,7 @@ unsupported_cpus = [
- 'parisc',
- 'parisc64',
- 'sh4',
-+ 'sparc',
- 'sparc64',
- ]
- system_supports_seccomp = host_system == 'linux'
---
-2.17.0
-
diff --git a/gnome-base/nautilus/files/3.30.5-thumbnailer-updates.patch b/gnome-base/nautilus/files/3.30.5-thumbnailer-updates.patch
deleted file mode 100644
index 84d0bfc1d5a..00000000000
--- a/gnome-base/nautilus/files/3.30.5-thumbnailer-updates.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From 2e36d4bacc3cffebe62161adc375bb9ec64099f5 Mon Sep 17 00:00:00 2001
-From: Timothy OBrien <obrien.timothy.a@gmail.com>
-Date: Fri, 18 Jan 2019 19:42:46 +1100
-Subject: [PATCH 1/2] gnome-desktop: update to latest version of upstream
- thumbnail code
-
-The thumbnail code in gnome-desktop had recent bug fixes that needed to be carried across to the Nautilus implementation. Issues for the three related upstream fixes can be found at: https://gitlab.gnome.org/GNOME/gnome-desktop/issues/4 | https://gitlab.gnome.org/GNOME/gnome-desktop/issues/89 | https://gitlab.gnome.org/GNOME/gnome-desktop/issues/87
-
-This patch includes the latest thumbnail code from the gnome-desktop repository to include the fixes.
-
-Fixes #836
-
-(cherry picked from commit e88b2dc8783833c4263ad5d84567a67dbc7bc6de)
----
- .../gnome-desktop-thumbnail-script.c | 54 +++++++++++++++++--
- src/gnome-desktop/gnome-desktop-thumbnail.c | 4 +-
- 2 files changed, 52 insertions(+), 6 deletions(-)
-
-diff --git a/src/gnome-desktop/gnome-desktop-thumbnail-script.c b/src/gnome-desktop/gnome-desktop-thumbnail-script.c
-index 14e2fed3a..525766388 100644
---- a/src/gnome-desktop/gnome-desktop-thumbnail-script.c
-+++ b/src/gnome-desktop/gnome-desktop-thumbnail-script.c
-@@ -506,22 +506,68 @@ setup_seccomp (GPtrArray *argv_array,
- #endif
-
- #ifdef HAVE_BWRAP
-+static gboolean
-+path_is_usrmerged (const char *dir)
-+{
-+ /* does /dir point to /usr/dir? */
-+ g_autofree char *target = NULL;
-+ GStatBuf stat_buf_src, stat_buf_target;
-+
-+ if (g_stat (dir, &stat_buf_src) < 0)
-+ return FALSE;
-+
-+ target = g_strdup_printf ("/usr/%s", dir);
-+
-+ if (g_stat (target, &stat_buf_target) < 0)
-+ return FALSE;
-+
-+ return (stat_buf_src.st_dev == stat_buf_target.st_dev) &&
-+ (stat_buf_src.st_ino == stat_buf_target.st_ino);
-+}
-+
- static gboolean
- add_bwrap (GPtrArray *array,
- ScriptExec *script)
- {
-+ const char * const usrmerged_dirs[] = { "bin", "lib64", "lib", "sbin" };
-+ int i;
-+
- g_return_val_if_fail (script->outdir != NULL, FALSE);
- g_return_val_if_fail (script->s_infile != NULL, FALSE);
-
- add_args (array,
- "bwrap",
- "--ro-bind", "/usr", "/usr",
-- "--ro-bind", "/lib", "/lib",
-- "--ro-bind", "/lib64", "/lib64",
-+ "--ro-bind", "/etc/ld.so.cache", "/etc/ld.so.cache",
-+ NULL);
-+
-+ /* These directories might be symlinks into /usr/... */
-+ for (i = 0; i < G_N_ELEMENTS (usrmerged_dirs); i++)
-+ {
-+ g_autofree char *absolute_dir = g_strdup_printf ("/%s", usrmerged_dirs[i]);
-+
-+ if (!g_file_test (absolute_dir, G_FILE_TEST_EXISTS))
-+ continue;
-+
-+ if (path_is_usrmerged (absolute_dir))
-+ {
-+ g_autofree char *symlink_target = g_strdup_printf ("/usr/%s", absolute_dir);
-+
-+ add_args (array,
-+ "--symlink", symlink_target, absolute_dir,
-+ NULL);
-+ }
-+ else
-+ {
-+ add_args (array,
-+ "--ro-bind", absolute_dir, absolute_dir,
-+ NULL);
-+ }
-+ }
-+
-+ add_args (array,
- "--proc", "/proc",
- "--dev", "/dev",
-- "--symlink", "usr/bin", "/bin",
-- "--symlink", "usr/sbin", "/sbin",
- "--chdir", "/",
- "--setenv", "GIO_USE_VFS", "local",
- "--unshare-all",
-diff --git a/src/gnome-desktop/gnome-desktop-thumbnail.c b/src/gnome-desktop/gnome-desktop-thumbnail.c
-index b31bad58d..f48fd461a 100644
---- a/src/gnome-desktop/gnome-desktop-thumbnail.c
-+++ b/src/gnome-desktop/gnome-desktop-thumbnail.c
-@@ -967,8 +967,8 @@ get_preview_thumbnail (const char *uri,
- if (file_info == NULL)
- return NULL;
-
-- object = g_file_info_get_attribute_object (file_info,
-- G_FILE_ATTRIBUTE_PREVIEW_ICON);
-+ object = g_object_ref (g_file_info_get_attribute_object (file_info,
-+ G_FILE_ATTRIBUTE_PREVIEW_ICON));
- g_object_unref (file_info);
-
- if (!object)
---
-2.17.0
-
diff --git a/gnome-base/nautilus/files/3.30.5-thumbnailer-updates2.patch b/gnome-base/nautilus/files/3.30.5-thumbnailer-updates2.patch
deleted file mode 100644
index 884deb42091..00000000000
--- a/gnome-base/nautilus/files/3.30.5-thumbnailer-updates2.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 87aa2520989bafbd861a03a32d6fdb0d2620faf5 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Mon, 11 Mar 2019 23:23:11 +0200
-Subject: [PATCH] Sync gnome-desktop code
-
-Brings in fontconfig cache bind mount and a small memory fix; cache path hardcoded to Gentoo for now
----
- src/gnome-desktop/gnome-desktop-thumbnail-script.c | 4 ++++
- src/gnome-desktop/gnome-desktop-thumbnail.c | 6 ++++--
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/src/gnome-desktop/gnome-desktop-thumbnail-script.c b/src/gnome-desktop/gnome-desktop-thumbnail-script.c
-index 525766388..0331cb3c7 100644
---- a/src/gnome-desktop/gnome-desktop-thumbnail-script.c
-+++ b/src/gnome-desktop/gnome-desktop-thumbnail-script.c
-@@ -565,6 +565,10 @@ add_bwrap (GPtrArray *array,
- }
- }
-
-+ /* fontconfig cache if necessary */
-+ if (!g_str_has_prefix ("/var/cache/fontconfig", "/usr/"))
-+ add_args (array, "--ro-bind-try", "/var/cache/fontconfig", "/var/cache/fontconfig", NULL);
-+
- add_args (array,
- "--proc", "/proc",
- "--dev", "/dev",
-diff --git a/src/gnome-desktop/gnome-desktop-thumbnail.c b/src/gnome-desktop/gnome-desktop-thumbnail.c
-index f48fd461a..566fbeb84 100644
---- a/src/gnome-desktop/gnome-desktop-thumbnail.c
-+++ b/src/gnome-desktop/gnome-desktop-thumbnail.c
-@@ -967,8 +967,10 @@ get_preview_thumbnail (const char *uri,
- if (file_info == NULL)
- return NULL;
-
-- object = g_object_ref (g_file_info_get_attribute_object (file_info,
-- G_FILE_ATTRIBUTE_PREVIEW_ICON));
-+ object = g_file_info_get_attribute_object (file_info,
-+ G_FILE_ATTRIBUTE_PREVIEW_ICON);
-+ if (object)
-+ g_object_ref (object);
- g_object_unref (file_info);
-
- if (!object)
---
-2.17.0
-
diff --git a/gnome-base/nautilus/nautilus-3.30.5-r1.ebuild b/gnome-base/nautilus/nautilus-3.30.5-r1.ebuild
deleted file mode 100644
index cdb86ae3328..00000000000
--- a/gnome-base/nautilus/nautilus-3.30.5-r1.ebuild
+++ /dev/null
@@ -1,106 +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 ~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
- "${FILESDIR}"/${PV}-CVE-2019-11461.patch
-)
-
-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
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-base/nautilus/files/, gnome-base/nautilus/
@ 2023-06-19 15:30 Matt Turner
0 siblings, 0 replies; 10+ messages in thread
From: Matt Turner @ 2023-06-19 15:30 UTC (permalink / raw
To: gentoo-commits
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
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-base/nautilus/files/, gnome-base/nautilus/
@ 2023-02-20 17:32 Matt Turner
0 siblings, 0 replies; 10+ messages in thread
From: Matt Turner @ 2023-02-20 17:32 UTC (permalink / raw
To: gentoo-commits
commit: 35cc36b0314c8242b1e4e99f2330106e59663d1b
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 20 16:58:05 2023 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Feb 20 17:32:18 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35cc36b0
gnome-base/nautilus: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
gnome-base/nautilus/Manifest | 1 -
.../nautilus/files/43.1-maximized-signal.patch | 34 ------
.../nautilus/files/43.1-treeview-shortcuts.patch | 41 -------
gnome-base/nautilus/nautilus-43.1-r1.ebuild | 122 ---------------------
gnome-base/nautilus/nautilus-43.1.ebuild | 115 -------------------
5 files changed, 313 deletions(-)
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 008aa9dde4b5..88ca16e6e083 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,3 +1,2 @@
DIST nautilus-42.2.tar.xz 3254912 BLAKE2B 303b52fe9bbdb8e437a447004dcd284ee0c66ecaa11db45c52cf8c831f52a764efa03476d69f74840289f200c49b917bc329487bd87d3e776ea5dc1a6ea9b413 SHA512 2b3ba2990b00bbc3abf771b83b9b0a7c1a8b107b1b4955a45879f7d28add713d326bbe84d70056058073edfc3c7b7891547af77b8a34f94fe1b9ca047c76e9c9
-DIST nautilus-43.1.tar.xz 3162772 BLAKE2B 5150f1453328d3861b343bdd7070ee5eaea95a96b5b52db928eeb16e0aefad05cc0281295cb26c28cf3808e6ea3d76a2efff0fd9fc670b173ef3d3ad8c9ed9f3 SHA512 f09362584f2d4a04870c7e6b64ec3d23c90f20c8d37aa7103277985f182db49f3306f6e130966c6cfc97463fd5322f454564f713e70b839fea177545214dced2
DIST nautilus-43.2.tar.xz 3166792 BLAKE2B 354cbdef7ec272a4966229d3c7da192c4613ef7c19187503253b0936dec6efb236e45793089709ab639dab94e372173d8c37c90e0beb9b0d258e384c2370bc8a SHA512 e4a12984b74614185cd7fbb9bf8c49a2572d673ae59d0f481dac92459d965ccc0eae6d9a5f545afb52ce1f24438a7feb02c0a35b8175187b5d74a9044488c13b
diff --git a/gnome-base/nautilus/files/43.1-maximized-signal.patch b/gnome-base/nautilus/files/43.1-maximized-signal.patch
deleted file mode 100644
index 2a333bd86687..000000000000
--- a/gnome-base/nautilus/files/43.1-maximized-signal.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d4061be4c72b952f1c20ec770f910ee311850478 Mon Sep 17 00:00:00 2001
-From: Gary Li <gary.li1@uwaterloo.ca>
-Date: Wed, 28 Dec 2022 22:19:57 +0000
-Subject: [PATCH] nautilus-window: Fix window maximized notify signal
-
-Nautilus does not persist the window maximized state.
-
-This is because we are listening to the property is-maximized for
-change, which is now maximized in GTK4.
-https://docs.gtk.org/gtk4/property.Window.maximized.html
-
-Use notify::maximized instead of notify::is-maximized.
-
-Fixes: https://gitlab.gnome.org/GNOME/nautilus/-/issues/2682
----
- src/nautilus-window.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/nautilus-window.c b/src/nautilus-window.c
-index 7cd980d987..092afcbbd2 100644
---- a/src/nautilus-window.c
-+++ b/src/nautilus-window.c
-@@ -2084,7 +2084,7 @@ nautilus_window_init (NautilusWindow *window)
- window,
- G_CONNECT_SWAPPED);
-
-- g_signal_connect (window, "notify::is-maximized",
-+ g_signal_connect (window, "notify::maximized",
- G_CALLBACK (on_is_maximized_changed), NULL);
-
- window->slots = NULL;
---
-GitLab
-
diff --git a/gnome-base/nautilus/files/43.1-treeview-shortcuts.patch b/gnome-base/nautilus/files/43.1-treeview-shortcuts.patch
deleted file mode 100644
index 206c1c6d9b81..000000000000
--- a/gnome-base/nautilus/files/43.1-treeview-shortcuts.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 98e34a4215f24a2414ca34a65804c86b8e4405c8 Mon Sep 17 00:00:00 2001
-From: Peter Eisenmann <p3732@getgoogleoff.me>
-Date: Wed, 30 Nov 2022 02:40:17 +0100
-Subject: [PATCH] help-overlay: drop tree view shortcuts
-
-Expanding folders in list view is not implemented in version 43. This
-removes the shortcuts from the keyboard shortcut help view.
-
-Fixes #2674
----
- src/resources/gtk/help-overlay.ui | 14 --------------
- 1 file changed, 14 deletions(-)
-
-diff --git a/src/resources/gtk/help-overlay.ui b/src/resources/gtk/help-overlay.ui
-index 27e5906b6e..42bad9ffd1 100644
---- a/src/resources/gtk/help-overlay.ui
-+++ b/src/resources/gtk/help-overlay.ui
-@@ -301,20 +301,6 @@
- <property name="accelerator"><Primary>2</property>
- </object>
- </child>
-- <child>
-- <object class="GtkShortcutsShortcut">
-- <property name="visible">True</property>
-- <property name="title" translatable="yes" context="shortcut window">Expand folder</property>
-- <property name="accelerator">Right</property>
-- </object>
-- </child>
-- <child>
-- <object class="GtkShortcutsShortcut">
-- <property name="visible">True</property>
-- <property name="title" translatable="yes" context="shortcut window">Collapse folder</property>
-- <property name="accelerator">Left</property>
-- </object>
-- </child>
- </object>
- </child>
- <child>
---
-GitLab
-
diff --git a/gnome-base/nautilus/nautilus-43.1-r1.ebuild b/gnome-base/nautilus/nautilus-43.1-r1.ebuild
deleted file mode 100644
index 3a4480054434..000000000000
--- a/gnome-base/nautilus/nautilus-43.1-r1.ebuild
+++ /dev/null
@@ -1,122 +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.0
- >=gnome-base/gnome-desktop-43:4=
- >=gnome-base/gsettings-desktop-schemas-42
- >=gui-libs/gtk-4.7.2:4[introspection?]
- >=gui-libs/libadwaita-1.2: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-docs-build.patch # Always install pregenerated manpage, keeping docs option for gtk-doc
- "${FILESDIR}"/43.0-optional-gstreamer.patch # Allow controlling audio-video-properties build
-
- # help-overlay: drop tree view shortcuts as they are not implemented
- # in 43.x
- "${FILESDIR}"/${PV}-treeview-shortcuts.patch
-
- # nautilus-window: Fix window maximized notify signal
- "${FILESDIR}"/43.1-maximized-signal.patch
-)
-
-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)
- -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-43.1.ebuild b/gnome-base/nautilus/nautilus-43.1.ebuild
deleted file mode 100644
index f96035ade04a..000000000000
--- a/gnome-base/nautilus/nautilus-43.1.ebuild
+++ /dev/null
@@ -1,115 +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"
-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.0
- >=gnome-base/gnome-desktop-43:4=
- >=gnome-base/gsettings-desktop-schemas-42
- >=gui-libs/gtk-4.7.2:4[introspection?]
- >=gui-libs/libadwaita-1.2: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-docs-build.patch # Always install pregenerated manpage, keeping docs option for gtk-doc
- "${FILESDIR}"/43.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)
- -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
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-base/nautilus/files/, gnome-base/nautilus/
@ 2023-01-02 10:09 Pacho Ramos
0 siblings, 0 replies; 10+ messages in thread
From: Pacho Ramos @ 2023-01-02 10:09 UTC (permalink / raw
To: gentoo-commits
commit: da225ddca5968b2eda74b4f5609a75904dd8a8bd
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 2 10:08:18 2023 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Mon Jan 2 10:08:18 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da225ddc
gnome-base/nautilus: Apply some upstream fixes
One to drop shotcuts for a functionality not available on 43.x and the other to
fix maximized state not being remembered.
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
.../nautilus/files/43.1-maximized-signal.patch | 34 ++++++
.../nautilus/files/43.1-treeview-shortcuts.patch | 41 +++++++
gnome-base/nautilus/nautilus-43.1-r1.ebuild | 122 +++++++++++++++++++++
3 files changed, 197 insertions(+)
diff --git a/gnome-base/nautilus/files/43.1-maximized-signal.patch b/gnome-base/nautilus/files/43.1-maximized-signal.patch
new file mode 100644
index 000000000000..2a333bd86687
--- /dev/null
+++ b/gnome-base/nautilus/files/43.1-maximized-signal.patch
@@ -0,0 +1,34 @@
+From d4061be4c72b952f1c20ec770f910ee311850478 Mon Sep 17 00:00:00 2001
+From: Gary Li <gary.li1@uwaterloo.ca>
+Date: Wed, 28 Dec 2022 22:19:57 +0000
+Subject: [PATCH] nautilus-window: Fix window maximized notify signal
+
+Nautilus does not persist the window maximized state.
+
+This is because we are listening to the property is-maximized for
+change, which is now maximized in GTK4.
+https://docs.gtk.org/gtk4/property.Window.maximized.html
+
+Use notify::maximized instead of notify::is-maximized.
+
+Fixes: https://gitlab.gnome.org/GNOME/nautilus/-/issues/2682
+---
+ src/nautilus-window.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/nautilus-window.c b/src/nautilus-window.c
+index 7cd980d987..092afcbbd2 100644
+--- a/src/nautilus-window.c
++++ b/src/nautilus-window.c
+@@ -2084,7 +2084,7 @@ nautilus_window_init (NautilusWindow *window)
+ window,
+ G_CONNECT_SWAPPED);
+
+- g_signal_connect (window, "notify::is-maximized",
++ g_signal_connect (window, "notify::maximized",
+ G_CALLBACK (on_is_maximized_changed), NULL);
+
+ window->slots = NULL;
+--
+GitLab
+
diff --git a/gnome-base/nautilus/files/43.1-treeview-shortcuts.patch b/gnome-base/nautilus/files/43.1-treeview-shortcuts.patch
new file mode 100644
index 000000000000..206c1c6d9b81
--- /dev/null
+++ b/gnome-base/nautilus/files/43.1-treeview-shortcuts.patch
@@ -0,0 +1,41 @@
+From 98e34a4215f24a2414ca34a65804c86b8e4405c8 Mon Sep 17 00:00:00 2001
+From: Peter Eisenmann <p3732@getgoogleoff.me>
+Date: Wed, 30 Nov 2022 02:40:17 +0100
+Subject: [PATCH] help-overlay: drop tree view shortcuts
+
+Expanding folders in list view is not implemented in version 43. This
+removes the shortcuts from the keyboard shortcut help view.
+
+Fixes #2674
+---
+ src/resources/gtk/help-overlay.ui | 14 --------------
+ 1 file changed, 14 deletions(-)
+
+diff --git a/src/resources/gtk/help-overlay.ui b/src/resources/gtk/help-overlay.ui
+index 27e5906b6e..42bad9ffd1 100644
+--- a/src/resources/gtk/help-overlay.ui
++++ b/src/resources/gtk/help-overlay.ui
+@@ -301,20 +301,6 @@
+ <property name="accelerator"><Primary>2</property>
+ </object>
+ </child>
+- <child>
+- <object class="GtkShortcutsShortcut">
+- <property name="visible">True</property>
+- <property name="title" translatable="yes" context="shortcut window">Expand folder</property>
+- <property name="accelerator">Right</property>
+- </object>
+- </child>
+- <child>
+- <object class="GtkShortcutsShortcut">
+- <property name="visible">True</property>
+- <property name="title" translatable="yes" context="shortcut window">Collapse folder</property>
+- <property name="accelerator">Left</property>
+- </object>
+- </child>
+ </object>
+ </child>
+ <child>
+--
+GitLab
+
diff --git a/gnome-base/nautilus/nautilus-43.1-r1.ebuild b/gnome-base/nautilus/nautilus-43.1-r1.ebuild
new file mode 100644
index 000000000000..3a4480054434
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-43.1-r1.ebuild
@@ -0,0 +1,122 @@
+# 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.0
+ >=gnome-base/gnome-desktop-43:4=
+ >=gnome-base/gsettings-desktop-schemas-42
+ >=gui-libs/gtk-4.7.2:4[introspection?]
+ >=gui-libs/libadwaita-1.2: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-docs-build.patch # Always install pregenerated manpage, keeping docs option for gtk-doc
+ "${FILESDIR}"/43.0-optional-gstreamer.patch # Allow controlling audio-video-properties build
+
+ # help-overlay: drop tree view shortcuts as they are not implemented
+ # in 43.x
+ "${FILESDIR}"/${PV}-treeview-shortcuts.patch
+
+ # nautilus-window: Fix window maximized notify signal
+ "${FILESDIR}"/43.1-maximized-signal.patch
+)
+
+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)
+ -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
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-base/nautilus/files/, gnome-base/nautilus/
@ 2019-09-19 20:16 Mart Raudsepp
0 siblings, 0 replies; 10+ messages in thread
From: Mart Raudsepp @ 2019-09-19 20:16 UTC (permalink / raw
To: gentoo-commits
commit: f013b6af9fd854f1b027476c7b912c2cae21348d
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 19 19:43:35 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Sep 19 20:10:12 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f013b6af
gnome-base/nautilus: bump to 3.32.3
Package-Manager: Portage-2.3.69, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
gnome-base/nautilus/Manifest | 1 +
.../nautilus/files/3.32.3-optional-gstreamer.patch | 57 +++++++++++
gnome-base/nautilus/metadata.xml | 1 +
gnome-base/nautilus/nautilus-3.32.3.ebuild | 110 +++++++++++++++++++++
4 files changed, 169 insertions(+)
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 3ffae22617b..f39a559f56c 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1 +1,2 @@
DIST nautilus-3.30.5.tar.xz 3254344 BLAKE2B 64da158ee661fc259a14f890bf6ad343f720245df6b9475ff047993570ea4e7234723eb242f057bc85b7ea95d38a99b5c2f5d546e982a3e3e32b7fc75cabb786 SHA512 e38a8bb380460d902e4ec6219d0e147a4245e790b18fb18ab9474ec2ae002a971243c6b09b8fec267e65c7ecc7bb1217191c4f5cb9547b3b9d5b0793068103cf
+DIST nautilus-3.32.3.tar.xz 3197820 BLAKE2B 28140210a855fe62faba4f0833067a81c4d8f71c0cc870ba4fdcc016754b01df003e45f636836f67cced8515aba8c8fb7922de788a14bfe0f0cc4518010aed5f SHA512 f19710f02bd91edb2d2f6cb8f46be6bebea3edfed14a07612444d5990533bafd032b604d65533727eb377b574d6bd4c82dbe11894d85ad254ee1473b683c4392
diff --git a/gnome-base/nautilus/files/3.32.3-optional-gstreamer.patch b/gnome-base/nautilus/files/3.32.3-optional-gstreamer.patch
new file mode 100644
index 00000000000..f28e9575d78
--- /dev/null
+++ b/gnome-base/nautilus/files/3.32.3-optional-gstreamer.patch
@@ -0,0 +1,57 @@
+From f2d55bc9a9398ed1c36e1b856bcb33080abbf7c0 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 5c6f64cef..bd8c41d3e 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 0a267d670..ccb2b8cc1 100644
+--- a/meson.build
++++ b/meson.build
+@@ -122,8 +122,10 @@ libm = cc.find_library('m')
+
+ if get_option('extensions')
+ gexiv = dependency('gexiv2', version: '>= 0.10.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 fce5f16f9..1fa8f8952 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.20.1
+
diff --git a/gnome-base/nautilus/metadata.xml b/gnome-base/nautilus/metadata.xml
index c5117d64948..6d7557c2caa 100644
--- a/gnome-base/nautilus/metadata.xml
+++ b/gnome-base/nautilus/metadata.xml
@@ -6,6 +6,7 @@
<name>Gentoo GNOME Desktop</name>
</maintainer>
<use>
+ <flag name="gstreamer">Enable the Audio/Video file properties page</flag>
<flag name="packagekit">Use packagekit to search for programs to open
unknown file types</flag>
<flag name="previewer">Use <pkg>gnome-extra/sushi</pkg> to preview files
diff --git a/gnome-base/nautilus/nautilus-3.32.3.ebuild b/gnome-base/nautilus/nautilus-3.32.3.ebuild
new file mode 100644
index 00000000000..b73d0c915cc
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-3.32.3.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 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.58.1:2
+ >=media-libs/gexiv2-0.10.0
+ gstreamer? ( media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.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:= )
+"
+RDEPEND="${COMMON_DEPEND}
+ packagekit? ( app-admin/packagekit-base )
+ seccomp? ( >=sys-apps/bubblewrap-0.3.1 )
+ sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
+ gstreamer? ( !<media-video/totem-3.31.91[nautilus] )
+"
+DEPEND="${COMMON_DEPEND}
+ media-libs/fontconfig
+"
+BDEPEND="
+ >=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
+"
+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}"/${PV}-optional-gstreamer.patch # Allow controlling audio-video-properties build
+)
+
+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; also required for -Dgstreamer=true
+ $(meson_use gstreamer) # gstreamer audio-video-properties extension
+ $(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
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-base/nautilus/files/, gnome-base/nautilus/
@ 2019-08-23 20:59 Mart Raudsepp
0 siblings, 0 replies; 10+ messages in thread
From: Mart Raudsepp @ 2019-08-23 20:59 UTC (permalink / raw
To: gentoo-commits
commit: 85cb57ebc68ef86e7286050d8edc186c3f632cf2
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 23 20:57:09 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Fri Aug 23 20:57:09 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85cb57eb
gnome-base/nautilus: fix CVE-2019-11461
Bug: https://bugs.gentoo.org/692784
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
.../nautilus/files/3.30.5-CVE-2019-11461.patch | 30 ++++++
gnome-base/nautilus/nautilus-3.30.5-r1.ebuild | 106 +++++++++++++++++++++
2 files changed, 136 insertions(+)
diff --git a/gnome-base/nautilus/files/3.30.5-CVE-2019-11461.patch b/gnome-base/nautilus/files/3.30.5-CVE-2019-11461.patch
new file mode 100644
index 00000000000..6c2d061123f
--- /dev/null
+++ b/gnome-base/nautilus/files/3.30.5-CVE-2019-11461.patch
@@ -0,0 +1,30 @@
+From 83949ed5800ec99953f5ee8d2bf8b90a69daa850 Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro@igalia.com>
+Date: Sat, 13 Apr 2019 13:57:36 -0500
+Subject: [PATCH] thumbnailer: fix incomplete TIOCSTI filtering
+
+Fixes #112
+
+See also: https://github.com/flatpak/flatpak/issues/2782
+---
+ libgnome-desktop/gnome-desktop-thumbnail-script.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+leio: Adjusted to apply to nautilus copy
+
+diff --git a/libgnome-desktop/gnome-desktop-thumbnail-script.c b/libgnome-desktop/gnome-desktop-thumbnail-script.c
+index 9468b51c..3b3d1ea9 100644
+--- a/src/gnome-desktop/gnome-desktop-thumbnail-script.c
++++ b/src/gnome-desktop/gnome-desktop-thumbnail-script.c
+@@ -343,7 +343,7 @@ setup_seccomp (GPtrArray *argv_array,
+ {SCMP_SYS (clone), &SCMP_A0 (SCMP_CMP_MASKED_EQ, CLONE_NEWUSER, CLONE_NEWUSER)},
+
+ /* Don't allow faking input to the controlling tty (CVE-2017-5226) */
+- {SCMP_SYS (ioctl), &SCMP_A1(SCMP_CMP_EQ, (int)TIOCSTI)},
++ {SCMP_SYS (ioctl), &SCMP_A1(SCMP_CMP_MASKED_EQ, 0xFFFFFFFFu, (int)TIOCSTI)},
+ };
+
+ struct
+--
+2.20.1
+
diff --git a/gnome-base/nautilus/nautilus-3.30.5-r1.ebuild b/gnome-base/nautilus/nautilus-3.30.5-r1.ebuild
new file mode 100644
index 00000000000..3601899c6aa
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-3.30.5-r1.ebuild
@@ -0,0 +1,106 @@
+# 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
+ "${FILESDIR}"/${PV}-CVE-2019-11461.patch
+)
+
+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
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-base/nautilus/files/, gnome-base/nautilus/
@ 2019-05-18 20:46 Mart Raudsepp
0 siblings, 0 replies; 10+ messages in thread
From: Mart Raudsepp @ 2019-05-18 20:46 UTC (permalink / raw
To: gentoo-commits
commit: 7cdd1f9feba0f3cf118cc3d4c5591ed3760dd89a
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat May 18 20:40:41 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat May 18 20:44:29 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cdd1f9f
gnome-base/nautilus: remove old
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
gnome-base/nautilus/Manifest | 1 -
.../files/3.26.4-file-view-crash-fix.patch | 81 -------
.../files/3.26.4-optional-introspection.patch | 49 ----
.../nautilus/files/3.26.4-optional-tracker.patch | 264 ---------------------
gnome-base/nautilus/metadata.xml | 2 -
gnome-base/nautilus/nautilus-3.26.4-r2.ebuild | 109 ---------
6 files changed, 506 deletions(-)
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 6be54e0e264..a410c4593bb 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,4 +1,3 @@
-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
DIST nautilus-3.30.5.tar.xz 3254344 BLAKE2B 64da158ee661fc259a14f890bf6ad343f720245df6b9475ff047993570ea4e7234723eb242f057bc85b7ea95d38a99b5c2f5d546e982a3e3e32b7fc75cabb786 SHA512 e38a8bb380460d902e4ec6219d0e147a4245e790b18fb18ab9474ec2ae002a971243c6b09b8fec267e65c7ecc7bb1217191c4f5cb9547b3b9d5b0793068103cf
diff --git a/gnome-base/nautilus/files/3.26.4-file-view-crash-fix.patch b/gnome-base/nautilus/files/3.26.4-file-view-crash-fix.patch
deleted file mode 100644
index 72077f4a9fa..00000000000
--- a/gnome-base/nautilus/files/3.26.4-file-view-crash-fix.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 834c4e7fe39f7053efdb126f9e1835e6b8e529f4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
-Date: Thu, 26 Jul 2018 02:55:19 +0000
-Subject: [PATCH 1/3] file-view: Always unset pending_selection after freeing
- it
-
-When a file view was loaded with a pending selection, and not all the files were
-seen yet, the private pending_selection list was properly free'd, but the pointer
-was not cleared, causing a crash when `nautilus_files_view_set_selection` was
-called again, as it was trying to deeply copy a list pointed by this invalid
-reference.
-
-So, removing the unneeded `pending_selection` temporary pointer from the main
-function scope, as it only confuses, while use it (with an autolist) when we
-need to pass the previous `priv->pending_selection` (stealing its ownership)
-to set_selection again.
-
-Eventually use a g_clear_pointer to free the list and nullify its priv reference
-
-Fixes #295
-
-(cherry picked from commit ae3382a281b018337a8032ef13663ec2d9c7fd6c)
----
- src/nautilus-files-view.c | 16 +++++++---------
- 1 file changed, 7 insertions(+), 9 deletions(-)
-
-diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
-index 8784f63f8..36d791f80 100644
---- a/src/nautilus-files-view.c
-+++ b/src/nautilus-files-view.c
-@@ -3556,7 +3556,6 @@ done_loading (NautilusFilesView *view,
- gboolean all_files_seen)
- {
- NautilusFilesViewPrivate *priv;
-- GList *pending_selection;
- GList *selection;
- gboolean do_reveal = FALSE;
-
-@@ -3577,21 +3576,23 @@ done_loading (NautilusFilesView *view,
- nautilus_files_view_update_toolbar_menus (view);
- reset_update_interval (view);
-
-- pending_selection = priv->pending_selection;
- selection = nautilus_view_get_selection (NAUTILUS_VIEW (view));
-
- if (nautilus_view_is_searching (NAUTILUS_VIEW (view)) &&
-- all_files_seen && !selection && !pending_selection)
-+ all_files_seen && selection == NULL && priv->pending_selection == NULL)
- {
- nautilus_files_view_select_first (view);
- do_reveal = TRUE;
- }
-- else if (pending_selection != NULL && all_files_seen)
-+ else if (priv->pending_selection != NULL && all_files_seen)
- {
-- priv->pending_selection = NULL;
-+ GList *pending_selection;
-+ pending_selection = g_steal_pointer (&priv->pending_selection);
-
- nautilus_files_view_call_set_selection (view, pending_selection);
- do_reveal = TRUE;
-+
-+ nautilus_file_list_free (pending_selection);
- }
-
- if (selection)
-@@ -3599,10 +3600,7 @@ done_loading (NautilusFilesView *view,
- g_list_free_full (selection, g_object_unref);
- }
-
-- if (pending_selection)
-- {
-- g_list_free_full (pending_selection, g_object_unref);
-- }
-+ g_clear_pointer (&priv->pending_selection, nautilus_file_list_free);
-
- if (do_reveal)
- {
---
-2.17.0
-
diff --git a/gnome-base/nautilus/files/3.26.4-optional-introspection.patch b/gnome-base/nautilus/files/3.26.4-optional-introspection.patch
deleted file mode 100644
index 54bf5ac95fe..00000000000
--- a/gnome-base/nautilus/files/3.26.4-optional-introspection.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 5058b09996181fbd398c799eeba6a1d83b083186 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Tue, 11 Dec 2018 16:14:11 +0200
-Subject: [PATCH 3/3] Make introspection support optional
-
-Upstream has it optional again with commit 200a5869b5c1dc8 as well,
-but that's included only since nautilus-3.29.90
----
- libnautilus-extension/meson.build | 2 ++
- meson_options.txt | 4 ++++
- 2 files changed, 6 insertions(+)
-
-diff --git a/libnautilus-extension/meson.build b/libnautilus-extension/meson.build
-index 067ad2414..4702964a9 100644
---- a/libnautilus-extension/meson.build
-+++ b/libnautilus-extension/meson.build
-@@ -41,12 +41,14 @@ libnautilus_extension = shared_library ('nautilus-extension',
- version: nautilus_extension_version,
- install: true)
-
-+if get_option('introspection')
- gnome.generate_gir (libnautilus_extension,
- sources: libnautilus_extension_headers + libnautilus_extension_sources,
- nsversion: '3.0',
- namespace: 'Nautilus',
- includes: ['Gtk-3.0', 'Gio-2.0', 'GLib-2.0'],
- install: true)
-+endif
-
- nautilus_extension = declare_dependency (link_with: libnautilus_extension,
- dependencies: libnautilus_extension_deps,
-diff --git a/meson_options.txt b/meson_options.txt
-index 0c23c7921..6ad3a72de 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -1,6 +1,10 @@
- option ('enable-profiling',
- type: 'boolean',
- value: false)
-+option ('introspection',
-+ type: 'boolean',
-+ value: true,
-+ description: 'Build GObject introspection data for extension library')
- option ('enable-nst-extension',
- type: 'boolean',
- value: true)
---
-2.17.0
-
diff --git a/gnome-base/nautilus/files/3.26.4-optional-tracker.patch b/gnome-base/nautilus/files/3.26.4-optional-tracker.patch
deleted file mode 100644
index 03791996770..00000000000
--- a/gnome-base/nautilus/files/3.26.4-optional-tracker.patch
+++ /dev/null
@@ -1,264 +0,0 @@
-From 74a7d02eb342416194dcc3c676199d8f5266a481 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sun, 27 May 2018 13:54:38 +0200
-Subject: [PATCH 2/3] Make tracker support optional
-
----
- config.h.meson | 1 +
- meson.build | 9 ++++++---
- meson_options.txt | 4 ++++
- src/meson.build | 19 ++++++++++++-------
- src/nautilus-file-undo-operations.c | 4 ++++
- src/nautilus-file.c | 2 ++
- src/nautilus-files-view.c | 4 ++++
- src/nautilus-search-engine.c | 14 ++++++++++++++
- 8 files changed, 47 insertions(+), 10 deletions(-)
-
-diff --git a/config.h.meson b/config.h.meson
-index 4f5cb5848..58d71e96f 100644
---- a/config.h.meson
-+++ b/config.h.meson
-@@ -4,6 +4,7 @@
- #mesondefine HAVE_EXEMPI
- #mesondefine HAVE_EXIF
- #mesondefine HAVE_SELINUX
-+#mesondefine HAVE_TRACKER
- #mesondefine ENABLE_DESKTOP
- #mesondefine ENABLE_PACKAGEKIT
- #mesondefine LOCALEDIR
-diff --git a/meson.build b/meson.build
-index 0b8a6f1b0..559c3dbfd 100644
---- a/meson.build
-+++ b/meson.build
-@@ -81,9 +81,12 @@ if get_option ('enable-selinux')
- conf.set10 ('HAVE_SELINUX', true)
- endif
-
--tracker_sparql = dependency ('tracker-sparql-2.0', required: false)
--if not tracker_sparql.found()
-- tracker_sparql = dependency ('tracker-sparql-1.0')
-+if get_option ('tracker')
-+ tracker_sparql = dependency ('tracker-sparql-2.0', required: false)
-+ if not tracker_sparql.found()
-+ tracker_sparql = dependency ('tracker-sparql-1.0')
-+ endif
-+ conf.set10 ('HAVE_TRACKER', true)
- endif
-
- if get_option ('enable-xmp')
-diff --git a/meson_options.txt b/meson_options.txt
-index c934dd8b1..0c23c7921 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -8,6 +8,10 @@ option ('enable-exif',
- type: 'boolean',
- value: false,
- description: 'enable EXIF support')
-+option ('tracker',
-+ type: 'boolean',
-+ value: true,
-+ description: 'enable bulk renames and search using Tracker')
- option ('enable-xmp',
- type: 'boolean',
- value: false,
-diff --git a/src/meson.build b/src/meson.build
-index cc08345d8..8ea10b16b 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -254,12 +254,6 @@ libnautilus_sources = [
- 'nautilus-file-undo-operations.h',
- 'nautilus-file-undo-manager.c',
- 'nautilus-file-undo-manager.h',
-- 'nautilus-batch-rename-dialog.c',
-- 'nautilus-batch-rename-dialog.h',
-- 'nautilus-batch-rename-utilities.c',
-- 'nautilus-batch-rename-utilities.h',
-- 'nautilus-search-engine-tracker.c',
-- 'nautilus-search-engine-tracker.h'
- ]
-
- nautilus_deps = [glib,
-@@ -274,7 +268,6 @@ nautilus_deps = [glib,
- nautilus_extension,
- x11,
- gmodule_no_export,
-- tracker_sparql,
- gio_unix]
-
- if get_option ('enable-exif')
-@@ -289,6 +282,18 @@ if get_option ('enable-xmp')
- nautilus_deps += exempi
- endif
-
-+if get_option ('tracker')
-+ libnautilus_sources += [
-+ 'nautilus-batch-rename-dialog.c',
-+ 'nautilus-batch-rename-dialog.h',
-+ 'nautilus-batch-rename-utilities.c',
-+ 'nautilus-batch-rename-utilities.h',
-+ 'nautilus-search-engine-tracker.c',
-+ 'nautilus-search-engine-tracker.h'
-+ ]
-+ nautilus_deps += tracker_sparql
-+endif
-+
- libnautilus = static_library ('nautilus',
- libnautilus_sources,
- dependencies: nautilus_deps,
-diff --git a/src/nautilus-file-undo-operations.c b/src/nautilus-file-undo-operations.c
-index e833d0578..d6e407ca5 100644
---- a/src/nautilus-file-undo-operations.c
-+++ b/src/nautilus-file-undo-operations.c
-@@ -31,8 +31,10 @@
- #include "nautilus-file-operations.h"
- #include "nautilus-file.h"
- #include "nautilus-file-undo-manager.h"
-+#ifdef HAVE_TRACKER
- #include "nautilus-batch-rename-dialog.h"
- #include "nautilus-batch-rename-utilities.h"
-+#endif
-
-
- /* Since we use g_get_current_time for setting "orig_trash_time" in the undo
-@@ -1087,6 +1089,7 @@ nautilus_file_undo_info_rename_set_data_post (NautilusFileUndoInfoRename *self,
- }
-
- /* batch rename */
-+#ifdef HAVE_TRACKER
- G_DEFINE_TYPE (NautilusFileUndoInfoBatchRename, nautilus_file_undo_info_batch_rename, NAUTILUS_TYPE_FILE_UNDO_INFO);
-
- struct _NautilusFileUndoInfoBatchRenameDetails
-@@ -1303,6 +1306,7 @@ nautilus_file_undo_info_batch_rename_set_data_post (NautilusFileUndoInfoBatchRen
-
- self->priv->new_display_names = g_list_reverse (self->priv->new_display_names);
- }
-+#endif
-
- /* trash */
- G_DEFINE_TYPE (NautilusFileUndoInfoTrash, nautilus_file_undo_info_trash, NAUTILUS_TYPE_FILE_UNDO_INFO)
-diff --git a/src/nautilus-file.c b/src/nautilus-file.c
-index 0ac53984b..549e1eb39 100644
---- a/src/nautilus-file.c
-+++ b/src/nautilus-file.c
-@@ -2407,6 +2407,7 @@ real_batch_rename (GList *files,
- }
- }
-
-+#ifdef HAVE_TRACKER
- /* Tell the undo manager a batch rename is taking place if at least
- * a file has been renamed*/
- if (!nautilus_file_undo_manager_is_operating () && op->skipped_files != g_list_length (files))
-@@ -2421,6 +2422,7 @@ real_batch_rename (GList *files,
-
- nautilus_file_undo_manager_set_action (op->undo_info);
- }
-+#endif
-
- if (op->skipped_files == g_list_length (files))
- {
-diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
-index 36d791f80..691d5606d 100644
---- a/src/nautilus-files-view.c
-+++ b/src/nautilus-files-view.c
-@@ -28,8 +28,10 @@
- #include "nautilus-files-view.h"
-
- #include "nautilus-application.h"
-+#ifdef HAVE_TRACKER
- #include "nautilus-batch-rename-dialog.h"
- #include "nautilus-batch-rename-utilities.h"
-+#endif
- #include "nautilus-error-reporting.h"
- #include "nautilus-file-undo-manager.h"
- #include "nautilus-floating-bar.h"
-@@ -6264,6 +6266,7 @@ real_action_rename (NautilusFilesView *view)
- {
- invoke_external_bulk_rename_utility (view, selection);
- }
-+#ifdef HAVE_TRACKER
- else
- {
- GdkCursor *cursor;
-@@ -6281,6 +6284,7 @@ real_action_rename (NautilusFilesView *view)
-
- gtk_widget_show (GTK_WIDGET (dialog));
- }
-+#endif
- }
- else
- {
-diff --git a/src/nautilus-search-engine.c b/src/nautilus-search-engine.c
-index 209bd4f80..436cd7471 100644
---- a/src/nautilus-search-engine.c
-+++ b/src/nautilus-search-engine.c
-@@ -28,11 +28,15 @@
- #include "nautilus-search-engine-model.h"
- #define DEBUG_FLAG NAUTILUS_DEBUG_SEARCH
- #include "nautilus-debug.h"
-+#ifdef HAVE_TRACKER
- #include "nautilus-search-engine-tracker.h"
-+#endif
-
- typedef struct
- {
-+#ifdef HAVE_TRACKER
- NautilusSearchEngineTracker *tracker;
-+#endif
- NautilusSearchEngineSimple *simple;
- NautilusSearchEngineModel *model;
-
-@@ -73,7 +77,9 @@ nautilus_search_engine_set_query (NautilusSearchProvider *provider,
- engine = NAUTILUS_SEARCH_ENGINE (provider);
- priv = nautilus_search_engine_get_instance_private (engine);
-
-+#ifdef HAVE_TRACKER
- nautilus_search_provider_set_query (NAUTILUS_SEARCH_PROVIDER (priv->tracker), query);
-+#endif
- nautilus_search_provider_set_query (NAUTILUS_SEARCH_PROVIDER (priv->model), query);
- nautilus_search_provider_set_query (NAUTILUS_SEARCH_PROVIDER (priv->simple), query);
- }
-@@ -95,8 +101,10 @@ search_engine_start_real (NautilusSearchEngine *engine)
-
- g_object_ref (engine);
-
-+#ifdef HAVE_TRACKER
- nautilus_search_provider_start (NAUTILUS_SEARCH_PROVIDER (priv->tracker));
- priv->providers_running++;
-+#endif
-
- if (nautilus_search_engine_model_get_model (priv->model))
- {
-@@ -158,7 +166,9 @@ nautilus_search_engine_stop (NautilusSearchProvider *provider)
-
- DEBUG ("Search engine stop");
-
-+#ifdef HAVE_TRACKER
- nautilus_search_provider_stop (NAUTILUS_SEARCH_PROVIDER (priv->tracker));
-+#endif
- nautilus_search_provider_stop (NAUTILUS_SEARCH_PROVIDER (priv->model));
- nautilus_search_provider_stop (NAUTILUS_SEARCH_PROVIDER (priv->simple));
-
-@@ -333,7 +343,9 @@ nautilus_search_engine_finalize (GObject *object)
-
- g_hash_table_destroy (priv->uris);
-
-+#ifdef HAVE_TRACKER
- g_clear_object (&priv->tracker);
-+#endif
- g_clear_object (&priv->model);
- g_clear_object (&priv->simple);
-
-@@ -387,8 +399,10 @@ nautilus_search_engine_init (NautilusSearchEngine *engine)
- priv = nautilus_search_engine_get_instance_private (engine);
- priv->uris = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
-
-+#ifdef HAVE_TRACKER
- priv->tracker = nautilus_search_engine_tracker_new ();
- connect_provider_signals (engine, NAUTILUS_SEARCH_PROVIDER (priv->tracker));
-+#endif
-
- priv->model = nautilus_search_engine_model_new ();
- connect_provider_signals (engine, NAUTILUS_SEARCH_PROVIDER (priv->model));
---
-2.17.0
-
diff --git a/gnome-base/nautilus/metadata.xml b/gnome-base/nautilus/metadata.xml
index 71760b9a632..c5117d64948 100644
--- a/gnome-base/nautilus/metadata.xml
+++ b/gnome-base/nautilus/metadata.xml
@@ -12,7 +12,5 @@
from the file mananger</flag>
<flag name="sendto">Enable the nautilus-sendto extension to send files to
various locations/devices</flag>
- <flag name="tracker">Add support for <pkg>app-misc/tracker</pkg> search</flag>
- <flag restrict=">=gnome-base/nautilus-3.22" name="tracker">Add support for <pkg>app-misc/tracker</pkg> search and batch rename</flag>
</use>
</pkgmetadata>
diff --git a/gnome-base/nautilus/nautilus-3.26.4-r2.ebuild b/gnome-base/nautilus/nautilus-3.26.4-r2.ebuild
deleted file mode 100644
index 735f54ca0fe..00000000000
--- a/gnome-base/nautilus/nautilus-3.26.4-r2.ebuild
+++ /dev/null
@@ -1,109 +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="A file manager for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
-
-LICENSE="GPL-3+ LGPL-2.1+"
-SLOT="0"
-IUSE="exif gnome gtk-doc +introspection packagekit +previewer selinux sendto tracker xmp"
-
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.51.2:2
- >=gnome-base/gnome-desktop-3.0.0:3=
- >=x11-libs/pango-1.28.3
- >=x11-libs/gtk+-3.22.6:3[X,introspection?]
- >=dev-libs/libxml2-2.7.8:2
- exif? ( >=media-libs/libexif-0.6.20 )
- xmp? ( >=media-libs/exempi-2.1.0:2 )
- >=gnome-base/gsettings-desktop-schemas-3.8.0
- >=app-arch/gnome-autoar-0.2.1
- selinux? ( >=sys-libs/libselinux-2.0 )
- x11-libs/libX11
- tracker? ( >=app-misc/tracker-1:= )
- introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-util/gdbus-codegen-2.51.2
- dev-util/glib-utils
- gtk-doc? ( >=dev-util/gtk-doc-1.10 )
- >=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=(
- "${FILESDIR}"/${PV}-file-view-crash-fix.patch
- "${FILESDIR}"/${PV}-optional-tracker.patch
- "${FILESDIR}"/${PV}-optional-introspection.patch
-)
-
-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=(
- -Denable-profiling=false
- $(meson_use introspection)
- $(meson_use sendto enable-nst-extension)
- $(meson_use exif enable-exif)
- $(meson_use tracker)
- $(meson_use xmp enable-xmp)
- $(meson_use selinux enable-selinux)
- -Denable-desktop=true
- $(meson_use packagekit enable-packagekit)
- $(meson_use gtk-doc enable-gtk-doc)
- )
- 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_icon_cache_update
- 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_icon_cache_update
- gnome2_schemas_update
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-base/nautilus/files/, gnome-base/nautilus/
@ 2018-12-11 18:17 Mart Raudsepp
0 siblings, 0 replies; 10+ messages in thread
From: Mart Raudsepp @ 2018-12-11 18:17 UTC (permalink / raw
To: gentoo-commits
commit: 0d63624f08af0799d2634447f5198dc5f27fc016
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 11 18:05:12 2018 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Tue Dec 11 18:09:03 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d63624f
gnome-base/nautilus: bump to 3.26.4
Revision r2 to show up as an upgrade to gnome overlay users,
as this one includes a crash fix patch from upstream branch.
Re-enabled tests - they seem to work with meson now.
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
Package-Manager: Portage-2.3.52, Repoman-2.3.11
gnome-base/nautilus/Manifest | 1 +
.../files/3.26.4-file-view-crash-fix.patch | 81 +++++++
.../files/3.26.4-optional-introspection.patch | 49 ++++
.../nautilus/files/3.26.4-optional-tracker.patch | 264 +++++++++++++++++++++
gnome-base/nautilus/nautilus-3.26.4-r2.ebuild | 109 +++++++++
5 files changed, 504 insertions(+)
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index da9b1018890..14a2ae53b9e 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1 +1,2 @@
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
diff --git a/gnome-base/nautilus/files/3.26.4-file-view-crash-fix.patch b/gnome-base/nautilus/files/3.26.4-file-view-crash-fix.patch
new file mode 100644
index 00000000000..72077f4a9fa
--- /dev/null
+++ b/gnome-base/nautilus/files/3.26.4-file-view-crash-fix.patch
@@ -0,0 +1,81 @@
+From 834c4e7fe39f7053efdb126f9e1835e6b8e529f4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
+Date: Thu, 26 Jul 2018 02:55:19 +0000
+Subject: [PATCH 1/3] file-view: Always unset pending_selection after freeing
+ it
+
+When a file view was loaded with a pending selection, and not all the files were
+seen yet, the private pending_selection list was properly free'd, but the pointer
+was not cleared, causing a crash when `nautilus_files_view_set_selection` was
+called again, as it was trying to deeply copy a list pointed by this invalid
+reference.
+
+So, removing the unneeded `pending_selection` temporary pointer from the main
+function scope, as it only confuses, while use it (with an autolist) when we
+need to pass the previous `priv->pending_selection` (stealing its ownership)
+to set_selection again.
+
+Eventually use a g_clear_pointer to free the list and nullify its priv reference
+
+Fixes #295
+
+(cherry picked from commit ae3382a281b018337a8032ef13663ec2d9c7fd6c)
+---
+ src/nautilus-files-view.c | 16 +++++++---------
+ 1 file changed, 7 insertions(+), 9 deletions(-)
+
+diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
+index 8784f63f8..36d791f80 100644
+--- a/src/nautilus-files-view.c
++++ b/src/nautilus-files-view.c
+@@ -3556,7 +3556,6 @@ done_loading (NautilusFilesView *view,
+ gboolean all_files_seen)
+ {
+ NautilusFilesViewPrivate *priv;
+- GList *pending_selection;
+ GList *selection;
+ gboolean do_reveal = FALSE;
+
+@@ -3577,21 +3576,23 @@ done_loading (NautilusFilesView *view,
+ nautilus_files_view_update_toolbar_menus (view);
+ reset_update_interval (view);
+
+- pending_selection = priv->pending_selection;
+ selection = nautilus_view_get_selection (NAUTILUS_VIEW (view));
+
+ if (nautilus_view_is_searching (NAUTILUS_VIEW (view)) &&
+- all_files_seen && !selection && !pending_selection)
++ all_files_seen && selection == NULL && priv->pending_selection == NULL)
+ {
+ nautilus_files_view_select_first (view);
+ do_reveal = TRUE;
+ }
+- else if (pending_selection != NULL && all_files_seen)
++ else if (priv->pending_selection != NULL && all_files_seen)
+ {
+- priv->pending_selection = NULL;
++ GList *pending_selection;
++ pending_selection = g_steal_pointer (&priv->pending_selection);
+
+ nautilus_files_view_call_set_selection (view, pending_selection);
+ do_reveal = TRUE;
++
++ nautilus_file_list_free (pending_selection);
+ }
+
+ if (selection)
+@@ -3599,10 +3600,7 @@ done_loading (NautilusFilesView *view,
+ g_list_free_full (selection, g_object_unref);
+ }
+
+- if (pending_selection)
+- {
+- g_list_free_full (pending_selection, g_object_unref);
+- }
++ g_clear_pointer (&priv->pending_selection, nautilus_file_list_free);
+
+ if (do_reveal)
+ {
+--
+2.17.0
+
diff --git a/gnome-base/nautilus/files/3.26.4-optional-introspection.patch b/gnome-base/nautilus/files/3.26.4-optional-introspection.patch
new file mode 100644
index 00000000000..54bf5ac95fe
--- /dev/null
+++ b/gnome-base/nautilus/files/3.26.4-optional-introspection.patch
@@ -0,0 +1,49 @@
+From 5058b09996181fbd398c799eeba6a1d83b083186 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Tue, 11 Dec 2018 16:14:11 +0200
+Subject: [PATCH 3/3] Make introspection support optional
+
+Upstream has it optional again with commit 200a5869b5c1dc8 as well,
+but that's included only since nautilus-3.29.90
+---
+ libnautilus-extension/meson.build | 2 ++
+ meson_options.txt | 4 ++++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/libnautilus-extension/meson.build b/libnautilus-extension/meson.build
+index 067ad2414..4702964a9 100644
+--- a/libnautilus-extension/meson.build
++++ b/libnautilus-extension/meson.build
+@@ -41,12 +41,14 @@ libnautilus_extension = shared_library ('nautilus-extension',
+ version: nautilus_extension_version,
+ install: true)
+
++if get_option('introspection')
+ gnome.generate_gir (libnautilus_extension,
+ sources: libnautilus_extension_headers + libnautilus_extension_sources,
+ nsversion: '3.0',
+ namespace: 'Nautilus',
+ includes: ['Gtk-3.0', 'Gio-2.0', 'GLib-2.0'],
+ install: true)
++endif
+
+ nautilus_extension = declare_dependency (link_with: libnautilus_extension,
+ dependencies: libnautilus_extension_deps,
+diff --git a/meson_options.txt b/meson_options.txt
+index 0c23c7921..6ad3a72de 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,6 +1,10 @@
+ option ('enable-profiling',
+ type: 'boolean',
+ value: false)
++option ('introspection',
++ type: 'boolean',
++ value: true,
++ description: 'Build GObject introspection data for extension library')
+ option ('enable-nst-extension',
+ type: 'boolean',
+ value: true)
+--
+2.17.0
+
diff --git a/gnome-base/nautilus/files/3.26.4-optional-tracker.patch b/gnome-base/nautilus/files/3.26.4-optional-tracker.patch
new file mode 100644
index 00000000000..03791996770
--- /dev/null
+++ b/gnome-base/nautilus/files/3.26.4-optional-tracker.patch
@@ -0,0 +1,264 @@
+From 74a7d02eb342416194dcc3c676199d8f5266a481 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sun, 27 May 2018 13:54:38 +0200
+Subject: [PATCH 2/3] Make tracker support optional
+
+---
+ config.h.meson | 1 +
+ meson.build | 9 ++++++---
+ meson_options.txt | 4 ++++
+ src/meson.build | 19 ++++++++++++-------
+ src/nautilus-file-undo-operations.c | 4 ++++
+ src/nautilus-file.c | 2 ++
+ src/nautilus-files-view.c | 4 ++++
+ src/nautilus-search-engine.c | 14 ++++++++++++++
+ 8 files changed, 47 insertions(+), 10 deletions(-)
+
+diff --git a/config.h.meson b/config.h.meson
+index 4f5cb5848..58d71e96f 100644
+--- a/config.h.meson
++++ b/config.h.meson
+@@ -4,6 +4,7 @@
+ #mesondefine HAVE_EXEMPI
+ #mesondefine HAVE_EXIF
+ #mesondefine HAVE_SELINUX
++#mesondefine HAVE_TRACKER
+ #mesondefine ENABLE_DESKTOP
+ #mesondefine ENABLE_PACKAGEKIT
+ #mesondefine LOCALEDIR
+diff --git a/meson.build b/meson.build
+index 0b8a6f1b0..559c3dbfd 100644
+--- a/meson.build
++++ b/meson.build
+@@ -81,9 +81,12 @@ if get_option ('enable-selinux')
+ conf.set10 ('HAVE_SELINUX', true)
+ endif
+
+-tracker_sparql = dependency ('tracker-sparql-2.0', required: false)
+-if not tracker_sparql.found()
+- tracker_sparql = dependency ('tracker-sparql-1.0')
++if get_option ('tracker')
++ tracker_sparql = dependency ('tracker-sparql-2.0', required: false)
++ if not tracker_sparql.found()
++ tracker_sparql = dependency ('tracker-sparql-1.0')
++ endif
++ conf.set10 ('HAVE_TRACKER', true)
+ endif
+
+ if get_option ('enable-xmp')
+diff --git a/meson_options.txt b/meson_options.txt
+index c934dd8b1..0c23c7921 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -8,6 +8,10 @@ option ('enable-exif',
+ type: 'boolean',
+ value: false,
+ description: 'enable EXIF support')
++option ('tracker',
++ type: 'boolean',
++ value: true,
++ description: 'enable bulk renames and search using Tracker')
+ option ('enable-xmp',
+ type: 'boolean',
+ value: false,
+diff --git a/src/meson.build b/src/meson.build
+index cc08345d8..8ea10b16b 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -254,12 +254,6 @@ libnautilus_sources = [
+ 'nautilus-file-undo-operations.h',
+ 'nautilus-file-undo-manager.c',
+ 'nautilus-file-undo-manager.h',
+- 'nautilus-batch-rename-dialog.c',
+- 'nautilus-batch-rename-dialog.h',
+- 'nautilus-batch-rename-utilities.c',
+- 'nautilus-batch-rename-utilities.h',
+- 'nautilus-search-engine-tracker.c',
+- 'nautilus-search-engine-tracker.h'
+ ]
+
+ nautilus_deps = [glib,
+@@ -274,7 +268,6 @@ nautilus_deps = [glib,
+ nautilus_extension,
+ x11,
+ gmodule_no_export,
+- tracker_sparql,
+ gio_unix]
+
+ if get_option ('enable-exif')
+@@ -289,6 +282,18 @@ if get_option ('enable-xmp')
+ nautilus_deps += exempi
+ endif
+
++if get_option ('tracker')
++ libnautilus_sources += [
++ 'nautilus-batch-rename-dialog.c',
++ 'nautilus-batch-rename-dialog.h',
++ 'nautilus-batch-rename-utilities.c',
++ 'nautilus-batch-rename-utilities.h',
++ 'nautilus-search-engine-tracker.c',
++ 'nautilus-search-engine-tracker.h'
++ ]
++ nautilus_deps += tracker_sparql
++endif
++
+ libnautilus = static_library ('nautilus',
+ libnautilus_sources,
+ dependencies: nautilus_deps,
+diff --git a/src/nautilus-file-undo-operations.c b/src/nautilus-file-undo-operations.c
+index e833d0578..d6e407ca5 100644
+--- a/src/nautilus-file-undo-operations.c
++++ b/src/nautilus-file-undo-operations.c
+@@ -31,8 +31,10 @@
+ #include "nautilus-file-operations.h"
+ #include "nautilus-file.h"
+ #include "nautilus-file-undo-manager.h"
++#ifdef HAVE_TRACKER
+ #include "nautilus-batch-rename-dialog.h"
+ #include "nautilus-batch-rename-utilities.h"
++#endif
+
+
+ /* Since we use g_get_current_time for setting "orig_trash_time" in the undo
+@@ -1087,6 +1089,7 @@ nautilus_file_undo_info_rename_set_data_post (NautilusFileUndoInfoRename *self,
+ }
+
+ /* batch rename */
++#ifdef HAVE_TRACKER
+ G_DEFINE_TYPE (NautilusFileUndoInfoBatchRename, nautilus_file_undo_info_batch_rename, NAUTILUS_TYPE_FILE_UNDO_INFO);
+
+ struct _NautilusFileUndoInfoBatchRenameDetails
+@@ -1303,6 +1306,7 @@ nautilus_file_undo_info_batch_rename_set_data_post (NautilusFileUndoInfoBatchRen
+
+ self->priv->new_display_names = g_list_reverse (self->priv->new_display_names);
+ }
++#endif
+
+ /* trash */
+ G_DEFINE_TYPE (NautilusFileUndoInfoTrash, nautilus_file_undo_info_trash, NAUTILUS_TYPE_FILE_UNDO_INFO)
+diff --git a/src/nautilus-file.c b/src/nautilus-file.c
+index 0ac53984b..549e1eb39 100644
+--- a/src/nautilus-file.c
++++ b/src/nautilus-file.c
+@@ -2407,6 +2407,7 @@ real_batch_rename (GList *files,
+ }
+ }
+
++#ifdef HAVE_TRACKER
+ /* Tell the undo manager a batch rename is taking place if at least
+ * a file has been renamed*/
+ if (!nautilus_file_undo_manager_is_operating () && op->skipped_files != g_list_length (files))
+@@ -2421,6 +2422,7 @@ real_batch_rename (GList *files,
+
+ nautilus_file_undo_manager_set_action (op->undo_info);
+ }
++#endif
+
+ if (op->skipped_files == g_list_length (files))
+ {
+diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
+index 36d791f80..691d5606d 100644
+--- a/src/nautilus-files-view.c
++++ b/src/nautilus-files-view.c
+@@ -28,8 +28,10 @@
+ #include "nautilus-files-view.h"
+
+ #include "nautilus-application.h"
++#ifdef HAVE_TRACKER
+ #include "nautilus-batch-rename-dialog.h"
+ #include "nautilus-batch-rename-utilities.h"
++#endif
+ #include "nautilus-error-reporting.h"
+ #include "nautilus-file-undo-manager.h"
+ #include "nautilus-floating-bar.h"
+@@ -6264,6 +6266,7 @@ real_action_rename (NautilusFilesView *view)
+ {
+ invoke_external_bulk_rename_utility (view, selection);
+ }
++#ifdef HAVE_TRACKER
+ else
+ {
+ GdkCursor *cursor;
+@@ -6281,6 +6284,7 @@ real_action_rename (NautilusFilesView *view)
+
+ gtk_widget_show (GTK_WIDGET (dialog));
+ }
++#endif
+ }
+ else
+ {
+diff --git a/src/nautilus-search-engine.c b/src/nautilus-search-engine.c
+index 209bd4f80..436cd7471 100644
+--- a/src/nautilus-search-engine.c
++++ b/src/nautilus-search-engine.c
+@@ -28,11 +28,15 @@
+ #include "nautilus-search-engine-model.h"
+ #define DEBUG_FLAG NAUTILUS_DEBUG_SEARCH
+ #include "nautilus-debug.h"
++#ifdef HAVE_TRACKER
+ #include "nautilus-search-engine-tracker.h"
++#endif
+
+ typedef struct
+ {
++#ifdef HAVE_TRACKER
+ NautilusSearchEngineTracker *tracker;
++#endif
+ NautilusSearchEngineSimple *simple;
+ NautilusSearchEngineModel *model;
+
+@@ -73,7 +77,9 @@ nautilus_search_engine_set_query (NautilusSearchProvider *provider,
+ engine = NAUTILUS_SEARCH_ENGINE (provider);
+ priv = nautilus_search_engine_get_instance_private (engine);
+
++#ifdef HAVE_TRACKER
+ nautilus_search_provider_set_query (NAUTILUS_SEARCH_PROVIDER (priv->tracker), query);
++#endif
+ nautilus_search_provider_set_query (NAUTILUS_SEARCH_PROVIDER (priv->model), query);
+ nautilus_search_provider_set_query (NAUTILUS_SEARCH_PROVIDER (priv->simple), query);
+ }
+@@ -95,8 +101,10 @@ search_engine_start_real (NautilusSearchEngine *engine)
+
+ g_object_ref (engine);
+
++#ifdef HAVE_TRACKER
+ nautilus_search_provider_start (NAUTILUS_SEARCH_PROVIDER (priv->tracker));
+ priv->providers_running++;
++#endif
+
+ if (nautilus_search_engine_model_get_model (priv->model))
+ {
+@@ -158,7 +166,9 @@ nautilus_search_engine_stop (NautilusSearchProvider *provider)
+
+ DEBUG ("Search engine stop");
+
++#ifdef HAVE_TRACKER
+ nautilus_search_provider_stop (NAUTILUS_SEARCH_PROVIDER (priv->tracker));
++#endif
+ nautilus_search_provider_stop (NAUTILUS_SEARCH_PROVIDER (priv->model));
+ nautilus_search_provider_stop (NAUTILUS_SEARCH_PROVIDER (priv->simple));
+
+@@ -333,7 +343,9 @@ nautilus_search_engine_finalize (GObject *object)
+
+ g_hash_table_destroy (priv->uris);
+
++#ifdef HAVE_TRACKER
+ g_clear_object (&priv->tracker);
++#endif
+ g_clear_object (&priv->model);
+ g_clear_object (&priv->simple);
+
+@@ -387,8 +399,10 @@ nautilus_search_engine_init (NautilusSearchEngine *engine)
+ priv = nautilus_search_engine_get_instance_private (engine);
+ priv->uris = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+
++#ifdef HAVE_TRACKER
+ priv->tracker = nautilus_search_engine_tracker_new ();
+ connect_provider_signals (engine, NAUTILUS_SEARCH_PROVIDER (priv->tracker));
++#endif
+
+ priv->model = nautilus_search_engine_model_new ();
+ connect_provider_signals (engine, NAUTILUS_SEARCH_PROVIDER (priv->model));
+--
+2.17.0
+
diff --git a/gnome-base/nautilus/nautilus-3.26.4-r2.ebuild b/gnome-base/nautilus/nautilus-3.26.4-r2.ebuild
new file mode 100644
index 00000000000..aef38545ec0
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-3.26.4-r2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2018 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="A file manager for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
+
+LICENSE="GPL-3+ LGPL-2.1+"
+SLOT="0"
+IUSE="exif gnome gtk-doc +introspection packagekit +previewer selinux sendto tracker xmp"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.51.2:2
+ >=gnome-base/gnome-desktop-3.0.0:3=
+ >=x11-libs/pango-1.28.3
+ >=x11-libs/gtk+-3.22.6:3[X,introspection?]
+ >=dev-libs/libxml2-2.7.8:2
+ exif? ( >=media-libs/libexif-0.6.20 )
+ xmp? ( >=media-libs/exempi-2.1.0:2 )
+ >=gnome-base/gsettings-desktop-schemas-3.8.0
+ >=app-arch/gnome-autoar-0.2.1
+ selinux? ( >=sys-libs/libselinux-2.0 )
+ x11-libs/libX11
+ tracker? ( >=app-misc/tracker-1:= )
+ introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/gdbus-codegen-2.51.2
+ dev-util/glib-utils
+ gtk-doc? ( >=dev-util/gtk-doc-1.10 )
+ >=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=(
+ "${FILESDIR}"/${PV}-file-view-crash-fix.patch
+ "${FILESDIR}"/${PV}-optional-tracker.patch
+ "${FILESDIR}"/${PV}-optional-introspection.patch
+)
+
+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=(
+ -Denable-profiling=false
+ $(meson_use introspection)
+ $(meson_use sendto enable-nst-extension)
+ $(meson_use exif enable-exif)
+ $(meson_use tracker)
+ $(meson_use xmp enable-xmp)
+ $(meson_use selinux enable-selinux)
+ -Denable-desktop=true
+ $(meson_use packagekit enable-packagekit)
+ $(meson_use gtk-doc enable-gtk-doc)
+ )
+ 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_icon_cache_update
+ 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_icon_cache_update
+ gnome2_schemas_update
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-base/nautilus/files/, gnome-base/nautilus/
@ 2016-11-01 17:31 Gilles Dartiguelongue
0 siblings, 0 replies; 10+ messages in thread
From: Gilles Dartiguelongue @ 2016-11-01 17:31 UTC (permalink / raw
To: gentoo-commits
commit: c373c12a1e4bf1b5d41db6a60acd3ae0cb4ebccf
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 1 15:29:06 2016 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Nov 1 17:06:22 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c373c12a
gnome-base/nautilus: cleanup old revisions
Package-Manager: portage-2.3.2
gnome-base/nautilus/Manifest | 2 -
.../files/nautilus-3.18.2-automagic-selinux.patch | 47 --------
gnome-base/nautilus/nautilus-3.18.5.ebuild | 127 ---------------------
gnome-base/nautilus/nautilus-3.20.2.ebuild | 111 ------------------
4 files changed, 287 deletions(-)
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index c931f24..7145211 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,4 +1,2 @@
-DIST nautilus-3.18.5.tar.xz 3349312 SHA256 60a927c0522b4cced9d8f62baed2ee5e2fd4305be4523eb5bc44805971a6cc15 SHA512 60ec5c1eb7ba90caed2f536a0fd78d8686b6f7372db36d526d634d727ac03719edee894ca0ff1d90a0974cc0bc76f05bf0f8d4db22845ae3585470aa8e7b8ca6 WHIRLPOOL 02bbd1c1f9f97c4ffd983cb8503a95aa549bbe9105094aeb76a12b89b6daa460377f4c3cf984989a16cadd426e138ecdda6e8089790bad5ebef20236eac596b9
-DIST nautilus-3.20.2.tar.xz 3447216 SHA256 8d6e679b880dc78c0c2e2dabf6025e6da34ff279dee501f7c75f3649c1a6caae SHA512 1c93f7821b2a14b94a4bc548ff5350a741f823b50a543136010d63e95374a31731004f8ee70cb4beabd9917b4fa05a2f4909ef90982969c5618fe40f42762d8a WHIRLPOOL 6d5f64f63f98b858f45705fda74f566d3ff41a66db603137a58db4eef0cb83298de39ced4e33c1525f81b7493f5e81f75c6713c59c31a8fe2f3de535d32497f2
DIST nautilus-3.20.3.tar.xz 3437224 SHA256 46600a2361a022a0170304aef7167caa29c0d52232063a3556bec6a77881310e SHA512 dbd23fd88f66b80056970f3e189e85aadf4c8ecb7ee1e103acda2da2b1aef99cb40d1dbfaa1dc905a8adda4bb9e591badb1b6b9762c6dc5b6d9b9f175747959b WHIRLPOOL 0036c7fe7e1d4494926c872bbec2a180cb262783c1e1a58c0f2f580dec8fcbeba56590060fda70a6fbd40b20282879afa1263bffaf998a529e3205b382370e4f
DIST nautilus-3.22.1.tar.xz 5139460 SHA256 17e37ffecebb2cf29e6bfb52111a951f0c67534b9dabf0210c12d15abb7dbddc SHA512 cb27b1c476a6a19959050bf1ea6ae34a4e7136ea261efd922fc03e362ba1357f4709547ed8bbff9e1d4f8892aff5f08a9e03aadc8c52a6202c1d6d7f201e51f0 WHIRLPOOL 3687d2a8a52f512c6c5e47f20f096e6ed750cf83202714cae8b755df520373527292e4ca1e565226f145bf43ac33b035e0a1dc390711457635d6015763f73481
diff --git a/gnome-base/nautilus/files/nautilus-3.18.2-automagic-selinux.patch b/gnome-base/nautilus/files/nautilus-3.18.2-automagic-selinux.patch
deleted file mode 100644
index 0f769fc..00000000
--- a/gnome-base/nautilus/files/nautilus-3.18.2-automagic-selinux.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From bfdedc2f762027ec9a50fda659d66720718bb28d Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Wed, 25 Nov 2015 09:23:51 +0100
-Subject: [PATCH] Make libselinux dependency controllable by configure switch
-
----
- configure.ac | 23 ++++++++++++-----------
- 1 file changed, 12 insertions(+), 11 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 777ff84..37a65ba 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -140,18 +140,19 @@ dnl ==========================================================================
- dnl ****************************
- dnl *** Check for libselinux ***
- dnl ****************************
--
--SELINUX_LIBS=
-+
- msg_selinux=no
--AC_CHECK_LIB(selinux, is_selinux_enabled,
-- [AC_CHECK_HEADERS(selinux/selinux.h,
-- [AC_SEARCH_LIBS(selinux_raw_to_trans_context, selinux,
-- [AC_DEFINE(HAVE_SELINUX, 1, [Define to 1 if libselinux is available])
-- SELINUX_LIBS="-lselinux"
-- msg_selinux=yes])
-- ])
-- ])
--AC_SUBST(SELINUX_LIBS)
-+
-+AC_ARG_ENABLE([selinux],
-+ [AS_HELP_STRING([--enable-selinux],
-+ [Enable selinux support])])
-+AS_IF([test "$enable_selinux" != "no"],
-+ [PKG_CHECK_MODULES([SELINUX], [libselinux >= 2.0],
-+ [
-+ AC_DEFINE([HAVE_SELINUX], [1], [Define to 1 if libselinux is available])
-+ msg_selinux=yes
-+ ])
-+ ])
-
-
- AC_ARG_ENABLE(empty_view,
---
-2.6.3
-
diff --git a/gnome-base/nautilus/nautilus-3.18.5.ebuild b/gnome-base/nautilus/nautilus-3.18.5.ebuild
deleted file mode 100644
index 6809ba6..00000000
--- a/gnome-base/nautilus/nautilus-3.18.5.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes" # Needed with USE 'sendto'
-
-inherit autotools eutils gnome2 readme.gentoo virtualx
-
-DESCRIPTION="A file manager for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
-
-LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
-SLOT="0"
-
-IUSE="exif gnome +introspection packagekit +previewer selinux sendto tracker xmp"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
-
-# FIXME: tests fails under Xvfb, but pass when building manually
-# "FAIL: check failed in nautilus-file.c, line 8307"
-# need org.gnome.SessionManager service (aka gnome-session) but cannot find it
-RESTRICT="test"
-
-# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92
-# and 2.30.0
-COMMON_DEPEND="
- >=dev-libs/glib-2.45.7:2[dbus]
- >=x11-libs/pango-1.28.3
- >=x11-libs/gtk+-3.18.5:3[introspection?]
- >=dev-libs/libxml2-2.7.8:2
- >=gnome-base/gnome-desktop-3:3=
-
- gnome-base/dconf
- >=gnome-base/gsettings-desktop-schemas-3.8.0
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXrender
-
- exif? ( >=media-libs/libexif-0.6.20 )
- introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
- selinux? ( >=sys-libs/libselinux-2 )
- tracker? ( >=app-misc/tracker-0.16:= )
- xmp? ( >=media-libs/exempi-2.1.0 )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-lang/perl-5
- >=dev-util/gdbus-codegen-2.33
- >=dev-util/gtk-doc-am-1.10
- >=dev-util/intltool-0.40.1
- sys-devel/gettext
- virtual/pkgconfig
- x11-proto/xproto
-"
-RDEPEND="${COMMON_DEPEND}
- packagekit? ( app-admin/packagekit-base )
- sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
-"
-
-# For eautoreconf
-# gnome-base/gnome-common
-# dev-util/gtk-doc-am"
-
-PDEPEND="
- gnome? (
- >=x11-themes/gnome-icon-theme-1.1.91
- x11-themes/gnome-icon-theme-symbolic )
- tracker? ( >=gnome-extra/nautilus-tracker-tags-0.12 )
- 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
-
-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
-
- # Control selinux support
- # https://bugzilla.gnome.org/show_bug.cgi?id=758632
- epatch "${FILESDIR}"/${PN}-3.18.2-automagic-selinux.patch
-
- eautoreconf
-
- # Remove -D*DEPRECATED flags. Don't leave this for eclass! (bug #448822)
- sed -e 's/DISABLE_DEPRECATED_CFLAGS=.*/DISABLE_DEPRECATED_CFLAGS=/' \
- -i configure || die "sed failed"
-
- gnome2_src_prepare
-}
-
-src_configure() {
- DOCS="AUTHORS HACKING MAINTAINERS NEWS README* THANKS"
- gnome2_src_configure \
- --disable-profiling \
- --disable-update-mimedb \
- $(use_enable exif libexif) \
- $(use_enable introspection) \
- $(use_enable packagekit) \
- $(use_enable sendto nst-extension) \
- $(use_enable selinux) \
- $(use_enable tracker) \
- $(use_enable xmp)
-}
-
-src_test() {
- gnome2_environment_reset
- Xemake check
-}
-
-src_install() {
- use previewer && readme.gentoo_create_doc
- gnome2_src_install
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- if use previewer; then
- readme.gentoo_print_elog
- else
- elog "To preview media files, emerge nautilus with USE=previewer"
- fi
-}
diff --git a/gnome-base/nautilus/nautilus-3.20.2.ebuild b/gnome-base/nautilus/nautilus-3.20.2.ebuild
deleted file mode 100644
index bcff81b..00000000
--- a/gnome-base/nautilus/nautilus-3.20.2.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-GNOME2_LA_PUNT="yes" # Needed with USE 'sendto'
-
-inherit gnome2 readme.gentoo-r1 virtualx
-
-DESCRIPTION="A file manager for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
-
-LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
-SLOT="0"
-IUSE="exif gnome +introspection packagekit +previewer selinux sendto tracker xmp"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
-
-# FIXME: tests fails under Xvfb, but pass when building manually
-# "FAIL: check failed in nautilus-file.c, line 8307"
-# need org.gnome.SessionManager service (aka gnome-session) but cannot find it
-RESTRICT="test"
-
-# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92
-# and 2.30.0
-COMMON_DEPEND="
- >=dev-libs/glib-2.45.7:2[dbus]
- >=x11-libs/pango-1.28.3
- >=x11-libs/gtk+-3.19.12:3[introspection?]
- >=dev-libs/libxml2-2.7.8:2
- >=gnome-base/gnome-desktop-3:3=
-
- gnome-base/dconf
- >=gnome-base/gsettings-desktop-schemas-3.8.0
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXrender
-
- exif? ( >=media-libs/libexif-0.6.20 )
- introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
- selinux? ( >=sys-libs/libselinux-2 )
- tracker? ( >=app-misc/tracker-0.16:= )
- xmp? ( >=media-libs/exempi-2.1.0 )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-lang/perl-5
- >=dev-util/gdbus-codegen-2.33
- >=dev-util/gtk-doc-am-1.10
- >=dev-util/intltool-0.50
- sys-devel/gettext
- virtual/pkgconfig
- x11-proto/xproto
-"
-RDEPEND="${COMMON_DEPEND}
- packagekit? ( app-admin/packagekit-base )
- sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
-"
-
-# For eautoreconf
-# gnome-base/gnome-common
-# dev-util/gtk-doc-am"
-
-PDEPEND="
- gnome? ( x11-themes/adwaita-icon-theme )
- tracker? ( >=gnome-extra/nautilus-tracker-tags-0.12 )
- 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
-
-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
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-profiling \
- --disable-update-mimedb \
- $(use_enable exif libexif) \
- $(use_enable introspection) \
- $(use_enable packagekit) \
- $(use_enable sendto nst-extension) \
- $(use_enable selinux) \
- $(use_enable tracker) \
- $(use_enable xmp)
-}
-
-src_test() {
- virtx emake check
-}
-
-src_install() {
- use previewer && readme.gentoo_create_doc
- gnome2_src_install
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- if use previewer; then
- readme.gentoo_print_elog
- else
- elog "To preview media files, emerge nautilus with USE=previewer"
- fi
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-base/nautilus/files/, gnome-base/nautilus/
@ 2015-11-14 13:48 Pacho Ramos
0 siblings, 0 replies; 10+ messages in thread
From: Pacho Ramos @ 2015-11-14 13:48 UTC (permalink / raw
To: gentoo-commits
commit: 64f1dae7b696c6d254c742a824e55a45788a9db9
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 14 13:21:02 2015 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Nov 14 13:46:42 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64f1dae7
gnome-base/nautilus: Drop old
Package-Manager: portage-2.2.24
gnome-base/nautilus/Manifest | 1 -
.../files/nautilus-3.14.2-active-slot.patch | 51 --------
.../nautilus-3.14.2-parse-force-desktop.patch | 38 ------
.../files/nautilus-3.14.2-unreadable-names.patch | 28 -----
.../nautilus/files/nautilus-3.5.91-delete.patch | 44 -------
gnome-base/nautilus/nautilus-3.14.2-r1.ebuild | 138 ---------------------
6 files changed, 300 deletions(-)
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 7425b45..91a0fdd 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,3 +1,2 @@
-DIST nautilus-3.14.2.tar.xz 3344428 SHA256 b2c9e13ba896a15101abf5d5fe30e291243e6030e0c84e8eb5df1e7bd90c10a5 SHA512 9d07878fc2474c7444fb7c573ce1886514b82ecb386365e608de81473184791daf17875b7ea471a7bef2c84df0d6d06b207223c7b5ec64d195e46865440ceff6 WHIRLPOOL c29af2fe684abeeffe58d6ba872b97b846db5d97cace8b73196fb77a024262f82df1908bac975b67938db9a12091dee681f1d827a551eb2610d11a6db2164495
DIST nautilus-3.16.2.tar.xz 3325172 SHA256 3e7ecdda3a47b6ad03098270940aa506782866fa3602d91e711d99f96741478f SHA512 06b4c338fe2295122b35053d754d8bb797cfeedf736db3a52dd290d7742d79fbbf50c23a3d59e62ef937f3ebf6b67f26f12a652b75d42a8b44462a3e1eef1be1 WHIRLPOOL bd6d3aee888474e247f19cf95fecead27a86296afcab04de7052b8403df95d9b776b0c93bad04b748ba638d4edfc3fc11e8fbce50142a0aad517a0ed35038f9c
DIST nautilus-3.18.2.tar.xz 3316652 SHA256 68dcf668e2ca93126a899d2e236ef37af2aea93e3fc25eee23ccd7ba911d424a SHA512 ac40683027f3318bbea23feee7a654502106932b049faa4bcbc1340a7fbafaa7e8857237b1ec5a0bcbee25e8d75eb1e9c8136cd5b748f9009e72589e73908e86 WHIRLPOOL 317258a102cf89497cfe87965614f77bff189ad3539c61f777b0d19bd0f8febe316a1389f47256f65de50b23b8c79382ac5b45cfb94919c8bf2a7e1fbe26a304
diff --git a/gnome-base/nautilus/files/nautilus-3.14.2-active-slot.patch b/gnome-base/nautilus/files/nautilus-3.14.2-active-slot.patch
deleted file mode 100644
index b194199..0000000
--- a/gnome-base/nautilus/files/nautilus-3.14.2-active-slot.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From c9f259ca8f5541ac879320b5d168ae7b4bc46d86 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Nelson=20Ben=C3=ADtez=20Le=C3=B3n?=
- <nbenitezl+gnome@gmail.com>
-Date: Sat, 27 Dec 2014 00:27:36 +0500
-Subject: nautilus-window: make sure active slot is closed last
-
-When destroying window and closing all slots, the closing
-of the active slot will trigger activation of next free slot,
-we don't want to be activating slots as part of
-'closing all slots' logic.
-
-Fixes bug 741952
-
-diff --git a/src/nautilus-window.c b/src/nautilus-window.c
-index 124fc57..38dea35 100644
---- a/src/nautilus-window.c
-+++ b/src/nautilus-window.c
-@@ -1531,6 +1531,18 @@ nautilus_window_get_property (GObject *object,
- }
- }
-
-+static gint
-+sort_slots_active_last (NautilusWindowSlot *a, NautilusWindowSlot *b, NautilusWindow *window)
-+{
-+ if (window->details->active_slot == a) {
-+ return 1;
-+ }
-+ if (window->details->active_slot == b) {
-+ return -1;
-+ }
-+ return 0;
-+}
-+
- static void
- destroy_slots_foreach (gpointer data,
- gpointer user_data)
-@@ -1557,6 +1569,11 @@ nautilus_window_destroy (GtkWidget *object)
-
- /* close all slots safely */
- slots_copy = g_list_copy (window->details->slots);
-+ if (window->details->active_slot != NULL) {
-+ /* Make sure active slot is last one to be closed, to avoid default activation
-+ * of others slots when closing the active one, see bug #741952 */
-+ slots_copy = g_list_sort_with_data (slots_copy, (GCompareFunc) sort_slots_active_last, window);
-+ }
- g_list_foreach (slots_copy, (GFunc) destroy_slots_foreach, window);
- g_list_free (slots_copy);
-
---
-cgit v0.10.1
-
diff --git a/gnome-base/nautilus/files/nautilus-3.14.2-parse-force-desktop.patch b/gnome-base/nautilus/files/nautilus-3.14.2-parse-force-desktop.patch
deleted file mode 100644
index a106f4c..0000000
--- a/gnome-base/nautilus/files/nautilus-3.14.2-parse-force-desktop.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 845e8dbe02a3609b3d7df41dd0df38f8bbad3682 Mon Sep 17 00:00:00 2001
-From: Carlos Soriano <carlos.sorian89@gmail.com>
-Date: Fri, 5 Dec 2014 17:57:19 +0100
-Subject: nautilus-application: Parse force-desktop before exiting
-
-In commit ae4d4960 we introduced a regression that a new window was
-openned if both --no-default-window and --force-desktop options were
-used.
-
-To avoid that, activate those options before actually skipping the
-activate of the application if --no-default-window option is provided.
-
-The application nornally would exit if --no-default-window is provided
-and the show-desktop-window is not activated, but, we rely on a the
-detail that activating the open-desktop action when --force-desktop is
-provided as a option, creates a new window, which makes the application
-keep alive.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=741166
-
-diff --git a/src/nautilus-application.c b/src/nautilus-application.c
-index f26c8c7..c336a39 100644
---- a/src/nautilus-application.c
-+++ b/src/nautilus-application.c
-@@ -930,7 +930,9 @@ nautilus_application_handle_local_options (GApplication *application,
- self->priv->desktop_override = TRUE;
- g_action_group_activate_action (G_ACTION_GROUP (application),
- "close-desktop", NULL);
-- } else if (g_variant_dict_contains (options, "no-default-window")) {
-+ }
-+
-+ if (g_variant_dict_contains (options, "no-default-window")) {
- /* We want to avoid trigering the activate signal; so no window is created.
- * GApplication doesn't call activate if we return a value >= 0.
- * Use EXIT_SUCCESS since is >= 0. */
---
-cgit v0.10.1
-
diff --git a/gnome-base/nautilus/files/nautilus-3.14.2-unreadable-names.patch b/gnome-base/nautilus/files/nautilus-3.14.2-unreadable-names.patch
deleted file mode 100644
index 54d5d5a..0000000
--- a/gnome-base/nautilus/files/nautilus-3.14.2-unreadable-names.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 29ed1dee800341e8fcde739d0561ecc9d14e7f10 Mon Sep 17 00:00:00 2001
-From: Carlos Soriano <carlos.soriano89@gmail.com>
-Date: Fri, 22 Aug 2014 19:18:30 +0200
-Subject: nautilus-list-view: Avoid unreadable names
-
-Currently if the view is resized, the column name is resized as well
-given that use ellipsization allowing the column to become unreadable.
-To avoid that, use width-chars property to set a desired width, but at
-the same time allowing the user to resize without limits the name column
-if desired.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=732004
-
-diff --git a/src/nautilus-list-view.c b/src/nautilus-list-view.c
-index 8711af6..b361734 100644
---- a/src/nautilus-list-view.c
-+++ b/src/nautilus-list-view.c
-@@ -2066,6 +2066,7 @@ create_and_set_up_tree_view (NautilusListView *view)
- g_object_set (cell,
- "ellipsize", PANGO_ELLIPSIZE_END,
- "single-paragraph-mode", TRUE,
-+ "width-chars", 30,
- "xpad", 5,
- NULL);
-
---
-cgit v0.10.1
-
diff --git a/gnome-base/nautilus/files/nautilus-3.5.91-delete.patch b/gnome-base/nautilus/files/nautilus-3.5.91-delete.patch
deleted file mode 100644
index 072b34e..0000000
--- a/gnome-base/nautilus/files/nautilus-3.5.91-delete.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 92af7beb790ad9181e5a6a89ac52f177354536f2 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Thu, 8 Dec 2011 18:39:28 -0500
-Subject: [PATCH] Delete key should delete files
-
-Make the Delete key delete files like in nautilus-2.x and every other
-file manager on the planet. Note: the nautilus-3 Ctrl+Delete shortcut
-will also continue to work.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=647048
-https://bugs.gentoo.org/show_bug.cgi?id=393663
----
- src/nautilus-view.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/nautilus-view.c b/src/nautilus-view.c
-index f51d916..0a50994 100644
---- a/src/nautilus-view.c
-+++ b/src/nautilus-view.c
-@@ -7237,7 +7237,7 @@ static const GtkActionEntry directory_view_entries[] = {
- /* tooltip */ NULL,
- G_CALLBACK (action_rename_select_all_callback) },
- /* name, stock id */ { NAUTILUS_ACTION_TRASH, NULL,
-- /* label, accelerator */ N_("Mo_ve to Trash"), "<control>Delete",
-+ /* label, accelerator */ N_("Mo_ve to Trash"), "Delete",
- /* tooltip */ N_("Move each selected item to the Trash"),
- G_CALLBACK (action_trash_callback) },
- /* name, stock id */ { NAUTILUS_ACTION_DELETE, NULL,
-@@ -9895,8 +9895,12 @@ nautilus_view_class_init (NautilusViewClass *klass)
- binding_set = gtk_binding_set_by_class (klass);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_Delete, GDK_CONTROL_MASK,
- "trash", 0);
-+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Delete, 0,
-+ "trash", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, GDK_CONTROL_MASK,
- "trash", 0);
-+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, 0,
-+ "trash", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, GDK_SHIFT_MASK,
- "delete", 0);
- }
---
-1.7.12
-
diff --git a/gnome-base/nautilus/nautilus-3.14.2-r1.ebuild b/gnome-base/nautilus/nautilus-3.14.2-r1.ebuild
deleted file mode 100644
index 0583fa9..0000000
--- a/gnome-base/nautilus/nautilus-3.14.2-r1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes" # Needed with USE 'sendto'
-
-inherit eutils gnome2 readme.gentoo virtualx
-
-DESCRIPTION="A file manager for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
-
-LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
-SLOT="0"
-
-# profiling?
-IUSE="debug exif gnome +introspection packagekit +previewer sendto tracker xmp"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
-
-# FIXME: tests fails under Xvfb, but pass when building manually
-# "FAIL: check failed in nautilus-file.c, line 8307"
-RESTRICT="test"
-
-# FIXME: selinux support is automagic
-# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92
-# and 2.30.0
-COMMON_DEPEND="
- >=dev-libs/glib-2.35.3:2[dbus]
- >=x11-libs/pango-1.28.3
- >=x11-libs/gtk+-3.13.2:3[introspection?]
- >=dev-libs/libxml2-2.7.8:2
- >=gnome-base/gnome-desktop-3:3=
-
- gnome-base/dconf
- >=gnome-base/gsettings-desktop-schemas-3.8.0
- >=x11-libs/libnotify-0.7:=
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXrender
-
- exif? ( >=media-libs/libexif-0.6.20 )
- introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
- tracker? ( >=app-misc/tracker-0.16:= )
- xmp? ( >=media-libs/exempi-2.1.0 )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-lang/perl-5
- >=dev-util/gdbus-codegen-2.33
- >=dev-util/gtk-doc-am-1.4
- >=dev-util/intltool-0.40.1
- sys-devel/gettext
- virtual/pkgconfig
- x11-proto/xproto
-"
-RDEPEND="${COMMON_DEPEND}
- packagekit? ( app-admin/packagekit-base )
- sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
-"
-
-# For eautoreconf
-# gnome-base/gnome-common
-# dev-util/gtk-doc-am"
-
-PDEPEND="
- gnome? (
- >=x11-themes/gnome-icon-theme-1.1.91
- x11-themes/gnome-icon-theme-symbolic )
- tracker? ( >=gnome-extra/nautilus-tracker-tags-0.12 )
- 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
-
-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
-
- # Restore the nautilus-2.x Delete shortcut (Ctrl+Delete will still work);
- # bug #393663
- epatch "${FILESDIR}/${PN}-3.5.91-delete.patch"
-
- # nautilus-application: Parse force-desktop before exiting (from '3.14')
- epatch "${FILESDIR}/${P}-parse-force-desktop.patch"
-
- # nautilus-window: make sure active slot is closed last (from '3.14')
- epatch "${FILESDIR}/${P}-active-slot.patch"
-
- # nautilus-list-view: Avoid unreadable names (from '3.14')
- epatch "${FILESDIR}/${P}-unreadable-names.patch"
-
- # Remove -D*DEPRECATED flags. Don't leave this for eclass! (bug #448822)
- sed -e 's/DISABLE_DEPRECATED_CFLAGS=.*/DISABLE_DEPRECATED_CFLAGS=/' \
- -i configure || die "sed failed"
-
- gnome2_src_prepare
-}
-
-src_configure() {
- DOCS="AUTHORS HACKING MAINTAINERS NEWS README* THANKS"
- gnome2_src_configure \
- --disable-profiling \
- --disable-update-mimedb \
- $(use_enable debug) \
- $(use_enable exif libexif) \
- $(use_enable introspection) \
- $(use_enable packagekit) \
- $(use_enable sendto nst-extension) \
- $(use_enable tracker) \
- $(use_enable xmp)
-}
-
-src_test() {
- gnome2_environment_reset
- unset DBUS_SESSION_BUS_ADDRESS
- export GSETTINGS_BACKEND="memory"
- Xemake check
- unset GSETTINGS_BACKEND
-}
-
-src_install() {
- use previewer && readme.gentoo_create_doc
- gnome2_src_install
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- if use previewer; then
- readme.gentoo_print_elog
- else
- elog "To preview media files, emerge nautilus with USE=previewer"
- fi
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2023-06-19 15:30 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-23 21:34 [gentoo-commits] repo/gentoo:master commit in: gnome-base/nautilus/files/, gnome-base/nautilus/ Mart Raudsepp
-- strict thread matches above, loose matches on Subject: below --
2023-06-19 15:30 Matt Turner
2023-02-20 17:32 Matt Turner
2023-01-02 10:09 Pacho Ramos
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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox