import OL gnome-control-center-40.0-32.el9_5

SOURCES/0001-wacom-Group-devices-using-libwacom-API-too.patch

@@ -0,0 +1,65 @@
+From 482c317e2bfd17297c886acd99317436926a210d Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Thu, 15 Aug 2024 02:03:23 +0200
+Subject: [PATCH] wacom: Group devices using libwacom API too
+
+---
+ panels/wacom/cc-wacom-device.c | 7 +++++++
+ panels/wacom/cc-wacom-device.h | 4 ++++
+ panels/wacom/cc-wacom-page.c   | 9 +++++----
+ 3 files changed, 16 insertions(+), 4 deletions(-)
+
+diff --git a/panels/wacom/cc-wacom-device.c b/panels/wacom/cc-wacom-device.c
+index a273393..cd3be0a 100644
+--- a/panels/wacom/cc-wacom-device.c
++++ b/panels/wacom/cc-wacom-device.c
+@@ -406,3 +406,10 @@ cc_wacom_device_get_button_settings (CcWacomDevice *device,
+ 
+ 	return settings;
+ }
++
++gboolean
++cc_wacom_device_is_grouped (CcWacomDevice *device1,
++                            CcWacomDevice *device2)
++{
++	return libwacom_compare (device1->wdevice, device2->wdevice, WCOMPARE_NORMAL) == 0;
++}
+diff --git a/panels/wacom/cc-wacom-device.h b/panels/wacom/cc-wacom-device.h
+index fae504a..18c5df0 100644
+--- a/panels/wacom/cc-wacom-device.h
++++ b/panels/wacom/cc-wacom-device.h
+@@ -61,3 +61,7 @@ guint           cc_wacom_device_get_num_buttons (CcWacomDevice *wacom_device);
+ 
+ GSettings     * cc_wacom_device_get_button_settings (CcWacomDevice *device,
+ 						     guint          button);
++
++gboolean        cc_wacom_device_is_grouped (CcWacomDevice *device1,
++                                            CcWacomDevice *device2);
++
+diff --git a/panels/wacom/cc-wacom-page.c b/panels/wacom/cc-wacom-page.c
+index b85bce7..25041c4 100644
+--- a/panels/wacom/cc-wacom-page.c
++++ b/panels/wacom/cc-wacom-page.c
+@@ -918,14 +918,15 @@ check_add_pad (CcWacomPage *page,
+ 	if ((gsd_device_get_device_type (gsd_device) & GSD_DEVICE_TYPE_PAD) == 0)
+ 		return;
+ 
+-	if (!gsd_device_shares_group (cc_wacom_device_get_device (page->stylus),
+-				      gsd_device))
+-		return;
+-
+ 	wacom_device = cc_wacom_device_new (gsd_device);
+ 	if (!wacom_device)
+ 		return;
+ 
++	if (!cc_wacom_device_is_grouped (page->stylus, wacom_device) &&
++            !gsd_device_shares_group (cc_wacom_device_get_device (page->stylus),
++                                      gsd_device))
++                return;
++
+ 	page->pads = g_list_prepend (page->pads, g_steal_pointer (&wacom_device));
+ 	update_pad_availability (page);
+ }
+-- 
+2.46.0
+

SOURCES/0001-wacom-Provide-connector-name-for-disambiguation.patch

@@ -0,0 +1,76 @@
+From 55ea6e7468634f97f48ceae20e3e4219e14a8320 Mon Sep 17 00:00:00 2001
+From: Carlos Garnacho <carlosg@gnome.org>
+Date: Wed, 7 Feb 2024 22:30:40 +0100
+Subject: [PATCH] wacom: Provide connector name for disambiguation
+
+Provide the connector name as the fourth value in the
+tablet's output setting. With recent Mutter, this will
+allow disambiguating the mapped output if there happens
+to be multiple outputs with the same EDID data.
+---
+ panels/wacom/cc-wacom-device.c | 14 ++++++++------
+ 1 file changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/panels/wacom/cc-wacom-device.c b/panels/wacom/cc-wacom-device.c
+index 4a3f98068..36781c9fc 100644
+--- a/panels/wacom/cc-wacom-device.c
++++ b/panels/wacom/cc-wacom-device.c
+@@ -257,7 +257,8 @@ static GnomeRROutput *
+ find_output_by_edid (GnomeRRScreen *rr_screen,
+ 		     const gchar   *vendor,
+ 		     const gchar   *product,
+-		     const gchar   *serial)
++		     const gchar   *serial,
++		     const gchar   *connector)
+ {
+ 	GnomeRROutput **rr_outputs;
+ 	GnomeRROutput *retval = NULL;
+@@ -284,8 +285,8 @@ find_output_by_edid (GnomeRRScreen *rr_screen,
+ 		        (g_strcmp0 (serial,  o_serial)  == 0);
+ 
+ 		if (match) {
+-			retval = rr_outputs[i];
+-			break;
++			if (!retval || g_strcmp0 (connector, gnome_rr_output_get_name (rr_outputs[i])) == 0)
++				retval = rr_outputs[i];
+ 		}
+ 	}
+ 
+@@ -309,7 +310,7 @@ find_output (GnomeRRScreen *rr_screen,
+ 	variant = g_settings_get_value (settings, "output");
+ 	edid = g_variant_get_strv (variant, &n);
+ 
+-	if (n != 3) {
++	if (n < 3) {
+ 		g_critical ("Expected 'output' key to store %d values; got %"G_GSIZE_FORMAT".", 3, n);
+ 		return NULL;
+ 	}
+@@ -317,7 +318,7 @@ find_output (GnomeRRScreen *rr_screen,
+ 	if (strlen (edid[0]) == 0 || strlen (edid[1]) == 0 || strlen (edid[2]) == 0)
+ 		return NULL;
+ 
+-	return find_output_by_edid (rr_screen, edid[0], edid[1], edid[2]);
++	return find_output_by_edid (rr_screen, edid[0], edid[1], edid[2], n == 4 ? edid[3] : NULL);
+ }
+ 
+ GnomeRROutput *
+@@ -353,7 +354,7 @@ cc_wacom_device_set_output (CcWacomDevice *device,
+ 	g_autofree gchar *vendor = NULL;
+ 	g_autofree gchar *product = NULL;
+ 	g_autofree gchar *serial = NULL;
+-	const gchar *values[] = { "", "", "", NULL };
++	const gchar *values[] = { "", "", "", "", NULL };
+ 
+         g_return_if_fail (CC_IS_WACOM_DEVICE (device));
+ 
+@@ -368,6 +369,7 @@ cc_wacom_device_set_output (CcWacomDevice *device,
+ 		values[0] = vendor;
+ 		values[1] = product;
+ 		values[2] = serial;
++		values[3] = gnome_rr_output_get_name (output);
+ 	}
+ 
+ 	g_settings_set_strv (settings, "output", values);
+-- 
+2.43.0
+

SPECS/gnome-control-center.spec

@@ -14,7 +14,7 @@
 
 Name:           gnome-control-center
 Version:        40.0
-Release:        30%{?dist}
+Release:        32%{?dist}
 Summary:        Utilities to configure the GNOME desktop
 
 License:        GPLv2+ and CC-BY-SA
@@ -53,6 +53,10 @@ Patch13:        gnome-control-center-wwan-5g-support.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=2168686
 Patch14:        0001-shell-Avoid-handling-map-events-from-other-windows.patch
 
+Patch15:        0001-wacom-Provide-connector-name-for-disambiguation.patch
+
+Patch16:        0001-wacom-Group-devices-using-libwacom-API-too.patch
+
 BuildRequires:  chrpath
 BuildRequires:  cups-devel
 BuildRequires:  desktop-file-utils
@@ -242,6 +246,14 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gnome-control-center
 %dir %{_datadir}/gnome/wm-properties
 
 %changelog
+* Fri Dec 13 2024 Carlos Garnacho <cgarnach@redhat.com> - 40.0-32
+- Look up grouped devices through libwacom API too
+  Resolves: RHEL-56634
+
+* Fri Apr 19 2024 Carlos Garnacho <cgarnach@redhat.com> - 40.0-31
+- Provide connector name for disambiguation in Wacom display mapping
+  Resolves: RHEL-23162
+
 * Tue Jan 09 2024 Ray Strode <rstrode@redhat.com> - 40.0-30
 - Handle subscription manager service not running without
   crashing