From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1DF0015852A for ; Fri, 23 Aug 2024 05:23:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 603E0E2A3A; Fri, 23 Aug 2024 05:23:42 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 41ABBE2A39 for ; Fri, 23 Aug 2024 05:23:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F0259342FA2 for ; Fri, 23 Aug 2024 05:23:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4A6661F13 for ; Fri, 23 Aug 2024 05:23:38 +0000 (UTC) From: "Eli Schwartz" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Eli Schwartz" Message-ID: <1724390488.709ff5b9a5bf18168a8fae46e2704d3954377a82.eschwartz@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-settings-daemon/ X-VCS-Repository: repo/gentoo X-VCS-Files: gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.2.0-r1.ebuild X-VCS-Directories: gnome-extra/cinnamon-settings-daemon/ X-VCS-Committer: eschwartz X-VCS-Committer-Name: Eli Schwartz X-VCS-Revision: 709ff5b9a5bf18168a8fae46e2704d3954377a82 X-VCS-Branch: master Date: Fri, 23 Aug 2024 05:23:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 38fc070f-3066-46ce-a19b-4978f95cc68d X-Archives-Hash: d80b4570e33f57d9a93d3e166ac1d1fb commit: 709ff5b9a5bf18168a8fae46e2704d3954377a82 Author: Eli Schwartz gentoo org> AuthorDate: Wed Aug 21 21:00:03 2024 +0000 Commit: Eli Schwartz gentoo org> CommitDate: Fri Aug 23 05:21:28 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=709ff5b9 gnome-extra/cinnamon-settings-daemon: avoid automagic deps on gtk+[X,wayland] Currently, one is forced to compile c-s-d and gtk with the same value of USE=wayland which makes it difficult to provide generically reusable binaries. It is better than automagically depending on wayland and then lacking it, but not ideal. Preferable would be for c-s-d[wayland] to require gtk+[wayland] but when built without wayland support, to not care whether gtk itself is. We now support a mechanism for packages to opt out of gtk providing the API, for use by packages that don't provide a `-D wayland=true` but autodetect whether gtk was built with it. Use that mechanism. Signed-off-by: Eli Schwartz gentoo.org> .../cinnamon-settings-daemon-6.2.0-r1.ebuild | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.2.0-r1.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.2.0-r1.ebuild index 7abe049b1722..701215fbc2c5 100644 --- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.2.0-r1.ebuild +++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.2.0-r1.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..13} ) -inherit meson gnome2-utils python-any-r1 xdg +inherit meson flag-o-matic gnome2-utils python-any-r1 xdg DESCRIPTION="Cinnamon's settings daemon" HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-settings-daemon" @@ -43,7 +43,7 @@ RDEPEND=" app-admin/system-config-printer net-print/cups-pk-helper ) input_devices_wacom? ( - >=x11-libs/gtk+-3.14.0:3[wayland=] + >=x11-libs/gtk+-3.24.41-r1:3[wayland?,X] >=dev-libs/libwacom-0.7:= >=gnome-base/librsvg-2.36.2 ) @@ -75,6 +75,12 @@ src_prepare() { } src_configure() { + # The only component that uses gdk backends is the wacom plugin + if use input_devices_wacom; then + # defang automagic dependencies + use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND + fi + # gudev not optional on Linux platforms local emesonargs=( -Duse_gudev=enabled