* [gentoo-commits] repo/gentoo:master commit in: gnome-base/nautilus/, gnome-base/nautilus/files/
@ 2015-11-26 10:51 Gilles Dartiguelongue
0 siblings, 0 replies; 12+ messages in thread
From: Gilles Dartiguelongue @ 2015-11-26 10:51 UTC (permalink / raw
To: gentoo-commits
commit: 474c3afcff644cca375b2507fb16df27e68d6e62
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 25 08:21:08 2015 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 10:50:45 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=474c3afc
gnome-base/nautilus: stop selinux from being automagic
Package-Manager: portage-2.2.25
.../files/nautilus-3.18.2-automagic-selinux.patch | 47 ++++++++
gnome-base/nautilus/nautilus-3.18.2-r1.ebuild | 123 +++++++++++++++++++++
2 files changed, 170 insertions(+)
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
new file mode 100644
index 0000000..0f769fc
--- /dev/null
+++ b/gnome-base/nautilus/files/nautilus-3.18.2-automagic-selinux.patch
@@ -0,0 +1,47 @@
+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.2-r1.ebuild b/gnome-base/nautilus/nautilus-3.18.2-r1.ebuild
new file mode 100644
index 0000000..6a37227
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-3.18.2-r1.ebuild
@@ -0,0 +1,123 @@
+# 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="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.45.7:2[dbus]
+ >=x11-libs/pango-1.28.3
+ >=x11-libs/gtk+-3.17.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:= )
+ 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
+
+ # 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 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] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-base/nautilus/, gnome-base/nautilus/files/
@ 2019-03-05 17:53 Mart Raudsepp
0 siblings, 0 replies; 12+ messages in thread
From: Mart Raudsepp @ 2019-03-05 17:53 UTC (permalink / raw
To: gentoo-commits
commit: d7a5555d5b2a6453521948b57e2e248b78a04d9d
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 5 17:50:56 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Tue Mar 5 17:51:46 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7a5555d
gnome-base/nautilus: bump to 3.28.1
nautilus-desktop is now gone. Suggested alternative: "Desktop Icons"
from https://extensions.gnome.org
Tracker support is not optional anymore. It is theoretically possible
to patch it, but very cumbersome and hard to maintain on bumps - it
uses tracker for new "Starred" files feature and that is intertwined
a lot more than batch rename and tracker search were.
However, if one doesn't care for "tracker search" bits, one could avoid
tracker-miners and only have the core - the miners are not used for
batch rename and (probably) starring, as tracker provides more than
mining metadata from your files, and this is what nautilus relies on
to not NIH it.
nautilus-sendto extension code also not optional anymore, as it's a
rather tiny thing and better to have it always built, so no need to
rebuild all of nautilus after deciding to install nautilus-sendto for
its feature. It will probably go away with GNOME 3.34 in favor of
desktop portals for mail sending, etc, so it would work in flatpak too.
XMP and EXIF support isn't gone, it's just done via gexiv2 now.
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
gnome-base/nautilus/Manifest | 2 +
gnome-base/nautilus/files/3.28.1-docs-build.patch | 42 +++++++++
gnome-base/nautilus/nautilus-3.28.1.ebuild | 104 ++++++++++++++++++++++
3 files changed, 148 insertions(+)
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 14a2ae53b9e..5397c7fa99d 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,2 +1,4 @@
DIST nautilus-3.24.2.1.tar.xz 5143440 BLAKE2B 731046b6bdd0817b770cf3e2f0667187bfde613cf1a15611e6ec06e74bc3c2432ca66894119f224023fe46b01fd777d3dde2d2ac7bba0a9eb0fd71d38e1756ff SHA512 f6868600bcdc82071b3a63f4e4a0f7decf0d72e021eb3d0c26e914413c858163ee4403c4f3ef7689556a0fc91394f30cff9a3db14da030b277b50972c7b80a07
DIST nautilus-3.26.4.tar.xz 3267652 BLAKE2B 56986b8d87afc0ea7ce6f1f56ae06c7cfb05d060414aad428145a6c2cb631b9d4ebbeaefabb0f0ceeb5f930ae94737f8dfcabb300554a59c2b7d5a53d1ee3cd1 SHA512 2a50a2a9ae6ffbe4b706d46fb47e5f54f42e645189b3548d1904c3ddf882ef4a94819740c6821fe50c662a9013ab43bb9b7b3dbdfc779ecc82f16170b4867973
+DIST nautilus-3.28.1-patchset.tar.xz 129360 BLAKE2B 18e94e83132a8ce2e07491ce6b5cb9499141bf93e0c3ef44f2e5ac891e59d334cf310d863e8e7450fa385a6a49873d790e4f8c36a1ef8e009b1f2be2361586b4 SHA512 6c3385b4bc7020601f47dc66c0b1cabd6dadcd9f986bdaec42aeca9b43a6b8a2362651958d4e6a4738b78fbd546071678ba15ab87c268e33cfc1cca49229da48
+DIST nautilus-3.28.1.tar.xz 3262520 BLAKE2B 6f007e2327ffb108c5195737c02c7be12b874f5bc3bdfc1c84a3ba2176ff36e1843057522a54e569a7c09a056ccd888e1ddf099d6f2b527dfa109370cbe1a3a9 SHA512 6b695c097e5082062afe8cb036e819c837ce1e2570f581f81860f378e34f38f3020b8802e6a4285243c111d5208e892c419ac92621cdb1d35b2df205a3ccaa13
diff --git a/gnome-base/nautilus/files/3.28.1-docs-build.patch b/gnome-base/nautilus/files/3.28.1-docs-build.patch
new file mode 100644
index 00000000000..a2cb07aa23e
--- /dev/null
+++ b/gnome-base/nautilus/files/3.28.1-docs-build.patch
@@ -0,0 +1,42 @@
+From eaf8435005e2637ce76690c71f729e6b3685d973 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Tue, 5 Mar 2019 19:22:58 +0200
+Subject: [PATCH] build: Always install man page
+
+It's already generated and shouldn't be thrown in the same pot as
+full gtk-doc generation. It should be either a separate `man` option,
+or just always installed.
+---
+ docs/meson.build | 4 +++-
+ meson.build | 4 +---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/docs/meson.build b/docs/meson.build
+index b039cb631..2b1800be6 100644
+--- a/docs/meson.build
++++ b/docs/meson.build
+@@ -1,3 +1,5 @@
+ install_man('nautilus.1')
+
+-subdir('reference')
++if get_option('docs')
++ subdir('reference')
++endif
+diff --git a/meson.build b/meson.build
+index 4b64239ac..88fe73237 100644
+--- a/meson.build
++++ b/meson.build
+@@ -152,9 +152,7 @@ if get_option('tests') != 'none'
+ endif
+ subdir('data')
+ subdir('po')
+-if get_option('docs')
+- subdir('docs')
+-endif
++subdir('docs')
+ if get_option('extensions')
+ subdir('extensions')
+ endif
+--
+2.17.0
+
diff --git a/gnome-base/nautilus/nautilus-3.28.1.ebuild b/gnome-base/nautilus/nautilus-3.28.1.ebuild
new file mode 100644
index 00000000000..77031b8ffd3
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-3.28.1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg
+
+DESCRIPTION="Default file manager for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
+
+LICENSE="GPL-3+ LGPL-2.1+"
+SLOT="0"
+IUSE="gnome gtk-doc +introspection packagekit +previewer selinux sendto"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.55.1:2
+ >=media-libs/gexiv2-0.10.0
+ >=app-arch/gnome-autoar-0.2.1
+ >=gnome-base/gnome-desktop-3.0.0:3=
+ >=x11-libs/pango-1.28.3
+ >=x11-libs/gtk+-3.22.6:3[X,introspection?]
+ selinux? ( >=sys-libs/libselinux-2.0 )
+ >=app-misc/tracker-2.0:=
+ x11-libs/libX11
+ >=dev-libs/libxml2-2.7.8:2
+ introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/gdbus-codegen-2.51.2
+ dev-util/glib-utils
+ gtk-doc? (
+ >=dev-util/gtk-doc-1.10
+ app-text/docbook-xml-dtd:4.1.2 )
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ x11-base/xorg-proto
+"
+RDEPEND="${COMMON_DEPEND}
+ packagekit? ( app-admin/packagekit-base )
+ sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
+"
+
+PDEPEND="
+ gnome? ( x11-themes/adwaita-icon-theme )
+ previewer? ( >=gnome-extra/sushi-0.1.9 )
+ sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
+ >=gnome-base/gvfs-1.14[gtk(+)]
+" # Need gvfs[gtk] for recent:/// support; always built (without USE=gtk) since gvfs-1.34
+
+PATCHES=(
+ "${WORKDIR}"/patches # gnome-3-28 + optional introspection
+ "${FILESDIR}"/${PV}-docs-build.patch # Always install pregenerated manpage, keeping docs option for gtk-doc
+)
+
+src_prepare() {
+ if use previewer; then
+ DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files.
+ To activate the previewer, select a file and press space; to
+ close the previewer, press space again."
+ fi
+ xdg_src_prepare
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use gtk-doc docs)
+ $(meson_use introspection)
+ -Dprofiling=false
+ -Dextensions=true # image file properties, sendto support
+ $(meson_use packagekit)
+ $(meson_use selinux)
+ -Dtests=$(usex test all none)
+ -Dprofile=default
+ )
+ meson_src_configure
+}
+
+src_install() {
+ use previewer && readme.gentoo_create_doc
+ meson_src_install
+}
+
+src_test() {
+ virtx meson_src_test
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+
+ if use previewer; then
+ readme.gentoo_print_elog
+ else
+ elog "To preview media files, emerge nautilus with USE=previewer"
+ fi
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-base/nautilus/, gnome-base/nautilus/files/
@ 2019-03-30 22:21 Mart Raudsepp
0 siblings, 0 replies; 12+ messages in thread
From: Mart Raudsepp @ 2019-03-30 22:21 UTC (permalink / raw
To: gentoo-commits
commit: ad75d19be298e48823d06d01a3bfc61501fc6350
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 30 22:15:47 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Mar 30 22:15:47 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad75d19b
gnome-base/nautilus: remove old
Package-Manager: Portage-2.3.52, 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/nautilus-3.26.4-r2.ebuild | 109 ---------
5 files changed, 504 deletions(-)
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index c7b79491984..1fd2b7d2b62 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,5 +1,4 @@
DIST nautilus-3.24.2.1.tar.xz 5143440 BLAKE2B 731046b6bdd0817b770cf3e2f0667187bfde613cf1a15611e6ec06e74bc3c2432ca66894119f224023fe46b01fd777d3dde2d2ac7bba0a9eb0fd71d38e1756ff SHA512 f6868600bcdc82071b3a63f4e4a0f7decf0d72e021eb3d0c26e914413c858163ee4403c4f3ef7689556a0fc91394f30cff9a3db14da030b277b50972c7b80a07
-DIST nautilus-3.26.4.tar.xz 3267652 BLAKE2B 56986b8d87afc0ea7ce6f1f56ae06c7cfb05d060414aad428145a6c2cb631b9d4ebbeaefabb0f0ceeb5f930ae94737f8dfcabb300554a59c2b7d5a53d1ee3cd1 SHA512 2a50a2a9ae6ffbe4b706d46fb47e5f54f42e645189b3548d1904c3ddf882ef4a94819740c6821fe50c662a9013ab43bb9b7b3dbdfc779ecc82f16170b4867973
DIST nautilus-3.28.1-patchset.tar.xz 129360 BLAKE2B 18e94e83132a8ce2e07491ce6b5cb9499141bf93e0c3ef44f2e5ac891e59d334cf310d863e8e7450fa385a6a49873d790e4f8c36a1ef8e009b1f2be2361586b4 SHA512 6c3385b4bc7020601f47dc66c0b1cabd6dadcd9f986bdaec42aeca9b43a6b8a2362651958d4e6a4738b78fbd546071678ba15ab87c268e33cfc1cca49229da48
DIST nautilus-3.28.1.tar.xz 3262520 BLAKE2B 6f007e2327ffb108c5195737c02c7be12b874f5bc3bdfc1c84a3ba2176ff36e1843057522a54e569a7c09a056ccd888e1ddf099d6f2b527dfa109370cbe1a3a9 SHA512 6b695c097e5082062afe8cb036e819c837ce1e2570f581f81860f378e34f38f3020b8802e6a4285243c111d5208e892c419ac92621cdb1d35b2df205a3ccaa13
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/nautilus-3.26.4-r2.ebuild b/gnome-base/nautilus/nautilus-3.26.4-r2.ebuild
deleted file mode 100644
index aef38545ec0..00000000000
--- a/gnome-base/nautilus/nautilus-3.26.4-r2.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# 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] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-base/nautilus/, gnome-base/nautilus/files/
@ 2019-03-31 10:14 Mart Raudsepp
0 siblings, 0 replies; 12+ messages in thread
From: Mart Raudsepp @ 2019-03-31 10:14 UTC (permalink / raw
To: gentoo-commits
commit: a8677055550e236f70140430dbcbc66d0b376d2c
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 31 09:49:13 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Mar 31 10:13:42 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8677055
Revert "gnome-base/nautilus: remove old"
Stable target for tracker-2 stabling
This reverts commit ad75d19be298e48823d06d01a3bfc61501fc6350.
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/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 1fd2b7d2b62..c7b79491984 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,4 +1,5 @@
DIST nautilus-3.24.2.1.tar.xz 5143440 BLAKE2B 731046b6bdd0817b770cf3e2f0667187bfde613cf1a15611e6ec06e74bc3c2432ca66894119f224023fe46b01fd777d3dde2d2ac7bba0a9eb0fd71d38e1756ff SHA512 f6868600bcdc82071b3a63f4e4a0f7decf0d72e021eb3d0c26e914413c858163ee4403c4f3ef7689556a0fc91394f30cff9a3db14da030b277b50972c7b80a07
+DIST nautilus-3.26.4.tar.xz 3267652 BLAKE2B 56986b8d87afc0ea7ce6f1f56ae06c7cfb05d060414aad428145a6c2cb631b9d4ebbeaefabb0f0ceeb5f930ae94737f8dfcabb300554a59c2b7d5a53d1ee3cd1 SHA512 2a50a2a9ae6ffbe4b706d46fb47e5f54f42e645189b3548d1904c3ddf882ef4a94819740c6821fe50c662a9013ab43bb9b7b3dbdfc779ecc82f16170b4867973
DIST nautilus-3.28.1-patchset.tar.xz 129360 BLAKE2B 18e94e83132a8ce2e07491ce6b5cb9499141bf93e0c3ef44f2e5ac891e59d334cf310d863e8e7450fa385a6a49873d790e4f8c36a1ef8e009b1f2be2361586b4 SHA512 6c3385b4bc7020601f47dc66c0b1cabd6dadcd9f986bdaec42aeca9b43a6b8a2362651958d4e6a4738b78fbd546071678ba15ab87c268e33cfc1cca49229da48
DIST nautilus-3.28.1.tar.xz 3262520 BLAKE2B 6f007e2327ffb108c5195737c02c7be12b874f5bc3bdfc1c84a3ba2176ff36e1843057522a54e569a7c09a056ccd888e1ddf099d6f2b527dfa109370cbe1a3a9 SHA512 6b695c097e5082062afe8cb036e819c837ce1e2570f581f81860f378e34f38f3020b8802e6a4285243c111d5208e892c419ac92621cdb1d35b2df205a3ccaa13
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
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] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-base/nautilus/, gnome-base/nautilus/files/
@ 2019-08-31 14:06 Mart Raudsepp
0 siblings, 0 replies; 12+ messages in thread
From: Mart Raudsepp @ 2019-08-31 14:06 UTC (permalink / raw
To: gentoo-commits
commit: 91a58bac644b1715b23214bd4977d1bdec7bcea2
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 31 14:05:47 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Aug 31 14:05:54 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91a58bac
gnome-base/nautilus: security cleanup
Bug: https://bugs.gentoo.org/692784
Package-Manager: Portage-2.3.69, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
gnome-base/nautilus/Manifest | 2 -
gnome-base/nautilus/files/3.28.1-docs-build.patch | 42 ---------
gnome-base/nautilus/nautilus-3.28.1.ebuild | 104 ---------------------
gnome-base/nautilus/nautilus-3.30.5.ebuild | 105 ----------------------
4 files changed, 253 deletions(-)
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index a410c4593bb..3ffae22617b 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,3 +1 @@
-DIST nautilus-3.28.1-patchset.tar.xz 129360 BLAKE2B 18e94e83132a8ce2e07491ce6b5cb9499141bf93e0c3ef44f2e5ac891e59d334cf310d863e8e7450fa385a6a49873d790e4f8c36a1ef8e009b1f2be2361586b4 SHA512 6c3385b4bc7020601f47dc66c0b1cabd6dadcd9f986bdaec42aeca9b43a6b8a2362651958d4e6a4738b78fbd546071678ba15ab87c268e33cfc1cca49229da48
-DIST nautilus-3.28.1.tar.xz 3262520 BLAKE2B 6f007e2327ffb108c5195737c02c7be12b874f5bc3bdfc1c84a3ba2176ff36e1843057522a54e569a7c09a056ccd888e1ddf099d6f2b527dfa109370cbe1a3a9 SHA512 6b695c097e5082062afe8cb036e819c837ce1e2570f581f81860f378e34f38f3020b8802e6a4285243c111d5208e892c419ac92621cdb1d35b2df205a3ccaa13
DIST nautilus-3.30.5.tar.xz 3254344 BLAKE2B 64da158ee661fc259a14f890bf6ad343f720245df6b9475ff047993570ea4e7234723eb242f057bc85b7ea95d38a99b5c2f5d546e982a3e3e32b7fc75cabb786 SHA512 e38a8bb380460d902e4ec6219d0e147a4245e790b18fb18ab9474ec2ae002a971243c6b09b8fec267e65c7ecc7bb1217191c4f5cb9547b3b9d5b0793068103cf
diff --git a/gnome-base/nautilus/files/3.28.1-docs-build.patch b/gnome-base/nautilus/files/3.28.1-docs-build.patch
deleted file mode 100644
index a2cb07aa23e..00000000000
--- a/gnome-base/nautilus/files/3.28.1-docs-build.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From eaf8435005e2637ce76690c71f729e6b3685d973 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Tue, 5 Mar 2019 19:22:58 +0200
-Subject: [PATCH] build: Always install man page
-
-It's already generated and shouldn't be thrown in the same pot as
-full gtk-doc generation. It should be either a separate `man` option,
-or just always installed.
----
- docs/meson.build | 4 +++-
- meson.build | 4 +---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/docs/meson.build b/docs/meson.build
-index b039cb631..2b1800be6 100644
---- a/docs/meson.build
-+++ b/docs/meson.build
-@@ -1,3 +1,5 @@
- install_man('nautilus.1')
-
--subdir('reference')
-+if get_option('docs')
-+ subdir('reference')
-+endif
-diff --git a/meson.build b/meson.build
-index 4b64239ac..88fe73237 100644
---- a/meson.build
-+++ b/meson.build
-@@ -152,9 +152,7 @@ if get_option('tests') != 'none'
- endif
- subdir('data')
- subdir('po')
--if get_option('docs')
-- subdir('docs')
--endif
-+subdir('docs')
- if get_option('extensions')
- subdir('extensions')
- endif
---
-2.17.0
-
diff --git a/gnome-base/nautilus/nautilus-3.28.1.ebuild b/gnome-base/nautilus/nautilus-3.28.1.ebuild
deleted file mode 100644
index 40dd98c4c84..00000000000
--- a/gnome-base/nautilus/nautilus-3.28.1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg
-
-DESCRIPTION="Default file manager for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
-
-LICENSE="GPL-3+ LGPL-2.1+"
-SLOT="0"
-IUSE="gnome gtk-doc +introspection packagekit +previewer selinux sendto"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.55.1:2
- >=media-libs/gexiv2-0.10.0
- >=app-arch/gnome-autoar-0.2.1
- >=gnome-base/gnome-desktop-3.0.0:3=
- >=x11-libs/pango-1.28.3
- >=x11-libs/gtk+-3.22.26:3[X,introspection?]
- selinux? ( >=sys-libs/libselinux-2.0 )
- >=app-misc/tracker-2.0:=
- x11-libs/libX11
- >=dev-libs/libxml2-2.7.8:2
- introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-util/gdbus-codegen-2.51.2
- dev-util/glib-utils
- gtk-doc? (
- >=dev-util/gtk-doc-1.10
- app-text/docbook-xml-dtd:4.1.2 )
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- x11-base/xorg-proto
-"
-RDEPEND="${COMMON_DEPEND}
- packagekit? ( app-admin/packagekit-base )
- sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
-"
-
-PDEPEND="
- gnome? ( x11-themes/adwaita-icon-theme )
- previewer? ( >=gnome-extra/sushi-0.1.9 )
- sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
- >=gnome-base/gvfs-1.14[gtk(+)]
-" # Need gvfs[gtk] for recent:/// support; always built (without USE=gtk) since gvfs-1.34
-
-PATCHES=(
- "${WORKDIR}"/patches # gnome-3-28 + optional introspection
- "${FILESDIR}"/${PV}-docs-build.patch # Always install pregenerated manpage, keeping docs option for gtk-doc
-)
-
-src_prepare() {
- if use previewer; then
- DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files.
- To activate the previewer, select a file and press space; to
- close the previewer, press space again."
- fi
- xdg_src_prepare
-}
-
-src_configure() {
- local emesonargs=(
- $(meson_use gtk-doc docs)
- $(meson_use introspection)
- -Dprofiling=false
- -Dextensions=true # image file properties, sendto support
- $(meson_use packagekit)
- $(meson_use selinux)
- -Dtests=$(usex test all none)
- -Dprofile=default
- )
- meson_src_configure
-}
-
-src_install() {
- use previewer && readme.gentoo_create_doc
- meson_src_install
-}
-
-src_test() {
- virtx meson_src_test
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-
- if use previewer; then
- readme.gentoo_print_elog
- else
- elog "To preview media files, emerge nautilus with USE=previewer"
- fi
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/gnome-base/nautilus/nautilus-3.30.5.ebuild b/gnome-base/nautilus/nautilus-3.30.5.ebuild
deleted file mode 100644
index 4fd2e7af049..00000000000
--- a/gnome-base/nautilus/nautilus-3.30.5.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg
-
-DESCRIPTION="Default file manager for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
-
-LICENSE="GPL-3+ LGPL-2.1+"
-SLOT="0"
-IUSE="gnome gtk-doc +introspection packagekit +previewer seccomp selinux sendto"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.55.1:2
- >=media-libs/gexiv2-0.10.0
- >=app-arch/gnome-autoar-0.2.1
- gnome-base/gsettings-desktop-schemas
- >=x11-libs/gtk+-3.22.27:3[X,introspection?]
- seccomp? ( sys-libs/libseccomp )
- >=x11-libs/pango-1.28.3
- selinux? ( >=sys-libs/libselinux-2.0 )
- >=app-misc/tracker-2.0:=
- x11-libs/libX11
- >=dev-libs/libxml2-2.7.8:2
- introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-util/gdbus-codegen-2.51.2
- dev-util/glib-utils
- gtk-doc? (
- >=dev-util/gtk-doc-1.10
- app-text/docbook-xml-dtd:4.1.2 )
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- x11-base/xorg-proto
-"
-RDEPEND="${COMMON_DEPEND}
- packagekit? ( app-admin/packagekit-base )
- seccomp? ( >=sys-apps/bubblewrap-0.3.1 )
- sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
-"
-
-PDEPEND="
- gnome? ( x11-themes/adwaita-icon-theme )
- previewer? ( >=gnome-extra/sushi-0.1.9 )
- sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
- >=gnome-base/gvfs-1.14[gtk(+)]
-" # Need gvfs[gtk] for recent:/// support; always built (without USE=gtk) since gvfs-1.34
-
-PATCHES=(
- "${FILESDIR}"/${PV}-docs-build.patch # Always install pregenerated manpage, keeping docs option for gtk-doc
- "${FILESDIR}"/${PV}-thumbnailer-updates{,2}.patch # syncs with gnome-desktop; fixes the ld.so.cache for us
- "${FILESDIR}"/${PV}-seccomp-sparc32.patch # 32-bit sparc doesn't have seccomp either
-)
-
-src_prepare() {
- if use previewer; then
- DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files.
- To activate the previewer, select a file and press space; to
- close the previewer, press space again."
- fi
- xdg_src_prepare
-}
-
-src_configure() {
- local emesonargs=(
- $(meson_use gtk-doc docs)
- -Dextensions=true # image file properties, sendto support
- $(meson_use introspection)
- $(meson_use packagekit)
- $(meson_use selinux)
- -Dprofiling=false
- -Dtests=$(usex test all none)
- )
- meson_src_configure
-}
-
-src_install() {
- use previewer && readme.gentoo_create_doc
- meson_src_install
-}
-
-src_test() {
- virtx meson_src_test
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-
- if use previewer; then
- readme.gentoo_print_elog
- else
- elog "To preview media files, emerge nautilus with USE=previewer"
- fi
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-base/nautilus/, gnome-base/nautilus/files/
@ 2020-03-03 22:20 Mart Raudsepp
0 siblings, 0 replies; 12+ messages in thread
From: Mart Raudsepp @ 2020-03-03 22:20 UTC (permalink / raw
To: gentoo-commits
commit: 94ca243228734271e0e93704fd50a1f5d0a5e1dd
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 3 22:19:07 2020 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Tue Mar 3 22:19:17 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94ca2432
gnome-base/nautilus: bump to 3.34.2
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
gnome-base/nautilus/Manifest | 1 +
.../nautilus/files/3.34.2-pango-1.42-compat.patch | 106 ++++++++++++++++++++
gnome-base/nautilus/nautilus-3.34.2.ebuild | 107 +++++++++++++++++++++
3 files changed, 214 insertions(+)
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index c27e9f9b5a9..5928b3e7fc0 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1 +1,2 @@
DIST nautilus-3.32.3.tar.xz 3197820 BLAKE2B 28140210a855fe62faba4f0833067a81c4d8f71c0cc870ba4fdcc016754b01df003e45f636836f67cced8515aba8c8fb7922de788a14bfe0f0cc4518010aed5f SHA512 f19710f02bd91edb2d2f6cb8f46be6bebea3edfed14a07612444d5990533bafd032b604d65533727eb377b574d6bd4c82dbe11894d85ad254ee1473b683c4392
+DIST nautilus-3.34.2.tar.xz 3196976 BLAKE2B 38424061cb5591fc1df5824dd80e282637345bde148955c81632d4894153e10f3840389bb4e43dffe8c28f10eb6e64c1cc89f1bffdcf80fa581a5d47b7724dee SHA512 1a4e24fea3201f68b0316b95425bbc90078baa1ae7dccef2d2e48beda4007ecf2986254cde243d310c548e47a4693d84d1255654199649ce08429a99fb3a3a51
diff --git a/gnome-base/nautilus/files/3.34.2-pango-1.42-compat.patch b/gnome-base/nautilus/files/3.34.2-pango-1.42-compat.patch
new file mode 100644
index 00000000000..76ab1fb1c2e
--- /dev/null
+++ b/gnome-base/nautilus/files/3.34.2-pango-1.42-compat.patch
@@ -0,0 +1,106 @@
+From a9cd85a7bc045ae4b4661f0e6f9ece362a26c0c3 Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi@gnome.org>
+Date: Wed, 27 Nov 2019 14:08:27 +0000
+Subject: [PATCH] Conditionally depend on Pango 1.44.4
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+We're using newly introduced Pango API, but we're not doing a version
+check on it. One option is to force a Pango ≥ 1.44.4 dependency; another
+is to do a compile time check and only use the new API if we're building
+against a new enough Pango.
+---
+ src/nautilus-canvas-item.c | 14 +++++++++-----
+ src/nautilus-view-icon-item-ui.c | 16 ++++++++++------
+ 2 files changed, 19 insertions(+), 11 deletions(-)
+
+diff --git a/src/nautilus-canvas-item.c b/src/nautilus-canvas-item.c
+index 4d33d119b..5b5d3312f 100644
+--- a/src/nautilus-canvas-item.c
++++ b/src/nautilus-canvas-item.c
+@@ -1381,14 +1381,12 @@ create_label_layout (NautilusCanvasItem *item,
+ GString *str;
+ char *zeroified_text;
+ const char *p;
+- PangoAttrList *attr_list;
+
+ canvas_item = EEL_CANVAS_ITEM (item);
+
+ container = NAUTILUS_CANVAS_CONTAINER (canvas_item->canvas);
+ context = gtk_widget_get_pango_context (GTK_WIDGET (canvas_item->canvas));
+ layout = pango_layout_new (context);
+- attr_list = pango_attr_list_new ();
+
+ zeroified_text = NULL;
+
+@@ -1417,8 +1415,15 @@ create_label_layout (NautilusCanvasItem *item,
+ pango_layout_set_spacing (layout, LABEL_LINE_SPACING);
+ pango_layout_set_wrap (layout, PANGO_WRAP_WORD_CHAR);
+
+- pango_attr_list_insert (attr_list, pango_attr_insert_hyphens_new (FALSE));
+- pango_layout_set_attributes (layout, attr_list);
++#if PANGO_VERSION_CHECK (1, 44, 4)
++ {
++ PangoAttrList *attr_list = pango_attr_list_new ();
++
++ pango_attr_list_insert (attr_list, pango_attr_insert_hyphens_new (FALSE));
++ pango_layout_set_attributes (layout, attr_list);
++ pango_attr_list_unref (attr_list);
++ }
++#endif
+
+ /* Create a font description */
+ if (container->details->font)
+@@ -1432,7 +1437,6 @@ create_label_layout (NautilusCanvasItem *item,
+ pango_layout_set_font_description (layout, desc);
+ pango_font_description_free (desc);
+ g_free (zeroified_text);
+- pango_attr_list_unref (attr_list);
+
+ return layout;
+ }
+diff --git a/src/nautilus-view-icon-item-ui.c b/src/nautilus-view-icon-item-ui.c
+index d192e28fa..837dc54a9 100644
+--- a/src/nautilus-view-icon-item-ui.c
++++ b/src/nautilus-view-icon-item-ui.c
+@@ -128,7 +128,6 @@ constructed (GObject *object)
+ GtkBox *container;
+ GtkBox *item_selection_background;
+ GtkLabel *label;
+- PangoAttrList *attr_list;
+ GtkStyleContext *style_context;
+ NautilusFile *file;
+ guint icon_size;
+@@ -150,9 +149,16 @@ constructed (GObject *object)
+
+ label = GTK_LABEL (gtk_label_new (nautilus_file_get_display_name (file)));
+ gtk_widget_show (GTK_WIDGET (label));
+- attr_list = pango_attr_list_new ();
+- pango_attr_list_insert (attr_list, pango_attr_insert_hyphens_new (FALSE));
+- gtk_label_set_attributes (label, attr_list);
++
++#if PANGO_VERSION_CHECK (1, 44, 4)
++ {
++ PangoAttrList *attr_list = pango_attr_list_new ();
++ pango_attr_list_insert (attr_list, pango_attr_insert_hyphens_new (FALSE));
++ gtk_label_set_attributes (label, attr_list);
++ pango_attr_list_unref (attr_list);
++ }
++#endif
++
+ gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_MIDDLE);
+ gtk_label_set_line_wrap (label, TRUE);
+ gtk_label_set_line_wrap_mode (label, PANGO_WRAP_WORD_CHAR);
+@@ -182,8 +188,6 @@ constructed (GObject *object)
+ (GCallback) on_view_item_size_changed, self);
+ g_signal_connect (self->model, "notify::file",
+ (GCallback) on_view_item_file_changed, self);
+-
+- pango_attr_list_unref (attr_list);
+ }
+
+ static void
+--
+2.20.1
+
diff --git a/gnome-base/nautilus/nautilus-3.34.2.ebuild b/gnome-base/nautilus/nautilus-3.34.2.ebuild
new file mode 100644
index 00000000000..5678b21d825
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-3.34.2.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2020 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 selinux sendto"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+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/gnome-desktop-3.0.0:3=
+ >=x11-libs/gtk+-3.22.27:3[X,introspection?]
+ >=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="${DEPEND}
+ packagekit? ( app-admin/packagekit-base )
+ sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
+ gstreamer? ( !<media-video/totem-3.31.91[nautilus] )
+ >=app-misc/tracker-miners-2.0:=
+" # 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? (
+ >=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}"/3.32.3-optional-gstreamer.patch # Allow controlling audio-video-properties build
+ "${FILESDIR}"/${PV}-pango-1.42-compat.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; 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] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-base/nautilus/, gnome-base/nautilus/files/
@ 2020-11-07 15:23 Mart Raudsepp
0 siblings, 0 replies; 12+ messages in thread
From: Mart Raudsepp @ 2020-11-07 15:23 UTC (permalink / raw
To: gentoo-commits
commit: 8fcad8bce86a5be3afb6bc0ab13d5b10b8914c6f
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 7 14:47:21 2020 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Nov 7 15:21:34 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fcad8bc
gnome-base/nautilus: remove old
Package-Manager: Portage-2.3.103, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
gnome-base/nautilus/Manifest | 1 -
.../nautilus/files/3.34.2-pango-1.42-compat.patch | 106 ---------------------
gnome-base/nautilus/nautilus-3.34.3.ebuild | 106 ---------------------
3 files changed, 213 deletions(-)
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index ece8e6a9e53..8f698b2f4b8 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,2 +1 @@
-DIST nautilus-3.34.3.tar.xz 3213260 BLAKE2B a417ee5d5e032befed704b71b9ffd29cc9a2a6fae0612f96601756b876b0990625cc78eb2c7679bdce914f3dd30208b60243f403a508cf87a6761ea56251140d SHA512 f8ef86b5b67ef2b8eced492ee6b8d77155a9d6ec5ba6bb18132d678e6f12870963da9bcf4ff0bfbb8f4791bf068314557f9551febc23234c48d722e529c6ed9d
DIST nautilus-3.36.3.tar.xz 3201908 BLAKE2B ec7be7ad523e29c853a1a16dd6381257bd7f7af0004d4b84a9ef13539f5c8ea431c61f819eee6c0d396037846d390ae112b3fe2771276cde6128e7fad95eb4f4 SHA512 4dce01c20a34ed9bbff53a9886775af431754d02a4300e4647d87830502103e7436e53127b2e503af8e3a90785aa864514dbde22508ffb3e06eb43d4633fddde
diff --git a/gnome-base/nautilus/files/3.34.2-pango-1.42-compat.patch b/gnome-base/nautilus/files/3.34.2-pango-1.42-compat.patch
deleted file mode 100644
index 76ab1fb1c2e..00000000000
--- a/gnome-base/nautilus/files/3.34.2-pango-1.42-compat.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From a9cd85a7bc045ae4b4661f0e6f9ece362a26c0c3 Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@gnome.org>
-Date: Wed, 27 Nov 2019 14:08:27 +0000
-Subject: [PATCH] Conditionally depend on Pango 1.44.4
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-We're using newly introduced Pango API, but we're not doing a version
-check on it. One option is to force a Pango ≥ 1.44.4 dependency; another
-is to do a compile time check and only use the new API if we're building
-against a new enough Pango.
----
- src/nautilus-canvas-item.c | 14 +++++++++-----
- src/nautilus-view-icon-item-ui.c | 16 ++++++++++------
- 2 files changed, 19 insertions(+), 11 deletions(-)
-
-diff --git a/src/nautilus-canvas-item.c b/src/nautilus-canvas-item.c
-index 4d33d119b..5b5d3312f 100644
---- a/src/nautilus-canvas-item.c
-+++ b/src/nautilus-canvas-item.c
-@@ -1381,14 +1381,12 @@ create_label_layout (NautilusCanvasItem *item,
- GString *str;
- char *zeroified_text;
- const char *p;
-- PangoAttrList *attr_list;
-
- canvas_item = EEL_CANVAS_ITEM (item);
-
- container = NAUTILUS_CANVAS_CONTAINER (canvas_item->canvas);
- context = gtk_widget_get_pango_context (GTK_WIDGET (canvas_item->canvas));
- layout = pango_layout_new (context);
-- attr_list = pango_attr_list_new ();
-
- zeroified_text = NULL;
-
-@@ -1417,8 +1415,15 @@ create_label_layout (NautilusCanvasItem *item,
- pango_layout_set_spacing (layout, LABEL_LINE_SPACING);
- pango_layout_set_wrap (layout, PANGO_WRAP_WORD_CHAR);
-
-- pango_attr_list_insert (attr_list, pango_attr_insert_hyphens_new (FALSE));
-- pango_layout_set_attributes (layout, attr_list);
-+#if PANGO_VERSION_CHECK (1, 44, 4)
-+ {
-+ PangoAttrList *attr_list = pango_attr_list_new ();
-+
-+ pango_attr_list_insert (attr_list, pango_attr_insert_hyphens_new (FALSE));
-+ pango_layout_set_attributes (layout, attr_list);
-+ pango_attr_list_unref (attr_list);
-+ }
-+#endif
-
- /* Create a font description */
- if (container->details->font)
-@@ -1432,7 +1437,6 @@ create_label_layout (NautilusCanvasItem *item,
- pango_layout_set_font_description (layout, desc);
- pango_font_description_free (desc);
- g_free (zeroified_text);
-- pango_attr_list_unref (attr_list);
-
- return layout;
- }
-diff --git a/src/nautilus-view-icon-item-ui.c b/src/nautilus-view-icon-item-ui.c
-index d192e28fa..837dc54a9 100644
---- a/src/nautilus-view-icon-item-ui.c
-+++ b/src/nautilus-view-icon-item-ui.c
-@@ -128,7 +128,6 @@ constructed (GObject *object)
- GtkBox *container;
- GtkBox *item_selection_background;
- GtkLabel *label;
-- PangoAttrList *attr_list;
- GtkStyleContext *style_context;
- NautilusFile *file;
- guint icon_size;
-@@ -150,9 +149,16 @@ constructed (GObject *object)
-
- label = GTK_LABEL (gtk_label_new (nautilus_file_get_display_name (file)));
- gtk_widget_show (GTK_WIDGET (label));
-- attr_list = pango_attr_list_new ();
-- pango_attr_list_insert (attr_list, pango_attr_insert_hyphens_new (FALSE));
-- gtk_label_set_attributes (label, attr_list);
-+
-+#if PANGO_VERSION_CHECK (1, 44, 4)
-+ {
-+ PangoAttrList *attr_list = pango_attr_list_new ();
-+ pango_attr_list_insert (attr_list, pango_attr_insert_hyphens_new (FALSE));
-+ gtk_label_set_attributes (label, attr_list);
-+ pango_attr_list_unref (attr_list);
-+ }
-+#endif
-+
- gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_MIDDLE);
- gtk_label_set_line_wrap (label, TRUE);
- gtk_label_set_line_wrap_mode (label, PANGO_WRAP_WORD_CHAR);
-@@ -182,8 +188,6 @@ constructed (GObject *object)
- (GCallback) on_view_item_size_changed, self);
- g_signal_connect (self->model, "notify::file",
- (GCallback) on_view_item_file_changed, self);
--
-- pango_attr_list_unref (attr_list);
- }
-
- static void
---
-2.20.1
-
diff --git a/gnome-base/nautilus/nautilus-3.34.3.ebuild b/gnome-base/nautilus/nautilus-3.34.3.ebuild
deleted file mode 100644
index 6a35a0d8f4e..00000000000
--- a/gnome-base/nautilus/nautilus-3.34.3.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2020 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 +previewer selinux sendto"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-
-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/gnome-desktop-3.0.0:3=
- >=x11-libs/gtk+-3.22.27:3[X,introspection?]
- >=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="${DEPEND}
- sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
- gstreamer? ( !<media-video/totem-3.31.91[nautilus] )
- >=app-misc/tracker-miners-2.0:=
-" # 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? (
- >=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}"/3.32.3-optional-gstreamer.patch # Allow controlling audio-video-properties build
- "${FILESDIR}"/3.34.2-pango-1.42-compat.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; 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() {
- 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] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-base/nautilus/, gnome-base/nautilus/files/
@ 2021-12-19 4:53 Matt Turner
0 siblings, 0 replies; 12+ messages in thread
From: Matt Turner @ 2021-12-19 4:53 UTC (permalink / raw
To: gentoo-commits
commit: 238c0c7a757b9eb2d9d9cb7f735e0643e179f25c
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 19 03:52:02 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Dec 19 04:53:05 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=238c0c7a
gnome-base/nautilus: Version bump to 41.1
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
gnome-base/nautilus/Manifest | 1 +
.../nautilus/files/41.1-optional-gstreamer.patch | 57 +++++++++++
gnome-base/nautilus/nautilus-41.1.ebuild | 108 +++++++++++++++++++++
3 files changed, 166 insertions(+)
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 622c8809d83b..b3a1b26e4bd8 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1 +1,2 @@
DIST nautilus-40.2.tar.xz 3250384 BLAKE2B 8f8bb0c1a060d57695b28df126d421f386d634cbeea007ca30e076eb1b432a4098b98e9a1f39f688f8a920d99ef42ae2d53fe14fb270ba1e7de16aadd037a8d7 SHA512 ff7beab2963231c6e5ccd88098260659dd7fedd38ef6c0b95d66ffa110bfe5adc86477e2c1657eb2fcfe6110384038f75a7e669158712dfc1e2bd3f9e273b268
+DIST nautilus-41.1.tar.xz 3246356 BLAKE2B 558cac6bacd4d4238e8ceb792baa4d85a6aa981e78ae380b6c1256d079cac8e78b3d9b850a01180e4952630eb7898b987f79c12844adca82ab3702b0213d3150 SHA512 1eb2f2a0187f8b6581fe64285f347e8522b971eeb4d1f575387f3767e177f0195e758da9187090155216807b8f49ebed0fbcc29dd3cce6f3e408d7a955ae5286
diff --git a/gnome-base/nautilus/files/41.1-optional-gstreamer.patch b/gnome-base/nautilus/files/41.1-optional-gstreamer.patch
new file mode 100644
index 000000000000..cb4023cd0d2e
--- /dev/null
+++ b/gnome-base/nautilus/files/41.1-optional-gstreamer.patch
@@ -0,0 +1,57 @@
+From 1b908b6cf0422ecb496a5aaf7da25ede9ad12d60 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 66e56bda6..d71d597a6 100644
+--- a/meson.build
++++ b/meson.build
+@@ -110,8 +110,10 @@ libm = cc.find_library('m')
+
+ if get_option('extensions')
+ gexiv = dependency('gexiv2', version: '>= 0.12.2')
++ 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.32.0
+
diff --git a/gnome-base/nautilus/nautilus-41.1.ebuild b/gnome-base/nautilus/nautilus-41.1.ebuild
new file mode 100644
index 000000000000..da337e10b426
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-41.1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2021 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 +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.10.0
+ gstreamer? ( media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0 )
+ >=app-arch/gnome-autoar-0.3.0
+ >=gnome-base/gnome-desktop-3.0.0:3=
+ >=x11-libs/gtk+-3.22.27:3[X,introspection?]
+ >=gui-libs/libhandy-1.1.90:1
+ >=x11-libs/pango-1.28.3
+ selinux? ( >=sys-libs/libselinux-2.0 )
+ >=app-misc/tracker-3.0:3=
+ x11-libs/libX11
+ >=dev-libs/libxml2-2.7.8:2
+ introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}
+ gstreamer? ( !<media-video/totem-3.31.91[nautilus] )
+ >=app-misc/tracker-miners-3.0:3=
+" # uses org.freedesktop.Tracker.Miner.Files gsettings schema from tracker-miners
+BDEPEND="
+ >=dev-util/gdbus-codegen-2.51.2
+ >=dev-util/meson-0.57.2
+ dev-util/glib-utils
+ gtk-doc? (
+ >=dev-util/gtk-doc-1.10
+ app-text/docbook-xml-dtd:4.1.2 )
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ x11-base/xorg-proto
+"
+PDEPEND="
+ gnome? ( x11-themes/adwaita-icon-theme )
+ previewer? ( >=gnome-extra/sushi-0.1.9 )
+ sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
+ >=gnome-base/gvfs-1.14[gtk(+)]
+" # Need gvfs[gtk] for recent:/// support; always built (without USE=gtk) since gvfs-1.34
+
+PATCHES=(
+ "${FILESDIR}"/3.30.5-docs-build.patch # Always install pregenerated manpage, keeping docs option for gtk-doc
+ "${FILESDIR}"/41.1-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)
+ -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
+ 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] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-base/nautilus/, gnome-base/nautilus/files/
@ 2022-03-27 18:58 Matt Turner
0 siblings, 0 replies; 12+ messages in thread
From: Matt Turner @ 2022-03-27 18:58 UTC (permalink / raw
To: gentoo-commits
commit: c0aa0dd46966297dd899be20e7d65b940a08b1d7
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 27 18:31:55 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 18:46:58 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0aa0dd4
gnome-base/nautilus: Version bump to 42.0
Bug: https://bugs.gentoo.org/831170
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
gnome-base/nautilus/Manifest | 1 +
.../nautilus/files/42.0-optional-gstreamer.patch | 57 +++++++++++
gnome-base/nautilus/nautilus-42.0.ebuild | 114 +++++++++++++++++++++
3 files changed, 172 insertions(+)
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index a1d203650dfc..3a500bc4f4b3 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1 +1,2 @@
DIST nautilus-41.2.tar.xz 3248212 BLAKE2B be4e4e8fc03751259a1a5d4d1eb726e3026d24376da3fa680c412598219bfb3ced52f9b809004913dffdb9bb1c176dede07288c440c100487b3a337d8eaab417 SHA512 adb14fa1cf37a4797f57ae5162bddcd5b012de270cf955051b69276bc266b1dbfd8027b835f627ae19a1252356b344b1c8a4b7ca79a22512f3138a2c13fd2f3e
+DIST nautilus-42.0.tar.xz 3263108 BLAKE2B 0d06a72cc1ea1a227f6d92ee2841a2fdda9220ccb61bdb43cd5930a8f64393994a746e33a5451d460ca4c15810549c5d94f895ee861efa8ae46b98e25ed20f5f SHA512 c3b182f75f89a31ecb7b4f6b42dfb2f9792e195fdaf0e5f2b1a4dbe0f0d01071cf4ecb8408d6da476aa111ec891462e33c0d139d3423109bd5b4138ae822bd1e
diff --git a/gnome-base/nautilus/files/42.0-optional-gstreamer.patch b/gnome-base/nautilus/files/42.0-optional-gstreamer.patch
new file mode 100644
index 000000000000..84835d4ba959
--- /dev/null
+++ b/gnome-base/nautilus/files/42.0-optional-gstreamer.patch
@@ -0,0 +1,57 @@
+From 918ffe8e1be66f7451452431385095b4cc7e6801 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Thu, 19 Sep 2019 22:26:08 +0300
+Subject: [PATCH] build: Optional gstreamer
+
+---
+ extensions/meson.build | 4 +++-
+ meson.build | 2 ++
+ meson_options.txt | 6 ++++++
+ 3 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/extensions/meson.build b/extensions/meson.build
+index 46c7b0393..bcce4fbfe 100644
+--- a/extensions/meson.build
++++ b/extensions/meson.build
+@@ -1,3 +1,5 @@
+ subdir('image-properties')
+-subdir('audio-video-properties')
++if get_option('gstreamer')
++ subdir('audio-video-properties')
++endif
+ subdir('sendto')
+diff --git a/meson.build b/meson.build
+index e8b044490..10cf06fd6 100644
+--- a/meson.build
++++ b/meson.build
+@@ -99,8 +99,10 @@ libm = cc.find_library('m')
+
+ if get_option('extensions')
+ gexiv = dependency('gexiv2', version: '>= 0.14.0')
++ if get_option('gstreamer')
+ gst_tag_dep = dependency('gstreamer-tag-1.0')
+ gst_pbutils_dep = dependency('gstreamer-pbutils-1.0')
++ endif
+ endif
+ gio = dependency('gio-2.0', version: glib_ver)
+ gio_unix = dependency('gio-unix-2.0', version: glib_ver)
+diff --git a/meson_options.txt b/meson_options.txt
+index 6e781c4ef..9ad8d8196 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -13,6 +13,12 @@ option(
+ value: true,
+ description: 'Build stock extensions',
+ )
++option(
++ 'gstreamer',
++ type: 'boolean',
++ value: true,
++ description: 'Build audio-video properties extension (requires "extensions")',
++)
+ option(
+ 'introspection',
+ type: 'boolean',
+--
+2.34.1
+
diff --git a/gnome-base/nautilus/nautilus-42.0.ebuild b/gnome-base/nautilus/nautilus-42.0.ebuild
new file mode 100644
index 000000000000..cc5893b59ef3
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-42.0.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg
+
+DESCRIPTION="Default file manager for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
+
+LICENSE="GPL-3+ LGPL-2.1+"
+SLOT="0"
+IUSE="gnome +gstreamer gtk-doc +introspection +previewer selinux sendto"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+ >=dev-libs/glib-2.67.1:2
+ >=media-libs/gexiv2-0.14.0
+ gstreamer? ( media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0 )
+ >=app-arch/gnome-autoar-0.4.0
+ >=gnome-base/gnome-desktop-3.0.0:3=
+ >=x11-libs/gtk+-3.22.27:3[X,introspection?]
+ >=gui-libs/libhandy-1.5.0:1
+ >=x11-libs/pango-1.28.3
+ selinux? ( >=sys-libs/libselinux-2.0 )
+ >=app-misc/tracker-3.0:3=
+ x11-libs/libX11
+ >=dev-libs/libxml2-2.7.8:2
+ introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}
+ gstreamer? ( !<media-video/totem-3.31.91[nautilus] )
+ >=app-misc/tracker-miners-3.0:3=
+" # uses org.freedesktop.Tracker.Miner.Files gsettings schema from tracker-miners
+BDEPEND="
+ >=dev-util/gdbus-codegen-2.51.2
+ >=dev-util/meson-0.57.2
+ dev-util/glib-utils
+ gtk-doc? (
+ >=dev-util/gtk-doc-1.10
+ app-text/docbook-xml-dtd:4.1.2 )
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ x11-base/xorg-proto
+"
+PDEPEND="
+ gnome? ( x11-themes/adwaita-icon-theme )
+ previewer? ( >=gnome-extra/sushi-0.1.9 )
+ sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
+ >=gnome-base/gvfs-1.14[gtk(+)]
+" # Need gvfs[gtk] for recent:/// support; always built (without USE=gtk) since gvfs-1.34
+
+PATCHES=(
+ "${FILESDIR}"/3.30.5-docs-build.patch # Always install pregenerated manpage, keeping docs option for gtk-doc
+ "${FILESDIR}"/42.0-optional-gstreamer.patch # Allow controlling audio-video-properties build
+)
+
+src_prepare() {
+ default
+ xdg_environment_reset
+
+ if use previewer; then
+ DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files.
+ To activate the previewer, select a file and press space; to
+ close the previewer, press space again."
+ fi
+
+ # Disable test-nautilus-search-engine-tracker; bug #831170
+ sed -e '/^tracker_tests = /{n;N;N;d}' -i test/automated/displayless/meson.build || die
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use gtk-doc docs)
+ -Dextensions=true # image file properties, sendto support; also required for -Dgstreamer=true
+ $(meson_use gstreamer) # gstreamer audio-video-properties extension
+ $(meson_use introspection)
+ -Dlibportal=false # As of 40.2, all libportal usages are flatpak-specific
+ -Dpackagekit=false
+ $(meson_use selinux)
+ -Dprofiling=false
+ -Dtests=$(usex test all none)
+ )
+ meson_src_configure
+}
+
+src_install() {
+ use previewer && readme.gentoo_create_doc
+ meson_src_install
+}
+
+src_test() {
+ gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
+ # TODO: Tests require tracker testutils (e.g. tracker-sandbox), which may need some sorting out with tracker use flag deps
+ virtx meson_src_test
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+
+ if use previewer; then
+ readme.gentoo_print_elog
+ else
+ elog "To preview media files, emerge nautilus with USE=previewer"
+ fi
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-base/nautilus/, gnome-base/nautilus/files/
@ 2022-09-30 17:55 Matt Turner
0 siblings, 0 replies; 12+ messages in thread
From: Matt Turner @ 2022-09-30 17:55 UTC (permalink / raw
To: gentoo-commits
commit: d2f81d64b40c0134450de226e32fd082331a5ca8
Author: Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
AuthorDate: Sun Sep 18 12:09:14 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Sep 30 17:55:34 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2f81d64
gnome-base/nautilus: Version bump to 43.0
Closes: https://github.com/gentoo/gentoo/pull/27324
Signed-off-by: Pascal Jäger <pascal.jaeger <AT> leimstift.de>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
gnome-base/nautilus/Manifest | 1 +
gnome-base/nautilus/files/43.0-docs-build.patch | 41 ++++++++
.../nautilus/files/43.0-optional-gstreamer.patch | 42 ++++++++
gnome-base/nautilus/nautilus-43.0.ebuild | 114 +++++++++++++++++++++
4 files changed, 198 insertions(+)
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 9c7df2dbaf62..d825d4d0d9c1 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1 +1,2 @@
DIST nautilus-42.2.tar.xz 3254912 BLAKE2B 303b52fe9bbdb8e437a447004dcd284ee0c66ecaa11db45c52cf8c831f52a764efa03476d69f74840289f200c49b917bc329487bd87d3e776ea5dc1a6ea9b413 SHA512 2b3ba2990b00bbc3abf771b83b9b0a7c1a8b107b1b4955a45879f7d28add713d326bbe84d70056058073edfc3c7b7891547af77b8a34f94fe1b9ca047c76e9c9
+DIST nautilus-43.0.tar.xz 3165200 BLAKE2B 460df75af37c1c038bbbc9442d061a45ef3fbf09b2af016cd8340674c6eddf59b37a92011cf6e46d84168c859d4cd543d95fe140b322a00e2866bfdf5421a909 SHA512 c880125c2339be02852470e45cd4d589470e0df7723acc44b80df35c18cb1375c5f85cb46c7e53efbab1b51eedb4fd51ffa455773d4913d44c59070dafa22b49
diff --git a/gnome-base/nautilus/files/43.0-docs-build.patch b/gnome-base/nautilus/files/43.0-docs-build.patch
new file mode 100644
index 000000000000..653970dc26ad
--- /dev/null
+++ b/gnome-base/nautilus/files/43.0-docs-build.patch
@@ -0,0 +1,41 @@
+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,4 +1,5 @@
+ install_man('nautilus.1')
+ install_man('nautilus-autorun-software.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
+@@ -205,9 +205,8 @@ subdirs = [
+ # Conditional building #
+ ########################
+
+-if gi_docgen.found()
+- subdirs += 'docs'
+-endif
++subdirs += 'docs'
++
+ if get_option('tests') != 'none'
+ subdirs += 'test'
+ endif
diff --git a/gnome-base/nautilus/files/43.0-optional-gstreamer.patch b/gnome-base/nautilus/files/43.0-optional-gstreamer.patch
new file mode 100644
index 000000000000..de0e008fffb7
--- /dev/null
+++ b/gnome-base/nautilus/files/43.0-optional-gstreamer.patch
@@ -0,0 +1,42 @@
+diff --git a/extensions/meson.build b/extensions/meson.build
+index a10349c..5494275 100644
+--- a/extensions/meson.build
++++ b/extensions/meson.build
+@@ -1,2 +1,4 @@
+ subdir('image-properties')
+-subdir('audio-video-properties')
++if get_option('gstreamer')
++ subdir('audio-video-properties')
++endif
+diff --git a/meson.build b/meson.build
+index 00f01f6..bdbd33a 100644
+--- a/meson.build
++++ b/meson.build
+@@ -102,8 +102,10 @@ libm = cc.find_library('m')
+ if get_option('extensions')
+ gexiv = dependency('gexiv2', version: '>= 0.14.0')
+ gdkpixbuf = dependency('gdk-pixbuf-2.0', version: '>= 2.30.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 fce5f16..1fa8f89 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',
diff --git a/gnome-base/nautilus/nautilus-43.0.ebuild b/gnome-base/nautilus/nautilus-43.0.ebuild
new file mode 100644
index 000000000000..44ac74e4207e
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-43.0.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg
+
+DESCRIPTION="Default file manager for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
+
+LICENSE="GPL-3+ LGPL-2.1+"
+SLOT="0"
+IUSE="gnome +gstreamer gtk-doc +introspection +previewer selinux sendto"
+
+KEYWORDS="~amd64"
+
+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[X,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] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-base/nautilus/, gnome-base/nautilus/files/
@ 2022-10-01 3:16 Sam James
0 siblings, 0 replies; 12+ messages in thread
From: Sam James @ 2022-10-01 3:16 UTC (permalink / raw
To: gentoo-commits
commit: a1b6c92b768d8ed8f0b34e057c14fda689adf12b
Author: Leonardo Hernández Hernández <leohdz172 <AT> protonmail <DOT> com>
AuthorDate: Sat Oct 1 02:04:55 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 1 03:14:24 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1b6c92b
gnome-base/nautilus: fix build with clang
Signed-off-by: Leonardo Hernández Hernández <leohdz172 <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/27549
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../nautilus/files/43.0-fix-clang-build.patch | 30 ++++++++++++++++++++++
gnome-base/nautilus/nautilus-43.0.ebuild | 1 +
2 files changed, 31 insertions(+)
diff --git a/gnome-base/nautilus/files/43.0-fix-clang-build.patch b/gnome-base/nautilus/files/43.0-fix-clang-build.patch
new file mode 100644
index 000000000000..ec8fbd90ac1a
--- /dev/null
+++ b/gnome-base/nautilus/files/43.0-fix-clang-build.patch
@@ -0,0 +1,30 @@
+From 68b050ac0f60b1f02767276643cba8eb701f9884 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?=
+ <leohdz172@protonmail.com>
+Date: Fri, 30 Sep 2022 17:35:50 -0500
+Subject: [PATCH] fix conflicting types for nautilus_file_get{u,g}id
+
+when building with clang
+---
+ src/nautilus-file.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/nautilus-file.h b/src/nautilus-file.h
+index 9b0613e98..57cca177f 100644
+--- a/src/nautilus-file.h
++++ b/src/nautilus-file.h
+@@ -244,9 +244,9 @@ gboolean nautilus_file_can_get_owner (Nautilu
+ gboolean nautilus_file_can_set_owner (NautilusFile *file);
+ gboolean nautilus_file_can_get_group (NautilusFile *file);
+ gboolean nautilus_file_can_set_group (NautilusFile *file);
+-uid_t nautilus_file_get_uid (NautilusFile *file);
++const uid_t nautilus_file_get_uid (NautilusFile *file);
+ char * nautilus_file_get_owner_name (NautilusFile *file);
+-gid_t nautilus_file_get_gid (NautilusFile *file);
++const gid_t nautilus_file_get_gid (NautilusFile *file);
+ char * nautilus_file_get_group_name (NautilusFile *file);
+ GList * nautilus_get_user_names (void);
+ GList * nautilus_get_all_group_names (void);
+--
+GitLab
+
diff --git a/gnome-base/nautilus/nautilus-43.0.ebuild b/gnome-base/nautilus/nautilus-43.0.ebuild
index 44ac74e4207e..8fec2d0f8328 100644
--- a/gnome-base/nautilus/nautilus-43.0.ebuild
+++ b/gnome-base/nautilus/nautilus-43.0.ebuild
@@ -56,6 +56,7 @@ PDEPEND="
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
+ "${FILESDIR}"/43.0-fix-clang-build.patch # https://gitlab.gnome.org/GNOME/nautilus/-/merge_requests/996
)
src_prepare() {
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-base/nautilus/, gnome-base/nautilus/files/
@ 2023-12-24 12:00 Mart Raudsepp
0 siblings, 0 replies; 12+ messages in thread
From: Mart Raudsepp @ 2023-12-24 12:00 UTC (permalink / raw
To: gentoo-commits
commit: 7b9626eea5fb19247b433695ca2efc840d1e400a
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 24 11:56:23 2023 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Dec 24 12:00:01 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b9626ee
gnome-base/nautilus: Fix crash opening audio/video properties
The crash doesn't happen on all systems (at least some amd64 don't),
but that was by pure luck from compiler UB handling.
Also include another changeset from gnome-45 stable branch while
revbumping anyways.
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
.../files/45.2.1-better-icon-lookup-fallback.patch | 116 +++++++++++++++++++
.../nautilus/files/45.2.1-fix-av-props-crash.patch | 38 +++++++
gnome-base/nautilus/nautilus-45.2.1-r1.ebuild | 125 +++++++++++++++++++++
3 files changed, 279 insertions(+)
diff --git a/gnome-base/nautilus/files/45.2.1-better-icon-lookup-fallback.patch b/gnome-base/nautilus/files/45.2.1-better-icon-lookup-fallback.patch
new file mode 100644
index 000000000000..ba7f970d7f28
--- /dev/null
+++ b/gnome-base/nautilus/files/45.2.1-better-icon-lookup-fallback.patch
@@ -0,0 +1,116 @@
+From 95befc684c535e251278ccc68b06261c2620271d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= <antoniof@gnome.org>
+Date: Sun, 10 Dec 2023 17:01:18 +0000
+Subject: [PATCH 1/2] icon-info: Don't ask the theme for an icon it doesn't
+ have
+
+GtkIconTheme changed behavior from GTK3 to GTK4. Before, it would
+return NULL for a non-existent icon. Now it returns a non-scallable
+`image-missing` icon.
+
+But our icon info code still relies on NULL icon to set a fallback.
+
+The documented solution to get the old behavior back is to call
+gtk_icon_theme_has_gicon(). Let's just do that instead.
+
+Also use a more generic fallback icon that's been available in
+adwaita-icon-theme for a few versions before our GTK4 port.
+
+Closes https://gitlab.gnome.org/GNOME/nautilus/-/issues/2796
+
+
+(cherry picked from commit 7de816f8a2019adec468cf39073fcd5bb922512f)
+---
+ src/nautilus-file.c | 2 +-
+ src/nautilus-icon-info.c | 7 ++++---
+ src/nautilus-properties-window.c | 2 +-
+ 3 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/src/nautilus-file.c b/src/nautilus-file.c
+index 0492e2f87..b469288a3 100644
+--- a/src/nautilus-file.c
++++ b/src/nautilus-file.c
+@@ -4706,7 +4706,7 @@ get_default_file_icon (void)
+ static GIcon *fallback_icon = NULL;
+ if (fallback_icon == NULL)
+ {
+- fallback_icon = g_themed_icon_new ("text-x-generic");
++ fallback_icon = g_themed_icon_new ("application-x-generic");
+ }
+
+ return fallback_icon;
+diff --git a/src/nautilus-icon-info.c b/src/nautilus-icon-info.c
+index c6b1e9a92..a7f3243d6 100644
+--- a/src/nautilus-icon-info.c
++++ b/src/nautilus-icon-info.c
+@@ -395,13 +395,14 @@ nautilus_icon_info_lookup (GIcon *icon,
+ return g_object_ref (icon_info);
+ }
+
+- icon_paintable = gtk_icon_theme_lookup_by_gicon (gtk_icon_theme_get_for_display (gdk_display_get_default ()),
+- icon, size, scale, GTK_TEXT_DIR_NONE, 0);
+- if (icon_paintable == NULL)
++ GtkIconTheme *theme = gtk_icon_theme_get_for_display (gdk_display_get_default ());
++ if (!gtk_icon_theme_has_gicon (theme, icon))
+ {
+ return nautilus_icon_info_new_for_paintable (NULL, scale);
+ }
+
++ icon_paintable = gtk_icon_theme_lookup_by_gicon (theme, icon, size, scale, GTK_TEXT_DIR_NONE, 0);
++
+ if (G_IS_THEMED_ICON (icon))
+ {
+ ThemedIconKey lookup_key;
+diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
+index 08bf91fcb..6a6dcc362 100644
+--- a/src/nautilus-properties-window.c
++++ b/src/nautilus-properties-window.c
+@@ -570,7 +570,7 @@ get_image_for_properties_window (NautilusPropertiesWindow *self,
+
+ if (!icon)
+ {
+- g_autoptr (GIcon) gicon = g_themed_icon_new ("text-x-generic");
++ g_autoptr (GIcon) gicon = g_themed_icon_new ("application-x-generic");
+
+ icon = nautilus_icon_info_lookup (gicon, NAUTILUS_GRID_ICON_SIZE_MEDIUM, icon_scale);
+ }
+--
+2.43.0
+
+
+From 038885de47293a3fd2a15410d7cf3e0d36406a0d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= <antoniof@gnome.org>
+Date: Wed, 13 Dec 2023 00:13:35 +0000
+Subject: [PATCH 2/2] icon-info: Fix build
+
+Previous commit relied on mixing declarations with code, which is not allowed with the build flags of this branch.
+
+(cherry picked from commit deed9bcab051529e64e3fc1870f299233b8c200e)
+---
+ src/nautilus-icon-info.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/nautilus-icon-info.c b/src/nautilus-icon-info.c
+index a7f3243d6..f18d574d6 100644
+--- a/src/nautilus-icon-info.c
++++ b/src/nautilus-icon-info.c
+@@ -333,6 +333,7 @@ nautilus_icon_info_lookup (GIcon *icon,
+ {
+ NautilusIconInfo *icon_info;
+ g_autoptr (GtkIconPaintable) icon_paintable = NULL;
++ GtkIconTheme *theme;
+
+ if (G_IS_LOADABLE_ICON (icon))
+ {
+@@ -395,7 +396,7 @@ nautilus_icon_info_lookup (GIcon *icon,
+ return g_object_ref (icon_info);
+ }
+
+- GtkIconTheme *theme = gtk_icon_theme_get_for_display (gdk_display_get_default ());
++ theme = gtk_icon_theme_get_for_display (gdk_display_get_default ());
+ if (!gtk_icon_theme_has_gicon (theme, icon))
+ {
+ return nautilus_icon_info_new_for_paintable (NULL, scale);
+--
+2.43.0
+
diff --git a/gnome-base/nautilus/files/45.2.1-fix-av-props-crash.patch b/gnome-base/nautilus/files/45.2.1-fix-av-props-crash.patch
new file mode 100644
index 000000000000..e1136fb196c9
--- /dev/null
+++ b/gnome-base/nautilus/files/45.2.1-fix-av-props-crash.patch
@@ -0,0 +1,38 @@
+From 6836526d6c95107f0bcdcf628ab2dfed394541a5 Mon Sep 17 00:00:00 2001
+From: Peter Eisenmann <p3732@getgoogleoff.me>
+Date: Sat, 9 Dec 2023 14:40:52 +0100
+Subject: [PATCH] properties-window: fix extension callback signature
+
+This was added in [1] with an incorrect signature.
+
+Relates to #3160
+
+[1] bc4dfddd80544092483fb058c946716ea4fc47f1
+
+
+(cherry picked from commit 8d51206503304ff62ca5eeba30ef3b29cdc50820)
+---
+ src/nautilus-properties-window.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
+index 14c8f74213..08bf91fcb7 100644
+--- a/src/nautilus-properties-window.c
++++ b/src/nautilus-properties-window.c
+@@ -925,10 +925,10 @@ create_extension_group_row (NautilusPropertiesItem *item,
+ }
+
+ static void
+-navigate_extension_model_page (AdwPreferencesRow *row,
+- GParamSpec *params,
+- NautilusPropertiesWindow *self)
++navigate_extension_model_page (AdwPreferencesRow *row,
++ gpointer user_data)
+ {
++ NautilusPropertiesWindow *self = NAUTILUS_PROPERTIES_WINDOW (user_data);
+ GListModel *list_model = g_object_get_data (G_OBJECT (row), "nautilus-extension-properties-model");
+ AdwNavigationPage *page;
+
+--
+GitLab
+
diff --git a/gnome-base/nautilus/nautilus-45.2.1-r1.ebuild b/gnome-base/nautilus/nautilus-45.2.1-r1.ebuild
new file mode 100644
index 000000000000..a84dd38af2c3
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-45.2.1-r1.ebuild
@@ -0,0 +1,125 @@
+# 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://apps.gnome.org/Nautilus/"
+
+LICENSE="GPL-3+ LGPL-2.1+"
+SLOT="0"
+IUSE="+cloudproviders gnome +gstreamer gtk-doc +introspection +previewer selinux sendto"
+REQUIRED_USE="gtk-doc? ( introspection )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+DEPEND="
+ >=dev-libs/glib-2.77.0:2
+ >=media-libs/gexiv2-0.14.2
+ >=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.11.2:4[introspection?]
+ >=gui-libs/libadwaita-1.4_alpha: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
+ cloudproviders? ( >=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
+ test? ( sys-apps/dbus )
+"
+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
+ "${FILESDIR}"/${PV}-fix-av-props-crash.patch # Fix crash opening audio/video properties, upstream #3160
+ "${FILESDIR}"/${PV}-better-icon-lookup-fallback.patch # Upstream #2796 from gnome-45 branch
+)
+
+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 introspection)
+ -Dpackagekit=false
+ $(meson_use selinux)
+ $(meson_use cloudproviders)
+ -Dprofiling=false
+ -Dtests=$(usex test all none)
+
+ $(meson_use gstreamer) # gstreamer audio-video-properties extension
+ )
+ 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
+ # GIO_USE_VOLUME_MONITOR=unix due to https://gitlab.gnome.org/GNOME/gvfs/-/issues/629#note_1467280
+ GIO_USE_VOLUME_MONITOR=unix XDG_SESSION_TYPE=x11 virtx dbus-run-session meson test -C "${BUILD_DIR}" || die
+}
+
+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] 12+ messages in thread
end of thread, other threads:[~2023-12-24 12:00 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-03 22:20 [gentoo-commits] repo/gentoo:master commit in: gnome-base/nautilus/, gnome-base/nautilus/files/ Mart Raudsepp
-- strict thread matches above, loose matches on Subject: below --
2023-12-24 12:00 Mart Raudsepp
2022-10-01 3:16 Sam James
2022-09-30 17:55 Matt Turner
2022-03-27 18:58 Matt Turner
2021-12-19 4:53 Matt Turner
2020-11-07 15:23 Mart Raudsepp
2019-08-31 14:06 Mart Raudsepp
2019-03-31 10:14 Mart Raudsepp
2019-03-30 22:21 Mart Raudsepp
2019-03-05 17:53 Mart Raudsepp
2015-11-26 10:51 Gilles Dartiguelongue
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox