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

3 files changed, 85 insertions, 17 deletions

diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
index a68b17a70a6f..436b34ca966d 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -1,5 +1,6 @@
-DIST cinnamon-control-center-5.6.1.tar.gz 3874429 BLAKE2B 53344aead6c5e31eeadf70e26a2ae61db930e595b5e546ac08b57029c924e4105d126fe6a27cd3ef7d4a59b51f83e0790dfaf815d9a3addfa5c496eab82d4537 SHA512 8679cc3afab77605b5e949e58cacb55782fca0ebc41991de7421b12fcd6c85991b6e4f5c70611753724ff47ea4eb39339ea4cea29e3f4e3399d9141fe4c80c7f
+AUX cinnamon-control-center-6.0.0-fix-optional-wayland.patch 1702 BLAKE2B 442a793bc3574a2fea9ea1f4b3cdbaa1fd78a74baec80b6ff6d2d35e0ca0e3c7eb4981490347e645e7fa4cabffdaecd5faa0076d31df6cfd3fac51ba42d20c73 SHA512 eb4395fa7e8a5822ea62068ddde0eb118d747dbbe54228fa015dc97ca6d8f041ab64095a1bc42114d82d775fc1bf569708b8e027034a95aa2ab01e99993fe552
 DIST cinnamon-control-center-5.8.2.tar.gz 3820570 BLAKE2B 3bc009e696c7d469b2a2e15aecc62f290e26d08f65400418666e4a5564a3a113107996326e1edec93a45e9cb935ea96946e385376fe7f1b4b1185425bb4d4964 SHA512 b7b726659ca712a81c8b52bf514c8f061f5146a4728a3f2172ac5658b947e3e72c3194513ac815efaa727664e03ce2684d8d491bfcf0f6e91ea4566d832e86a2
-EBUILD cinnamon-control-center-5.6.1.ebuild 2483 BLAKE2B a93ac698fbb133ee2bc628f17e16da5234bd21d1ef2373cde2500bfddc544f25f071d21175769b951ed284d6591285267d521818ce686084328f83c883c0bd1c SHA512 21457bf328ce099130bb82e53e491e8c98291e6463f6b4ab90c96855926f19a2faedc61e9bfe13fd3ebaeca9da137ab4aaa70d2f5470d51fb1605f6ff16f9ba6
+DIST cinnamon-control-center-6.0.0.tar.gz 3821056 BLAKE2B b856e4c258a76aa5e558cca53ac333df81ae135d731a5de65470282e741a95f2c179fbd9f28e8bb26824de5ee1f9b9fcb0143fee1760800149a345085c45f11b SHA512 e49b72590418da63c6db9c4224e6a32f9014bf4a4810e3a89babaa21d211ade135912e7be1a356c57328d85774517e0f696c724e62b2d3581c5f73c8a88cf486
 EBUILD cinnamon-control-center-5.8.2.ebuild 2494 BLAKE2B de7eabdb9d42d73e73c69e2715a566d92038402247792843fff208f90c19d49a35b452ef9de5cd5c89662c1a9113e3fcb0081a713616a47161542a03f0ea1203 SHA512 084d0922ddebbe5a9335af3f535ead6da15f8d4aeda50ca0733b9fffce2e57746af0c2144de72cbab8a8f18ba646220840617ea26292e6a72d3bcd9b201a7ad7
+EBUILD cinnamon-control-center-6.0.0.ebuild 2691 BLAKE2B 63a2dbe84c3ae8fc0f817e966a57517bceb29ef829eb425f89aa177baf2aad051ce39f236ec39355bd1714709290b229db73b7414560db8d110ea78187457fd1 SHA512 a0c54d3286b3f0d7c36b43df074ae340921546b236dabf4cdb0814a0656462a1e652a7415d49b11553f4d98f9208462b5a466c44a15668917268818799bb1c78
 MISC metadata.xml 762 BLAKE2B 5a4411060287e76154bd0727feae76a45e8992077d7cbc6d1ad102d933246d98b3349bf0dc516f35d538e6c1d4a5d427e1561b646b628d408a5743666f5f2ca7 SHA512 c03709d9a1c8d678ce0957d08516e49f8affa6be2153f30607c0f1be7c29a1e00f4955f2112e82dc7c3b3e410a6dabf5ba2bdd9f3141b6a5299068598decd0c3
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.6.1.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-6.0.0.ebuild
index 535e5122bcc3..c6374005882f 100644
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.6.1.ebuild
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-6.0.0.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-any-r1 xdg virtualx
 
@@ -13,22 +13,22 @@ SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.
 
 LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+ MIT"
 SLOT="0"
-IUSE="+colord input_devices_wacom +networkmanager +modemmanager gnome-online-accounts systemd test"
+IUSE="+colord input_devices_wacom +networkmanager +modemmanager gnome-online-accounts systemd test wayland"
 REQUIRED_USE="modemmanager? ( networkmanager )"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 RESTRICT="test"
 
 COMMON_DEPEND="
 	app-accessibility/at-spi2-core:2
 	>=dev-libs/glib-2.44.0:2
 	>=gnome-base/libgnomekbd-3.0.0:0=
-	>=gnome-extra/cinnamon-desktop-5.6:0=
-	>=gnome-extra/cinnamon-menus-5.6
+	>=gnome-extra/cinnamon-desktop-6.0:0=
+	>=gnome-extra/cinnamon-menus-6.0
 	media-libs/fontconfig
 	>=sys-auth/polkit-0.103
 	>=sys-power/upower-0.99.8:=
 	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.16.0:3
+	>=x11-libs/gtk+-3.16.0:3[wayland=]
 	>=dev-libs/libgudev-232
 	>=x11-libs/libnotify-0.7.3
 	x11-libs/cairo
@@ -36,29 +36,42 @@ COMMON_DEPEND="
 	>=x11-libs/libxklavier-5.1:=
 	x11-libs/pango
 
-	colord? ( >=x11-misc/colord-0.1.14:0= )
+	colord? (
+		>=x11-misc/colord-0.1.14:0=
+	)
 	input_devices_wacom? (
 		>=dev-libs/libwacom-0.7:=
-		>=x11-libs/libXi-1.2 )
+		>=x11-libs/libXi-1.2
+	)
 	networkmanager? (
 		>=gnome-extra/nm-applet-1.2.0
 		>=net-libs/libnma-1.8.34
 		>=net-misc/networkmanager-1.2.0[modemmanager?]
 
-		modemmanager? ( >=net-misc/modemmanager-0.7 )
+		modemmanager? (
+			>=net-misc/modemmanager-0.7:=
+		)
 	)
 	gnome-online-accounts? (
-		>=net-libs/gnome-online-accounts-3.18.0
+		>=net-libs/gnome-online-accounts-3.18.0:=
 	)
 "
 RDEPEND="
 	${COMMON_DEPEND}
 	x11-themes/adwaita-icon-theme
 
-	colord? ( >=gnome-extra/gnome-color-manager-3 )
-	input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
-	systemd? ( >=sys-apps/systemd-31 )
-	!systemd? ( app-admin/openrc-settingsd )
+	colord? (
+		>=gnome-extra/gnome-color-manager-3
+	)
+	input_devices_wacom? (
+		gnome-extra/cinnamon-settings-daemon[input_devices_wacom]
+	)
+	systemd? (
+		>=sys-apps/systemd-31
+	)
+	!systemd? (
+		app-admin/openrc-settingsd
+	)
 "
 DEPEND="
 	${COMMON_DEPEND}
@@ -72,6 +85,12 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	# Fix optional wayland
+	# https://github.com/linuxmint/cinnamon-control-center/pull/323
+	"${FILESDIR}/${PN}-6.0.0-fix-optional-wayland.patch"
+)
+
 src_prepare() {
 	default
 	python_fix_shebang meson_install_schemas.py
diff --git a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-6.0.0-fix-optional-wayland.patch b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-6.0.0-fix-optional-wayland.patch
new file mode 100644
index 000000000000..2aab3af02146
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-6.0.0-fix-optional-wayland.patch
@@ -0,0 +1,48 @@
+From 1f90a561e4ba0e7431aeb64602e293b05a09be15 Mon Sep 17 00:00:00 2001
+From: Sparky Bluefang <sparky@bluefang-logic.com>
+Date: Sun, 7 Jan 2024 21:46:36 -0500
+Subject: [PATCH] Fix optional wayland handling in cc-display-panel
+
+---
+ meson.build                       | 1 +
+ panels/display/cc-display-panel.c | 6 ++++++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/meson.build b/meson.build
+index 6c3d5e3..11aafd5 100644
+--- a/meson.build
++++ b/meson.build
+@@ -196,6 +196,7 @@ final_message = [ '',
+   '** Colord support (Color management panel)         : @0@'.format(colord.found()),
+   '** Wacom support (Wacom panel)                     : @0@'.format(libwacom.found()),
+   '** Online-Accounts support (Online-Accounts panel) : @0@'.format(goa.found()),
++  '** Wayland support                                 : @0@'.format(cc.has_header('gdk/gdkwayland.h', dependencies: gtk)),
+   '',
+ ]
+ message('\n'.join(final_message))
+diff --git a/panels/display/cc-display-panel.c b/panels/display/cc-display-panel.c
+index 5a513b4..0676f66 100644
+--- a/panels/display/cc-display-panel.c
++++ b/panels/display/cc-display-panel.c
+@@ -28,7 +28,9 @@
+ 
+ #include <libcinnamon-desktop/cdesktop-enums.h>
+ #include <math.h>
++#ifdef GDK_WINDOWING_WAYLAND
+ #include <gdk/gdkwayland.h>
++#endif
+ 
+ #include <libupower-glib/upower.h>
+ 
+@@ -114,7 +116,11 @@ struct _CcDisplayPanel
+ 
+ CC_PANEL_REGISTER (CcDisplayPanel, cc_display_panel)
+ 
++#ifdef GDK_WINDOWING_WAYLAND
+ #define WAYLAND_SESSION() (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default()))
++#else
++#define WAYLAND_SESSION() (FALSE)
++#endif
+ 
+ static void update_bottom_buttons (CcDisplayPanel *panel);
+ static void apply_current_configuration (CcDisplayPanel *self);