From 950e84accd28b8ee5766d8519b94afedde26f058 Mon Sep 17 00:00:00 2001 From: Gerben Jan Dijkman Date: Tue, 4 Oct 2022 00:13:59 +0200 Subject: [PATCH] Added --- gnome-base/nautilus/Manifest | 2 + .../nautilus/files/3.30.5-docs-build.patch | 42 +++++++ .../files/42.0-optional-gstreamer.patch | 57 +++++++++ .../nautilus/files/43.0-docs-build.patch | 41 +++++++ .../nautilus/files/43.0-fix-clang-build.patch | 30 +++++ .../files/43.0-optional-gstreamer.patch | 42 +++++++ gnome-base/nautilus/nautilus-43.0.ebuild | 115 ++++++++++++++++++ 7 files changed, 329 insertions(+) create mode 100644 gnome-base/nautilus/Manifest create mode 100644 gnome-base/nautilus/files/3.30.5-docs-build.patch create mode 100644 gnome-base/nautilus/files/42.0-optional-gstreamer.patch create mode 100644 gnome-base/nautilus/files/43.0-docs-build.patch create mode 100644 gnome-base/nautilus/files/43.0-fix-clang-build.patch create mode 100644 gnome-base/nautilus/files/43.0-optional-gstreamer.patch create mode 100644 gnome-base/nautilus/nautilus-43.0.ebuild diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest new file mode 100644 index 0000000..d825d4d --- /dev/null +++ b/gnome-base/nautilus/Manifest @@ -0,0 +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/3.30.5-docs-build.patch b/gnome-base/nautilus/files/3.30.5-docs-build.patch new file mode 100644 index 0000000..65ac291 --- /dev/null +++ b/gnome-base/nautilus/files/3.30.5-docs-build.patch @@ -0,0 +1,42 @@ +From a62478c8e55bc6b1cd685f0c8c2094e1ed244c69 Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp +Date: Mon, 11 Mar 2019 20:52:53 +0200 +Subject: [PATCH] build: Always install man page + +It's already generated and shouldn't be thrown in the same pot as +full gtk-doc generation. It should be either a separate `man` option, +or just always installed. +--- + docs/meson.build | 4 +++- + meson.build | 4 +--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/docs/meson.build b/docs/meson.build +index b039cb631..2b1800be6 100644 +--- a/docs/meson.build ++++ b/docs/meson.build +@@ -1,3 +1,5 @@ + install_man('nautilus.1') + +-subdir('reference') ++if get_option('docs') ++ subdir('reference') ++endif +diff --git a/meson.build b/meson.build +index 996360a62..50479f5f0 100644 +--- a/meson.build ++++ b/meson.build +@@ -222,9 +222,7 @@ subdirs = [ + # Conditional building # + ######################## + +-if get_option('docs') +- subdirs += 'docs' +-endif ++subdirs += 'docs' + if get_option('tests') != 'none' + subdirs += 'test' + endif +-- +2.17.0 + diff --git a/gnome-base/nautilus/files/42.0-optional-gstreamer.patch b/gnome-base/nautilus/files/42.0-optional-gstreamer.patch new file mode 100644 index 0000000..84835d4 --- /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 +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/files/43.0-docs-build.patch b/gnome-base/nautilus/files/43.0-docs-build.patch new file mode 100644 index 0000000..653970d --- /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 +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-fix-clang-build.patch b/gnome-base/nautilus/files/43.0-fix-clang-build.patch new file mode 100644 index 0000000..ec8fbd9 --- /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?= + +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/files/43.0-optional-gstreamer.patch b/gnome-base/nautilus/files/43.0-optional-gstreamer.patch new file mode 100644 index 0000000..de0e008 --- /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 0000000..08ce680 --- /dev/null +++ b/gnome-base/nautilus/nautilus-43.0.ebuild @@ -0,0 +1,115 @@ +# 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 ~arm64" + +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 + "${FILESDIR}"/43.0-fix-clang-build.patch # https://gitlab.gnome.org/GNOME/nautilus/-/merge_requests/996 +) + +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 +}