xorgproto 2018.4

.gitignore

@@ -133,3 +133,4 @@ inputproto-2.0.1.tar.bz2
 /xorgproto-2018.1.tar.bz2
 /xorgproto-2018.2.tar.bz2
 /xorgproto-2018.3.tar.bz2
+/xorgproto-2018.4.tar.bz2

inputproto-0001-Allow-library-users-to-avoid-having-the-P.patch

@@ -1,39 +0,0 @@
-From b4184619702b6801e3a2ea9733ae1620fa4ceda7 Mon Sep 17 00:00:00 2001
-From: Keith Packard <keithp@keithp.com>
-Date: Mon, 16 Dec 2013 09:43:41 -0800
-Subject: [PATCH] inputproto: Allow library users to avoid having the 'Pointer'
- typedef declared
-
-'Pointer' collides with too many other application names, so stop
-using it locally and allow applications to avoid having it in the API.
-
-Signed-off-by: Keith Packard <keithp@keithp.com>
-Reviewed-by: Eric Anholt <eric@anholt.net>
----
- XIproto.h | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/XIproto.h b/XIproto.h
-index e00ab61..82323d8 100644
---- a/XIproto.h
-+++ b/XIproto.h
-@@ -85,12 +85,14 @@ typedef struct  _XExtEventInfo
-     BYTE	word;
-     } XExtEventInfo;
- 
--typedef unsigned char *Pointer;
-+#ifndef _XITYPEDEF_POINTER
-+typedef void *Pointer;
-+#endif
- 
- struct tmask
-     {
-     Mask	mask;
--    Pointer     dev;
-+    void        *dev;
-     };
- 
- /*********************************************************
--- 
-1.9.0
-

presentproto-0001-Force-Window-and-Pixmap-to-be-CARD32-on-the-wire.patch

@@ -1,41 +0,0 @@
-From 8405ee4552565825d776e6a8963d33d9cd9cddf0 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Wed, 11 Dec 2013 13:25:06 -0500
-Subject: [PATCH presentproto 1/4] Force Window and Pixmap to be CARD32 on the
- wire
-
-If you don't do this then the client libs on 64-bit machines see them as
-XIDs, which are 64-bit wide (sigh), which ruins the wire encoding and
-nothing works.
-
-Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
- presentproto.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/presentproto.h b/presentproto.h
-index 8303a94..ee65fa4 100644
---- a/presentproto.h
-+++ b/presentproto.h
-@@ -25,6 +25,8 @@
- 
- #include <X11/extensions/presenttokens.h>
- 
-+#define Window CARD32
-+#define Pixmap CARD32
- #define Region CARD32
- #define XSyncFence CARD32
- #define EventID CARD32
-@@ -235,6 +237,8 @@ typedef struct {
- 
- #define sz_xPresentRedirectNotify 104
- 
-+#undef Window
-+#undef Pixmap
- #undef Region
- #undef XSyncFence
- #undef EventID
--- 
-1.9.0
-

sources

@@ -1 +1 @@
-SHA512 (xorgproto-2018.3.tar.bz2) = c0d69021ab5a4d3415811f4e7719cc14c2a0dc2624c6d99524304805a1b09de35fbc3cdf5027f951b389a339e9082f53a7d05e7f337589f58ce0660dc088d02b
+SHA512 (xorgproto-2018.4.tar.bz2) = 2db682d10280ca58cdc04d8eb9fef30c111d4cd379de9fec86cff317865b859a576de5426447be9231d24be9762cc1d684c57383a99ad499398e8b7d62b1c03c

xorg-x11-proto-devel.spec

@@ -2,7 +2,7 @@
 
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
-Version: 2018.3
+Version: 2018.4
 Release: 1%{?dist}
 License: MIT
 Group: Development/System
@@ -215,6 +215,9 @@ rm -f $RPM_BUILD_ROOT%{_docdir}/*/*.{html,svg}
 %{_docdir}/xorgproto/*
 
 %changelog
+* Wed Feb 28 2018 Adam Jackson <ajax@redhat.com> - 2018.4-1
+- xorgproto 2018.4
+
 * Wed Feb 21 2018 Adam Jackson <ajax@redhat.com> - 2018.3-1
 - xorgproto 2018.3
 

xproto-extra-XF86keysyms.patch

@@ -1,107 +0,0 @@
-From 9019240a9a5c869875ff6c5c28e6fca75fa90580 Mon Sep 17 00:00:00 2001
-From: Christian Kellner <christian@kellner.me>
-Date: Wed, 19 Apr 2017 15:26:41 +0200
-Subject: [PATCH xproto v2 1/3] Add XF86XK_Keyboard
-
-The 2017 Thinkpad models have a new hotkey with a keyboard symbols
-on it, which is mapped to KEY_KEYBOARD in the kernel.
-
-Signed-off-by: Christian Kellner <christian@kellner.me>
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- XF86keysym.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/XF86keysym.h b/XF86keysym.h
-index 8b5646e..89d40b8 100644
---- a/XF86keysym.h
-+++ b/XF86keysym.h
-@@ -197,6 +197,8 @@
- 
- #define XF86XK_AudioMicMute	0x1008FFB2   /* Mute the Mic from the system */
- 
-+#define XF86XK_Keyboard		0x1008FFB3   /* User defined keyboard related action */
-+
- /* Keys for special action keys (hot keys) */
- /* Virtual terminals on some operating systems */
- #define XF86XK_Switch_VT_1	0x1008FE01
--- 
-2.12.2
-
-From 98a32d328e7195e12c38baa877917335bceffbaf Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Wed, 10 May 2017 15:26:45 +0200
-Subject: [PATCH xproto v2 2/3] Add XF86XK_WWAN and XF86XK_RFKill
-
-Add Keysyms corresponding to the evdev WWAN and RFKILL keys, we already
-have Keysyms for WLAN and UWB from linux/input-event-codes.h:
-
- #define KEY_WLAN                238
- #define KEY_UWB                 239
-
-But not for the WWAN and generic RFKILL keys:
-
- #define KEY_WWAN                246     /* Wireless WAN (LTE, UMTS, GSM, etc.) */
- #define KEY_WIMAX               KEY_WWAN
- #define KEY_RFKILL              247     /* Key that controls all radios */
-
-This commits add Keysyms for these so that we can add proper mappings for
-them to xkb.
-
-Cc: Bastien Nocera <bnocera@redhat.com>
-Cc: Benjamin Berg <bberg@redhat.com>
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
-Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- XF86keysym.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/XF86keysym.h b/XF86keysym.h
-index 89d40b8..8576358 100644
---- a/XF86keysym.h
-+++ b/XF86keysym.h
-@@ -199,6 +199,9 @@
- 
- #define XF86XK_Keyboard		0x1008FFB3   /* User defined keyboard related action */
- 
-+#define XF86XK_WWAN		0x1008FFB4   /* Toggle WWAN (LTE, UMTS, etc.) radio */
-+#define XF86XK_RFKill		0x1008FFB5   /* Toggle radios on/off */
-+
- /* Keys for special action keys (hot keys) */
- /* Virtual terminals on some operating systems */
- #define XF86XK_Switch_VT_1	0x1008FE01
--- 
-2.12.2
-
-From ab8666661fc68f075b8d6ffabe22c6b577c30ac1 Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Wed, 10 May 2017 15:39:12 +0200
-Subject: [PATCH xproto v2 3/3] Add XF86XK_AudioPreset
-
-Add XF86XK_AudioPreset keysym, to be used as mapping for evdev's
-KEY_SOUND keycode which is generated on some devices by a button which
-on windows selects equalizer presets switching between settings such as
-e.g. theatre-mode / game-mode / voice-mode.
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
-Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- XF86keysym.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/XF86keysym.h b/XF86keysym.h
-index 8576358..c0d12c1 100644
---- a/XF86keysym.h
-+++ b/XF86keysym.h
-@@ -202,6 +202,8 @@
- #define XF86XK_WWAN		0x1008FFB4   /* Toggle WWAN (LTE, UMTS, etc.) radio */
- #define XF86XK_RFKill		0x1008FFB5   /* Toggle radios on/off */
- 
-+#define XF86XK_AudioPreset	0x1008FFB6   /* Select equalizer preset, e.g. theatre-mode */
-+
- /* Keys for special action keys (hot keys) */
- /* Virtual terminals on some operating systems */
- #define XF86XK_Switch_VT_1	0x1008FE01
--- 
-2.12.2
-