[PATCH] xkbactions.h

Thu Jun 8 08:52:24 PDT 2006

On Thu, Jun 08, 2006 at 02:20:49PM +0200, Enrico Weigelt wrote:
> diff -ruN xorg-server-1.0.99.902.orig/xkb/Makefile.am xorg-server-1.0.99.902/xkb/Makefile.am
> --- xorg-server-1.0.99.902.orig/xkb/Makefile.am	Thu Jun 8 12:56:43 2006
> +++ xorg-server-1.0.99.902/xkb/Makefile.am	Thu Jun 8 12:58:46 2006
> @@ -45,7 +45,7 @@
> $(X11_SRCS)
> libxkbstubs_la_SOURCES = ddxVT.c ddxPrivate.c ddxKillSrv.c
>> -EXTRA_DIST = xkb.h xkbDflts.h
> +EXTRA_DIST = xkb.h xkbDflts.h xkbactions.h
>> xkbcompileddir = $(XKB_COMPILED_DIR)
> dist_xkbcompiled_DATA = README.compiled

Ok, you add it, and then a bit farther down in your patch:
> diff -ruN xorg-server-1.0.99.902.orig/xkb/Makefile.am xorg-server-1.0.99.902/xkb/Makefile.am
> --- xorg-server-1.0.99.902.orig/xkb/Makefile.am	Thu Jun 8 13:22:40 2006
> +++ xorg-server-1.0.99.902/xkb/Makefile.am	Fri Jun 2 12:39:54 2006
> @@ -45,7 +45,7 @@
> $(X11_SRCS)
> libxkbstubs_la_SOURCES = ddxVT.c ddxPrivate.c ddxKillSrv.c
>> -EXTRA_DIST = xkb.h xkbDflts.h xkbactions.h
> +EXTRA_DIST = xkb.h xkbDflts.h
>> xkbcompileddir = $(XKB_COMPILED_DIR)
> dist_xkbcompiled_DATA = README.compiled

You remove it again?
This looks like you put the patch together by hand :(
> +//static	int		szFilters = 0;
> +//static	XkbFilterPtr	filters = NULL;

Why are these commented out and in a .h file?
thanks,
greg k-h