Update to kbproto 1.0.4

5 files changed, 227 insertions, 21 deletions

diff --git a/proto/kbproto/ChangeLog b/proto/kbproto/ChangeLog
index c722b519a..36328b818 100644
--- a/proto/kbproto/ChangeLog
+++ b/proto/kbproto/ChangeLog
@@ -1,4 +1,208 @@
-2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 4e3ccd5b2144005af1d5d2f9b96275a01156aec5
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Mon Oct 12 22:39:05 2009 -0700
 
-	* configure.ac:
-	Update package version number for final X11R7 release candidate.
+    kbproto 1.0.4
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 6472994ea38a8416214b5ce12a34437541e6d15e
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Mon Oct 12 22:38:03 2009 -0700
+
+    Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 5273e7bc22cc7f11f2461ba1f5f30cbdecda1289
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Mon Apr 6 17:54:12 2009 -0700
+
+    Made some defines typedefs for better compatability
+
+commit 3baa0be057f2bf2e2f0f049c0dded4a93c68819e
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date:   Tue Jan 27 20:06:28 2009 -0200
+
+    Janitor: Correct make distcheck and dont distribute autogen.sh
+
+commit 0396fb99f96ff15e1000a6e4b5ccdca119319a8a
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Thu Dec 6 16:39:02 2007 -0500
+
+    Replace static ChangeLog with dist-hook to generate from git log
+
+commit 1a41bb4ff63d0fa27238be2af6a8b59941c0f7db
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Mon Sep 3 05:54:08 2007 -0400
+
+    Add *~ to .gitignore to skip patch/emacs droppings
+
+commit c4f5dac457e13d2cd5a1d8a1e28e56dd5d3be856
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Tue Jul 18 15:21:43 2006 -0400
+
+    Bump to 1.0.3.
+
+commit b23c0835504887f460deeac55b8be94d07336745
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Tue Jul 18 15:21:28 2006 -0400
+
+    unconditionally declare XFree86Private
+    This could probably be moved to generic DDX private.
+
+commit 85c889c725de1a0233c845c75ad62b39940b120a
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri Jul 14 18:56:20 2006 -0700
+
+    renamed: .cvsignore -> .gitignore
+
+commit d15dc14c2fb8996e1da9daaef748ff35f7844809
+Author: Kevin E Martin <kem@kem.org>
+Date:   Thu Dec 15 00:24:38 2005 +0000
+
+    Update package version number for final X11R7 release candidate.
+
+commit 9d625ab848eee9a7488e6ee3d4cfbeea5198f61b
+Author: Kevin E Martin <kem@kem.org>
+Date:   Wed Oct 19 02:48:14 2005 +0000
+
+    Update package version number for RC1 release.
+
+commit b9a70202a5d2edc2d62cbe2776635e994f07bb2d
+Author: Kristian Høgsberg <krh@redhat.com>
+Date:   Thu Sep 1 19:56:14 2005 +0000
+
+    Teach xkb how to optionally run xkbcomp from $bindir instead of
+        $datadir/xkb.
+
+commit ac13227d0007b6fac32af6281ae2e49f5e8fa90c
+Author: Eric Anholt <anholt@freebsd.org>
+Date:   Tue Aug 2 19:19:39 2005 +0000
+
+    Add basic .cvsignore files for proto modules.
+
+commit 81b6633f6509e0d8053a40cc9fe4025202991112
+Author: Kevin E Martin <kem@kem.org>
+Date:   Fri Jul 29 21:22:55 2005 +0000
+
+    Various changes preparing packages for RC0:
+    - Verify and update package version numbers as needed
+    - Implement versioning scheme
+    - Change bug address to point to bugzilla bug entry form
+    - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+        reenable it)
+    - Fix makedepend to use pkgconfig and pass distcheck
+    - Update build script to build macros first
+    - Update modular Xorg version
+
+commit 234e6351e159ec892c0f9878663819c32a88fabd
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Thu Jul 7 19:07:28 2005 +0000
+
+    More compiler warning fixes for missing prototypes:
+    Add prototype for XkbSetExtension()
+    Add #include <ctype.h> for isspace() & isdigit()
+    Add #include <grp.h> (for initgroups()) and remove extra *
+    Add prototype for xorgGetVersion()
+
+commit 4a9390f0bfc464967151b670179998d375e28d75
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Sun May 22 01:12:49 2005 +0000
+
+    Bugzilla #2800 <https://bugs.freedesktop.org/show_bug.cgi?id=2800> Xevie
+        extension crash with signal 11 on keyboard Bugzilla #1205
+        <https://bugs.freedesktop.org/show_bug.cgi?id=1205> Xevie client
+        receives two KeyPress events on consumed keys when XKB is enabled
+    Patch #2223 <https://bugs.freedesktop.org/attachment.cgi?id=2223> Fixes for
+        both of these and some other Xevie bugs (Derek Wang - Sun Microsystems)
+
+commit 3c68899e6798045e60d3c99900ab73825a612237
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Sat May 21 04:12:09 2005 +0000
+
+    Set version to 1.0.
+
+commit d346d81559dc1c8ca0d52c98c667a1afec40ce71
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Thu May 19 00:22:39 2005 +0000
+
+    revert last change, didn't do right thing at all, sorry for the noise
+
+commit 6882836c45e5a5e1caef49aa33b6fc1db0b48e27
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Thu May 19 00:10:18 2005 +0000
+
+    Require automake 1.7 in AM_INIT_AUTOMAKE
+
+commit d4a17c55d88d4a373fb1ade20001be80c5a956db
+Author: Josh Triplett <josh@speakeasy.net>
+Date:   Mon May 16 03:53:47 2005 +0000
+
+    Add COPYING file for KB.
+
+commit 19bc22d68a990a2498934695f4d938519345a1b0
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date:   Mon May 9 18:20:05 2005 +0000
+
+    Change all the protonames from <extension>Ext to <extension>Proto.
+
+commit aaef7b5591cfaaa08ca1d03b113e04dd726059a1
+Author: Kevin E Martin <kem@kem.org>
+Date:   Fri May 6 01:46:31 2005 +0000
+
+    Initial build system files for proto module.
+
+commit b5bacc5786658560870cc24975d29d582e9a335c
+Author: Egbert Eich <eich@suse.de>
+Date:   Fri Apr 23 18:43:06 2004 +0000
+
+    Merging XORG-CURRENT into trunk
+
+commit 50b5d3dd26018cec029d04413bc8deabb83a3845
+Author: Egbert Eich <eich@suse.de>
+Date:   Sun Mar 14 08:31:35 2004 +0000
+
+    Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit f121988370dcc8b5dbdc5b77c49e3c2fb2558fb2
+Author: Egbert Eich <eich@suse.de>
+Date:   Wed Mar 3 12:10:54 2004 +0000
+
+    Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 85a3d5bced3a1907fe42bbd25b77b3d2e35b1935
+Author: Egbert Eich <eich@suse.de>
+Date:   Thu Feb 26 13:35:11 2004 +0000
+
+    readding XFree86's cvs IDs
+
+commit 27095f92dfad92436113534f850098810d067fb0
+Author: Egbert Eich <eich@suse.de>
+Date:   Thu Feb 26 09:22:27 2004 +0000
+
+    Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 532eebc568179adf69317855e2c3c9cf305ef81c
+Author: Egbert Eich <eich@suse.de>
+Date:   Thu Jan 29 08:07:56 2004 +0000
+
+    Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004
+
+commit 66aafd71e17dbaeb0ba7fa4bf72f17e57d9022e5
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Tue Nov 25 19:28:02 2003 +0000
+
+    XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit bae998431a7285432eb5d1f519246e41832754d0
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Nov 14 16:48:42 2003 +0000
+
+    XFree86 4.3.0.1
+
+commit 209ae2d4c9cd739e91f8c00184dc6f2f48e21100
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Nov 14 15:54:35 2003 +0000
+
+    R6.6 is the Xorg base-line
diff --git a/proto/kbproto/Makefile.am b/proto/kbproto/Makefile.am
index 559105cbc..bbb5f3654 100644
--- a/proto/kbproto/Makefile.am
+++ b/proto/kbproto/Makefile.am
@@ -9,4 +9,14 @@ kb_HEADERS = \
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = kbproto.pc
 
-EXTRA_DIST = autogen.sh kbproto.pc.in
+EXTRA_DIST = kbproto.pc.in
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+	$(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
diff --git a/proto/kbproto/XKBsrv.h b/proto/kbproto/XKBsrv.h
index 49630af1d..26a4ed8cc 100644
--- a/proto/kbproto/XKBsrv.h
+++ b/proto/kbproto/XKBsrv.h
@@ -330,9 +330,9 @@ extern	int	DeviceButtonPress,DeviceButtonRelease;
 #undef	IsKeypadKey
 #define	IsKeypadKey(s)		XkbKSIsKeypad(s)
 
-#define	Status		int
-#define	XPointer	pointer
-#define	Display		struct _XDisplay
+typedef int Status;
+typedef pointer XPointer;
+typedef struct _XDisplay Display;
 
 #ifndef True
 #define	True	1
diff --git a/proto/kbproto/autogen.sh b/proto/kbproto/autogen.sh
deleted file mode 100644
index 904cd6746..000000000
--- a/proto/kbproto/autogen.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-ORIGDIR=`pwd`
-cd $srcdir
-
-autoreconf -v --install || exit 1
-cd $ORIGDIR || exit $?
-
-$srcdir/configure --enable-maintainer-mode "$@"
diff --git a/proto/kbproto/configure.ac b/proto/kbproto/configure.ac
index 15bfa190e..9537951aa 100644
--- a/proto/kbproto/configure.ac
+++ b/proto/kbproto/configure.ac
@@ -1,8 +1,12 @@
 AC_PREREQ([2.57])
-AC_INIT([KBProto], [1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([KBProto], [1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
-XORG_RELEASE_VERSION
+# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+	  [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+XORG_DEFAULT_OPTIONS
 
 AC_OUTPUT([Makefile
            kbproto.pc])