From 82fa7cf455d2e7ca1049b728a36c79e3e47d5237 Mon Sep 17 00:00:00 2001
From: Aleksei Bavshin <alebastr@fedoraproject.org>
Date: Mar 12 2024 01:25:01 +0000
Subject: Update to 0.17.2 (#2269046)


---

diff --git a/sources b/sources
index 82fccdf..7f53089 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (wlroots-0.17.1.tar.gz) = 33360da04c5af807d775638a06844ada21fa451a745bcbb8d92b005608195c6301bd27b5c1e815990a581b6330b9343a00fc8f8e93a3764e8a856f74d55f8ff7
-SHA512 (wlroots-0.17.1.tar.gz.sig) = 1a7cd6ec2a4a6e6e4da9e387bbf2a295dc63740fc9caba965493c2293244ef2c8e211f663a60fbc9ed51f1fc1a18f145bcab23b98eb32057243e0d7a1b563070
+SHA512 (wlroots-0.17.2.tar.gz) = 44a3ec673431c02fc08a5c33daa06148b5e85a3a7ea45b28978cd6be230dd4c5082e8a34985e2976c9e64f98b7567e334c191c3d20141e8e27ddc4a4659843cc
+SHA512 (wlroots-0.17.2.tar.gz.sig) = bd316ed7ec3b2efdb5af6bd117bb5a67edb43581b85302f991c1ec7f1f42ecddacaed0435997a2e7cbd489790f61b35ec91e007c31825543ad9b283d59afaed0
diff --git a/wlroots-0.17-backend-fix-build-against-upcoming-gcc-14.patch b/wlroots-0.17-backend-fix-build-against-upcoming-gcc-14.patch
deleted file mode 100644
index 1199143..0000000
--- a/wlroots-0.17-backend-fix-build-against-upcoming-gcc-14.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From f3e1f7b2a70a500b740bfc406e893eba0852699a Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyich@gmail.com>
-Date: Thu, 21 Dec 2023 21:06:20 +0000
-Subject: [PATCH] backend: fix build against upcoming `gcc-14`
- (`-Werror=calloc-transposed-args`)
-
-`gcc-14` added a new `-Wcalloc-transposed-args` warning recently. It
-detected minor infelicity in `calloc()` API usage in `wlroots`:
-
-    ../backend/libinput/tablet_pad.c: In function 'add_pad_group_from_libinput':
-    ../backend/libinput/tablet_pad.c:36:38: error: 'calloc' sizes specified with 'sizeof' in the earlier argument and not in the later argument [-Werror=calloc-transposed-args]
-       36 |         group->rings = calloc(sizeof(unsigned int), group->ring_count);
-          |                                      ^~~~~~~~
-    ../backend/libinput/tablet_pad.c:36:38: note: earlier argument should specify number of elements, later size of each element
----
- backend/libinput/tablet_pad.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/backend/libinput/tablet_pad.c b/backend/libinput/tablet_pad.c
-index 2e74022a5..e53275281 100644
---- a/backend/libinput/tablet_pad.c
-+++ b/backend/libinput/tablet_pad.c
-@@ -33,7 +33,7 @@ static void add_pad_group_from_libinput(struct wlr_tablet_pad *pad,
- 			++group->ring_count;
- 		}
- 	}
--	group->rings = calloc(sizeof(unsigned int), group->ring_count);
-+	group->rings = calloc(group->ring_count, sizeof(unsigned int));
- 	if (group->rings == NULL) {
- 		goto group_fail;
- 	}
-@@ -50,7 +50,7 @@ static void add_pad_group_from_libinput(struct wlr_tablet_pad *pad,
- 			++group->strip_count;
- 		}
- 	}
--	group->strips = calloc(sizeof(unsigned int), group->strip_count);
-+	group->strips = calloc(group->strip_count, sizeof(unsigned int));
- 	if (group->strips == NULL) {
- 		goto group_fail;
- 	}
-@@ -66,7 +66,7 @@ static void add_pad_group_from_libinput(struct wlr_tablet_pad *pad,
- 			++group->button_count;
- 		}
- 	}
--	group->buttons = calloc(sizeof(unsigned int), group->button_count);
-+	group->buttons = calloc(group->button_count, sizeof(unsigned int));
- 	if (group->buttons == NULL) {
- 		goto group_fail;
- 	}
--- 
-GitLab
-
diff --git a/wlroots.spec b/wlroots.spec
index 53118b9..8b035fe 100644
--- a/wlroots.spec
+++ b/wlroots.spec
@@ -2,8 +2,8 @@
 %global abi_ver 12
 
 Name:           wlroots
-Version:        0.17.1
-Release:        2%{?dist}
+Version:        0.17.2
+Release:        1%{?dist}
 Summary:        A modular Wayland compositor library
 
 # Source files/overall project licensed as MIT, but
@@ -34,7 +34,6 @@ Source2:        https://emersion.fr/.well-known/openpgpkey/hu/dj3498u4hyyarh35rk
 Source3:        examples.meson.build
 
 # Upstream patches
-Patch:          %{url}/-/commit/f3e1f7b.patch#/wlroots-0.17-backend-fix-build-against-upcoming-gcc-14.patch
 
 # Fedora patches
 # Following patch is required for phoc.
@@ -128,6 +127,9 @@ install -pm0644 -D '%{SOURCE3}' '%{buildroot}/%{_pkgdocdir}/examples/meson.build
 
 
 %changelog
+* Mon Mar 11 2024 Aleksei Bavshin <alebastr@fedoraproject.org> - 0.17.2-1
+- Update to 0.17.2 (#2269046)
+
 * Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.17.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild