commit: d82515e7fa1ecbe16c0767b0e5c40662b63e7f08 Author: Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com> AuthorDate: Thu Sep 26 22:48:00 2024 +0000 Commit: Eli Schwartz <eschwartz <AT> gentoo <DOT> org> CommitDate: Fri Sep 27 05:55:52 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d82515e7
gnome-extra/nemo: drop 6.0.2 Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com> Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org> gnome-extra/nemo/Manifest | 1 - .../files/nemo-6.0.0-fix-optional-wayland.patch | 61 --------- gnome-extra/nemo/nemo-6.0.2.ebuild | 146 --------------------- 3 files changed, 208 deletions(-) diff --git a/gnome-extra/nemo/Manifest b/gnome-extra/nemo/Manifest index 33b802ff7684..25d478fa7103 100644 --- a/gnome-extra/nemo/Manifest +++ b/gnome-extra/nemo/Manifest @@ -1,2 +1 @@ -DIST nemo-6.0.2.tar.gz 1480887 BLAKE2B d1e3892938cb81bcb676626a9ef54362939d522a6d09befe25dd77a236a7eee3e06461da1855317bff2a5f201bc142903ce085bfbafdbddca0700a177221ccdf SHA512 05e8a6ab785f527ad61c1fe57d372ae8ea8f77d27ec8608d38e99f5f0f9065aecef4b84d1b016b682d14320d7099806d5672a101c0a370429d1c3f2a341fed1c DIST nemo-6.2.8.tar.gz 1505198 BLAKE2B fc74ab19e5aef65ba279f212f505cab91aa0dc92b19d31d4ae2f44b3222bd2278fbdf0df0bc36fa3973b91c9c06fab2c211b58c8d840deef5e60d5dbcbfa4dd7 SHA512 cd943603cfb14cc9d50466872607d191a3af7ff61f05549407caa5d9dfe606e080d6eb40d17bbcdf3a9e810bcc493f3be087b1eac6c8272746cd72c9751822af diff --git a/gnome-extra/nemo/files/nemo-6.0.0-fix-optional-wayland.patch b/gnome-extra/nemo/files/nemo-6.0.0-fix-optional-wayland.patch deleted file mode 100644 index 559abbde0a47..000000000000 --- a/gnome-extra/nemo/files/nemo-6.0.0-fix-optional-wayland.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 1d74919f2657bdb0414d5bf631f6fb1207b261a9 Mon Sep 17 00:00:00 2001 -From: Sparky Bluefang <[email protected]> -Date: Sun, 7 Jan 2024 18:14:22 -0500 -Subject: [PATCH] Make wayland dependency optional - ---- - eel/eel-gtk-extensions.c | 5 ++++- - meson.build | 2 +- - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/eel/eel-gtk-extensions.c b/eel/eel-gtk-extensions.c -index c4fcc942a..643a51726 100644 ---- a/eel/eel-gtk-extensions.c -+++ b/eel/eel-gtk-extensions.c -@@ -38,7 +38,9 @@ - #include <X11/Xatom.h> - #include <gdk/gdk.h> - #include <gdk/gdkprivate.h> -+#ifdef GDK_WINDOWING_WAYLAND - #include <gdk/gdkwayland.h> -+#endif - #include <gtk/gtk.h> - #include <glib/gi18n-lib.h> - #include <math.h> -@@ -253,6 +255,7 @@ gboolean - eel_check_is_wayland (void) - { - static gboolean using_wayland = FALSE; -+#ifdef GDK_WINDOWING_WAYLAND - static gsize once_init = 0; - - if (g_once_init_enter (&once_init)) { -@@ -260,7 +263,7 @@ eel_check_is_wayland (void) - - g_once_init_leave (&once_init, 1); - } -- -+#endif - return using_wayland; - } - -diff --git a/meson.build b/meson.build -index bba97ee31..998229620 100644 ---- a/meson.build -+++ b/meson.build -@@ -72,7 +72,6 @@ glib_version = '>=2.45.7' - math = cc.find_library('m', required: true) - - gtk = dependency('gtk+-3.0', version: '>=3.10.0') --gtk_wl = dependency('gtk+-wayland-3.0', version: '>=3.10.0') - gio = dependency('gio-2.0', version: glib_version) - gio_unix= dependency('gio-unix-2.0', version: glib_version) - glib = dependency('glib-2.0', version: glib_version) -@@ -201,6 +200,7 @@ message('\n'.join(['', - ' libexif support: @0@'.format(libexif_enabled), - ' exempi support: @0@'.format(exempi_enabled), - ' Tracker support: @0@'.format(tracker_enabled), -+' Wayland support: @0@'.format(cc.has_header('gdk/gdkwayland.h', dependencies: gtk)), - '', - ' nemo-extension documentation: @0@'.format(gtkdoc_enabled), - ' nemo-extension introspection: @0@'.format(true), diff --git a/gnome-extra/nemo/nemo-6.0.2.ebuild b/gnome-extra/nemo/nemo-6.0.2.ebuild deleted file mode 100644 index c6bdeac5f1a2..000000000000 --- a/gnome-extra/nemo/nemo-6.0.2.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit meson gnome2-utils python-single-r1 readme.gentoo-r1 virtualx xdg - -DESCRIPTION="A file manager for Cinnamon, forked from Nautilus" -HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/nemo"; -SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+ FDL-1.1" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86" -IUSE="exif gtk-doc +nls selinux test tracker wayland xmp" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -# https://github.com/linuxmint/nemo/issues/2501 -RESTRICT="test" - -COMMON_DEPEND=" - ${PYTHON_DEPS} - >=app-accessibility/at-spi2-core-2.46.0:2 - >=dev-libs/glib-2.45.7:2[dbus] - >=dev-libs/gobject-introspection-0.9.12:= - >=dev-libs/libxml2-2.7.8:2 - >=gnome-extra/cinnamon-desktop-6.0:0= - gnome-extra/libgsf:= - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-3.10.0:3[introspection,wayland=] - x11-libs/libX11 - >=x11-libs/pango-1.40.0 - >=x11-libs/xapp-2.8.2 - - exif? ( - >=media-libs/libexif-0.6.20 - ) - selinux? ( - sys-libs/libselinux - ) - tracker? ( - app-misc/tracker:3 - ) - xmp? ( - >=media-libs/exempi-2.2.0:= - ) -" -RDEPEND=" - ${COMMON_DEPEND} - $(python_gen_cond_dep ' - dev-python/pygobject:3[${PYTHON_USEDEP}] - ') - x11-themes/adwaita-icon-theme - - nls? ( - >=gnome-extra/cinnamon-translations-6.0 - ) -" -PDEPEND=" - >=gnome-base/gvfs-0.1.2 -" -DEPEND=" - ${COMMON_DEPEND} - x11-base/xorg-proto -" -BDEPEND=" - >=dev-util/gdbus-codegen-2.31.0 - >=dev-util/intltool-0.40.1 - sys-devel/gettext - virtual/pkgconfig - - gtk-doc? ( - dev-util/gtk-doc - ) -" - -PATCHES=( - # Undo the switch to untex as it's not packaged. - "${FILESDIR}/${PN}-5.0.3-use-detex.patch" - - # Fix optional wayland - # https://github.com/linuxmint/nemo/pull/3347 - "${FILESDIR}/${PN}-6.0.0-fix-optional-wayland.patch" -) - -DISABLE_AUTOFORMATTING="yes" -FORCE_PRINT_ELOG="yes" -DOC_CONTENTS=" -${PN} functionality can be extended by installing other packages. - -sys-apps/gnome-disk-utility - Mount archive files -gnome-extra/nemo-fileroller - Extract/Create archive files - -${PN} search capabilities can be extended through external -helpers. Install any of the following packages to make -their associated file types searchable. - -epub - app-arch/unzip and app-text/html2text -Image metadata - media-gfx/exif -MP3 tags - media-sound/id3 -Microsoft Office .doc - app-text/catdoc -Microsoft Office .xls - dev-python/xlrd -OpenDocument/LibreOffice - app-text/odt2txt or app-office/unoconv -PDF - app-text/poppler[utils] -PostScript - app-text/ghostscript-gpl -TeX - app-text/texlive-core -" - -src_prepare() { - default - python_fix_shebang files/usr/share/nemo/actions install-scripts -} - -src_configure() { - local emesonargs=( - $(meson_use exif) - $(meson_use xmp) - $(meson_use selinux) - $(meson_use tracker) - $(meson_use gtk-doc gtk_doc) - ) - meson_src_configure -} - -src_install() { - meson_src_install - readme.gentoo_create_doc -} - -src_test() { - virtx meson_src_test -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update - readme.gentoo_print_elog -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -}
