[gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/files/, gnome-base/nautilus/
commit: 8f138b3343728af2545643d3d08745e30fe38d4a Author: Sobhan Mohammadpour gentoo org> AuthorDate: Sat Sep 14 19:24:48 2019 + Commit: Sobhan Mohammadpour gentoo org> CommitDate: Sat Sep 14 19:24:48 2019 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=8f138b33 gnome-base/nautilus: add 3.34.0 Package-Manager: Portage-2.3.76, Repoman-2.3.17 gnome-base/nautilus/files/3.34.0-docs-build.patch | 40 + gnome-base/nautilus/nautilus-3.34.0.ebuild| 103 ++ 2 files changed, 143 insertions(+) diff --git a/gnome-base/nautilus/files/3.34.0-docs-build.patch b/gnome-base/nautilus/files/3.34.0-docs-build.patch new file mode 100644 index ..3d700bdd --- /dev/null +++ b/gnome-base/nautilus/files/3.34.0-docs-build.patch @@ -0,0 +1,40 @@ +From 49d85c31346ff61afdd2c03b19b75c657416bacc Mon Sep 17 00:00:00 2001 +From: Sobhan Mohammadpour +Date: Sat, 14 Sep 2019 15:03:53 -0400 +Subject: [PATCH] [Patch] update 3.30-5: build: always install man pages + +originally by: Mart Raudsepp +--- + docs/meson.build | 5 +++-- + meson.build | 4 +--- + 2 files changed, 4 insertions(+), 5 deletions(-) + +diff --git a/docs/meson.build b/docs/meson.build +index a54574f..ae0b171 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 8ab4fb6..98cc73b 100644 +--- a/meson.build b/meson.build +@@ -196,9 +196,7 @@ subdirs = [ + # Conditional building # + + +-if get_option('docs') +- subdirs += 'docs' +-endif ++subdirs += 'docs' + if get_option('tests') != 'none' + subdirs += 'test' + endif +-- +2.23.0 diff --git a/gnome-base/nautilus/nautilus-3.34.0.ebuild b/gnome-base/nautilus/nautilus-3.34.0.ebuild new file mode 100644 index ..30c37296 --- /dev/null +++ b/gnome-base/nautilus/nautilus-3.34.0.ebuild @@ -0,0 +1,103 @@ +# 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 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 + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + >=app-arch/gnome-autoar-0.2.1 + gnome-base/gnome-desktop: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:= ) +" +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? ( !
[gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/
commit: b956c6230776b910136cefac4f15c736f30fc497 Author: Mart Raudsepp gentoo org> AuthorDate: Tue Dec 11 18:35:33 2018 + Commit: Mart Raudsepp gentoo org> CommitDate: Tue Dec 11 18:35:40 2018 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=b956c623 gnome-base/nautilus-3.26.4-r1: remove, -r2 available in ::gentoo Main tree version adds a crash fix patch from gnome-3-26 upstream branch, allows tracker-1, fixes introspection optionality and re-enables tests. Signed-off-by: Mart Raudsepp gentoo.org> Package-Manager: Portage-2.3.52, Repoman-2.3.11 gnome-base/nautilus/nautilus-3.26.4-r1.ebuild | 116 -- 1 file changed, 116 deletions(-) diff --git a/gnome-base/nautilus/nautilus-3.26.4-r1.ebuild b/gnome-base/nautilus/nautilus-3.26.4-r1.ebuild deleted file mode 100644 index 80e0ab5a.. --- a/gnome-base/nautilus/nautilus-3.26.4-r1.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" # Needed with USE 'sendto' - -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-2+ LGPL-2+ FDL-1.1" -SLOT="0" -IUSE="exif gnome gtk-doc +introspection packagekit +previewer selinux sendto tracker xmp" - -KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" - -# FIXME: tests fails under Xvfb, but pass when building manually -# "FAIL: check failed in nautilus-file.c, line 8307" -# need org.gnome.SessionManager service (aka gnome-session) but cannot find it -RESTRICT="test" - -# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92 -# and 2.30.0 -COMMON_DEPEND=" - >=app-arch/gnome-autoar-0.2.1 - >=dev-libs/glib-2.51.2:2[dbus] - >=x11-libs/pango-1.28.3 - >=x11-libs/gtk+-3.22.6:3[introspection?] - >=dev-libs/libxml2-2.7.8:2 - >=gnome-base/gnome-desktop-3:3= - - >=gnome-base/gsettings-desktop-schemas-3.8.0 - x11-libs/libX11 - - exif? ( >=media-libs/libexif-0.6.20 ) - introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) - selinux? ( >=sys-libs/libselinux-2 ) - tracker? ( >=app-misc/tracker-2:= ) - xmp? ( >=media-libs/exempi-2.1.0:2 ) -" -DEPEND="${COMMON_DEPEND} - >=dev-util/gdbus-codegen-2.33 - >=sys-devel/gettext-0.19.7 - virtual/pkgconfig - x11-base/xorg-proto - - gtk-doc? ( dev-util/gtk-doc ) -" -RDEPEND="${COMMON_DEPEND} - gnome-base/dconf - packagekit? ( app-admin/packagekit-base ) - sendto? ( !
[gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/files/
commit: c24fa3d782ee8fda6faa3e5dc06c2feb654d6a59 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Tue Dec 11 15:22:46 2018 + Commit: Gilles Dartiguelongue gentoo org> CommitDate: Tue Dec 11 15:23:43 2018 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=c24fa3d7 gnome-base/nautilus: one more typo fix for tracker patch Signed-off-by: Gilles Dartiguelongue gentoo.org> gnome-base/nautilus/files/3.26.4-tracker-support-optional.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnome-base/nautilus/files/3.26.4-tracker-support-optional.patch b/gnome-base/nautilus/files/3.26.4-tracker-support-optional.patch index d02ebe7c..96f89722 100644 --- a/gnome-base/nautilus/files/3.26.4-tracker-support-optional.patch +++ b/gnome-base/nautilus/files/3.26.4-tracker-support-optional.patch @@ -1,4 +1,4 @@ -From 75c1aca1128bf29c9d195abfb8184f8c20b05b15 Mon Sep 17 00:00:00 2001 +From 0008d41d0b3d75ba01ffa2ebfc2cfb9055f60f78 Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Sun, 27 May 2018 13:54:38 +0200 Subject: [PATCH] Make tracker support optional @@ -62,7 +62,7 @@ index c934dd8b1..0c23c7921 100644 type: 'boolean', value: false, diff --git a/src/meson.build b/src/meson.build -index cc08345d8..40f337cde 100644 +index cc08345d8..8ea10b16b 100644 --- a/src/meson.build +++ b/src/meson.build @@ -254,12 +254,6 @@ libnautilus_sources = [ @@ -90,7 +90,7 @@ index cc08345d8..40f337cde 100644 nautilus_deps += exempi endif -+if get_option ('tracker') != 'disabled' ++if get_option ('tracker') +libnautilus_sources += [ +'nautilus-batch-rename-dialog.c', +'nautilus-batch-rename-dialog.h',
[gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/files/
commit: 4e0d15fc16e0c8adb2af52a19d5c9fa3114fe60f Author: Gilles Dartiguelongue gentoo org> AuthorDate: Tue Dec 11 13:57:05 2018 + Commit: Gilles Dartiguelongue gentoo org> CommitDate: Tue Dec 11 13:57:22 2018 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=4e0d15fc gnome-base/nautilus: cleanup tracker patch Signed-off-by: Gilles Dartiguelongue gentoo.org> .../nautilus/files/3.26.4-tracker-support-optional.patch| 13 ++--- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/gnome-base/nautilus/files/3.26.4-tracker-support-optional.patch b/gnome-base/nautilus/files/3.26.4-tracker-support-optional.patch index f3b58689..d02ebe7c 100644 --- a/gnome-base/nautilus/files/3.26.4-tracker-support-optional.patch +++ b/gnome-base/nautilus/files/3.26.4-tracker-support-optional.patch @@ -1,18 +1,18 @@ -From a87d6c0c7bdf52f5c1b73972e850c0ce0e1d3043 Mon Sep 17 00:00:00 2001 +From 75c1aca1128bf29c9d195abfb8184f8c20b05b15 Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Sun, 27 May 2018 13:54:38 +0200 Subject: [PATCH] Make tracker support optional --- config.h.meson | 1 + - meson.build | 10 +++--- + 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, 48 insertions(+), 10 deletions(-) + 8 files changed, 47 insertions(+), 10 deletions(-) diff --git a/config.h.meson b/config.h.meson index 4f5cb5848..58d71e96f 100644 @@ -27,18 +27,17 @@ index 4f5cb5848..58d71e96f 100644 #mesondefine ENABLE_PACKAGEKIT #mesondefine LOCALEDIR diff --git a/meson.build b/meson.build -index 6256193cc..7258e00e1 100644 +index 6256193cc..d6418d770 100644 --- a/meson.build +++ b/meson.build -@@ -81,9 +81,13 @@ if get_option ('enable-selinux') +@@ -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') -+tracker_api = get_option ('tracker') -+if tracker_api ++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')
[gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/, gnome-base/nautilus/files/
commit: 9aca0eedfea36cb6a2a5203591f4d20291a06675 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Tue Dec 11 13:54:24 2018 + Commit: Gilles Dartiguelongue gentoo org> CommitDate: Tue Dec 11 13:54:34 2018 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=9aca0eed gnome-base/nautilus: turn tracker support into a boolean Signed-off-by: Gilles Dartiguelongue gentoo.org> .../files/3.26.4-tracker-support-optional.patch| 30 +- gnome-base/nautilus/nautilus-3.26.4-r1.ebuild | 2 +- 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/gnome-base/nautilus/files/3.26.4-tracker-support-optional.patch b/gnome-base/nautilus/files/3.26.4-tracker-support-optional.patch index 61eacc2a..f3b58689 100644 --- a/gnome-base/nautilus/files/3.26.4-tracker-support-optional.patch +++ b/gnome-base/nautilus/files/3.26.4-tracker-support-optional.patch @@ -1,18 +1,18 @@ -From 664c66bd231c5d0ac20f6f4f14be461bfb206a1e Mon Sep 17 00:00:00 2001 +From a87d6c0c7bdf52f5c1b73972e850c0ce0e1d3043 Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Sun, 27 May 2018 13:54:38 +0200 Subject: [PATCH] Make tracker support optional --- config.h.meson | 1 + - meson.build | 15 --- - meson_options.txt | 5 + + meson.build | 10 +++--- + 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, 54 insertions(+), 10 deletions(-) + 8 files changed, 48 insertions(+), 10 deletions(-) diff --git a/config.h.meson b/config.h.meson index 4f5cb5848..58d71e96f 100644 @@ -27,10 +27,10 @@ index 4f5cb5848..58d71e96f 100644 #mesondefine ENABLE_PACKAGEKIT #mesondefine LOCALEDIR diff --git a/meson.build b/meson.build -index 6256193cc..776111f81 100644 +index 6256193cc..7258e00e1 100644 --- a/meson.build +++ b/meson.build -@@ -81,9 +81,18 @@ if get_option ('enable-selinux') +@@ -81,9 +81,13 @@ if get_option ('enable-selinux') conf.set10 ('HAVE_SELINUX', true) endif @@ -38,32 +38,26 @@ index 6256193cc..776111f81 100644 -if not tracker_sparql.found() -tracker_sparql = dependency ('tracker-sparql-1.0') +tracker_api = get_option ('tracker') -+if tracker_api == 'disabled' -+# pass -+elif tracker_api == 'auto' ++if tracker_api +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) -+else -+tracker_sparql = dependency ('tracker-sparql-@0@'.format(tracker_api)) +conf.set10 ('HAVE_TRACKER', true) endif if get_option ('enable-xmp') diff --git a/meson_options.txt b/meson_options.txt -index c934dd8b1..d2ba885a2 100644 +index c934dd8b1..0c23c7921 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -8,6 +8,11 @@ option ('enable-exif', +@@ -8,6 +8,10 @@ option ('enable-exif', type: 'boolean', value: false, description: 'enable EXIF support') +option ('tracker', -+type: 'combo', -+choices: ['auto', '1.0', '2.0', 'disabled'], -+value: 'auto', ++type: 'boolean', ++value: true, +description: 'enable bulk renames and search using Tracker') option ('enable-xmp', type: 'boolean', @@ -267,5 +261,5 @@ index 209bd4f80..436cd7471 100644 priv->model = nautilus_search_engine_model_new (); connect_provider_signals (engine, NAUTILUS_SEARCH_PROVIDER (priv->model)); -- -2.17.0 +2.19.2 diff --git a/gnome-base/nautilus/nautilus-3.26.4-r1.ebuild b/gnome-base/nautilus/nautilus-3.26.4-r1.ebuild index 716a0347..80e0ab5a 100644 --- a/gnome-base/nautilus/nautilus-3.26.4-r1.ebuild +++ b/gnome-base/nautilus/nautilus-3.26.4-r1.ebuild @@ -77,7 +77,7 @@ src_configure() { local emesonargs=( "-Denable-desktop=true" "-Denable-profiling=false" - "-Dtracker=$(usex tracker auto disabled)" + $(meson_use tracker) $(meson_use gtk-doc enable-gtk-doc) $(meson_use exif enable-exif) $(meson_use packagekit enable-packagekit)
[gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/
commit: 6e876fbac63dff1da3ecab7601dd3ab8713fd911 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sat Dec 1 17:26:51 2018 + Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sat Dec 1 17:41:29 2018 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=6e876fba gnome-base/nautilus: use gtk-doc instead of doc USE flag As discussed on gentoo-dev mailing list, this is now the standard for gtk-doc documentation. Message-ID: <1535141206.6451.19.camel gentoo.org> Subject: [gentoo-dev] [RFC] New global USE flag: gtk-doc Package-Manager: Portage-2.3.52, Repoman-2.3.12 Manifest-Sign-Key: 0x5A56C8CD0C13248A Signed-off-by: Gilles Dartiguelongue gentoo.org> gnome-base/nautilus/nautilus-3.26.4-r1.ebuild | 9 - 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnome-base/nautilus/nautilus-3.26.4-r1.ebuild b/gnome-base/nautilus/nautilus-3.26.4-r1.ebuild index 8c82d5fe..716a0347 100644 --- a/gnome-base/nautilus/nautilus-3.26.4-r1.ebuild +++ b/gnome-base/nautilus/nautilus-3.26.4-r1.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"; LICENSE="GPL-2+ LGPL-2+ FDL-1.1" SLOT="0" -IUSE="doc exif gnome +introspection packagekit +previewer selinux sendto tracker xmp" +IUSE="exif gnome gtk-doc +introspection packagekit +previewer selinux sendto tracker xmp" KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" @@ -45,7 +45,7 @@ DEPEND="${COMMON_DEPEND} virtual/pkgconfig x11-base/xorg-proto - doc? ( dev-util/gtk-doc ) + gtk-doc? ( dev-util/gtk-doc ) " RDEPEND="${COMMON_DEPEND} gnome-base/dconf @@ -74,12 +74,11 @@ src_prepare() { } src_configure() { - # FIXME no doc useflag?? local emesonargs=( "-Denable-desktop=true" "-Denable-profiling=false" "-Dtracker=$(usex tracker auto disabled)" - $(meson_use doc enable-gtk-doc) + $(meson_use gtk-doc enable-gtk-doc) $(meson_use exif enable-exif) $(meson_use packagekit enable-packagekit) $(meson_use sendto enable-nst-extension) @@ -111,7 +110,7 @@ pkg_postinst() { } pkg_postrm() { - gnome2_icon_cache_update xdg_pkg_postrm + gnome2_icon_cache_update gnome2_schemas_update }
[gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/
commit: d92f9bae154cc8e4f54e203ca3ef368c3533f204 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sat Dec 1 17:30:53 2018 + Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sat Dec 1 17:41:29 2018 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=d92f9bae gnome-base/nautilus: sync live ebuild Package-Manager: Portage-2.3.52, Repoman-2.3.12 Manifest-Sign-Key: 0x5A56C8CD0C13248A Signed-off-by: Gilles Dartiguelongue gentoo.org> gnome-base/nautilus/nautilus-.ebuild | 89 +++- 1 file changed, 43 insertions(+), 46 deletions(-) diff --git a/gnome-base/nautilus/nautilus-.ebuild b/gnome-base/nautilus/nautilus-.ebuild index 7b1340d5..f49bf82c 100644 --- a/gnome-base/nautilus/nautilus-.ebuild +++ b/gnome-base/nautilus/nautilus-.ebuild @@ -1,12 +1,14 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 GNOME2_LA_PUNT="yes" # Needed with USE 'sendto' -inherit gnome2 readme.gentoo-r1 virtualx +inherit gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg if [[ ${PV} = ]]; then - inherit gnome2-live + inherit git-r3 + SRC_URI="" + EGIT_SRC_URI="https://gitlab.gnome.org/GNOME/${PN}"; fi DESCRIPTION="A file manager for the GNOME desktop" @@ -14,14 +16,9 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"; LICENSE="GPL-2+ LGPL-2+ FDL-1.1" SLOT="0" -IUSE="exif gnome +introspection packagekit +previewer selinux sendto tracker xmp" +IUSE="exif gnome gtk-doc +introspection packagekit +previewer selinux sendto tracker xmp" -if [[ ${PV} = ]]; then - IUSE="${IUSE} doc" - KEYWORDS="" -else - KEYWORDS="~amd64 ~arm64 ~ia64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" -fi +KEYWORDS="" # FIXME: tests fails under Xvfb, but pass when building manually # "FAIL: check failed in nautilus-file.c, line 8307" @@ -31,55 +28,46 @@ RESTRICT="test" # Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92 # and 2.30.0 COMMON_DEPEND=" - >=app-arch/gnome-autoar-0.1 - >=dev-libs/glib-2.49.1:2[dbus] + >=app-arch/gnome-autoar-0.2.1 + >=dev-libs/glib-2.51.2:2[dbus] >=x11-libs/pango-1.28.3 - >=x11-libs/gtk+-3.21.6:3[introspection?] + >=x11-libs/gtk+-3.22.6:3[introspection?] >=dev-libs/libxml2-2.7.8:2 >=gnome-base/gnome-desktop-3:3= - gnome-base/dconf >=gnome-base/gsettings-desktop-schemas-3.8.0 x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrender exif? ( >=media-libs/libexif-0.6.20 ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) selinux? ( >=sys-libs/libselinux-2 ) - tracker? ( >=app-misc/tracker-0.16:= ) + tracker? ( >=app-misc/tracker-2:= ) xmp? ( >=media-libs/exempi-2.1.0:2 ) " DEPEND="${COMMON_DEPEND} - >=dev-lang/perl-5 >=dev-util/gdbus-codegen-2.33 - >=dev-util/gtk-doc-am-1.10 >=sys-devel/gettext-0.19.7 virtual/pkgconfig x11-base/xorg-proto + + gtk-doc? ( dev-util/gtk-doc ) " RDEPEND="${COMMON_DEPEND} + gnome-base/dconf packagekit? ( app-admin/packagekit-base ) sendto? ( !
[gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/
commit: ba1b3ed9a747832b702937ea65230f7ed76a8e78 Author: Sobhan Mohammadpour gentoo org> AuthorDate: Sun Oct 14 18:13:44 2018 + Commit: Sobhan Mohammadpour gentoo org> CommitDate: Sun Oct 14 18:13:44 2018 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=ba1b3ed9 gnome-base/nautilus: remove gnome eclass from 3.26 & minor bug fixes Package-Manager: Portage-2.3.51, Repoman-2.3.11 Manifest-Sign-Key: 0x7DF238CF0AA182E1 ...lus-3.26.4.ebuild => nautilus-3.26.4-r1.ebuild} | 38 ++ 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/gnome-base/nautilus/nautilus-3.26.4.ebuild b/gnome-base/nautilus/nautilus-3.26.4-r1.ebuild similarity index 79% rename from gnome-base/nautilus/nautilus-3.26.4.ebuild rename to gnome-base/nautilus/nautilus-3.26.4-r1.ebuild index de179978..8c82d5fe 100644 --- a/gnome-base/nautilus/nautilus-3.26.4.ebuild +++ b/gnome-base/nautilus/nautilus-3.26.4-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 GNOME2_LA_PUNT="yes" # Needed with USE 'sendto' -inherit gnome-meson readme.gentoo-r1 virtualx +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"; @@ -70,21 +70,23 @@ src_prepare() { To activate the previewer, select a file and press space; to close the previewer, press space again." fi - gnome-meson_src_prepare + xdg_src_prepare } src_configure() { # FIXME no doc useflag?? - gnome-meson_src_configure \ - -Denable-desktop=true \ - -Denable-profiling=false \ - -Dtracker=$(usex tracker auto disabled) \ - $(meson_use doc enable-gtk-doc) \ - $(meson_use exif enable-exif) \ - $(meson_use packagekit enable-packagekit) \ - $(meson_use sendto nst-extension) \ - $(meson_use selinux enable-selinux) \ + local emesonargs=( + "-Denable-desktop=true" + "-Denable-profiling=false" + "-Dtracker=$(usex tracker auto disabled)" + $(meson_use doc enable-gtk-doc) + $(meson_use exif enable-exif) + $(meson_use packagekit enable-packagekit) + $(meson_use sendto enable-nst-extension) + $(meson_use selinux enable-selinux) $(meson_use xmp enable-xmp) + ) + meson_src_configure } src_test() { @@ -93,11 +95,13 @@ src_test() { src_install() { use previewer && readme.gentoo_create_doc - gnome-meson_src_install + meson_src_install } pkg_postinst() { - gnome-meson_pkg_postinst + xdg_pkg_postinst + gnome2_icon_cache_update + gnome2_schemas_update if use previewer; then readme.gentoo_print_elog @@ -105,3 +109,9 @@ pkg_postinst() { elog "To preview media files, emerge nautilus with USE=previewer" fi } + +pkg_postrm() { + gnome2_icon_cache_update + xdg_pkg_postrm + gnome2_schemas_update +}
[gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/, gnome-base/nautilus/files/
commit: 0e652f17d2f812c33487a1ed0cdf44a338705645 Author: Sobhan Mohammadpour gentoo org> AuthorDate: Sun Sep 16 15:25:13 2018 + Commit: Sobhan Mohammadpour gentoo org> CommitDate: Sun Sep 16 15:25:13 2018 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=0e652f17 gnome-base/nautilus: version bump to 3.26.4 and minor fixes add the doc flag back, rename the patch Package-Manager: Portage-2.3.44, Repoman-2.3.10 Manifest-Sign-Key: 0x7DF238CF0AA182E1 ...support-optional.patch => 3.26.4-tracker-support-optional.patch} | 0 .../nautilus/{nautilus-3.26.3.1.ebuild => nautilus-3.26.4.ebuild} | 6 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gnome-base/nautilus/files/3.26.3.1-tracker-support-optional.patch b/gnome-base/nautilus/files/3.26.4-tracker-support-optional.patch similarity index 100% rename from gnome-base/nautilus/files/3.26.3.1-tracker-support-optional.patch rename to gnome-base/nautilus/files/3.26.4-tracker-support-optional.patch diff --git a/gnome-base/nautilus/nautilus-3.26.3.1.ebuild b/gnome-base/nautilus/nautilus-3.26.4.ebuild similarity index 94% rename from gnome-base/nautilus/nautilus-3.26.3.1.ebuild rename to gnome-base/nautilus/nautilus-3.26.4.ebuild index f7b2ad76..de179978 100644 --- a/gnome-base/nautilus/nautilus-3.26.3.1.ebuild +++ b/gnome-base/nautilus/nautilus-3.26.4.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"; LICENSE="GPL-2+ LGPL-2+ FDL-1.1" SLOT="0" -IUSE="exif gnome +introspection packagekit +previewer selinux sendto tracker xmp" +IUSE="doc exif gnome +introspection packagekit +previewer selinux sendto tracker xmp" KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" @@ -44,6 +44,8 @@ DEPEND="${COMMON_DEPEND} >=sys-devel/gettext-0.19.7 virtual/pkgconfig x11-base/xorg-proto + + doc? ( dev-util/gtk-doc ) " RDEPEND="${COMMON_DEPEND} gnome-base/dconf @@ -75,9 +77,9 @@ src_configure() { # FIXME no doc useflag?? gnome-meson_src_configure \ -Denable-desktop=true \ - -Denable-gtk-doc=false \ -Denable-profiling=false \ -Dtracker=$(usex tracker auto disabled) \ + $(meson_use doc enable-gtk-doc) \ $(meson_use exif enable-exif) \ $(meson_use packagekit enable-packagekit) \ $(meson_use sendto nst-extension) \
[gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/
commit: df3e0805801a324f532853d892717451dc81f1d3 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Mon Sep 10 14:49:48 2018 + Commit: Gilles Dartiguelongue gentoo org> CommitDate: Mon Sep 10 14:53:50 2018 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=df3e0805 gnome-base/nautilus: update gvfs dependency gtk USE flag is removed in 1.34. Package-Manager: Portage-2.3.49, Repoman-2.3.10 Manifest-Sign-Key: 0x5A56C8CD0C13248A gnome-base/nautilus/nautilus-3.26.3.1.ebuild | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnome-base/nautilus/nautilus-3.26.3.1.ebuild b/gnome-base/nautilus/nautilus-3.26.3.1.ebuild index 73c00b20..f2eb379d 100644 --- a/gnome-base/nautilus/nautilus-3.26.3.1.ebuild +++ b/gnome-base/nautilus/nautilus-3.26.3.1.ebuild @@ -54,9 +54,8 @@ 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] + >=gnome-base/gvfs-1.34 " -# Need gvfs[gtk] for recent:/// support PATCHES=( # Keep tracker optional
[gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/files/, gnome-base/nautilus/
commit: 22215e85317f85cd469433b6e5a017d420247f33 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sun May 27 12:44:47 2018 + Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sun May 27 12:56:34 2018 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=22215e85 gnome-base/nautilus: 3.26.2 → 3.26.3.1 Cleanup unused dependencies. Package-Manager: Portage-2.3.40, Repoman-2.3.9 Manifest-Sign-Key: 0x5A56C8CD0C13248A ...tch => 3.26.3.1-tracker-support-optional.patch} | 32 ++ ...ilus-3.26.2.ebuild => nautilus-3.26.3.1.ebuild} | 14 ++ 2 files changed, 18 insertions(+), 28 deletions(-) diff --git a/gnome-base/nautilus/files/3.26.2-tracker-support-optional.patch b/gnome-base/nautilus/files/3.26.3.1-tracker-support-optional.patch similarity index 91% rename from gnome-base/nautilus/files/3.26.2-tracker-support-optional.patch rename to gnome-base/nautilus/files/3.26.3.1-tracker-support-optional.patch index 4363cbbf..61eacc2a 100644 --- a/gnome-base/nautilus/files/3.26.2-tracker-support-optional.patch +++ b/gnome-base/nautilus/files/3.26.3.1-tracker-support-optional.patch @@ -1,4 +1,4 @@ -From 3e3d7621c6f8ec72e626701e3f55afc900a04a68 Mon Sep 17 00:00:00 2001 +From 664c66bd231c5d0ac20f6f4f14be461bfb206a1e Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Sun, 27 May 2018 13:54:38 +0200 Subject: [PATCH] Make tracker support optional @@ -7,12 +7,12 @@ Subject: [PATCH] Make tracker support optional config.h.meson | 1 + meson.build | 15 --- meson_options.txt | 5 + - src/meson.build | 21 + + 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, 55 insertions(+), 11 deletions(-) + 8 files changed, 54 insertions(+), 10 deletions(-) diff --git a/config.h.meson b/config.h.meson index 4f5cb5848..58d71e96f 100644 @@ -27,7 +27,7 @@ index 4f5cb5848..58d71e96f 100644 #mesondefine ENABLE_PACKAGEKIT #mesondefine LOCALEDIR diff --git a/meson.build b/meson.build -index 7b8f15cf5..b2f2ef438 100644 +index 6256193cc..776111f81 100644 --- a/meson.build +++ b/meson.build @@ -81,9 +81,18 @@ if get_option ('enable-selinux') @@ -36,7 +36,7 @@ index 7b8f15cf5..b2f2ef438 100644 -tracker_sparql = dependency ('tracker-sparql-2.0', required: false) -if not tracker_sparql.found() -- tracker_sparql = dependency ('tracker-sparql-1.0') +-tracker_sparql = dependency ('tracker-sparql-1.0') +tracker_api = get_option ('tracker') +if tracker_api == 'disabled' +# pass @@ -69,7 +69,7 @@ index c934dd8b1..d2ba885a2 100644 type: 'boolean', value: false, diff --git a/src/meson.build b/src/meson.build -index 9f01f5ba2..c55f39c7d 100644 +index cc08345d8..40f337cde 100644 --- a/src/meson.build +++ b/src/meson.build @@ -254,12 +254,6 @@ libnautilus_sources = [ @@ -85,17 +85,15 @@ index 9f01f5ba2..c55f39c7d 100644 ] nautilus_deps = [glib, -@@ -273,8 +267,7 @@ nautilus_deps = [glib, - eel_2, +@@ -274,7 +268,6 @@ nautilus_deps = [glib, nautilus_extension, x11, -- gmodule_no_export, -- tracker_sparql] -+ gmodule_no_export] + gmodule_no_export, +- tracker_sparql, + gio_unix] if get_option ('enable-exif') - nautilus_deps += exif -@@ -288,6 +281,18 @@ if get_option ('enable-xmp') +@@ -289,6 +282,18 @@ if get_option ('enable-xmp') nautilus_deps += exempi endif @@ -146,7 +144,7 @@ index e833d0578..d6e407ca5 100644 /* 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 536f83541..247334d5d 100644 +index d6ac35a44..752adc295 100644 --- a/src/nautilus-file.c +++ b/src/nautilus-file.c @@ -2392,6 +2392,7 @@ real_batch_rename (GList *files, @@ -166,7 +164,7 @@ index 536f83541..247334d5d 100644 if (op->skipped_files == g_list_length (files)) { diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c -index a79ecf20d..3b7bd4166 100644 +index 8784f63f8..af5605d68 100644 --- a/src/nautilus-files-view.c +++ b/src/nautilus-files-view.c @@ -28,8 +28,10 @@ @@ -180,7 +178,7 @@ index a79ecf20d..3b7bd4166 100644 #include "nautilus-error-reporting.h" #include "nautilus-file-undo-manager.h" #include "nautilus-floating-bar.h" -@@ -6209,6 +6211,7 @@ real_action_rename (NautilusFilesView *view) +@@ -6266,6 +6268,7 @@ real_action_rename (NautilusFilesView *view) { invoke_external_bulk_rename_utility (view, selection)
[gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/files/, gnome-base/nautilus/
commit: b97b01ed40764ab5782ced32aac956d881a3cb54 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sun May 27 12:44:47 2018 + Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sun May 27 12:47:01 2018 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=b97b01ed gnome-base/nautilus: 3.26.2 → 3.26.3.1 Package-Manager: Portage-2.3.40, Repoman-2.3.9 Manifest-Sign-Key: 0x5A56C8CD0C13248A ...tch => 3.26.3.1-tracker-support-optional.patch} | 32 ++ ...ilus-3.26.2.ebuild => nautilus-3.26.3.1.ebuild} | 0 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/gnome-base/nautilus/files/3.26.2-tracker-support-optional.patch b/gnome-base/nautilus/files/3.26.3.1-tracker-support-optional.patch similarity index 91% rename from gnome-base/nautilus/files/3.26.2-tracker-support-optional.patch rename to gnome-base/nautilus/files/3.26.3.1-tracker-support-optional.patch index 4363cbbf..61eacc2a 100644 --- a/gnome-base/nautilus/files/3.26.2-tracker-support-optional.patch +++ b/gnome-base/nautilus/files/3.26.3.1-tracker-support-optional.patch @@ -1,4 +1,4 @@ -From 3e3d7621c6f8ec72e626701e3f55afc900a04a68 Mon Sep 17 00:00:00 2001 +From 664c66bd231c5d0ac20f6f4f14be461bfb206a1e Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Sun, 27 May 2018 13:54:38 +0200 Subject: [PATCH] Make tracker support optional @@ -7,12 +7,12 @@ Subject: [PATCH] Make tracker support optional config.h.meson | 1 + meson.build | 15 --- meson_options.txt | 5 + - src/meson.build | 21 + + 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, 55 insertions(+), 11 deletions(-) + 8 files changed, 54 insertions(+), 10 deletions(-) diff --git a/config.h.meson b/config.h.meson index 4f5cb5848..58d71e96f 100644 @@ -27,7 +27,7 @@ index 4f5cb5848..58d71e96f 100644 #mesondefine ENABLE_PACKAGEKIT #mesondefine LOCALEDIR diff --git a/meson.build b/meson.build -index 7b8f15cf5..b2f2ef438 100644 +index 6256193cc..776111f81 100644 --- a/meson.build +++ b/meson.build @@ -81,9 +81,18 @@ if get_option ('enable-selinux') @@ -36,7 +36,7 @@ index 7b8f15cf5..b2f2ef438 100644 -tracker_sparql = dependency ('tracker-sparql-2.0', required: false) -if not tracker_sparql.found() -- tracker_sparql = dependency ('tracker-sparql-1.0') +-tracker_sparql = dependency ('tracker-sparql-1.0') +tracker_api = get_option ('tracker') +if tracker_api == 'disabled' +# pass @@ -69,7 +69,7 @@ index c934dd8b1..d2ba885a2 100644 type: 'boolean', value: false, diff --git a/src/meson.build b/src/meson.build -index 9f01f5ba2..c55f39c7d 100644 +index cc08345d8..40f337cde 100644 --- a/src/meson.build +++ b/src/meson.build @@ -254,12 +254,6 @@ libnautilus_sources = [ @@ -85,17 +85,15 @@ index 9f01f5ba2..c55f39c7d 100644 ] nautilus_deps = [glib, -@@ -273,8 +267,7 @@ nautilus_deps = [glib, - eel_2, +@@ -274,7 +268,6 @@ nautilus_deps = [glib, nautilus_extension, x11, -- gmodule_no_export, -- tracker_sparql] -+ gmodule_no_export] + gmodule_no_export, +- tracker_sparql, + gio_unix] if get_option ('enable-exif') - nautilus_deps += exif -@@ -288,6 +281,18 @@ if get_option ('enable-xmp') +@@ -289,6 +282,18 @@ if get_option ('enable-xmp') nautilus_deps += exempi endif @@ -146,7 +144,7 @@ index e833d0578..d6e407ca5 100644 /* 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 536f83541..247334d5d 100644 +index d6ac35a44..752adc295 100644 --- a/src/nautilus-file.c +++ b/src/nautilus-file.c @@ -2392,6 +2392,7 @@ real_batch_rename (GList *files, @@ -166,7 +164,7 @@ index 536f83541..247334d5d 100644 if (op->skipped_files == g_list_length (files)) { diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c -index a79ecf20d..3b7bd4166 100644 +index 8784f63f8..af5605d68 100644 --- a/src/nautilus-files-view.c +++ b/src/nautilus-files-view.c @@ -28,8 +28,10 @@ @@ -180,7 +178,7 @@ index a79ecf20d..3b7bd4166 100644 #include "nautilus-error-reporting.h" #include "nautilus-file-undo-manager.h" #include "nautilus-floating-bar.h" -@@ -6209,6 +6211,7 @@ real_action_rename (NautilusFilesView *view) +@@ -6266,6 +6268,7 @@ real_action_rename (NautilusFilesView *view) { invoke_external_bulk_rename_utility (view, selection); } @@ -188,7 +186,7 @@ ind
[gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/
commit: 05e1f76c44ed16de71ecd0ecc884a4816de53a26 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sun May 27 12:50:00 2018 + Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sun May 27 12:51:11 2018 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=05e1f76c gnome-base/nautilus: cleanup unused dependencies And fix slot dependency for tracker. Package-Manager: Portage-2.3.40, Repoman-2.3.9 Manifest-Sign-Key: 0x5A56C8CD0C13248A gnome-base/nautilus/nautilus-3.26.3.1.ebuild | 8 ++-- 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/gnome-base/nautilus/nautilus-3.26.3.1.ebuild b/gnome-base/nautilus/nautilus-3.26.3.1.ebuild index ac07418d..1b434bc8 100644 --- a/gnome-base/nautilus/nautilus-3.26.3.1.ebuild +++ b/gnome-base/nautilus/nautilus-3.26.3.1.ebuild @@ -30,27 +30,23 @@ COMMON_DEPEND=" >=dev-libs/libxml2-2.7.8:2 >=gnome-base/gnome-desktop-3:3= - gnome-base/dconf >=gnome-base/gsettings-desktop-schemas-3.8.0 x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrender exif? ( >=media-libs/libexif-0.6.20 ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) selinux? ( >=sys-libs/libselinux-2 ) - tracker? ( >=app-misc/tracker-1:= ) + tracker? ( >=app-misc/tracker-1:0/100= ) xmp? ( >=media-libs/exempi-2.1.0:2 ) " DEPEND="${COMMON_DEPEND} - >=dev-lang/perl-5 >=dev-util/gdbus-codegen-2.33 - >=dev-util/gtk-doc-1.10 >=sys-devel/gettext-0.19.7 virtual/pkgconfig x11-base/xorg-proto " RDEPEND="${COMMON_DEPEND} + gnome-base/dconf packagekit? ( app-admin/packagekit-base ) sendto? ( !
[gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/files/, gnome-base/nautilus/
commit: b5b579892433c8fafd8b528a63b5fd74592ab2fc Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sun May 27 12:39:16 2018 + Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sun May 27 12:47:01 2018 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=b5b57989 gnome-base/nautilus: restore optional tracker support Disable gtk-doc building as it seems broken. Package-Manager: Portage-2.3.40, Repoman-2.3.9 Manifest-Sign-Key: 0x5A56C8CD0C13248A .../files/3.26.2-tracker-support-optional.patch| 273 + gnome-base/nautilus/nautilus-3.26.2.ebuild | 18 +- 2 files changed, 284 insertions(+), 7 deletions(-) diff --git a/gnome-base/nautilus/files/3.26.2-tracker-support-optional.patch b/gnome-base/nautilus/files/3.26.2-tracker-support-optional.patch new file mode 100644 index ..4363cbbf --- /dev/null +++ b/gnome-base/nautilus/files/3.26.2-tracker-support-optional.patch @@ -0,0 +1,273 @@ +From 3e3d7621c6f8ec72e626701e3f55afc900a04a68 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue +Date: Sun, 27 May 2018 13:54:38 +0200 +Subject: [PATCH] Make tracker support optional + +--- + config.h.meson | 1 + + meson.build | 15 --- + meson_options.txt | 5 + + src/meson.build | 21 + + 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, 55 insertions(+), 11 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 7b8f15cf5..b2f2ef438 100644 +--- a/meson.build b/meson.build +@@ -81,9 +81,18 @@ 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') ++tracker_api = get_option ('tracker') ++if tracker_api == 'disabled' ++# pass ++elif tracker_api == 'auto' ++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) ++else ++tracker_sparql = dependency ('tracker-sparql-@0@'.format(tracker_api)) ++conf.set10 ('HAVE_TRACKER', true) + endif + + if get_option ('enable-xmp') +diff --git a/meson_options.txt b/meson_options.txt +index c934dd8b1..d2ba885a2 100644 +--- a/meson_options.txt b/meson_options.txt +@@ -8,6 +8,11 @@ option ('enable-exif', + type: 'boolean', + value: false, + description: 'enable EXIF support') ++option ('tracker', ++type: 'combo', ++choices: ['auto', '1.0', '2.0', 'disabled'], ++value: 'auto', ++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 9f01f5ba2..c55f39c7d 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, +@@ -273,8 +267,7 @@ nautilus_deps = [glib, + eel_2, + nautilus_extension, + x11, +- gmodule_no_export, +- tracker_sparql] ++ gmodule_no_export] + + if get_option ('enable-exif') + nautilus_deps += exif +@@ -288,6 +281,18 @@ if get_option ('enable-xmp') + nautilus_deps += exempi + endif + ++if get_option ('tracker') != 'disabled' ++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/sr
[gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/
commit: 232523fbe74db867a66c120ebfad233f44ad8dfc Author: Sobhan Mohammadpour gentoo org> AuthorDate: Tue Jan 2 14:21:45 2018 + Commit: Sobhan Mohammadpour gentoo org> CommitDate: Tue Jan 2 14:21:45 2018 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=232523fb gnome-base/nautilus: build docs Package-Manager: Portage-2.3.19, Repoman-2.3.6 Manifest-Sign-Key: 0x7DF238CF0AA182E1 gnome-base/nautilus/nautilus-3.26.2.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnome-base/nautilus/nautilus-3.26.2.ebuild b/gnome-base/nautilus/nautilus-3.26.2.ebuild index 963df5a2..7e62ef46 100644 --- a/gnome-base/nautilus/nautilus-3.26.2.ebuild +++ b/gnome-base/nautilus/nautilus-3.26.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -47,7 +47,7 @@ COMMON_DEPEND=" DEPEND="${COMMON_DEPEND} >=dev-lang/perl-5 >=dev-util/gdbus-codegen-2.33 - >=dev-util/gtk-doc-am-1.10 + >=dev-util/gtk-doc-1.10 >=sys-devel/gettext-0.19.7 virtual/pkgconfig x11-proto/xproto @@ -82,7 +82,7 @@ src_configure() { # FIXME no doc useflag?? gnome-meson_src_configure \ -Denable-desktop=true \ - -Denable-gtk-doc=false \ + -Denable-gtk-doc=true \ -Denable-profiling=false \ $(meson_use exif enable-exif) \ $(meson_use packagekit enable-packagekit) \
[gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/
commit: 4772c10d2ea559668438ce48f902b9bfb28aa334 Author: Sobhan Mohammadpour gentoo org> AuthorDate: Sun Dec 31 20:26:23 2017 + Commit: Sobhan Mohammadpour gentoo org> CommitDate: Sun Dec 31 20:26:23 2017 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=4772c10d gnome-base/nautilus: fix useflags and start using meson_use Package-Manager: Portage-2.3.19, Repoman-2.3.6 Manifest-Sign-Key: 0x7DF238CF0AA182E1 gnome-base/nautilus/nautilus-3.26.2.ebuild | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnome-base/nautilus/nautilus-3.26.2.ebuild b/gnome-base/nautilus/nautilus-3.26.2.ebuild index ed1b5f47..963df5a2 100644 --- a/gnome-base/nautilus/nautilus-3.26.2.ebuild +++ b/gnome-base/nautilus/nautilus-3.26.2.ebuild @@ -82,13 +82,13 @@ src_configure() { # FIXME no doc useflag?? gnome-meson_src_configure \ -Denable-desktop=true \ - -Denable-gtk-doc=true \ - $(gnome-meson_use exif libexif) \ - $(gnome-meson_use introspection) \ - $(gnome-meson_use packagekit) \ - $(gnome-meson_use sendto nst-extension) \ - $(gnome-meson_use selinux) \ - $(gnome-meson_use xmp) + -Denable-gtk-doc=false \ + -Denable-profiling=false \ + $(meson_use exif enable-exif) \ + $(meson_use packagekit enable-packagekit) \ + $(meson_use sendto nst-extension) \ + $(meson_use selinux enable-selinux) \ + $(meson_use xmp enable-xmp) } src_test() {
[gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/
commit: f2974eaff6a05554f0b666f777c643cfbae1bfb0 Author: Sobhan Mohammadpour gentoo org> AuthorDate: Mon Dec 11 14:24:47 2017 + Commit: Sobhan Mohammadpour gentoo org> CommitDate: Mon Dec 11 14:24:47 2017 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=f2974eaf gnome-base/nautilus: Bump to 3.26.2 Bump to 3.26.2 and use meson Package-Manager: Portage-2.3.17, Repoman-2.3.6 Manifest-Sign-Key: 0x7DF238CF0AA182E1 gnome-base/nautilus/nautilus-3.26.2.ebuild | 111 + 1 file changed, 111 insertions(+) diff --git a/gnome-base/nautilus/nautilus-3.26.2.ebuild b/gnome-base/nautilus/nautilus-3.26.2.ebuild new file mode 100644 index ..ed1b5f47 --- /dev/null +++ b/gnome-base/nautilus/nautilus-3.26.2.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" # Needed with USE 'sendto' + +inherit gnome-meson readme.gentoo-r1 virtualx + +DESCRIPTION="A file manager for the GNOME desktop" +HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"; + +#FIXME: shoudln't this be GPL-3+? +LICENSE="GPL-2+ LGPL-2+ FDL-1.1" +SLOT="0" +#FIXME: tracker is needed +IUSE="exif gnome +introspection packagekit +previewer selinux sendto xmp" + +KEYWORDS="~amd64" + +# FIXME: tests fails under Xvfb, but pass when building manually +# "FAIL: check failed in nautilus-file.c, line 8307" +# need org.gnome.SessionManager service (aka gnome-session) but cannot find it +RESTRICT="test" + +# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92 +# and 2.30.0 +COMMON_DEPEND=" + >=app-arch/gnome-autoar-0.2.1 + >=dev-libs/glib-2.51.2:2[dbus] + >=x11-libs/pango-1.28.3 + >=x11-libs/gtk+-3.22.6: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 + + >=app-misc/tracker-1:= + exif? ( >=media-libs/libexif-0.6.20 ) + introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) + selinux? ( >=sys-libs/libselinux-2 ) + xmp? ( >=media-libs/exempi-2.1.0:2 ) +" +DEPEND="${COMMON_DEPEND} + >=dev-lang/perl-5 + >=dev-util/gdbus-codegen-2.33 + >=dev-util/gtk-doc-am-1.10 + >=sys-devel/gettext-0.19.7 + virtual/pkgconfig + x11-proto/xproto +" +RDEPEND="${COMMON_DEPEND} + packagekit? ( app-admin/packagekit-base ) + sendto? ( !
[gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/
commit: e8ea8e6e9e6f6392977095e30f0a7414df7984f9 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Fri Aug 11 06:37:21 2017 + Commit: Gilles Dartiguelongue gentoo org> CommitDate: Fri Aug 11 06:37:21 2017 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=e8ea8e6e gnome-base/nautilus: sync with gentoo repository Package-Manager: Portage-2.3.6, Repoman-2.3.3 Manifest-Sign-Key: 0x5A56C8CD0C13248A gnome-base/nautilus/metadata.xml | 1 + gnome-base/nautilus/nautilus-3.20.0.ebuild | 121 - gnome-base/nautilus/nautilus-.ebuild | 39 -- 3 files changed, 15 insertions(+), 146 deletions(-) diff --git a/gnome-base/nautilus/metadata.xml b/gnome-base/nautilus/metadata.xml index 4e3c7a33..71760b9a 100644 --- a/gnome-base/nautilus/metadata.xml +++ b/gnome-base/nautilus/metadata.xml @@ -13,5 +13,6 @@ Enable the nautilus-sendto extension to send files to various locations/devices Add support for app-misc/tracker search + Add support for app-misc/tracker search and batch rename diff --git a/gnome-base/nautilus/nautilus-3.20.0.ebuild b/gnome-base/nautilus/nautilus-3.20.0.ebuild deleted file mode 100644 index c70dc4f1.. --- a/gnome-base/nautilus/nautilus-3.20.0.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" # Needed with USE 'sendto' - -inherit gnome2 readme.gentoo virtualx - -DESCRIPTION="A file manager for the GNOME desktop" -HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"; - -LICENSE="GPL-2+ LGPL-2+ FDL-1.1" -SLOT="0" - -IUSE="exif gnome +introspection packagekit +previewer selinux sendto tracker xmp" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux" - -# FIXME: tests fails under Xvfb, but pass when building manually -# "FAIL: check failed in nautilus-file.c, line 8307" -# need org.gnome.SessionManager service (aka gnome-session) but cannot find it -RESTRICT="test" - -# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92 -# and 2.30.0 -COMMON_DEPEND=" - >=dev-libs/glib-2.45.7:2[dbus] - >=x11-libs/pango-1.28.3 - >=x11-libs/gtk+-3.19.12:3[introspection?] - >=dev-libs/libxml2-2.7.8:2 - >=gnome-base/gnome-desktop-3:3= - - gnome-base/dconf - >=gnome-base/gsettings-desktop-schemas-3.8.0 - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrender - - exif? ( >=media-libs/libexif-0.6.20 ) - introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) - selinux? ( >=sys-libs/libselinux-2 ) - tracker? ( >=app-misc/tracker-0.16:= ) - xmp? ( >=media-libs/exempi-2.1.0 ) -" -DEPEND="${COMMON_DEPEND} - >=dev-lang/perl-5 - >=dev-util/gdbus-codegen-2.33 - >=dev-util/gtk-doc-am-1.10 - >=dev-util/intltool-0.50 - sys-devel/gettext - virtual/pkgconfig - x11-proto/xproto -" -RDEPEND="${COMMON_DEPEND} - packagekit? ( app-admin/packagekit-base ) - sendto? ( !https://wiki.gnome.org/Apps/Nautilus"; LICENSE="GPL-2+ LGPL-2+ FDL-1.1" SLOT="0" - -# profiling? IUSE="exif gnome +introspection packagekit +previewer selinux sendto tracker xmp" + if [[ ${PV} = ]]; then IUSE="${IUSE} doc" KEYWORDS="" else - KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux" + KEYWORDS="~amd64 ~arm64 ~ia64 ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" fi # FIXME: tests fails under Xvfb, but pass when building manually # "FAIL: check failed in nautilus-file.c, line 8307" +# need org.gnome.SessionManager service (aka gnome-session) but cannot find it RESTRICT="test" -# 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] + >=app-arch/gnome-autoar-0.1 + >=dev-libs/glib-2.49.1:2[dbus] >=x11-libs/pango-1.28.3 - >=x11-libs/gtk+-3.19.12:3[introspection?] + >=x11-libs/gtk+-3.21.6:3[introspection?] >=dev-libs/libxml2-2.7.8:2 >=gnome-base/gnome-desktop-3:3= @@ -50,14 +48,13 @@ COMMON_DEPEND=" introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) selinux? ( >=sys-libs/libselinux-2 ) tracker? ( >=app-misc/tracker-0.16:= ) - xmp? ( >=media-libs/exempi-2.1.0 ) + xmp? ( >=media-libs/exempi-2.1.0:2 ) " DEPEND="${COMMON_DEPEND} >=dev-lang/perl-5 >=dev-util/gdbus-codegen-2.33 >=dev-util/gtk-doc-am-1.10 - >=dev-util/intltool-0.50 - sys-devel/gettext + >=sys-devel/gettext-0.19.7 virtual/pkgconfig x11-proto/xproto " @@ -71,9 +68,7 @@ RDEPEN
[gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/
commit: 2769fa9d1cf9076073f48905bb1c9a56ec712a14 Author: Ole Reifschneider gentoo org> AuthorDate: Sun Mar 20 22:10:37 2016 + Commit: Ole Reifschneider gentoo org> CommitDate: Fri Mar 25 00:55:46 2016 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=2769fa9d gnome-base/nautilus: Bump version to 3.20.0 Package-Manager: portage-2.2.28 Manifest-Sign-Key: 0xE9E568677E8B4D42 ...nautilus-3.18.1.ebuild => nautilus-3.20.0.ebuild} | 20 +--- gnome-base/nautilus/nautilus-.ebuild | 17 - 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/gnome-base/nautilus/nautilus-3.18.1.ebuild b/gnome-base/nautilus/nautilus-3.20.0.ebuild similarity index 86% rename from gnome-base/nautilus/nautilus-3.18.1.ebuild rename to gnome-base/nautilus/nautilus-3.20.0.ebuild index ca079ba..c70dc4f 100644 --- a/gnome-base/nautilus/nautilus-3.18.1.ebuild +++ b/gnome-base/nautilus/nautilus-3.20.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -6,7 +6,7 @@ EAPI="5" GCONF_DEBUG="no" GNOME2_LA_PUNT="yes" # Needed with USE 'sendto' -inherit eutils gnome2 readme.gentoo virtualx +inherit gnome2 readme.gentoo virtualx DESCRIPTION="A file manager for the GNOME desktop" HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"; @@ -14,21 +14,20 @@ 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" +IUSE="exif gnome +introspection packagekit +previewer selinux sendto tracker xmp" KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux" # FIXME: tests fails under Xvfb, but pass when building manually # "FAIL: check failed in nautilus-file.c, line 8307" +# need org.gnome.SessionManager service (aka gnome-session) but cannot find it RESTRICT="test" -# 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?] + >=x11-libs/gtk+-3.19.12:3[introspection?] >=dev-libs/libxml2-2.7.8:2 >=gnome-base/gnome-desktop-3:3= @@ -39,7 +38,8 @@ COMMON_DEPEND=" x11-libs/libXrender exif? ( >=media-libs/libexif-0.6.20 ) - introspection? ( >=dev-libs/gobject-introspection-0.6.4 ) + introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) + selinux? ( >=sys-libs/libselinux-2 ) tracker? ( >=app-misc/tracker-0.16:= ) xmp? ( >=media-libs/exempi-2.1.0 ) " @@ -47,7 +47,7 @@ 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 + >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig x11-proto/xproto @@ -95,16 +95,14 @@ src_configure() { $(use_enable introspection) \ $(use_enable packagekit) \ $(use_enable sendto nst-extension) \ + $(use_enable selinux) \ $(use_enable tracker) \ $(use_enable xmp) } src_test() { gnome2_environment_reset - unset DBUS_SESSION_BUS_ADDRESS - export GSETTINGS_BACKEND="memory" Xemake check - unset GSETTINGS_BACKEND } src_install() { diff --git a/gnome-base/nautilus/nautilus-.ebuild b/gnome-base/nautilus/nautilus-.ebuild index 71e45dc..9e8e345 100644 --- a/gnome-base/nautilus/nautilus-.ebuild +++ b/gnome-base/nautilus/nautilus-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -6,7 +6,7 @@ EAPI="5" GCONF_DEBUG="no" GNOME2_LA_PUNT="yes" # Needed with USE 'sendto' -inherit eutils gnome2 readme.gentoo virtualx +inherit gnome2 readme.gentoo virtualx if [[ ${PV} = ]]; then inherit gnome2-live fi @@ -18,7 +18,7 @@ LICENSE="GPL-2+ LGPL-2+ FDL-1.1" SLOT="0" # profiling? -IUSE="debug exif gnome +introspection packagekit +previewer sendto tracker xmp" +IUSE="exif gnome +introspection packagekit +previewer selinux sendto tracker xmp" if [[ ${PV} = ]]; then IUSE="${IUSE} doc" KEYWORDS="" @@ -36,7 +36,7 @@ RESTRICT="test" COMMON_DEPEND=" >=dev-libs/glib-2.45.7:2[dbus] >=x11-libs/pango-1.28.3 - >=x11-libs/gtk+-3.17.5:3[introspection?] + >=x11-libs/gtk+-3.19.12:3[introspection?] >=dev-libs/libxml2-2.7.8:2 >=gnome-base/gnome-desktop-3:3= @@ -47,7 +47,8 @@ COMMON_DEPEND=" x11-libs/libXrender exif? ( >=media-libs/libex
[gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/
commit: 95cf2c7b86c25b4bd129b1b4881936df4cd66b43 Author: Ole Reifschneider gentoo org> AuthorDate: Thu Oct 15 22:07:18 2015 + Commit: Ole Reifschneider gentoo org> CommitDate: Thu Oct 15 22:07:18 2015 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=95cf2c7b gnome-base/nautilus: Bump version to 3.18.1 Package-Manager: portage-2.2.23 Manifest-Sign-Key: 0xE9E568677E8B4D42 gnome-base/nautilus/{nautilus-3.18.0.ebuild => nautilus-3.18.1.ebuild} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gnome-base/nautilus/nautilus-3.18.0.ebuild b/gnome-base/nautilus/nautilus-3.18.1.ebuild similarity index 100% rename from gnome-base/nautilus/nautilus-3.18.0.ebuild rename to gnome-base/nautilus/nautilus-3.18.1.ebuild
[gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/
commit: 7fd2cd077b0a48a2a2d67e83cebdf138a77ff61d Author: Ole Reifschneider gentoo org> AuthorDate: Sun Oct 4 11:05:19 2015 + Commit: Ole Reifschneider gentoo org> CommitDate: Sun Oct 11 20:46:13 2015 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=7fd2cd07 gnome-base/nautilus: Bump version to 3.18.0 Package-Manager: portage-2.2.22 Manifest-Sign-Key: 7E8B4D42 ...nautilus-.ebuild => nautilus-3.18.0.ebuild} | 23 +- gnome-base/nautilus/nautilus-.ebuild | 6 +++--- 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/gnome-base/nautilus/nautilus-.ebuild b/gnome-base/nautilus/nautilus-3.18.0.ebuild similarity index 84% copy from gnome-base/nautilus/nautilus-.ebuild copy to gnome-base/nautilus/nautilus-3.18.0.ebuild index 6b9ea11..ca079ba 100644 --- a/gnome-base/nautilus/nautilus-.ebuild +++ b/gnome-base/nautilus/nautilus-3.18.0.ebuild @@ -7,9 +7,6 @@ GCONF_DEBUG="no" GNOME2_LA_PUNT="yes" # Needed with USE 'sendto' inherit eutils gnome2 readme.gentoo virtualx -if [[ ${PV} = ]]; then - inherit gnome2-live -fi DESCRIPTION="A file manager for the GNOME desktop" HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"; @@ -18,13 +15,8 @@ LICENSE="GPL-2+ LGPL-2+ FDL-1.1" SLOT="0" # profiling? -IUSE="debug exif gnome +introspection packagekit +previewer sendto tracker xmp" -if [[ ${PV} = ]]; then - IUSE="${IUSE} doc" - KEYWORDS="" -else - KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux" -fi +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" @@ -34,9 +26,9 @@ RESTRICT="test" # Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92 # and 2.30.0 COMMON_DEPEND=" - >=dev-libs/glib-2.43.4:2[dbus] + >=dev-libs/glib-2.45.7:2[dbus] >=x11-libs/pango-1.28.3 - >=x11-libs/gtk+-3.15.2:3[introspection?] + >=x11-libs/gtk+-3.17.5:3[introspection?] >=dev-libs/libxml2-2.7.8:2 >=gnome-base/gnome-desktop-3:3= @@ -54,7 +46,7 @@ COMMON_DEPEND=" DEPEND="${COMMON_DEPEND} >=dev-lang/perl-5 >=dev-util/gdbus-codegen-2.33 - >=dev-util/gtk-doc-am-1.4 + >=dev-util/gtk-doc-am-1.10 >=dev-util/intltool-0.40.1 sys-devel/gettext virtual/pkgconfig @@ -80,11 +72,6 @@ PDEPEND=" " # Need gvfs[gtk] for recent:/// support -if [[ ${PV} = ]]; then - DEPEND="${DEPEND} - doc? ( >=dev-util/gtk-doc-1.4 )" -fi - src_prepare() { if use previewer; then DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files. diff --git a/gnome-base/nautilus/nautilus-.ebuild b/gnome-base/nautilus/nautilus-.ebuild index 6b9ea11..71e45dc 100644 --- a/gnome-base/nautilus/nautilus-.ebuild +++ b/gnome-base/nautilus/nautilus-.ebuild @@ -34,9 +34,9 @@ RESTRICT="test" # Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92 # and 2.30.0 COMMON_DEPEND=" - >=dev-libs/glib-2.43.4:2[dbus] + >=dev-libs/glib-2.45.7:2[dbus] >=x11-libs/pango-1.28.3 - >=x11-libs/gtk+-3.15.2:3[introspection?] + >=x11-libs/gtk+-3.17.5:3[introspection?] >=dev-libs/libxml2-2.7.8:2 >=gnome-base/gnome-desktop-3:3= @@ -54,7 +54,7 @@ COMMON_DEPEND=" DEPEND="${COMMON_DEPEND} >=dev-lang/perl-5 >=dev-util/gdbus-codegen-2.33 - >=dev-util/gtk-doc-am-1.4 + >=dev-util/gtk-doc-am-1.10 >=dev-util/intltool-0.40.1 sys-devel/gettext virtual/pkgconfig
[gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/
commit: 0ba4cd3ff6177b61f4e4fa7e2b76a970aaa72444 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Thu May 14 10:56:13 2015 + Commit: Gilles Dartiguelongue gentoo org> CommitDate: Thu May 14 10:56:13 2015 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=0ba4cd3f gnome-base/nautilus: 3.16.1 → 3.16.2 gnome-base/nautilus/{nautilus-3.16.1.ebuild => nautilus-3.16.2.ebuild} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gnome-base/nautilus/nautilus-3.16.1.ebuild b/gnome-base/nautilus/nautilus-3.16.2.ebuild similarity index 100% rename from gnome-base/nautilus/nautilus-3.16.1.ebuild rename to gnome-base/nautilus/nautilus-3.16.2.ebuild
[gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/, gnome-base/nautilus/files/
commit: f996b4645d051c362a20815f223f625be97c86ff Author: Ole Reifschneider gentoo org> AuthorDate: Sun Apr 26 14:01:43 2015 + Commit: Ole Reifschneider gentoo org> CommitDate: Sun Apr 26 14:01:43 2015 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=f996b464 Bump nautilus to 3.16.1 Package-Manager: portage-2.2.14 Manifest-Sign-Key: 7E8B4D42 .../nautilus/files/nautilus-3.5.91-delete.patch| 44 -- ...nautilus-.ebuild => nautilus-3.16.1.ebuild} | 32 gnome-base/nautilus/nautilus-.ebuild | 13 ++- 3 files changed, 11 insertions(+), 78 deletions(-) diff --git a/gnome-base/nautilus/files/nautilus-3.5.91-delete.patch b/gnome-base/nautilus/files/nautilus-3.5.91-delete.patch deleted file mode 100644 index 072b34e..000 --- a/gnome-base/nautilus/files/nautilus-3.5.91-delete.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 92af7beb790ad9181e5a6a89ac52f177354536f2 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Thu, 8 Dec 2011 18:39:28 -0500 -Subject: [PATCH] Delete key should delete files - -Make the Delete key delete files like in nautilus-2.x and every other -file manager on the planet. Note: the nautilus-3 Ctrl+Delete shortcut -will also continue to work. - -https://bugzilla.gnome.org/show_bug.cgi?id=647048 -https://bugs.gentoo.org/show_bug.cgi?id=393663 - src/nautilus-view.c | 6 +- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/nautilus-view.c b/src/nautilus-view.c -index f51d916..0a50994 100644 a/src/nautilus-view.c -+++ b/src/nautilus-view.c -@@ -7237,7 +7237,7 @@ static const GtkActionEntry directory_view_entries[] = { - /* tooltip */ NULL, -G_CALLBACK (action_rename_select_all_callback) }, - /* name, stock id */ { NAUTILUS_ACTION_TRASH, NULL, -- /* label, accelerator */ N_("Mo_ve to Trash"), "Delete", -+ /* label, accelerator */ N_("Mo_ve to Trash"), "Delete", - /* tooltip */ N_("Move each selected item to the Trash"), -G_CALLBACK (action_trash_callback) }, - /* name, stock id */ { NAUTILUS_ACTION_DELETE, NULL, -@@ -9895,8 +9895,12 @@ nautilus_view_class_init (NautilusViewClass *klass) - binding_set = gtk_binding_set_by_class (klass); - gtk_binding_entry_add_signal (binding_set, GDK_KEY_Delete, GDK_CONTROL_MASK, - "trash", 0); -+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Delete, 0, -+"trash", 0); - gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, GDK_CONTROL_MASK, - "trash", 0); -+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, 0, -+"trash", 0); - gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, GDK_SHIFT_MASK, - "delete", 0); - } --- -1.7.12 - diff --git a/gnome-base/nautilus/nautilus-.ebuild b/gnome-base/nautilus/nautilus-3.16.1.ebuild similarity index 79% copy from gnome-base/nautilus/nautilus-.ebuild copy to gnome-base/nautilus/nautilus-3.16.1.ebuild index 55bd512..26ceb6d 100644 --- a/gnome-base/nautilus/nautilus-.ebuild +++ b/gnome-base/nautilus/nautilus-3.16.1.ebuild @@ -1,15 +1,12 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-3.14.2-r1.ebuild,v 1.3 2015/03/15 13:23:47 pacho Exp $ EAPI="5" GCONF_DEBUG="no" GNOME2_LA_PUNT="yes" # Needed with USE 'sendto' inherit eutils gnome2 readme.gentoo virtualx -if [[ ${PV} = ]]; then - inherit gnome2-live -fi DESCRIPTION="A file manager for the GNOME desktop" HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"; @@ -18,13 +15,8 @@ LICENSE="GPL-2+ LGPL-2+ FDL-1.1" SLOT="0" # profiling? -IUSE="debug exif gnome +introspection packagekit +previewer sendto tracker xmp" -if [[ ${PV} = ]]; then - IUSE="${IUSE} doc" - KEYWORDS="" -else - KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux" -fi +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" @@ -34,15 +26,14 @@ RESTRICT="test" # Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92 # and 2.30.0 COMMON_DEPEND=" - >=dev-libs/glib-2.35.3:2 + >=dev-libs/glib-2.43.4:2[dbus] >=x11-libs/pango-1.28.3 - >=x11-libs/gtk+-3.13.2:3[introspection?] + >
[gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/
commit: 8418d8d92a5f73c5ced64ccdedc1202ec5e60b16 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Mon Dec 22 23:07:31 2014 + Commit: Gilles Dartiguelongue gentoo org> CommitDate: Mon Dec 22 23:07:31 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=8418d8d9 gnome-base/nautilus: moved to gentoo-x86 --- gnome-base/nautilus/nautilus-3.14.2.ebuild | 128 - 1 file changed, 128 deletions(-) diff --git a/gnome-base/nautilus/nautilus-3.14.2.ebuild b/gnome-base/nautilus/nautilus-3.14.2.ebuild deleted file mode 100644 index bd82ad4..000 --- a/gnome-base/nautilus/nautilus-3.14.2.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="5" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" # Needed with USE 'sendto' - -inherit eutils gnome2 readme.gentoo virtualx - -DESCRIPTION="A file manager for the GNOME desktop" -HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"; - -LICENSE="GPL-2+ LGPL-2+ FDL-1.1" -SLOT="0" - -# profiling? -IUSE="debug exif gnome +introspection packagekit +previewer sendto tracker xmp" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux" - -# FIXME: tests fails under Xvfb, but pass when building manually -# "FAIL: check failed in nautilus-file.c, line 8307" -RESTRICT="test" - -# FIXME: selinux support is automagic -# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92 -# and 2.30.0 -COMMON_DEPEND=" - >=dev-libs/glib-2.35.3:2 - >=x11-libs/pango-1.28.3 - >=x11-libs/gtk+-3.13.2:3[introspection?] - >=dev-libs/libxml2-2.7.8:2 - >=gnome-base/gnome-desktop-3:3= - - gnome-base/dconf - >=gnome-base/gsettings-desktop-schemas-3.8.0 - >=x11-libs/libnotify-0.7:= - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrender - - exif? ( >=media-libs/libexif-0.6.20 ) - introspection? ( >=dev-libs/gobject-introspection-0.6.4 ) - tracker? ( >=app-misc/tracker-0.16:= ) - xmp? ( >=media-libs/exempi-2.1.0 ) -" -DEPEND="${COMMON_DEPEND} - >=dev-lang/perl-5 - >=dev-util/gdbus-codegen-2.33 - >=dev-util/gtk-doc-am-1.4 - >=dev-util/intltool-0.40.1 - sys-devel/gettext - virtual/pkgconfig - x11-proto/xproto -" -RDEPEND="${COMMON_DEPEND} - packagekit? ( app-admin/packagekit-base ) - sendto? ( !
[gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/
commit: 733a6b02873d375cc1f190fe8e5ce5b930b25567 Author: Rémi Cardona gentoo org> AuthorDate: Wed Nov 26 23:44:46 2014 + Commit: Remi Cardona gentoo org> CommitDate: Wed Nov 26 23:44:46 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=733a6b02 gnome-base/nautilus: 3.14.1 → 3.14.2 --- gnome-base/nautilus/{nautilus-3.14.1.ebuild => nautilus-3.14.2.ebuild} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gnome-base/nautilus/nautilus-3.14.1.ebuild b/gnome-base/nautilus/nautilus-3.14.2.ebuild similarity index 100% rename from gnome-base/nautilus/nautilus-3.14.1.ebuild rename to gnome-base/nautilus/nautilus-3.14.2.ebuild
[gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/
commit: 56cddf0352d2311cafc038d6133bc8b3096091df Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sun Nov 23 19:19:13 2014 + Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sun Nov 23 19:19:13 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=56cddf03 gnome-base/nautilus: 3.14.0 → 3.14.1 --- gnome-base/nautilus/{nautilus-3.14.0.ebuild => nautilus-3.14.1.ebuild} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gnome-base/nautilus/nautilus-3.14.0.ebuild b/gnome-base/nautilus/nautilus-3.14.1.ebuild similarity index 100% rename from gnome-base/nautilus/nautilus-3.14.0.ebuild rename to gnome-base/nautilus/nautilus-3.14.1.ebuild
[gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/
commit: 1b48f05a26ab97df869ebcc62893b6c8f37817e9 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Mon Apr 7 21:32:02 2014 + Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sun Apr 20 17:30:10 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1b48f05a gnome-base/nautilus: 3.10.1 → 3.12.0 --- .../{nautilus-.ebuild => nautilus-3.12.0.ebuild} | 19 +++ gnome-base/nautilus/nautilus-.ebuild | 4 ++-- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/gnome-base/nautilus/nautilus-.ebuild b/gnome-base/nautilus/nautilus-3.12.0.ebuild similarity index 88% copy from gnome-base/nautilus/nautilus-.ebuild copy to gnome-base/nautilus/nautilus-3.12.0.ebuild index dc8cbf2..97a973d 100644 --- a/gnome-base/nautilus/nautilus-.ebuild +++ b/gnome-base/nautilus/nautilus-3.12.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -7,9 +7,6 @@ GCONF_DEBUG="no" GNOME2_LA_PUNT="yes" # Needed with USE 'sendto' inherit eutils gnome2 readme.gentoo virtualx -if [[ ${PV} = ]]; then - inherit gnome2-live -fi DESCRIPTION="A file manager for the GNOME desktop" HOMEPAGE="http://live.gnome.org/Nautilus"; @@ -19,12 +16,7 @@ SLOT="0" # profiling? IUSE="debug exif gnome +introspection packagekit +previewer sendto tracker xmp" -if [[ ${PV} = ]]; then - IUSE="${IUSE} doc" - KEYWORDS="" -else - KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux" -fi +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" @@ -36,7 +28,7 @@ RESTRICT="test" COMMON_DEPEND=" >=dev-libs/glib-2.35.3:2 >=x11-libs/pango-1.28.3 - >=x11-libs/gtk+-3.9.11:3[introspection?] + >=x11-libs/gtk+-3.11.6:3[introspection?] >=dev-libs/libxml2-2.7.8:2 >=gnome-base/gnome-desktop-3:3= @@ -81,11 +73,6 @@ PDEPEND=" " # Need gvfs[gtk] for recent:/// support -if [[ ${PV} = ]]; then - DEPEND="${DEPEND} - doc? ( >=dev-util/gtk-doc-1.4 )" -fi - src_prepare() { if use previewer; then DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files. diff --git a/gnome-base/nautilus/nautilus-.ebuild b/gnome-base/nautilus/nautilus-.ebuild index dc8cbf2..e5ebfa0 100644 --- a/gnome-base/nautilus/nautilus-.ebuild +++ b/gnome-base/nautilus/nautilus-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -36,7 +36,7 @@ RESTRICT="test" COMMON_DEPEND=" >=dev-libs/glib-2.35.3:2 >=x11-libs/pango-1.28.3 - >=x11-libs/gtk+-3.9.11:3[introspection?] + >=x11-libs/gtk+-3.11.6:3[introspection?] >=dev-libs/libxml2-2.7.8:2 >=gnome-base/gnome-desktop-3:3=