From 8ccc5e9cd405ef3c2fa0d95af30e4f7cfe956783 Mon Sep 17 00:00:00 2001 From: matthieu Date: Tue, 20 Dec 2011 20:18:26 +0000 Subject: [PATCH] Update to libXi 1.4.5. --- lib/libXi/ChangeLog | 30 ++++++++++++++++++++++++++++++ lib/libXi/configure | 20 ++++++++++---------- lib/libXi/configure.ac | 2 +- lib/libXi/man/XIChangeProperty.man | 4 ++-- lib/libXi/man/XIGrabButton.man | 4 ++-- lib/libXi/man/XIGrabDevice.man | 4 ++-- lib/libXi/man/XIGrabEnter.man | 4 ++-- lib/libXi/man/XIQueryDevice.man | 4 ++-- lib/libXi/src/XExtInt.c | 2 +- 9 files changed, 52 insertions(+), 22 deletions(-) diff --git a/lib/libXi/ChangeLog b/lib/libXi/ChangeLog index 7b2521f59..dd996c0e2 100644 --- a/lib/libXi/ChangeLog +++ b/lib/libXi/ChangeLog @@ -1,3 +1,33 @@ +commit d58150cf5cf11c0449fc9e9f3c7fc4d29764f6e5 +Author: Peter Hutterer +Date: Tue Dec 20 10:18:28 2011 +1000 + + libXi 1.4.5 + + Signed-off-by: Peter Hutterer + +commit 7a30bc136fb6c1561f5cd91606bca01fb877f167 +Author: Peter Hutterer +Date: Fri Aug 12 14:24:26 2011 +1000 + + Don't use the protocol defines for 2.0 versioning. + + Otherwise we run into the old problem again: recompiling libXi against + newer inputproto headers will appear to change the version support, + potentially causing errors or other misbehaviours. + + Signed-off-by: Peter Hutterer + Reviewed-by: Jeremy Huddleston + (cherry picked from commit ca73cd3b7630e7eb7d26c61c4af10d35dbce5465) + +commit e423bfa6045a2b2eeb02080ae39dbee44e062bfa +Author: Peter Hutterer +Date: Fri Dec 16 07:43:45 2011 +1000 + + libXi 1.4.4 + + Signed-off-by: Peter Hutterer + commit 30bff38c7436daad4140fedf867c546bea839b93 Author: Peter Hutterer Date: Wed Oct 26 08:54:53 2011 +1000 diff --git a/lib/libXi/configure b/lib/libXi/configure index 4d8137413..3c66fbf39 100644 --- a/lib/libXi/configure +++ b/lib/libXi/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.62 for libXi 1.4.4. +# Generated by GNU Autoconf 2.62 for libXi 1.4.5. # # Report bugs to . # @@ -676,8 +676,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='libXi' PACKAGE_TARNAME='libXi' -PACKAGE_VERSION='1.4.4' -PACKAGE_STRING='libXi 1.4.4' +PACKAGE_VERSION='1.4.5' +PACKAGE_STRING='libXi 1.4.5' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' ac_unique_file="Makefile.am" @@ -1459,7 +1459,7 @@ if test "$ac_init_help" = "long"; then # 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 libXi 1.4.4 to adapt to many kinds of systems. +\`configure' configures libXi 1.4.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1529,7 +1529,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libXi 1.4.4:";; + short | recursive ) echo "Configuration of libXi 1.4.5:";; esac cat <<\_ACEOF @@ -1649,7 +1649,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libXi configure 1.4.4 +libXi configure 1.4.5 generated by GNU Autoconf 2.62 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1663,7 +1663,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libXi $as_me 1.4.4, which was +It was created by libXi $as_me 1.4.5, which was generated by GNU Autoconf 2.62. Invocation command line was $ $0 $@ @@ -2317,7 +2317,7 @@ fi # Define the identity of the package. PACKAGE='libXi' - VERSION='1.4.4' + VERSION='1.4.5' cat >>confdefs.h <<_ACEOF @@ -14048,7 +14048,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libXi $as_me 1.4.4, which was +This file was extended by libXi $as_me 1.4.5, which was generated by GNU Autoconf 2.62. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14101,7 +14101,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -libXi config.status 1.4.4 +libXi config.status 1.4.5 configured by $0, generated by GNU Autoconf 2.62, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/lib/libXi/configure.ac b/lib/libXi/configure.ac index 3650edb67..9d5d5eb67 100644 --- a/lib/libXi/configure.ac +++ b/lib/libXi/configure.ac @@ -1,7 +1,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([libXi], [1.4.4], +AC_INIT([libXi], [1.4.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXi]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([src/config.h]) diff --git a/lib/libXi/man/XIChangeProperty.man b/lib/libXi/man/XIChangeProperty.man index bf8cafd23..c9d6a8ed8 100644 --- a/lib/libXi/man/XIChangeProperty.man +++ b/lib/libXi/man/XIChangeProperty.man @@ -2,12 +2,12 @@ .\" Title: xichangeproperty .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 -.\" Date: 12/16/2011 +.\" Date: 12/20/2011 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XICHANGEPROPERTY" "libmansuffix" "12/16/2011" "[FIXME: source]" "[FIXME: manual]" +.TH "XICHANGEPROPERTY" "libmansuffix" "12/20/2011" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/lib/libXi/man/XIGrabButton.man b/lib/libXi/man/XIGrabButton.man index 8e12b8d22..4f7674381 100644 --- a/lib/libXi/man/XIGrabButton.man +++ b/lib/libXi/man/XIGrabButton.man @@ -2,12 +2,12 @@ .\" Title: xigrabbutton .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 -.\" Date: 12/16/2011 +.\" Date: 12/20/2011 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XIGRABBUTTON" "libmansuffix" "12/16/2011" "[FIXME: source]" "[FIXME: manual]" +.TH "XIGRABBUTTON" "libmansuffix" "12/20/2011" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/lib/libXi/man/XIGrabDevice.man b/lib/libXi/man/XIGrabDevice.man index 3c6b1dc0d..52d999836 100644 --- a/lib/libXi/man/XIGrabDevice.man +++ b/lib/libXi/man/XIGrabDevice.man @@ -2,12 +2,12 @@ .\" Title: xigrabdevice .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 -.\" Date: 12/16/2011 +.\" Date: 12/20/2011 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XIGRABDEVICE" "libmansuffix" "12/16/2011" "[FIXME: source]" "[FIXME: manual]" +.TH "XIGRABDEVICE" "libmansuffix" "12/20/2011" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/lib/libXi/man/XIGrabEnter.man b/lib/libXi/man/XIGrabEnter.man index d22536100..17541f831 100644 --- a/lib/libXi/man/XIGrabEnter.man +++ b/lib/libXi/man/XIGrabEnter.man @@ -2,12 +2,12 @@ .\" Title: xigrabenter .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 -.\" Date: 12/16/2011 +.\" Date: 12/20/2011 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XIGRABENTER" "libmansuffix" "12/16/2011" "[FIXME: source]" "[FIXME: manual]" +.TH "XIGRABENTER" "libmansuffix" "12/20/2011" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/lib/libXi/man/XIQueryDevice.man b/lib/libXi/man/XIQueryDevice.man index 016f11c35..2d3c9d6ae 100644 --- a/lib/libXi/man/XIQueryDevice.man +++ b/lib/libXi/man/XIQueryDevice.man @@ -2,12 +2,12 @@ .\" Title: xiquerydevice .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 -.\" Date: 12/16/2011 +.\" Date: 12/20/2011 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XIQUERYDEVICE" "libmansuffix" "12/16/2011" "[FIXME: source]" "[FIXME: manual]" +.TH "XIQUERYDEVICE" "libmansuffix" "12/20/2011" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/lib/libXi/src/XExtInt.c b/lib/libXi/src/XExtInt.c index a5e70b5ab..63afb8f2f 100644 --- a/lib/libXi/src/XExtInt.c +++ b/lib/libXi/src/XExtInt.c @@ -268,7 +268,7 @@ static XExtensionVersion versions[] = { {XI_Absent, 0, 0}, XI_Add_DevicePresenceNotify_Minor}, {XI_Present, XI_Add_DeviceProperties_Major, XI_Add_DeviceProperties_Minor}, -{XI_Present, XI_2_Major, XI_2_Minor} +{XI_Present, 2, 0} }; /***********************************************************************