Hello community,
here is the log from the commit of package xorg-x11
checked in at Thu May 8 02:20:47 CEST 2008.
--------
--- xorg-x11/xorg-x11.changes 2008-05-06 13:50:41.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2008-05-07 22:29:19.741104000 +0200
@@ -1,0 +2,7 @@
+Wed May 7 22:49:18 CEST 2008 - sndirsch@suse.de
+
+- xkbcomp 1.0.5
+ * xkbcomp: Take a device ID argument
+ * Don't scan paths which make NO SENSE WHATSOEVER TO SCAN
+
+-------------------------------------------------------------------
Old:
----
xkbcomp-1.0.4.tar.bz2
New:
----
xkbcomp-1.0.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11.spec ++++++
--- /var/tmp/diff_new_pack.K18384/_old 2008-05-08 02:20:14.000000000 +0200
+++ /var/tmp/diff_new_pack.K18384/_new 2008-05-08 02:20:14.000000000 +0200
@@ -19,7 +19,7 @@
%endif
Url: http://xorg.freedesktop.org/
Version: 7.3
-Release: 80
+Release: 81
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Utilities
@@ -86,7 +86,7 @@
Source53: xgc-X11R7.0-1.0.1.tar.bz2
Source54: xhost-1.0.2.tar.bz2
Source55: xinit-1.0.8.tar.bz2
-Source56: xkbcomp-1.0.4.tar.bz2
+Source56: xkbcomp-1.0.5.tar.bz2
Source57: xkbevd-X11R7.1-1.0.2.tar.bz2
Source58: xkbprint-X11R7.0-1.0.1.tar.bz2
Source59: xkbutils-X11R7.0-1.0.1.tar.bz2
@@ -459,6 +459,10 @@
/var/lib/xdm/authdir/
%changelog
+* Thu May 08 2008 sndirsch@suse.de
+- xkbcomp 1.0.5
+ * xkbcomp: Take a device ID argument
+ * Don't scan paths which make NO SENSE WHATSOEVER TO SCAN
* Tue May 06 2008 dmueller@suse.de
- update documentation for kdm3 and kdm4 (bnc #381821)
* Mon Apr 28 2008 sndirsch@suse.de
++++++ xkbcomp-1.0.4.tar.bz2 -> xkbcomp-1.0.5.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xkbcomp-1.0.4/aclocal.m4 new/xkbcomp-1.0.5/aclocal.m4
--- old/xkbcomp-1.0.4/aclocal.m4 2008-03-06 23:13:21.000000000 +0100
+++ new/xkbcomp-1.0.5/aclocal.m4 2008-05-07 19:44:40.000000000 +0200
@@ -87,14 +87,16 @@
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
# ---------------------------------------------
m4_define([_PKG_CONFIG],
-[if test -n "$$1"; then
- pkg_cv_[]$1="$$1"
- elif test -n "$PKG_CONFIG"; then
- PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
- [pkg_failed=yes])
- else
- pkg_failed=untried
+[if test -n "$PKG_CONFIG"; then
+ if test -n "$$1"; then
+ pkg_cv_[]$1="$$1"
+ else
+ PKG_CHECK_EXISTS([$3],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+ [pkg_failed=yes])
+ fi
+else
+ pkg_failed=untried
fi[]dnl
])# _PKG_CONFIG
@@ -138,9 +140,9 @@
if test $pkg_failed = yes; then
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
@@ -222,7 +224,7 @@
XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
- [XORG_MACROS_version=1.1.6
+ [XORG_MACROS_version=1.1.5
XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
@@ -647,14 +649,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/xkbcomp-1.0.4/ChangeLog new/xkbcomp-1.0.5/ChangeLog
--- old/xkbcomp-1.0.4/ChangeLog 2008-03-06 23:13:27.000000000 +0100
+++ new/xkbcomp-1.0.5/ChangeLog 2008-05-07 19:44:44.000000000 +0200
@@ -1,3 +1,30 @@
+commit 1aecdffaa0db7bbf85bc0aae9043e9437b25c30d
+Author: Daniel Stone
+Date: Thu Apr 17 00:52:29 2008 +0300
+
+ Don't scan paths which make NO SENSE WHATSOEVER TO SCAN
+
+ Hey, I wonder if we have XKB files in our directory! I wonder if we
+ haven't bothered with a structure, and let's try to open a file called
+ 'misc' in someone's home directory! What a surprise, it's not a valid
+ XKB file! Let's fail miserably!
+
+ SURPRISINGLY, THIS IS NOT USEFUL BEHAVIOUR.
+
+commit a3a05fd489a9a35942a4419c537634e796dbebd1
+Author: Daniel Stone
+Date: Thu Apr 17 00:50:07 2008 +0300
+
+ xkbcomp: Take a device ID argument
+
+ Allows the user to set maps (or whatever) on arbitrary devices.
+
+commit be084fbeba28312fc5102e98d64726464032c3e8
+Author: Adam Jackson
+Date: Thu Mar 6 17:13:42 2008 -0500
+
+ xkbcomp 1.0.4
+
commit c1cc023fc50ce3a4a23f4682ebefd2301fd13170
Author: Adam Jackson
Date: Fri Feb 29 15:30:34 2008 -0500
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xkbcomp-1.0.4/config.guess new/xkbcomp-1.0.5/config.guess
--- old/xkbcomp-1.0.4/config.guess 2008-03-06 23:13:24.000000000 +0100
+++ new/xkbcomp-1.0.5/config.guess 2008-02-22 18:48:13.000000000 +0100
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-# Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+# Inc.
-timestamp='2008-01-08'
+timestamp='2007-07-22'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -56,8 +56,8 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -532,7 +532,7 @@
echo rs6000-ibm-aix3.2
fi
exit ;;
- *:AIX:*:[456])
+ *:AIX:*:[45])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
@@ -799,9 +799,6 @@
EM64T | authenticamd)
echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
- IA64)
- echo ia64-unknown-interix${UNAME_RELEASE}
- exit ;;
esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
@@ -836,14 +833,7 @@
echo ${UNAME_MACHINE}-pc-minix
exit ;;
arm*:Linux:*:*)
- eval $set_cc_for_build
- if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
- | grep -q __ARM_EABI__
- then
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- else
- echo ${UNAME_MACHINE}-unknown-linux-gnueabi
- fi
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
avr32*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -964,8 +954,8 @@
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit ;;
- xtensa*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ xtensa:Linux:*:*)
+ echo xtensa-unknown-linux-gnu
exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xkbcomp-1.0.4/config.sub new/xkbcomp-1.0.5/config.sub
--- old/xkbcomp-1.0.4/config.sub 2008-03-06 23:13:24.000000000 +0100
+++ new/xkbcomp-1.0.5/config.sub 2008-02-22 18:48:13.000000000 +0100
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-# Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+# Inc.
-timestamp='2008-01-16'
+timestamp='2007-06-28'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -72,8 +72,8 @@
version="\
GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -369,14 +369,10 @@
| v850-* | v850e-* | vax-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
- | xstormy16-* | xtensa*-* \
+ | xstormy16-* | xtensa-* \
| ymp-* \
| z8k-*)
;;
- # Recognize the basic CPU types without company name, with glob match.
- xtensa*)
- basic_machine=$basic_machine-unknown
- ;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
386bsd)
@@ -447,14 +443,6 @@
basic_machine=ns32k-sequent
os=-dynix
;;
- blackfin)
- basic_machine=bfin-unknown
- os=-linux
- ;;
- blackfin-*)
- basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
- os=-linux
- ;;
c90)
basic_machine=c90-cray
os=-unicos
@@ -680,14 +668,6 @@
basic_machine=m68k-isi
os=-sysv
;;
- m68knommu)
- basic_machine=m68k-unknown
- os=-linux
- ;;
- m68knommu-*)
- basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
- os=-linux
- ;;
m88k-omron*)
basic_machine=m88k-omron
;;
@@ -833,14 +813,6 @@
basic_machine=i860-intel
os=-osf
;;
- parisc)
- basic_machine=hppa-unknown
- os=-linux
- ;;
- parisc-*)
- basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
- os=-linux
- ;;
pbd)
basic_machine=sparc-tti
;;
@@ -1049,10 +1021,6 @@
basic_machine=tic6x-unknown
os=-coff
;;
- tile*)
- basic_machine=tile-unknown
- os=-linux-gnu
- ;;
tx39)
basic_machine=mipstx39-unknown
;;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xkbcomp-1.0.4/configure new/xkbcomp-1.0.5/configure
--- old/xkbcomp-1.0.4/configure 2008-03-06 23:13:23.000000000 +0100
+++ new/xkbcomp-1.0.5/configure 2008-05-07 19:44:42.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for xkbcomp 1.0.4.
+# Generated by GNU Autoconf 2.61 for xkbcomp 1.0.5.
#
# Report bugs to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='xkbcomp'
PACKAGE_TARNAME='xkbcomp'
-PACKAGE_VERSION='1.0.4'
-PACKAGE_STRING='xkbcomp 1.0.4'
+PACKAGE_VERSION='1.0.5'
+PACKAGE_STRING='xkbcomp 1.0.5'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_subst_vars='SHELL
@@ -1199,7 +1199,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 xkbcomp 1.0.4 to adapt to many kinds of systems.
+\`configure' configures xkbcomp 1.0.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1269,7 +1269,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xkbcomp 1.0.4:";;
+ short | recursive ) echo "Configuration of xkbcomp 1.0.5:";;
esac
cat <<\_ACEOF
@@ -1370,7 +1370,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xkbcomp configure 1.0.4
+xkbcomp configure 1.0.5
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1384,7 +1384,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xkbcomp $as_me 1.0.4, which was
+It was created by xkbcomp $as_me 1.0.5, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2074,7 +2074,7 @@
# Define the identity of the package.
PACKAGE='xkbcomp'
- VERSION='1.0.4'
+ VERSION='1.0.5'
cat >>confdefs.h <<_ACEOF
@@ -3585,10 +3585,11 @@
{ echo "$as_me:$LINENO: checking for XKBCOMP" >&5
echo $ECHO_N "checking for XKBCOMP... $ECHO_C" >&6; }
-if test -n "$XKBCOMP_CFLAGS"; then
- pkg_cv_XKBCOMP_CFLAGS="$XKBCOMP_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
+if test -n "$PKG_CONFIG"; then
+ if test -n "$XKBCOMP_CFLAGS"; then
+ pkg_cv_XKBCOMP_CFLAGS="$XKBCOMP_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xkbfile\"") >&5
($PKG_CONFIG --exists --print-errors "x11 xkbfile") 2>&5
ac_status=$?
@@ -3598,13 +3599,15 @@
else
pkg_failed=yes
fi
- else
- pkg_failed=untried
+ fi
+else
+ pkg_failed=untried
fi
-if test -n "$XKBCOMP_LIBS"; then
- pkg_cv_XKBCOMP_LIBS="$XKBCOMP_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
+if test -n "$PKG_CONFIG"; then
+ if test -n "$XKBCOMP_LIBS"; then
+ pkg_cv_XKBCOMP_LIBS="$XKBCOMP_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xkbfile\"") >&5
($PKG_CONFIG --exists --print-errors "x11 xkbfile") 2>&5
ac_status=$?
@@ -3614,8 +3617,9 @@
else
pkg_failed=yes
fi
- else
- pkg_failed=untried
+ fi
+else
+ pkg_failed=untried
fi
@@ -3628,9 +3632,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- XKBCOMP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 xkbfile" 2>&1`
+ XKBCOMP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11 xkbfile"`
else
- XKBCOMP_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 xkbfile" 2>&1`
+ XKBCOMP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11 xkbfile"`
fi
# Put the nasty error message in config.log where it belongs
echo "$XKBCOMP_PKG_ERRORS" >&5
@@ -3864,7 +3868,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
@@ -3873,7 +3877,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
@@ -4303,7 +4307,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xkbcomp $as_me 1.0.4, which was
+This file was extended by xkbcomp $as_me 1.0.5, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4356,7 +4360,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xkbcomp config.status 1.0.4
+xkbcomp config.status 1.0.5
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/xkbcomp-1.0.4/configure.ac new/xkbcomp-1.0.5/configure.ac
--- old/xkbcomp-1.0.4/configure.ac 2008-03-06 23:12:55.000000000 +0100
+++ new/xkbcomp-1.0.5/configure.ac 2008-05-07 19:44:35.000000000 +0200
@@ -21,7 +21,7 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(xkbcomp,[1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xkbcomp)
+AC_INIT(xkbcomp,[1.0.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xkbcomp)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xkbcomp-1.0.4/xkbcomp.c new/xkbcomp-1.0.5/xkbcomp.c
--- old/xkbcomp-1.0.4/xkbcomp.c 2008-02-29 21:29:51.000000000 +0100
+++ new/xkbcomp-1.0.5/xkbcomp.c 2008-04-16 23:53:28.000000000 +0200
@@ -104,6 +104,7 @@
static char * preErrorMsg= NULL;
static char * postErrorMsg= NULL;
static char * errorPrefix= NULL;
+static unsigned int device_id = XkbUseCoreKbd;
/***====================================================================***/
@@ -140,6 +141,7 @@
M(" R: recursively list subdirectories\n");
M(" default is all options off\n");
}
+ M("-i <deviceid> Specifies device ID (not name) to compile for\n");
M("-m[ap] <map> Specifies map to compile\n");
M("-o <file> Specifies output file name\n");
if (!xkblist) {
@@ -301,6 +303,13 @@
exit(1);
}
}
+ else if ((strncmp(argv[i], "-i", 2) == 0) && (!xkblist)) {
+ if (++i >= argc) {
+ if (warningLevel > 0)
+ WARN("No device ID specified\n");
+ }
+ device_id = atoi(argv[i]);
+ }
else if ((strncmp(argv[i],"-l",2)==0)&&(!xkblist)) {
if (outputFormat!=WANT_DEFAULT) {
if (warningLevel>0) {
@@ -846,7 +855,7 @@
else if (inDpy!=NULL) {
bzero((char *)&result,sizeof(result));
result.type= XkmKeymapFile;
- result.xkb= XkbGetMap(inDpy,XkbAllMapComponentsMask,XkbUseCoreKbd);
+ result.xkb= XkbGetMap(inDpy,XkbAllMapComponentsMask,device_id);
if (result.xkb==NULL)
WSGO("Cannot load keyboard description\n");
if (XkbGetIndicatorMap(inDpy,~0,result.xkb)!=Success)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xkbcomp-1.0.4/xkbpath.c new/xkbcomp-1.0.5/xkbpath.c
--- old/xkbcomp-1.0.4/xkbpath.c 2008-02-29 21:29:51.000000000 +0100
+++ new/xkbcomp-1.0.5/xkbpath.c 2008-04-16 23:53:28.000000000 +0200
@@ -133,7 +133,6 @@
{
if (noDefaultPath)
return;
- XkbAddDirectoryToPath(".");
XkbAddDirectoryToPath(DFLT_XKB_CONFIG_ROOT);
}
@@ -298,16 +297,7 @@
typeLen= strlen(typeDir);
for (i=0;i=PATH_MAX) {
- ERROR2("File name (%s/%s) too long\n",includePath[i],name);
- ACTION("Ignored\n");
- continue;
- }
- sprintf(buf,"%s/%s",includePath[i],name);
- file= fopen(buf,"r");
- if (file!=NULL)
- break;
- else if (typeLen<1)
+ if (typeLen<1)
continue;
if ((nameLen+typeLen+pathLen+2)>=PATH_MAX) {
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org