Upgrade to 2021.5-1

backport-add-XKB_KEY_XF86FullScreen-to-solve-could-not-resolve-keysym-XF86FullScreen.patch

@@ -1,33 +0,0 @@
-From 15329c5a0d3a5d9a8eddf0bed38c3b62c7fc7965 Mon Sep 17 00:00:00 2001
-From: Sebastian Wick <sebastian@sebastianwick.net>
-Date: Thu, 31 Oct 2019 15:17:26 +0100
-Subject: [PATCH] XF86keysym: Add XF86XK_FullScreen
-
-Add XF86XK_FullScreen keysym, to be used as mapping for evdev's
-KEY_FULL_SCREEN.
-
-Chromebooks have a special media key for toggling full screen mode.
-
-Signed-off-by: Sebastian Wick <sebastian@sebastianwick.net>
-
-Refenence: https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/11
-
----
- include/X11/XF86keysym.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/include/X11/XF86keysym.h b/include/X11/XF86keysym.h
-index dd287e2..dab1220 100644
---- a/include/X11/XF86keysym.h
-+++ b/include/X11/XF86keysym.h
-@@ -207,6 +207,8 @@
- 
- #define XF86XK_RotationLockToggle 0x1008FFB7 /* Toggle screen rotation lock on/off */
- 
-+#define XF86XK_FullScreen	0x1008FFB8   /* Toggle fullscreen */
-+
- /* Keys for special action keys (hot keys) */
- /* Virtual terminals on some operating systems */
- #define XF86XK_Switch_VT_1	0x1008FE01
--- 
-GitLab

xorg-x11-proto-devel.spec

@@ -1,15 +1,14 @@
 Name:          xorg-x11-proto-devel
-Version:       2019.1
-Release:       2
+Version:       2021.5
+Release:       1
 License:       MIT
 Summary:       X.Org X11 Protocol headers
 URL:           https://www.x.org
 Source0:       https://www.x.org/pub/individual/proto/xorgproto-%{version}.tar.bz2
 Source1:       make-git-snapshot.sh
 
-Patch6000:     backport-add-XKB_KEY_XF86FullScreen-to-solve-could-not-resolve-keysym-XF86FullScreen.patch
 
-BuildRequires: autoconf automake libtool pkgconfig xorg-x11-util-macros >= 1.0.2-1
+BuildRequires: gcc pkgconfig meson
 BuildArch:     noarch
 
 %description
@@ -19,12 +18,11 @@ X.Org X11 Protocol headers
 %autosetup -n xorgproto-%{version} -p1
 
 %build
-autoreconf -fiv
-%configure --without-xmlto
-%make_build
+%meson
+%meson_build
 
 %install
-%make_install
+%meson_install
 
 %files
 %license COPYING-*
@@ -34,6 +32,9 @@ autoreconf -fiv
 %{_docdir}/*
 
 %changelog
+* Tue Nov 30 2021 yangcheng <yangcheng87@huawei.com> 2021.5-1
+- DESC:Upgrade to 2021.5-1
+
 * Mon Jul 02 2021 wangkerong <wangkeorng@huawei.com> 2019.1-2
 - DESC:solve the issue which display could not resolve keysym XF86FullScreen