[gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-desktop/

["Eli Schwartz" <eschwartz@gentoo.org>]

commit:     a500615470af01a46e895d7ba78d84149d0aead2
Author:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 11 22:46:34 2025 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Wed Mar 12 00:46:23 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5006154

gnome-extra/cinnamon-desktop: enforce binary dependency on gtk backends

```
 * QA Notice: binaries depend on Gtk's x11-specific ABI without USE dep:
 *
 *   /usr/lib64/libcinnamon-desktop.so.4.0.0
```

Unconditional includes, makes sense since cinnamon only supports X
anyway. There is some preliminary wayland support though, which is
guarded via `#ifdef GDK_WINDOWING_WAYLAND`, so add a USE flag to key off
of, even if just so that nobody sets it and it gets forcibly suppressed.
:)

Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>

 ...-desktop-6.2.0.ebuild => cinnamon-desktop-6.2.0-r1.ebuild} |  4 ++--
 ...-desktop-6.4.1.ebuild => cinnamon-desktop-6.4.1-r1.ebuild} | 11 ++++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-6.2.0.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-6.2.0-r1.ebuild
similarity index 95%
rename from gnome-extra/cinnamon-desktop/cinnamon-desktop-6.2.0.ebuild
rename to gnome-extra/cinnamon-desktop/cinnamon-desktop-6.2.0-r1.ebuild
index 975d5f73aba2..3e5eb39cf4d8 100644
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-6.2.0.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-6.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,7 +24,7 @@ RDEPEND="
 	sys-apps/hwdata
 	x11-libs/cairo[X]
 	>=x11-libs/gdk-pixbuf-2.22:2[introspection]
-	>=x11-libs/gtk+-3.3.16:3[introspection]
+	>=x11-libs/gtk+-3.3.16:3[introspection,X]
 	x11-libs/libX11
 	>=x11-libs/libXext-1.1
 	x11-libs/libxkbfile

diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-6.4.1.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-6.4.1-r1.ebuild
similarity index 84%
rename from gnome-extra/cinnamon-desktop/cinnamon-desktop-6.4.1.ebuild
rename to gnome-extra/cinnamon-desktop/cinnamon-desktop-6.4.1-r1.ebuild
index 2849983c8bc1..a7ca019663f0 100644
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-6.4.1.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-6.4.1-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..13} )
 
-inherit meson gnome2-utils python-any-r1
+inherit meson flag-o-matic gnome2-utils python-any-r1
 
 DESCRIPTION="A collection of libraries and utilites used by Cinnamon"
 HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-desktop"
@@ -14,6 +14,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-desktop/archive/${PV}.tar.gz -> $
 LICENSE="GPL-1 GPL-2+ LGPL-2+ LGPL-2.1+ MIT"
 SLOT="0/4" # subslot = libcinnamon-desktop soname version
 KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="wayland"
 
 RDEPEND="
 	app-text/iso-codes
@@ -25,7 +26,7 @@ RDEPEND="
 	virtual/libudev:=
 	x11-libs/cairo[X]
 	>=x11-libs/gdk-pixbuf-2.22:2[introspection]
-	>=x11-libs/gtk+-3.3.16:3[introspection]
+	>=x11-libs/gtk+-3.3.16:3[introspection,wayland?,X]
 	x11-libs/libX11
 	>=x11-libs/libXext-1.1
 	x11-libs/libxkbfile
@@ -56,6 +57,10 @@ src_prepare() {
 }
 
 src_configure() {
+	# defang automagic dependencies
+	# Preliminary wayland support only. Xorg code is unconditional.
+	use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND
+
 	local emesonargs=(
 		# https://github.com/linuxmint/cinnamon-desktop/commit/7eadfb1da9a42384396978b8ab46e0725d18e04f
 		# > Unless/until this fixes an actual identified issue for us or provides significant advantages