Hello community,
here is the log from the commit of package xorg-x11 for openSUSE:Factory
checked in at Fri May 15 22:07:43 CEST 2009.
--------
--- xorg-x11/xorg-x11.changes 2009-04-23 11:30:10.000000000 +0200
+++ xorg-x11/xorg-x11.changes 2009-05-07 10:43:47.000000000 +0200
@@ -1,0 +2,13 @@
+Thu May 7 10:42:57 CEST 2009 - sndirsch@suse.de
+
+- xinput 1.4.1
+ * This release brings mainly 64-bit fixes. Also, the device list
+ now prints out the type (MOUSE, KEYBOARD, etc.).
+
+-------------------------------------------------------------------
+Sat Apr 25 14:16:39 CEST 2009 - sndirsch@suse.de
+
+- keytable4hal
+ * fixed it again ('x' means nothing specified!)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
xinput-1.4.1.tar.bz2
New:
----
xinput-1.4.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11.spec ++++++
--- /var/tmp/diff_new_pack.m24248/_old 2009-05-15 22:06:39.000000000 +0200
+++ /var/tmp/diff_new_pack.m24248/_new 2009-05-15 22:06:39.000000000 +0200
@@ -26,7 +26,7 @@
%endif
Url: http://xorg.freedesktop.org/
Version: 7.4
-Release: 19
+Release: 20
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Utilities
@@ -134,7 +134,7 @@
Source93: mkcomposecache-1.2.tar.bz2
Source94: rendercheck-1.3.tar.bz2
Source96: xbacklight-1.1.tar.bz2
-Source97: xinput-1.4.1.tar.bz2
+Source97: xinput-1.4.2.tar.bz2
Source98: xcompmgr-1.1.4.tar.bz2
Source99: xrestop-0.4.tar.gz
Source200: misc.tar.bz2
@@ -536,6 +536,13 @@
%{_mandir}/man1/xauth.1*
%changelog
+* Thu May 07 2009 sndirsch@suse.de
+- xinput 1.4.1
+ * This release brings mainly 64-bit fixes. Also, the device list
+ now prints out the type (MOUSE, KEYBOARD, etc.).
+* Sat Apr 25 2009 sndirsch@suse.de
+- keytable4hal
+ * fixed it again ('x' means nothing specified!)
* Thu Apr 23 2009 sndirsch@suse.de
- mkfontscale-skip_symlinks.diff
* skip symlinks if they refer to files in the same directory
++++++ xdm.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/X11/xdm/keytable4hal new/etc/X11/xdm/keytable4hal
--- old/etc/X11/xdm/keytable4hal 2009-04-22 12:25:32.000000000 +0200
+++ new/etc/X11/xdm/keytable4hal 2009-04-25 14:15:39.000000000 +0200
@@ -46,12 +46,12 @@
EOF
-if [ "x$layout" != "x" ]; then
+if [ "$layout" != "x" ]; then
echo " $layout</merge>" >> $halfile
- if [ "x$variant" != "x" ]; then
+ if [ "$variant" != "x" ]; then
echo " $variant</merge>" >> $halfile
fi
- if [ "x$options" != "x" ]; then
+ if [ "$options" != "x" ]; then
echo " $options</merge>" >> $halfile
fi
fi
++++++ xinput-1.4.1.tar.bz2 -> xinput-1.4.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xinput-1.4.1/aclocal.m4 new/xinput-1.4.2/aclocal.m4
--- old/xinput-1.4.1/aclocal.m4 2009-04-06 02:03:31.000000000 +0200
+++ new/xinput-1.4.2/aclocal.m4 2009-05-07 07:21:22.000000000 +0200
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -13,7 +13,7 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(AC_AUTOCONF_VERSION, [2.63],,
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
[m4_warning([this file was generated for autoconf 2.63.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
@@ -175,7 +175,7 @@
fi[]dnl
])# PKG_CHECK_MODULES
-# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -190,7 +190,7 @@
[am__api_version='1.10'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.10.1], [],
+m4_if([$1], [1.10.2], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -204,12 +204,12 @@
# AM_SET_CURRENT_AUTOMAKE_VERSION
# -------------------------------
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10.1])dnl
+[AM_AUTOMAKE_VERSION([1.10.2])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
@@ -459,19 +459,28 @@
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-#serial 3
+#serial 4
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[for mf in $CONFIG_FILES; do
+[# Autoconf 2.62 quotes --file arguments for eval, but not when files
+# are listed without --file. Let's play safe and only enable the eval
+# if we detect the quoting.
+case $CONFIG_FILES in
+*\'*) eval set x "$CONFIG_FILES" ;;
+*) set x $CONFIG_FILES ;;
+esac
+shift
+for mf
+do
# Strip MF so we end up with the name of the file.
mf=`echo "$mf" | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile or not.
@@ -844,13 +853,13 @@
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 3
+# serial 4
# _AM_MANGLE_OPTION(NAME)
# -----------------------
@@ -867,7 +876,7 @@
# ----------------------------------
# OPTIONS is a space-separated list of Automake options.
AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
# -------------------------------------------
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xinput-1.4.1/ChangeLog new/xinput-1.4.2/ChangeLog
--- old/xinput-1.4.1/ChangeLog 2009-04-06 02:03:35.000000000 +0200
+++ new/xinput-1.4.2/ChangeLog 2009-05-07 07:21:28.000000000 +0200
@@ -1,3 +1,94 @@
+commit 5600d953531f377b5be114c9b72aca281f9bbca5
+Author: Peter Hutterer
+Date: Thu May 7 15:21:16 2009 +1000
+
+ xinput 1.4.2
+
+commit 0996eebd20b017078b7a61e42b13b3c1c5acd1b8
+Author: Peter Hutterer
+Date: Thu May 7 14:00:46 2009 +1000
+
+ XCloseDisplay when we're done.
+
+ This isn't really necessary, but we might as well be correct.
+
+ Signed-off-by: Peter Hutterer
+ (cherry picked from commit 4832dc1f3ee8d11eadc99b5cd4e8158773d11f9b)
+
+commit c6c2736a31c00717c5915e97a22b85d96ce163fe
+Author: Peter Hutterer
+Date: Fri May 1 11:22:53 2009 +1000
+
+ Create the float property if it doesn't exist.
+
+ If we don't have the float property we won't be able to use float properties
+ for device configuration since the drivers may not understand it.
+ We might still want to apply properties for client settings though.
+
+ Reported-by: Simon Thum
+ Signed-off-by: Peter Hutterer
+ (cherry picked from commit 4b4b2e3f31cf08073887d8583997eb3340a6c2e1)
+
+commit c7df478676b6573a07f74484668f9130706c4a1f
+Author: Peter Hutterer
+Date: Thu Apr 30 14:50:08 2009 +1000
+
+ If there's multiple null-terminated strings in the property, print all.
+
+ Signed-off-by: Peter Hutterer
+ Signed-off-by: Simon Thum
+ (cherry picked from commit 42dca922d287ffddcf2185ca96738f1505a04c27)
+
+commit 0616fc2e8c76c70d95173377abf39b2c7edfce19
+Author: Peter Hutterer
+Date: Fri May 1 09:14:46 2009 +1000
+
+ The float_atom should actually be an Atom
+
+ Signed-off-by: Peter Hutterer
+ (cherry picked from commit e9af7c5f602b5580df36c77ee1c2ed22ccf72134)
+
+commit 4fa194b42a5a6a15b533be070d21d981751b9b83
+Author: Peter Hutterer
+Date: Thu Apr 16 09:20:16 2009 -0400
+
+ Fix set-float-prop on 64-bit architectures.
+
+ Since 32-byte data on 64-bit machines must be passed in as 64-bit longs, let's
+ typecast around a bit.
+
+ Signed-off-by: Peter Hutterer
+ (cherry picked from commit a577bada8dddf3241a59cab812f5128131c46b29)
+
+commit 7abb366e80d3a309d4ab8cd459ce184c6806b6d1
+Author: Peter Hutterer
+Date: Tue Apr 14 09:13:15 2009 -0400
+
+ fix 64 bit issues with set-int-prop and list-props.
+
+ libX11 uses longs for 32 bit values, increasing hilarity on 64 bit machines.
+
+ Signed-off-by: Peter Hutterer
+ (cherry picked from commit de6326a75de810752a5b4e4c2f5fe98a2f7241a9)
+
+commit 4dc5f13e13c9434d6fa9ed9f10a8e12a55aedc24
+Author: Simon Thum
+Date: Thu Mar 26 13:52:15 2009 +0100
+
+ xinput: include device type in device list
+
+ Signed-off-by: Peter Hutterer
+ (cherry picked from commit 2f8f2193fdfe783c0854772cc46f1b2e0b2e3ec4)
+
+commit 61b2df1cd0135d90c65219cfa17caedbe60a44a2
+Author: Simon Thum
+Date: Thu Mar 26 15:19:47 2009 +0100
+
+ xinput: mention set-float-prop in manpage
+
+ Signed-off-by: Peter Hutterer
+ (cherry picked from commit 17d537fd65ba9b1c99a0dde7833eb4069cc624a8)
+
commit 286724a1417ffda447be918e8bcf46cc37ed715b
Author: Peter Hutterer
Date: Mon Apr 6 09:54:07 2009 +1000
@@ -201,7 +292,7 @@
Use new XQueryInputVersion() request to tell the server we can do XI 2.
commit e3b705dc15d07bbb478ced6b54a5e0553d978113
-Merge: ac3498c... 834422a...
+Merge: ac3498c 834422a
Author: Peter Hutterer
Date: Mon Apr 7 17:24:16 2008 +0930
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xinput-1.4.1/configure new/xinput-1.4.2/configure
--- old/xinput-1.4.1/configure 2009-04-06 02:03:32.000000000 +0200
+++ new/xinput-1.4.2/configure 2009-05-07 07:21:23.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for xinput 1.4.1.
+# Generated by GNU Autoconf 2.63 for xinput 1.4.2.
#
# Report bugs to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg.
#
@@ -596,8 +596,8 @@
# Identity of this package.
PACKAGE_NAME='xinput'
PACKAGE_TARNAME='xinput'
-PACKAGE_VERSION='1.4.1'
-PACKAGE_STRING='xinput 1.4.1'
+PACKAGE_VERSION='1.4.2'
+PACKAGE_STRING='xinput 1.4.2'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
# Factoring default headers for most tests.
@@ -1320,7 +1320,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 xinput 1.4.1 to adapt to many kinds of systems.
+\`configure' configures xinput 1.4.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1390,7 +1390,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xinput 1.4.1:";;
+ short | recursive ) echo "Configuration of xinput 1.4.2:";;
esac
cat <<\_ACEOF
@@ -1489,7 +1489,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xinput configure 1.4.1
+xinput configure 1.4.2
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1503,7 +1503,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xinput $as_me 1.4.1, which was
+It was created by xinput $as_me 1.4.2, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2219,7 +2219,7 @@
# Define the identity of the package.
PACKAGE='xinput'
- VERSION='1.4.1'
+ VERSION='1.4.2'
cat >>confdefs.h <<_ACEOF
@@ -5298,7 +5298,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xinput $as_me 1.4.1, which was
+This file was extended by xinput $as_me 1.4.2, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5361,7 +5361,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-xinput config.status 1.4.1
+xinput config.status 1.4.2
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -6143,7 +6143,16 @@
case $ac_file$ac_mode in
- "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
+ "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files
+# are listed without --file. Let's play safe and only enable the eval
+# if we detect the quoting.
+case $CONFIG_FILES in
+*\'*) eval set x "$CONFIG_FILES" ;;
+*) set x $CONFIG_FILES ;;
+esac
+shift
+for mf
+do
# Strip MF so we end up with the name of the file.
mf=`echo "$mf" | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile or not.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xinput-1.4.1/configure.ac new/xinput-1.4.2/configure.ac
--- old/xinput-1.4.1/configure.ac 2009-04-06 02:01:44.000000000 +0200
+++ new/xinput-1.4.2/configure.ac 2009-05-07 07:15:34.000000000 +0200
@@ -2,7 +2,7 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(xinput,[1.4.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xinput)
+AC_INIT(xinput,[1.4.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xinput)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xinput-1.4.1/Makefile.in new/xinput-1.4.2/Makefile.in
--- old/xinput-1.4.1/Makefile.in 2009-04-06 02:03:32.000000000 +0200
+++ new/xinput-1.4.2/Makefile.in 2009-05-07 07:21:24.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -336,7 +336,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xinput-1.4.1/man/Makefile.in new/xinput-1.4.2/man/Makefile.in
--- old/xinput-1.4.1/man/Makefile.in 2009-04-06 02:03:32.000000000 +0200
+++ new/xinput-1.4.2/man/Makefile.in 2009-05-07 07:21:24.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -219,8 +219,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xinput-1.4.1/man/xinput.man new/xinput-1.4.2/man/xinput.man
--- old/xinput-1.4.1/man/xinput.man 2008-09-29 06:45:36.000000000 +0200
+++ new/xinput-1.4.2/man/xinput.man 2009-05-07 07:14:01.000000000 +0200
@@ -65,6 +65,10 @@
are 8, 16, or 32, depending on the property.
.PP
.TP 8
+.B xinput set-float-prop \fIdevice_name\fP \fIproperty\fP \fIvalue\fP
+Sets a float property for the device.
+.PP
+.TP 8
.B xinput watch-props \fIdevice_name\fP
Prints to standard out when property changes occur.
.PP
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xinput-1.4.1/src/list.c new/xinput-1.4.2/src/list.c
--- old/xinput-1.4.1/src/list.c 2009-04-06 01:50:22.000000000 +0200
+++ new/xinput-1.4.2/src/list.c 2009-05-07 07:14:01.000000000 +0200
@@ -26,7 +26,7 @@
#include /* for XI_Device***ChangedNotify */
static void
-print_info(XDeviceInfo *info, Bool shortformat)
+print_info(Display* dpy, XDeviceInfo *info, Bool shortformat)
{
int i,j;
XAnyClassPtr any;
@@ -65,6 +65,9 @@
if (shortformat)
return;
+ if(info->type != None)
+ printf("\tType is %s\n", XGetAtomName(dpy, info->type));
+
if (info->num_classes > 0) {
any = (XAnyClassPtr) (info->inputclassinfo);
for (i=0; i<info->num_classes; i++) {
@@ -140,7 +143,7 @@
do {
info = XListInputDevices(display, &num_devices);
for(loop=0; loopfunc)(display, argc-2, argv+2,
driver->func_name, driver->arg_desc);
XSync(display, False);
+ XCloseDisplay(display);
return r;
}
driver++;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org