commit xorg-x11-proto-devel - openSUSE Commits

2 Aug 2008

Hello community,
here is the log from the commit of package xorg-x11-proto-devel
checked in at Sat Aug 2 00:37:34 CEST 2008.
--------

--- xorg-x11-proto-devel/xorg-x11-proto-devel.changes	2008-07-21 14:38:41.000000000 +0200
+++ xorg-x11-proto-devel/xorg-x11-proto-devel.changes	2008-07-29 10:58:44.029315905 +0200
@@ -1,0 +2,9 @@
+Tue Jul 29 10:57:47 CEST 2008 - sndirsch@suse.de
+
+- inputproto 1.4.4 
+  * C sucks: define XEventClass in terms of unsigned int, not CARD32.
+  * Typo fix.
+  * Add DeviceControlChanged define.
+- obsoletes inputproto.diff
+
+-------------------------------------------------------------------
Old:
----
  inputproto-1.4.3.tar.bz2
  inputproto.diff
New:
----
  inputproto-1.4.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-proto-devel.spec ++++++
--- /var/tmp/diff_new_pack.j18687/_old	2008-08-02 00:37:03.000000000 +0200
+++ /var/tmp/diff_new_pack.j18687/_new	2008-08-02 00:37:03.000000000 +0200
@@ -14,7 +14,7 @@
 Name:           xorg-x11-proto-devel
 Url:            http://xorg.freedesktop.org/
 Version:        7.3
-Release:        53
+Release:        58
 License:        X11/MIT
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          Development/Libraries/X11
@@ -28,7 +28,7 @@
 Source6:        fontcacheproto-X11R7.0-0.1.2.tar.bz2
 Source7:        fontsproto-X11R7.0-2.0.2.tar.bz2
 Source8:        glproto-1.4.9.tar.bz2
-Source9:        inputproto-1.4.3.tar.bz2
+Source9:        inputproto-1.4.4.tar.bz2
 Source10:       kbproto-1.0.3.tar.bz2
 Source11:       printproto-1.0.4.tar.bz2
 Source12:       randrproto-1.2.2.tar.bz2
@@ -57,7 +57,6 @@
 Source35:       vncproto-20070501.tar.bz2
 Source36:       xcliplistproto-20070501.tar.bz2
 Source37:       dri2proto-1.1.tar.bz2
-Patch:          inputproto.diff
%description
 This package contains all necessary include files and libraries needed
@@ -82,9 +81,6 @@
 %prep
 %setup -T -c %{name}
 for i in $RPM_SOURCE_DIR/*.tar.bz2; do tar xjf $i; done
-pushd inputproto-*
-%patch0 -p1
-popd
%build
@@ -137,6 +133,12 @@
 /usr/share/xcb/
%changelog
+* Tue Jul 29 2008 sndirsch@suse.de
+- inputproto 1.4.4
+  * C sucks: define XEventClass in terms of unsigned int, not CARD32.
+  * Typo fix.
+  * Add DeviceControlChanged define.
+- obsoletes inputproto.diff
 * Mon Jul 21 2008 sndirsch@suse.de
 - back to xcb-proto 1.1, since xcb-proto 1.2 requires python for
   building, which requires xorg-x11-proto-devel for building
++++++ inputproto-1.4.3.tar.bz2 -> inputproto-1.4.4.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/inputproto-1.4.3/aclocal.m4 new/inputproto-1.4.4/aclocal.m4
--- old/inputproto-1.4.3/aclocal.m4	2008-03-06 04:06:03.000000000 +0100
+++ new/inputproto-1.4.4/aclocal.m4	2008-07-29 01:50:01.000000000 +0200
@@ -65,14 +65,14 @@
    AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
    	[`echo $PACKAGE_VERSION | cut -d . -f 1`],
    	[Major version of this package])
-	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
+	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
    if test "x$PVM" = "x"; then
    	PVM="0"
    fi
    AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
    	[$PVM],
    	[Minor version of this package])
-	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
+	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
    if test "x$PVP" = "x"; then
    	PVP="0"
    fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/inputproto-1.4.3/ChangeLog new/inputproto-1.4.4/ChangeLog
--- old/inputproto-1.4.3/ChangeLog	2008-03-06 04:06:10.000000000 +0100
+++ new/inputproto-1.4.4/ChangeLog	2008-07-29 01:50:03.000000000 +0200
@@ -1,3 +1,41 @@
+commit c109e2ddb9cab22f185a877ab7e48002d1087400
+Author: Peter Hutterer peter.hutterer@who-t.net
+Date:   Tue Jul 29 09:10:09 2008 +0930
+
+    inputproto 1.4.4
+
+commit f41d153886c3519ebaf767f9c0d3281b6adce030
+Author: Peter Hutterer peter.hutterer@who-t.net
+Date:   Tue Jul 29 08:58:53 2008 +0930
+
+    Add DeviceControlChanged define.
+    
+    This value is used for the devchange field in the DevicePresenceNotify event
+    when a device's control has been modified.
+    (cherry picked from commit 0daf8328cfa90b038753fc409c5eb05ba3fac6d5)
+
+commit 852568991b251e9366da167f1b746a0a1db6adf0
+Author: Adam Jackson ajax@redhat.com
+Date:   Mon Mar 10 09:31:51 2008 -0400
+
+    Typo fix.
+
+commit b5cbe2d93f6c0129b8f29da97778f6d1b15c38f9
+Author: Adam Jackson ajax@redhat.com
+Date:   Mon Mar 10 09:08:21 2008 -0400
+
+    C sucks: define XEventClass in terms of unsigned int, not CARD32.
+    
+    Apparently pulling in Xmd.h here breaks qt, since they both define an
+    INT32 type (and incompatible ones even, since Xmd's is unsigned long on
+    ILP32 because whoever wrote Xmd.h is a C novice).
+
+commit 3edc1bf23b07ea47d7e1e32047e15c67333c663e
+Author: Adam Jackson ajax@redhat.com
+Date:   Wed Mar 5 22:06:19 2008 -0500
+
+    inputproto 1.4.3
+
 commit 096b20bf5492d248b5c8ff0c1c28e221d59db724
 Author: Jesse Barnes jesse.barnes@intel.com
 Date:   Mon Jan 21 15:28:49 2008 -0800
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/inputproto-1.4.3/configure new/inputproto-1.4.4/configure
--- old/inputproto-1.4.3/configure	2008-03-06 04:06:04.000000000 +0100
+++ new/inputproto-1.4.4/configure	2008-07-29 01:50:02.000000000 +0200
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for InputProto 1.4.3.
+# Generated by GNU Autoconf 2.61 for InputProto 1.4.4.
 #
 # Report bugs to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg.
 #
@@ -574,8 +574,8 @@
 # Identity of this package.
 PACKAGE_NAME='InputProto'
 PACKAGE_TARNAME='inputproto'
-PACKAGE_VERSION='1.4.3'
-PACKAGE_STRING='InputProto 1.4.3'
+PACKAGE_VERSION='1.4.4'
+PACKAGE_STRING='InputProto 1.4.4'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_subst_vars='SHELL
@@ -1145,7 +1145,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-`configure' configures InputProto 1.4.3 to adapt to many kinds of systems.
+`configure' configures InputProto 1.4.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1211,7 +1211,7 @@
if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of InputProto 1.4.3:";;
+     short | recursive ) echo "Configuration of InputProto 1.4.4:";;
    esac
   cat <<_ACEOF
@@ -1282,7 +1282,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<_ACEOF
-InputProto configure 1.4.3
+InputProto configure 1.4.4
 generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1296,7 +1296,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
-It was created by InputProto $as_me 1.4.3, which was
+It was created by InputProto $as_me 1.4.4, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
$ $0 $@
@@ -1986,7 +1986,7 @@
# Define the identity of the package.
  PACKAGE='inputproto'
- VERSION='1.4.3'
+ VERSION='1.4.4'
cat >>confdefs.h <<_ACEOF
@@ -2153,7 +2153,7 @@
 #define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
 _ACEOF
-	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
+	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
    if test "x$PVM" = "x"; then
    	PVM="0"
    fi
@@ -2162,7 +2162,7 @@
 #define PACKAGE_VERSION_MINOR $PVM
 _ACEOF
-	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
+	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
    if test "x$PVP" = "x"; then
    	PVP="0"
    fi
@@ -2601,7 +2601,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by InputProto $as_me 1.4.3, which was
+This file was extended by InputProto $as_me 1.4.4, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
CONFIG_FILES    = $CONFIG_FILES
@@ -2644,7 +2644,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\
-InputProto config.status 1.4.3
+InputProto config.status 1.4.4
 configured by $0, generated by GNU Autoconf 2.61,
   with options \"`echo "$ac_configure_args" | sed 's/^ //; s/[\""`$]/\\&/g'`\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/inputproto-1.4.3/configure.ac new/inputproto-1.4.4/configure.ac
--- old/inputproto-1.4.3/configure.ac	2008-03-06 04:05:48.000000000 +0100
+++ new/inputproto-1.4.4/configure.ac	2008-07-29 01:49:33.000000000 +0200
@@ -1,5 +1,5 @@
 AC_PREREQ([2.57])
-AC_INIT([InputProto], [1.4.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([InputProto], [1.4.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
XORG_RELEASE_VERSION
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/inputproto-1.4.3/install-sh new/inputproto-1.4.4/install-sh
--- old/inputproto-1.4.3/install-sh	2008-03-06 04:06:05.000000000 +0100
+++ new/inputproto-1.4.4/install-sh	2008-04-16 06:02:08.000000000 +0200
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
-scriptversion=2006-12-25.00
+scriptversion=2006-10-14.15
# This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -48,7 +48,7 @@
 # set DOITPROG to echo to test this script
# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit=${DOITPROG-}
+doit="${DOITPROG-}"
 if test -z "$doit"; then
   doit_exec=exec
 else
@@ -58,49 +58,34 @@
 # Put in absolute file names if you don't have them in your path;
 # or use environment vars.
-chgrpprog=${CHGRPPROG-chgrp}
-chmodprog=${CHMODPROG-chmod}
-chownprog=${CHOWNPROG-chown}
-cmpprog=${CMPPROG-cmp}
-cpprog=${CPPROG-cp}
-mkdirprog=${MKDIRPROG-mkdir}
-mvprog=${MVPROG-mv}
-rmprog=${RMPROG-rm}
-stripprog=${STRIPPROG-strip}
-
-posix_glob='?'
-initialize_posix_glob='
-  test "$posix_glob" != "?" || {
-    if (set -f) 2>/dev/null; then
-      posix_glob=
-    else
-      posix_glob=:
-    fi
-  }
-'
+mvprog="${MVPROG-mv}"
+cpprog="${CPPROG-cp}"
+chmodprog="${CHMODPROG-chmod}"
+chownprog="${CHOWNPROG-chown}"
+chgrpprog="${CHGRPPROG-chgrp}"
+stripprog="${STRIPPROG-strip}"
+rmprog="${RMPROG-rm}"
+mkdirprog="${MKDIRPROG-mkdir}"
+posix_glob=
 posix_mkdir=
# Desired mode of installed file.
 mode=0755
-chgrpcmd=
 chmodcmd=$chmodprog
 chowncmd=
-mvcmd=$mvprog
-rmcmd="$rmprog -f"
+chgrpcmd=
 stripcmd=
-
+rmcmd="$rmprog -f"
+mvcmd="$mvprog"
 src=
 dst=
 dir_arg=
-dst_arg=
-
-copy_on_change=false
+dstarg=
 no_target_directory=
-usage="\
-Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
    or: $0 [OPTION]... SRCFILES... DIRECTORY
    or: $0 [OPTION]... -t DIRECTORY SRCFILES...
    or: $0 [OPTION]... -d DIRECTORIES...
@@ -110,55 +95,65 @@
 In the 4th, create DIRECTORIES.
Options:
-     --help     display this help and exit.
-     --version  display version info and exit.
-
-  -c            (ignored)
-  -C            install only if different (preserve the last data modification time)
-  -d            create directories instead of installing files.
-  -g GROUP      $chgrpprog installed files to GROUP.
-  -m MODE       $chmodprog installed files to MODE.
-  -o USER       $chownprog installed files to USER.
-  -s            $stripprog installed files.
-  -t DIRECTORY  install into DIRECTORY.
-  -T            report an error if DSTFILE is a directory.
+-c         (ignored)
+-d         create directories instead of installing files.
+-g GROUP   $chgrpprog installed files to GROUP.
+-m MODE    $chmodprog installed files to MODE.
+-o USER    $chownprog installed files to USER.
+-s         $stripprog installed files.
+-t DIRECTORY  install into DIRECTORY.
+-T         report an error if DSTFILE is a directory.
+--help     display this help and exit.
+--version  display version info and exit.
Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
-  RMPROG STRIPPROG
+  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
 "
while test $# -ne 0; do
   case $1 in
-    -c) ;;
-
-    -C) copy_on_change=true;;
+    -c) shift
+        continue;;
-    -d) dir_arg=true;;
+    -d) dir_arg=true
+        shift
+        continue;;
-g) chgrpcmd="$chgrpprog $2"
-	shift;;
+        shift
+        shift
+        continue;;
--help) echo "$usage"; exit $?;;
-m) mode=$2
+        shift
+        shift
    case $mode in
      *' '* | *'	'* | *'
 '*	  | *'*'* | *'?'* | *'['*)
        echo "$0: invalid mode: $mode" >&2
        exit 1;;
    esac
-	shift;;
+        continue;;
-o) chowncmd="$chownprog $2"
-	shift;;
-
-    -s) stripcmd=$stripprog;;
-
-    -t) dst_arg=$2
-	shift;;
-
-    -T) no_target_directory=true;;
+        shift
+        shift
+        continue;;
+
+    -s) stripcmd=$stripprog
+        shift
+        continue;;
+
+    -t) dstarg=$2
+	shift
+	shift
+	continue;;
+
+    -T) no_target_directory=true
+	shift
+	continue;;
--version) echo "$0 $scriptversion"; exit $?;;
@@ -170,22 +165,21 @@
*)  break;;
   esac
-  shift
 done
-if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
   # When -d is used, all remaining arguments are directories to create.
   # When -t is used, the destination is already specified.
   # Otherwise, the last argument is the destination.  Remove it from $@.
   for arg
   do
-    if test -n "$dst_arg"; then
+    if test -n "$dstarg"; then
       # $@ is not empty: it contains at least $arg.
-      set fnord "$@" "$dst_arg"
+      set fnord "$@" "$dstarg"
       shift # fnord
     fi
     shift # arg
-    dst_arg=$arg
+    dstarg=$arg
   done
 fi
@@ -230,7 +224,7 @@
 do
   # Protect names starting with `-'.
   case $src in
-    -*) src=./$src;;
+    -*) src=./$src ;;
   esac
if test -n "$dir_arg"; then
@@ -248,22 +242,22 @@
       exit 1
     fi
-    if test -z "$dst_arg"; then
+    if test -z "$dstarg"; then
       echo "$0: no destination specified." >&2
       exit 1
     fi
-    dst=$dst_arg
+    dst=$dstarg
     # Protect names starting with `-'.
     case $dst in
-      -*) dst=./$dst;;
+      -*) dst=./$dst ;;
     esac
# If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
     if test -d "$dst"; then
       if test -n "$no_target_directory"; then
-	echo "$0: $dst_arg: Is a directory" >&2
+	echo "$0: $dstarg: Is a directory" >&2
    exit 1
       fi
       dstdir=$dst
@@ -384,19 +378,26 @@
       # directory the slow way, step by step, checking for races as we go.
case $dstdir in
-	/*) prefix='/';;
-	-*) prefix='./';;
-	*)  prefix='';;
+	/*) prefix=/ ;;
+	-*) prefix=./ ;;
+	*)  prefix= ;;
       esac
-      eval "$initialize_posix_glob"
+      case $posix_glob in
+        '')
+	  if (set -f) 2>/dev/null; then
+	    posix_glob=true
+	  else
+	    posix_glob=false
+	  fi ;;
+      esac
oIFS=$IFS
       IFS=/
-      $posix_glob set -f
+      $posix_glob && set -f
       set fnord $dstdir
       shift
-      $posix_glob set +f
+      $posix_glob && set +f
       IFS=$oIFS
prefixes=
@@ -458,54 +459,41 @@
     # ignore errors from any of these, just make sure not to ignore
     # errors from the above "$doit $cpprog $src $dsttmp" command.
     #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
-    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
-    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-
-    # If -C, don't bother to copy if it wouldn't change the file.
-    if $copy_on_change &&
-       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
-       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
-
-       eval "$initialize_posix_glob" &&
-       $posix_glob set -f &&
-       set X $old && old=:$2:$4:$5:$6 &&
-       set X $new && new=:$2:$4:$5:$6 &&
-       $posix_glob set +f &&
-
-       test "$old" = "$new" &&
-       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
-    then
-      rm -f "$dsttmp"
-    else
-      # Rename the file to the real destination.
-      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
-
-      # The rename failed, perhaps because mv can't rename something else
-      # to itself, or perhaps because mv is so ancient that it does not
-      # support -f.
-      {
-	# Now remove or move aside any old file at destination location.
-	# We try this two ways since rm can't unlink itself on some
-	# systems and the destination file might be busy for other
-	# reasons.  In this case, the final cleanup might fail but the new
-	# file should still install successfully.
-	{
-	  test ! -f "$dst" ||
-	  $doit $rmcmd -f "$dst" 2>/dev/null ||
-	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-	  } ||
-	  { echo "$0: cannot unlink or rename $dst" >&2
-	    (exit 1); exit 1
-	  }
-	} &&
-
-	# Now rename the file to the real destination.
-	$doit $mvcmd "$dsttmp" "$dst"
-      }
-    fi || exit 1
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
+      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
+      && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+    # Now rename the file to the real destination.
+    { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
+      || {
+	   # The rename failed, perhaps because mv can't rename something else
+	   # to itself, or perhaps because mv is so ancient that it does not
+	   # support -f.
+
+	   # Now remove or move aside any old file at destination location.
+	   # We try this two ways since rm can't unlink itself on some
+	   # systems and the destination file might be busy for other
+	   # reasons.  In this case, the final cleanup might fail but the new
+	   # file should still install successfully.
+	   {
+	     if test -f "$dst"; then
+	       $doit $rmcmd -f "$dst" 2>/dev/null \
+	       || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
+		     && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
+	       || {
+		 echo "$0: cannot unlink or rename $dst" >&2
+		 (exit 1); exit 1
+	       }
+	     else
+	       :
+	     fi
+	   } &&
+
+	   # Now rename the file to the real destination.
+	   $doit $mvcmd "$dsttmp" "$dst"
+	 }
+    } || exit 1
trap '' 0
   fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/inputproto-1.4.3/XI.h new/inputproto-1.4.4/XI.h
--- old/inputproto-1.4.3/XI.h	2008-03-06 04:05:38.000000000 +0100
+++ new/inputproto-1.4.4/XI.h	2008-07-29 01:45:06.000000000 +0200
@@ -1,5 +1,3 @@
-/* $Xorg: XI.h,v 1.4 2001/02/09 02:03:23 xorgcvs Exp $ */
-
 /************************************************************
Copyright 1989, 1998  The Open Group
@@ -45,17 +43,14 @@
 SOFTWARE.
********************************************************/
-/* $XFree86: xc/include/extensions/XI.h,v 1.4 2001/01/17 17:53:16 dawes Exp $ */
/* Definitions used by the server, library and client */
#ifndef _XI_H_
 #define _XI_H_
-#include <X11/Xmd.h> /* CARD32 */
-
-#define sz_xGetExtensionVersionReq		8
-#define sz_xGetExtensionVersionReply		32
+#define sz_xGetExtensionVersionReq             8
+#define sz_xGetExtensionVersionReply           32
 #define sz_xListInputDevicesReq			4
 #define sz_xListInputDevicesReply		32
 #define sz_xOpenDeviceReq			8
@@ -255,7 +250,8 @@
 #define DeviceRemoved            1
 #define DeviceEnabled            2
 #define DeviceDisabled           3
-#define DeviceUnrecoverable      4  
+#define DeviceUnrecoverable      4
+#define DeviceControlChanged     5
#define XI_BadDevice	0
 #define XI_BadEvent	1
@@ -263,12 +259,16 @@
 #define XI_DeviceBusy	3
 #define XI_BadClass	4
-/* Make XEventClass be a CARD32 for 64 bit servers.  Don't affect client
+/*
+ * Make XEventClass be a CARD32 for 64 bit servers.  Don't affect client
  * definition of XEventClass since that would be a library interface change.
  * See the top of X.h for more _XSERVER64 magic.
+ *
+ * But, don't actually use the CARD32 type.  We can't get it defined here
+ * without polluting the namespace.
  */
 #ifdef _XSERVER64
-typedef	CARD32		XEventClass;
+typedef unsigned int	XEventClass;
 #else
 typedef	unsigned long	XEventClass;
 #endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/inputproto-1.4.3/XIproto.h new/inputproto-1.4.4/XIproto.h
--- old/inputproto-1.4.3/XIproto.h	2008-03-06 04:05:38.000000000 +0100
+++ new/inputproto-1.4.4/XIproto.h	2008-07-29 01:45:06.000000000 +0200
@@ -1600,7 +1600,7 @@
     BYTE        pad00;
     CARD16 	sequenceNumber B16;
     Time        time B32;
-    BYTE        devchange; /* Device{Added|Removed|Enabled|Disabled} */
+    BYTE        devchange; /* Device{Added|Removed|Enabled|Disabled|ControlChanged} */
     BYTE        deviceid;
     CARD16      control B16;
     CARD32	pad02 B32;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    