gentoo auto-resync : 15:02:2024 - 23:36:26

3 files changed, 94 insertions, 17 deletions

diff --git a/gnome-extra/nemo/Manifest b/gnome-extra/nemo/Manifest
index 8e07e320d003..c324417a076e 100644
--- a/gnome-extra/nemo/Manifest
+++ b/gnome-extra/nemo/Manifest
@@ -1,6 +1,7 @@
 AUX nemo-5.0.3-use-detex.patch 252 BLAKE2B 24c27845065f64a58411a8d719fbc1ca41362001f08d469bc336f55601e49358c02ba3aba423c521a261955a5da9832d8ae2df49f3d372270e63256a45fafcda SHA512 142bd88c7843fa40fb30cab01f8f7dd23b2b5c338eae2ac5971c7e392f9f24a8a820ef4b17b1c4afea729cc85a66cb7ddb06ecd417ff6ad494118fe8d88f1498
-DIST nemo-5.6.5.tar.gz 1498469 BLAKE2B 1ead71e79170e977e21dd631f7875198b3aa411689bd59b9c64b50a3c3b02a396f2b1cbc1e1420bf242004a6a724b8498e7e0cdd2b48b9d5e54ed97d21331cba SHA512 b37181e419d5a9427931d29f2addf9faebca7d74d8b8337dc9cb62ebc3b8f8d9dcef978bc6fc9be65efc41bd2a153685849f10cac9e28ffb3ccb3a8dee5aa739
+AUX nemo-6.0.0-fix-optional-wayland.patch 2103 BLAKE2B ad99989113d7d65d586709f78f68dd28c016fb56c33465aa38c2282ac0ff57669efab45f5547b5b983554401b32fef472362ab9e12a66715c6a0c89a27f173da SHA512 0a32ba81d1c79e9a008a9480d3901a17e55af67a8043041adc9f77989999fdf6ece0c654eb8fb62cbda5ade9104f1d52990ca3f38686fe8483d08d8163d4b210
 DIST nemo-5.8.4.tar.gz 1506620 BLAKE2B 948735bf75df2a0f8be9f5ddb29a73d6bf5127a6d932325855976da21334feb2c905b1a26c0ef285c8317b7e42223de098505802b1dde7a5e6fc1f4942d11681 SHA512 b636d5bbaa18e9259f74f086ed55e528be8dcfabdddbcdb0e3c82e3b93d0aa1b77573319f83df1529f1c473cdabbcab7280baa4169b482b5b9ecf6ade6e04427
-EBUILD nemo-5.6.5.ebuild 3152 BLAKE2B b41b7db1fdb2fb96ac6856df07194ef30f0796a7af10a06af5ecc7be4fbf3dbd9655a8bea90f9f4712c6741bf134c2e38a9dcefa50cb9dfc8014f6f1294d5f1b SHA512 6e4ad752933ad78fc5d75c18c8af72fc6178a6a0f09b4a54e9e07f5cd5f532a1fcfc8fde6962288a78f38ee87d5333e5e968b758a158b1bcdc680854050175bb
+DIST nemo-6.0.2.tar.gz 1480887 BLAKE2B d1e3892938cb81bcb676626a9ef54362939d522a6d09befe25dd77a236a7eee3e06461da1855317bff2a5f201bc142903ce085bfbafdbddca0700a177221ccdf SHA512 05e8a6ab785f527ad61c1fe57d372ae8ea8f77d27ec8608d38e99f5f0f9065aecef4b84d1b016b682d14320d7099806d5672a101c0a370429d1c3f2a341fed1c
 EBUILD nemo-5.8.4.ebuild 3137 BLAKE2B 6d5cc7a56517cddd50b959ed39e40112e742ba4b48be34635d0c1504eb5070ef9901a57ab62cb1912d5af5d4d983ae355704e3fd7682d097a9271bf1a43dc8ea SHA512 448ce11da464b5c9c0edcde8707cdff6e323b3b1d47314a9bb11a7b2f7eb4f979351c8746d3e1762a21199c3199d13b707616ead9414a42976701f4a0cd9c21b
+EBUILD nemo-6.0.2.ebuild 3300 BLAKE2B ca13f502ec38f3b9620ca8c902ed1fa6a249d4d8e2f369c39f51c0b6dbaa3024bc30be22b755b0c7f5cc22a2e2de0f68e7ce3f932edf6e80548f0217f405825e SHA512 2916c9eaf741d1e64d5462058873b22572ef3ec14dac7478da1a61d806f39581672717533aefbcaf3044bc898ddcbc8ba7dfd81a647ecd87d5ccbf9e3dc9ddef
 MISC metadata.xml 580 BLAKE2B da0ac9cd13730b5c1727a6d0431f3289af829b77781baf4d3512c78139bca7b9a7d136563de8e2f5abf914520de8a5a092b1e0f2505558e5e61813fa5f9c09ad SHA512 d38cebfe673764a4a96d66a66afe55f6f04c74bf1d06d8fddc319a2eb9ed351b205e3a48c47bfeff7f3da85c89ad0512e11a420f82c228a548fc7553147b927e
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
new file mode 100644
index 000000000000..559abbde0a47
--- /dev/null
+++ b/gnome-extra/nemo/files/nemo-6.0.0-fix-optional-wayland.patch
@@ -0,0 +1,61 @@
+From 1d74919f2657bdb0414d5bf631f6fb1207b261a9 Mon Sep 17 00:00:00 2001
+From: Sparky Bluefang <sparky@bluefang-logic.com>
+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-5.6.5.ebuild b/gnome-extra/nemo/nemo-6.0.2.ebuild
index 3e20d3f28c70..089f473515e5 100644
--- a/gnome-extra/nemo/nemo-5.6.5.ebuild
+++ b/gnome-extra/nemo/nemo-6.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit meson gnome2-utils python-single-r1 readme.gentoo-r1 virtualx xdg
 
@@ -13,8 +13,8 @@ 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 ~ppc64 ~riscv x86"
-IUSE="exif gtk-doc +nls selinux test xmp"
+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
@@ -26,18 +26,27 @@ COMMON_DEPEND="
 	>=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-5.6:0=
+	>=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]
+	>=x11-libs/gtk+-3.10.0:3[introspection,wayland=]
 	x11-libs/libX11
 	>=x11-libs/pango-1.40.0
-	>=x11-libs/xapp-2.4.1
+	>=x11-libs/xapp-2.8.2
 
-	exif? ( >=media-libs/libexif-0.6.20 )
-	selinux? ( sys-libs/libselinux )
-	xmp? ( >=media-libs/exempi-2.2.0:= )
+	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}
@@ -46,7 +55,9 @@ RDEPEND="
 	')
 	x11-themes/adwaita-icon-theme
 
-	nls? ( >=gnome-extra/cinnamon-translations-5.6 )
+	nls? (
+		>=gnome-extra/cinnamon-translations-6.0
+	)
 "
 PDEPEND="
 	>=gnome-base/gvfs-0.1.2
@@ -61,12 +72,18 @@ BDEPEND="
 	sys-devel/gettext
 	virtual/pkgconfig
 
-	gtk-doc? ( dev-util/gtk-doc )
+	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"
@@ -98,14 +115,12 @@ src_prepare() {
 }
 
 src_configure() {
-	# tracker: only supports unmaintained tracker-2, not >=tracker-3.
 	local emesonargs=(
 		$(meson_use exif)
 		$(meson_use xmp)
 		$(meson_use selinux)
+		$(meson_use tracker)
 		$(meson_use gtk-doc gtk_doc)
-
-		-Dtracker=false
 	)
 	meson_src_configure
 }