public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/libwacom] rawhide: libwacom 2.19.0
@ 2026-05-29  0:17 Peter Hutterer
  2026-05-29  0:18 ` [rpms/libwacom] f44: " Peter Hutterer
  0 siblings, 1 reply; 2+ messages in thread
From: Peter Hutterer @ 2026-05-29  0:17 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/libwacom
Branch : rawhide
Commit : ee817e8ab75698c57ac0231224b52c2591c4125c
Author : Peter Hutterer <peter.hutterer@who-t.net>
Date   : 2026-05-29T10:15:54+10:00
Stats  : +6/-80 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/libwacom/c/ee817e8ab75698c57ac0231224b52c2591c4125c?branch=rawhide

Log:
libwacom 2.19.0

---
diff --git a/0001-database-skip-any-entries-with-an-unknown-bus-type.patch b/0001-database-skip-any-entries-with-an-unknown-bus-type.patch
deleted file mode 100644
index dd9eede..0000000
--- a/0001-database-skip-any-entries-with-an-unknown-bus-type.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From cddee7be05cd36c00092b0d32561e8df3e6c60c9 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Thu, 7 May 2026 14:13:32 +1000
-Subject: [PATCH libwacom] database: skip any entries with an unknown bus type
-
-We have support for tablet files in XDG_CONFIG_HOME so we cannot have
-the same assurances about compatibility that we have with our own
-shipped files.
-
-If the bus type is an unknown prefix we later trigger a
-g_assert_not_reached() when converting from the bustype to a match
-string. This, rather inconveniently, can bring down the compositor.
-
-And to get past our own dbverify test we need to now special-case the
-"generic" device match, otherwise that ends up with WBUSTYPE_UKNOWN
-which triggers the warning which then triggers a test case failure.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=2463712
----
- libwacom/libwacom-database.c | 2 ++
- libwacom/libwacom.c          | 5 +++++
- 2 files changed, 7 insertions(+)
-
-diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c
-index e845c10075b9..2a09202ed8ba 100644
---- a/libwacom/libwacom-database.c
-+++ b/libwacom/libwacom-database.c
-@@ -230,16 +230,18 @@ match_from_string(const char *str_in,
- 	if (g_str_has_suffix(str_in, ";"))
- 		str[strlen(str) - 1] = '\0';
- 
- 	components = g_strsplit(str, "|", 16);
- 	if (!components[0] || !components[1] || !components[2])
- 		goto out;
- 
- 	*bus = bus_from_str(components[0]);
-+	if (*bus == WBUSTYPE_UNKNOWN)
-+		goto out;
- 	if (!g_ascii_string_to_unsigned(components[1], 16, 0, 0xffff, &num, NULL))
- 		goto out;
- 	*vendor_id = (int)num;
- 
- 	if (!g_ascii_string_to_unsigned(components[2], 16, 0, 0xffff, &num, NULL))
- 		goto out;
- 	*product_id = (int)num;
- 
-diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c
-index 0665bca601fb..fd381a1fb704 100644
---- a/libwacom/libwacom.c
-+++ b/libwacom/libwacom.c
-@@ -1112,16 +1112,21 @@ print_match(int fd,
- {
- 	const char *name = libwacom_match_get_name(match);
- 	const char *uniq = libwacom_match_get_uniq(match);
- 	WacomBusType type = libwacom_match_get_bustype(match);
- 	int vendor = libwacom_match_get_vendor_id(match);
- 	int product = libwacom_match_get_product_id(match);
- 	const char *bus_name;
- 
-+	if (g_str_equal(match->match, GENERIC_DEVICE_MATCH)) {
-+		dprintf(fd, "%s;", match->match);
-+		return;
-+	}
-+
- 	switch (type) {
- 	case WBUSTYPE_BLUETOOTH:
- 		bus_name = "bluetooth";
- 		break;
- 	case WBUSTYPE_USB:
- 		bus_name = "usb";
- 		break;
- 	case WBUSTYPE_SERIAL:
--- 
-2.53.0
-

diff --git a/libwacom.spec b/libwacom.spec
index e2ed5d2..76fe510 100644
--- a/libwacom.spec
+++ b/libwacom.spec
@@ -1,6 +1,6 @@
 Name:           libwacom
-Version:        2.18.0
-Release:        2%{?dist}
+Version:        2.19.0
+Release:        1%{?dist}
 Summary:        Tablet Information Client Library
 Requires:       %{name}-data
 
@@ -9,8 +9,6 @@ URL:            https://github.com/linuxwacom/libwacom
 
 Source0:        https://github.com/linuxwacom/libwacom/releases/download/%{name}-%{version}/%{name}-%{version}.tar.xz
 
-Patch01:        0001-database-skip-any-entries-with-an-unknown-bus-type.patch
-
 BuildRequires:  meson gcc
 BuildRequires:  glib2-devel libgudev1-devel libevdev-devel
 BuildRequires:  systemd systemd-devel
@@ -96,6 +94,9 @@ install -d ${RPM_BUILD_ROOT}/%{_udevrulesdir}
 %{_mandir}/man1/libwacom-show-stylus.1*
 
 %changelog
+* Fri May 29 2026 Peter Hutterer <peter.hutterer@redhat.com> - 2.19.0-1
+- libwacom 2.19.0
+
 * Thu May 07 2026 Peter Hutterer <peter.hutterer@redhat.com> - 2.18.0-2
 - Ignore device matches with unknown bustypes
 

diff --git a/sources b/sources
index e1d2515..5733380 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libwacom-2.18.0.tar.xz) = 33e0289fbf9e61e113264ebc5fffc89f4c4141dbc2c8807af567888651287e8d8bf2f25140e8dc075b4e9803000486af2d55880c67ee637ead5926db7f39e235
+SHA512 (libwacom-2.19.0.tar.xz) = b3348670a0fb0d570e750e21b59702a4b3dadafd6784758fbe7bdd4d76e019cb805b92cc16608e049f4392165093e7275df1af3619d32a67b8e00055113a4408

^ permalink raw reply related	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-05-29  0:18 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-05-29  0:17 [rpms/libwacom] rawhide: libwacom 2.19.0 Peter Hutterer
2026-05-29  0:18 ` [rpms/libwacom] f44: " Peter Hutterer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox