From f9a4ecfe7c271506d685f970f19b29044b0dbb12 Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed, 2 Feb 2022 15:51:00 +0100
Subject: [PATCH] xwayland 22.0.99.902

Resolves: #2042521
---
 .gitignore                              |  1 +
 0001-meson-Werror-no-array-bounds.patch | 28 -------------------------
 sources                                 |  2 +-
 xorg-x11-server-Xwayland.spec           |  9 ++++----
 4 files changed, 6 insertions(+), 34 deletions(-)
 delete mode 100644 0001-meson-Werror-no-array-bounds.patch

diff --git a/.gitignore b/.gitignore
index 1ae0822..2e12272 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /xwayland-21.1.3.tar.xz
 /xwayland-21.1.4.tar.xz
 /xwayland-22.0.99.901.tar.xz
+/xwayland-22.0.99.902.tar.xz
diff --git a/0001-meson-Werror-no-array-bounds.patch b/0001-meson-Werror-no-array-bounds.patch
deleted file mode 100644
index 48ab8c4..0000000
--- a/0001-meson-Werror-no-array-bounds.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From ffbba91546bb1493a4701cc591cdd7343025a508 Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <ofourdan@redhat.com>
-Date: Fri, 21 Jan 2022 11:31:53 +0100
-Subject: [PATCH xserver] meson: -Werror=no-array-bounds
-
-gcc 12 would raise a false positive here.
-
-Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index d4cad9d48..ee3d225da 100644
---- a/meson.build
-+++ b/meson.build
-@@ -41,7 +41,7 @@ if cc.get_id() == 'gcc' or cc.get_id() == 'clang'
-         '-Werror=sequence-point',
-         '-Werror=return-type',
-         '-Werror=trigraphs',
--        '-Werror=array-bounds',
-+        '-Werror=no-array-bounds',
-         '-Werror=write-strings',
-         '-Werror=address',
-         '-Werror=int-to-pointer-cast',
--- 
-2.34.1
-
diff --git a/sources b/sources
index fd25619..cd8fb66 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xwayland-22.0.99.901.tar.xz) = ac1c947b7212bcc0b86433bbf30478173ff8499dab0175fea4a9fb2892706c96631243da7f2f82cf812d2df6efb5cd3534d394f958ba3c47aa2014b2a8120159
+SHA512 (xwayland-22.0.99.902.tar.xz) = f87a93efa896ed33cc775d524976ff3b4ca34ac7aea52aa2f9d28685fe086b24eef2a621376d65ff4f48303eec18c7c5eca45d104c94f439d5798717513cba35
diff --git a/xorg-x11-server-Xwayland.spec b/xorg-x11-server-Xwayland.spec
index 1440786..0129b13 100644
--- a/xorg-x11-server-Xwayland.spec
+++ b/xorg-x11-server-Xwayland.spec
@@ -8,7 +8,7 @@
 
 Summary:   Xwayland
 Name:      xorg-x11-server-Xwayland
-Version:   22.0.99.901
+Version:   22.0.99.902
 Release:   1%{?gitdate:.%{gitdate}git%{shortcommit}}%{?dist}
 
 URL:       http://www.x.org
@@ -18,10 +18,6 @@ Source0:   https://gitlab.freedesktop.org/xorg/%{pkgname}/-/archive/%{commit}/%{
 Source0:   https://www.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.xz
 %endif
 
-# FIXME!
-# Work around gcc 12: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=103292
-Patch1: 0001-meson-Werror-no-array-bounds.patch
-
 License:   MIT
 
 Requires: xorg-x11-server-common
@@ -128,6 +124,9 @@ rm -Rf $RPM_BUILD_ROOT%{_localstatedir}/lib/xkb
 %{_libdir}/pkgconfig/xwayland.pc
 
 %changelog
+* Wed Feb  2 2022 Olivier Fourdan <ofourdan@redhat.com> - 22.0.99.902
+- xwayland 22.0.99.902 (xwayland 22.1.0 rc2) - (#2042521)
+
 * Tue Jan 25 2022 Olivier Fourdan <ofourdan@redhat.com> - 22.0.99.901
 - xwayland 22.0.99.901 (xwayland 22.1.0 rc1) - (#2042521)