File U_boo1194179-001-xkb-rename-xkb_h-to-xkb-procs_... of Package xorg-x11-server

Overview Repositories Revisions Requests Users Attributes Meta

File U_boo1194179-001-xkb-rename-xkb_h-to-xkb-procs_h.patch of Package xorg-x11-server (Revision 16ec8362e8148f56ea199effc2ea46da)

Currently displaying revision 16ec8362e8148f56ea199effc2ea46da , Show latest

From 04a2689e96b42330718517b2a3950aa2bb1ca017 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 4 Jul 2022 09:42:53 +1000
Subject: [PATCH] xkb: rename xkb.h to xkb-procs.h

This header merely defines the various protocol request handlers, so
let's rename it to something less generic and remove its include from
all the files that don't actually need it (which is almost all of them).

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
---
 test/test_xkb.c            | 1 -
 xkb/ddxLoad.c              | 1 -
 xkb/{xkb.h => xkb-procs.h} | 0
 xkb/xkb.c                  | 2 +-
 xkb/xkbActions.c           | 1 -
 xkb/xkbEvents.c            | 1 -
 xkb/xkbInit.c              | 1 -
 xkb/xkbLEDs.c              | 1 -
 xkb/xkbSwap.c              | 2 +-
 xkb/xkbUtils.c             | 1 -
 xkb/xkbfmisc.c             | 1 -
 11 files changed, 2 insertions(+), 10 deletions(-)
 rename xkb/{xkb.h => xkb-procs.h} (100%)

Index: xorg-server-1.20.3/test/test_xkb.c
===================================================================
--- xorg-server-1.20.3.orig/test/test_xkb.c
+++ xorg-server-1.20.3/test/test_xkb.c
@@ -45,7 +45,6 @@
 #include "../xkb/xkbgeom.h"
 #include <X11/extensions/XKMformat.h>
 #include "xkbfile.h"
-#include "../xkb/xkb.h"
 #include <assert.h>
 
 #include "tests-common.h"
Index: xorg-server-1.20.3/xkb/ddxLoad.c
===================================================================
--- xorg-server-1.20.3.orig/xkb/ddxLoad.c
+++ xorg-server-1.20.3/xkb/ddxLoad.c
@@ -43,7 +43,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define	XKBSRV_NEED_FILE_FUNCS
 #include <xkbsrv.h>
 #include <X11/extensions/XI.h>
-#include "xkb.h"
 
 #define	PRE_ERROR_MSG "\"The XKEYBOARD keymap compiler (xkbcomp) reports:\""
 #define	ERROR_PREFIX	"\"> \""
Index: xorg-server-1.20.3/xkb/xkb.c
===================================================================
--- xorg-server-1.20.3.orig/xkb/xkb.c
+++ xorg-server-1.20.3/xkb/xkb.c
@@ -38,7 +38,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "extnsionst.h"
 #include "extinit.h"
 #include "xace.h"
-#include "xkb.h"
+#include "xkb-procs.h"
 #include "protocol-versions.h"
 
 #include <X11/extensions/XI.h>
Index: xorg-server-1.20.3/xkb/xkbActions.c
===================================================================
--- xorg-server-1.20.3.orig/xkb/xkbActions.c
+++ xorg-server-1.20.3/xkb/xkbActions.c
@@ -38,7 +38,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "exevents.h"
 #include "eventstr.h"
 #include <xkbsrv.h>
-#include "xkb.h"
 #include <ctype.h>
 #include "mi.h"
 #include "mipointer.h"
Index: xorg-server-1.20.3/xkb/xkbEvents.c
===================================================================
--- xorg-server-1.20.3.orig/xkb/xkbEvents.c
+++ xorg-server-1.20.3/xkb/xkbEvents.c
@@ -39,7 +39,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "exglobals.h"
 #include "windowstr.h"
 #include <xkbsrv.h>
-#include "xkb.h"
 
 /***====================================================================***/
 
Index: xorg-server-1.20.3/xkb/xkbInit.c
===================================================================
--- xorg-server-1.20.3.orig/xkb/xkbInit.c
+++ xorg-server-1.20.3/xkb/xkbInit.c
@@ -49,7 +49,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "xkbgeom.h"
 #include <X11/extensions/XKMformat.h>
 #include "xkbfile.h"
-#include "xkb.h"
 
 #define	CREATE_ATOM(s)	MakeAtom(s,sizeof(s)-1,1)
 
Index: xorg-server-1.20.3/xkb/xkbLEDs.c
===================================================================
--- xorg-server-1.20.3.orig/xkb/xkbLEDs.c
+++ xorg-server-1.20.3/xkb/xkbLEDs.c
@@ -38,7 +38,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <X11/extensions/XI.h>
 #include <xkbsrv.h>
-#include "xkb.h"
 
 /***====================================================================***/
 
Index: xorg-server-1.20.3/xkb/xkbSwap.c
===================================================================
--- xorg-server-1.20.3.orig/xkb/xkbSwap.c
+++ xorg-server-1.20.3/xkb/xkbSwap.c
@@ -36,7 +36,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <xkbsrv.h>
 #include "xkbstr.h"
 #include "extnsionst.h"
-#include "xkb.h"
+#include "xkb-procs.h"
 
         /*
          * REQUEST SWAPPING
Index: xorg-server-1.20.3/xkb/xkbUtils.c
===================================================================
--- xorg-server-1.20.3.orig/xkb/xkbUtils.c
+++ xorg-server-1.20.3/xkb/xkbUtils.c
@@ -67,7 +67,6 @@ DEALINGS IN THE SOFTWARE.
 #define	XKBSRV_NEED_FILE_FUNCS
 #include <xkbsrv.h>
 #include "xkbgeom.h"
-#include "xkb.h"
 
 /***====================================================================***/
 
Index: xorg-server-1.20.3/xkb/xkbfmisc.c
===================================================================
--- xorg-server-1.20.3.orig/xkb/xkbfmisc.c
+++ xorg-server-1.20.3/xkb/xkbfmisc.c
@@ -46,7 +46,6 @@
 #define XKBSRV_NEED_FILE_FUNCS	1
 #include <xkbsrv.h>
 #include "xkbgeom.h"
-#include "xkb.h"
 
 unsigned
 _XkbKSCheckCase(KeySym ks)
Index: xorg-server-1.20.3/xkb/xkb-procs.h
===================================================================
--- /dev/null
+++ xorg-server-1.20.3/xkb/xkb-procs.h
@@ -0,0 +1,30 @@
+#ifndef _XKB_H
+#define _XKB_H
+
+extern int ProcXkbUseExtension(ClientPtr client);
+extern int ProcXkbSelectEvents(ClientPtr client);
+extern int ProcXkbBell(ClientPtr client);
+extern int ProcXkbGetState(ClientPtr client);
+extern int ProcXkbLatchLockState(ClientPtr client);
+extern int ProcXkbGetControls(ClientPtr client);
+extern int ProcXkbSetControls(ClientPtr client);
+extern int ProcXkbGetMap(ClientPtr client);
+extern int ProcXkbSetMap(ClientPtr client);
+extern int ProcXkbGetCompatMap(ClientPtr client);
+extern int ProcXkbSetCompatMap(ClientPtr client);
+extern int ProcXkbGetIndicatorState(ClientPtr client);
+extern int ProcXkbGetIndicatorMap(ClientPtr client);
+extern int ProcXkbSetIndicatorMap(ClientPtr client);
+extern int ProcXkbGetNamedIndicator(ClientPtr client);
+extern int ProcXkbSetNamedIndicator(ClientPtr client);
+extern int ProcXkbGetNames(ClientPtr client);
+extern int ProcXkbSetNames(ClientPtr client);
+extern int ProcXkbGetGeometry(ClientPtr client);
+extern int ProcXkbSetGeometry(ClientPtr client);
+extern int ProcXkbPerClientFlags(ClientPtr client);
+extern int ProcXkbListComponents(ClientPtr client);
+extern int ProcXkbGetKbdByName(ClientPtr client);
+extern int ProcXkbGetDeviceInfo(ClientPtr client);
+extern int ProcXkbSetDeviceInfo(ClientPtr client);
+extern int ProcXkbSetDebuggingFlags(ClientPtr client);
+#endif
Index: xorg-server-1.20.3/xkb/xkb.h
===================================================================
--- xorg-server-1.20.3.orig/xkb/xkb.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef _XKB_H
-#define _XKB_H
-
-extern int ProcXkbUseExtension(ClientPtr client);
-extern int ProcXkbSelectEvents(ClientPtr client);
-extern int ProcXkbBell(ClientPtr client);
-extern int ProcXkbGetState(ClientPtr client);
-extern int ProcXkbLatchLockState(ClientPtr client);
-extern int ProcXkbGetControls(ClientPtr client);
-extern int ProcXkbSetControls(ClientPtr client);
-extern int ProcXkbGetMap(ClientPtr client);
-extern int ProcXkbSetMap(ClientPtr client);
-extern int ProcXkbGetCompatMap(ClientPtr client);
-extern int ProcXkbSetCompatMap(ClientPtr client);
-extern int ProcXkbGetIndicatorState(ClientPtr client);
-extern int ProcXkbGetIndicatorMap(ClientPtr client);
-extern int ProcXkbSetIndicatorMap(ClientPtr client);
-extern int ProcXkbGetNamedIndicator(ClientPtr client);
-extern int ProcXkbSetNamedIndicator(ClientPtr client);
-extern int ProcXkbGetNames(ClientPtr client);
-extern int ProcXkbSetNames(ClientPtr client);
-extern int ProcXkbGetGeometry(ClientPtr client);
-extern int ProcXkbSetGeometry(ClientPtr client);
-extern int ProcXkbPerClientFlags(ClientPtr client);
-extern int ProcXkbListComponents(ClientPtr client);
-extern int ProcXkbGetKbdByName(ClientPtr client);
-extern int ProcXkbGetDeviceInfo(ClientPtr client);
-extern int ProcXkbSetDeviceInfo(ClientPtr client);
-extern int ProcXkbSetDebuggingFlags(ClientPtr client);
-#endif

Places

File U_boo1194179-001-xkb-rename-xkb_h-to-xkb-procs_h.patch of Package xorg-x11-server (Revision 16ec8362e8148f56ea199effc2ea46da)

Places