public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Eli Schwartz" <eschwartz@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-settings-daemon/
Date: Fri, 23 Aug 2024 05:23:38 +0000 (UTC)	[thread overview]
Message-ID: <1724390487.055fbf9c705c61023de2860f624d43dff70d0a7d.eschwartz@gentoo> (raw)

commit:     055fbf9c705c61023de2860f624d43dff70d0a7d
Author:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 21 20:55:21 2024 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Fri Aug 23 05:21:27 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=055fbf9c

gnome-extra/cinnamon-settings-daemon: conditionalize wayland on wacom

The only plugin that uses gtk's wayland support -- or any wayland
support at all -- is the wacom plugin. It is otherwise meaningless to
depend on gtk's wayland support, so rejuggle the dependencies to reflect
that.

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

 ...emon-6.2.0.ebuild => cinnamon-settings-daemon-6.2.0-r1.ebuild} | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.2.0.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.2.0-r1.ebuild
similarity index 94%
rename from gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.2.0.ebuild
rename to gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.2.0-r1.ebuild
index bf665356ce46..7abe049b1722 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.2.0.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.2.0-r1.ebuild
@@ -28,7 +28,6 @@ RDEPEND="
 	>=sys-auth/polkit-0.97
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.14.0:3[wayland=]
 	>=x11-libs/libnotify-0.7.3
 	x11-libs/libX11
 	x11-libs/libXext
@@ -44,8 +43,13 @@ RDEPEND="
 		app-admin/system-config-printer
 		net-print/cups-pk-helper )
 	input_devices_wacom? (
+		>=x11-libs/gtk+-3.14.0:3[wayland=]
 		>=dev-libs/libwacom-0.7:=
-		>=gnome-base/librsvg-2.36.2 )
+		>=gnome-base/librsvg-2.36.2
+	)
+	!input_devices_wacom? (
+		>=x11-libs/gtk+-3.14.0:3
+	)
 	smartcard? (
 		dev-libs/nspr
 		>=dev-libs/nss-3.11.2


             reply	other threads:[~2024-08-23  5:23 UTC|newest]

Thread overview: 77+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-23  5:23 Eli Schwartz [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-11-04 18:39 [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-settings-daemon/ Andreas Sturmlechner
2024-09-25 14:22 Joonas Niilola
2024-09-25 13:58 Joonas Niilola
2024-08-23  5:23 Eli Schwartz
2024-08-05  3:36 Eli Schwartz
2024-08-05  3:36 Eli Schwartz
2024-05-29 14:43 Jakov Smolić
2024-05-29 11:47 Sam James
2024-02-15 13:29 Joonas Niilola
2024-02-15 13:29 Joonas Niilola
2023-10-13  7:43 Joonas Niilola
2023-10-04  8:24 Joonas Niilola
2023-09-26 15:59 WANG Xuerui
2023-07-16 18:34 Sam James
2023-06-10 23:05 Andreas Sturmlechner
2023-06-05  9:58 Joonas Niilola
2023-06-05  9:58 Joonas Niilola
2023-05-07 22:14 Sam James
2023-05-07 22:14 Sam James
2023-05-01  1:43 Sam James
2023-04-29 18:10 Arthur Zamarin
2022-12-24  7:11 Sam James
2022-11-22  6:20 Sam James
2022-11-22  6:20 Sam James
2022-11-21 17:46 Arthur Zamarin
2022-10-12 23:09 Sam James
2022-10-12 23:09 Sam James
2022-06-20  2:53 Sam James
2022-05-11  2:11 Sam James
2022-05-05  3:01 Sam James
2022-05-05  3:01 Sam James
2022-01-21 17:15 Sam James
2021-12-24 20:00 Jakov Smolić
2021-12-24 19:25 Jakov Smolić
2021-11-23  1:25 Yixun Lan
2021-07-31  8:35 Joonas Niilola
2021-07-31  8:35 Joonas Niilola
2021-07-15 11:32 Joonas Niilola
2021-06-21 22:26 Sam James
2021-06-12  3:55 Sam James
2021-06-08  7:34 Sam James
2021-06-01 16:28 Joonas Niilola
2021-06-01 16:28 Joonas Niilola
2021-03-01 13:02 Joonas Niilola
2021-01-06  1:05 Sam James
2020-12-29 17:14 Sam James
2020-12-16 22:30 Sam James
2020-09-15 14:20 Joonas Niilola
2020-09-09  2:15 Sam James
2020-09-09  2:15 Sam James
2020-09-09  2:15 Sam James
2020-05-31 19:05 Matt Turner
2020-04-20 20:52 Mart Raudsepp
2019-06-07 20:12 Mikle Kolyada
2019-06-04 20:58 Thomas Deutschmann
2018-11-28 19:56 Kristian Fiskerstrand
2018-04-12 19:07 Thomas Deutschmann
2018-04-06 14:00 Aaron Bauman
2017-11-28 20:00 Kristian Fiskerstrand
2017-11-26 23:02 David Seifert
2017-11-26 15:43 Kristian Fiskerstrand
2017-09-05 20:00 Kristian Fiskerstrand
2017-06-24 14:58 Kristian Fiskerstrand
2016-11-22 20:42 Kristian Fiskerstrand
2016-10-01  0:54 Pacho Ramos
2016-09-17 13:29 Kristian Fiskerstrand
2016-06-21 19:09 Michał Górny
2016-05-30 21:15 Pacho Ramos
2016-05-29 12:42 Pacho Ramos
2016-05-29 12:42 Pacho Ramos
2016-03-06 18:58 Mikle Kolyada
2016-01-30 12:57 Pacho Ramos
2016-01-16 10:48 Pacho Ramos
2016-01-16 10:48 Pacho Ramos
2016-01-11 14:26 Pacho Ramos
2015-11-15 22:30 Pacho Ramos

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1724390487.055fbf9c705c61023de2860f624d43dff70d0a7d.eschwartz@gentoo \
    --to=eschwartz@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox