From ba4938837d52c0aff763d8acdc03ce103dd3ff82 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 24 Dec 2023 13:37:40 +0000 Subject: gentoo auto-resync : 24:12:2023 - 13:37:40 --- gnome-base/Manifest.gz | Bin 4722 -> 4726 bytes gnome-base/nautilus/Manifest | 8 +- .../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.0.ebuild | 122 -------------------- gnome-base/nautilus/nautilus-45.1.ebuild | 123 -------------------- gnome-base/nautilus/nautilus-45.2.1-r1.ebuild | 125 +++++++++++++++++++++ gnome-base/nautilus/nautilus-45.2.1.ebuild | 123 -------------------- 8 files changed, 282 insertions(+), 373 deletions(-) create mode 100644 gnome-base/nautilus/files/45.2.1-better-icon-lookup-fallback.patch create mode 100644 gnome-base/nautilus/files/45.2.1-fix-av-props-crash.patch delete mode 100644 gnome-base/nautilus/nautilus-45.0.ebuild delete mode 100644 gnome-base/nautilus/nautilus-45.1.ebuild create mode 100644 gnome-base/nautilus/nautilus-45.2.1-r1.ebuild delete mode 100644 gnome-base/nautilus/nautilus-45.2.1.ebuild (limited to 'gnome-base') diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz index d322354a009e..38d8c01e850b 100644 Binary files a/gnome-base/Manifest.gz and b/gnome-base/Manifest.gz differ diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest index 86d7fb617b68..865c10349f05 100644 --- a/gnome-base/nautilus/Manifest +++ b/gnome-base/nautilus/Manifest @@ -1,10 +1,8 @@ AUX 43.0-optional-gstreamer.patch 1269 BLAKE2B 2a4599771977e44f9e1b25d2334f838a2016d1bfd6eea48c004ce410442ec12152e69efec389b6d373d1e187f00b78ac3fd617f4992e90acaf69a5a3325b7a2d SHA512 7f578859a3c8100f4d8783851b91a40c1c3d2d702851772e91bb08bade7802271ffa0524861e968004c6ea6450060da0ca6cf917808c4542ad5853bcb7d3ae45 +AUX 45.2.1-better-icon-lookup-fallback.patch 4262 BLAKE2B 0a472471f2032c32013d53afe31b55b5f2496035d0af949687a73d082bc0cc5d63c6e74bc92dc4eb845005d6829ea07bd7d2adfe7d5f1781c1da6f1116187dd8 SHA512 c2d0dc6b51ac39ce8cd27a36a6257a36481c86ba4ecdd2ad0317fcf2f718286a13f3625c1f795fbaec37fb499f95ee7521e438d80f5dd9de50c728b14078d4ee +AUX 45.2.1-fix-av-props-crash.patch 1345 BLAKE2B 14f48ec5adf2d4c7935a302f81c34f503eb62774f0c9a4b4b0321e175242bf332867c8815854331476278b4f1de3893c7b82d434e0ec558ce97e5d0718cc69dd SHA512 6331a246143991b2798600e49275e2e0d4c21ad1b5000e51b47eb3c4c79cf4f0659c00ae1c40d95f312a9d20d3e70faa283a6489bcd32143460a2dbe3b7c7d68 DIST nautilus-44.2.1.tar.xz 3190824 BLAKE2B 159abd8fbaea3f372febb4c7f68f95d97b50ac19e31d6108c9588aa849f92ea82a2a04402c8ee78f223339ffe929ed3fc95e4606db7753adacf6edb49f340910 SHA512 35974f9d2d785c69d4199287f1b79aa83397b37b3ad3ebe97894ee5e5d9aa4a981808fa443d5c04d2c7223c290a2cad87e3eeb62787b1d241486c39d5e061769 -DIST nautilus-45.0.tar.xz 3212952 BLAKE2B 38a6e572d6ce41515bb2447bf5636c82b28f0b1fe16b56540910a7c69fb2ce45495ad128d1bd969665749244f2a45e055b22e4c4d5815afc921afe8862776240 SHA512 046c2afac51dc42337a1f26cbbb76cbbdc7145999b46574efc02acac5d0bc1ebeb8d84fa4121973216ee49f8a2cc102b62e72eeabc4141c48046cf7685789f64 -DIST nautilus-45.1.tar.xz 3207896 BLAKE2B 3d487deed19aaa79302a94f5205c172b6ba3fd739d495f235a9f6dafb42a68ac54e88228ed422932b15deb2fcb4bf2c5730e8a528221ee70f86eb9deb7c3a96c SHA512 ae3a21891d28c85976015eee1d605cb43b5d9c23da74ac2635cc65435f922bbad01d1b6eaa7ea4893121e08005c49f9ef9f2bbc217b9525a2f432d99636b3ffd DIST nautilus-45.2.1.tar.xz 3208272 BLAKE2B 80adf7ace00c21d21eddf764595c3f981e6206b936996458e5c2cc9cc51536e759528bdc38d1cddfe1c87eb94eac0ef2ced714ae797db947b81199a4bfa41c9d SHA512 c1e26e9f802f62ccb7a7d60f895575a1b31d8071f6a60206472fe79f70d64717b9abe97a5c5c0c87349994ff6f144dfe97c7bd448a05a9da00ff9918884e65fa EBUILD nautilus-44.2.1.ebuild 3319 BLAKE2B 5b1ead51507c44f62756f917fb60be25522ae380a26c729ca7b776890f2ab891bce9ec903ac10de4d8c57798ecdaf1cf8e2a60ffd1bc117faecefa2c1094b560 SHA512 f8f9fe969d3cb3c35d60d50633524c02ce775db2e5d95722af0ab3c17e3570284667c2fd07d4f01dbc62397a183bba71fe0cb686c81c6fd3446af4e6bd3bea10 -EBUILD nautilus-45.0.ebuild 3414 BLAKE2B 818059318d5f330e269acc42982e04de9037c7837c7e676105839beee377aafafa71a42ad344cc3c8b6e9c3295c831f234e86b0e2ec03e7f591786be7aa3b39e SHA512 56d0a0e0efafb4d55a51b17d3faf6af28f03647c23a09ac66265e6389f00552ba8ba26e04a8590f931edb7efd328431b49c198764c0b090ba4f0322f5d031f6d -EBUILD nautilus-45.1.ebuild 3538 BLAKE2B c09234cd676bf8e953ea00d90d3fcf97da250c30de82ddcddc1c4e75bf758f00fd5d982b9f285d601f6bbdb57acf10488b340977ffdcb84cbae0e9089565f59b SHA512 8959c7a8e5e8ac5819c1eff5cb096cb8dbf4835b1a3e93f160e2a8f092d6ee5ad6368b41cbd5c57dad7791041964b4723fcbabb5ac7b0d4f4055399e8323b1aa -EBUILD nautilus-45.2.1.ebuild 3538 BLAKE2B c09234cd676bf8e953ea00d90d3fcf97da250c30de82ddcddc1c4e75bf758f00fd5d982b9f285d601f6bbdb57acf10488b340977ffdcb84cbae0e9089565f59b SHA512 8959c7a8e5e8ac5819c1eff5cb096cb8dbf4835b1a3e93f160e2a8f092d6ee5ad6368b41cbd5c57dad7791041964b4723fcbabb5ac7b0d4f4055399e8323b1aa +EBUILD nautilus-45.2.1-r1.ebuild 3736 BLAKE2B 4f2606ea100c01381970c27bf76f6af4806c1e91774ee72cc1e12ed14fb6130040bfe294c1f78f9d006a4f34aeae41d2654b5ea2aa375468fd55947d37076c8b SHA512 8c90f3ea70912ba64baf917fa4a3ff83eea08f745ae02b9080a2cfe956ba3a588d0b6f839ee9ac3c88f6a27eee2f80b9439ade9357333bad3e8280a38fe07746 MISC metadata.xml 735 BLAKE2B 45a5510704506c6dd881fe6a653002b99eb6746d886e957022089028642969eb184001fc9d8a224bc8d699515399196088351fada65bf3c5d7085241c2be5ee4 SHA512 9f788fafb7965d95451f7f8d3bbde2357c149e2781368056893975f34f8b3e339e8b5016802c39b4bf5575649a071cd2a08185c9aae0bdb33c7a3a86b81d0353 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?= +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?= +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 +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.0.ebuild b/gnome-base/nautilus/nautilus-45.0.ebuild deleted file mode 100644 index ae39dd95947e..000000000000 --- a/gnome-base/nautilus/nautilus-45.0.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg - -DESCRIPTION="Default file manager for the GNOME desktop" -HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus" - -LICENSE="GPL-3+ LGPL-2.1+" -SLOT="0" -IUSE="+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.0 - >=x11-libs/gdk-pixbuf-2.30.0:2 - gstreamer? ( media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 ) - >=app-arch/gnome-autoar-0.4.4 - >=gnome-base/gnome-desktop-43:4= - >=gnome-base/gsettings-desktop-schemas-42 - >=gui-libs/gtk-4.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 -) - -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 - 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 -} diff --git a/gnome-base/nautilus/nautilus-45.1.ebuild b/gnome-base/nautilus/nautilus-45.1.ebuild deleted file mode 100644 index 5a07549431d0..000000000000 --- a/gnome-base/nautilus/nautilus-45.1.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg - -DESCRIPTION="Default file manager for the GNOME desktop" -HOMEPAGE="https://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 -) - -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 -} 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 +} diff --git a/gnome-base/nautilus/nautilus-45.2.1.ebuild b/gnome-base/nautilus/nautilus-45.2.1.ebuild deleted file mode 100644 index 5a07549431d0..000000000000 --- a/gnome-base/nautilus/nautilus-45.2.1.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg - -DESCRIPTION="Default file manager for the GNOME desktop" -HOMEPAGE="https://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 -) - -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 -} -- cgit v1.2.3