Hello community,
here is the log from the commit of package xorg-x11 for openSUSE:Factory
checked in at Mon Dec 13 12:34:24 CET 2010.
--------
--- xorg-x11/xorg-x11.changes 2010-12-02 10:53:22.000000000 +0100
+++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2010-12-09 12:37:19.000000000 +0100
@@ -1,0 +2,18 @@
+Thu Dec 9 11:27:56 UTC 2010 - sndirsch@novell.com
+
+- xbacklight 1.1.2
+ * This minor maintenance release provides the usual round of
+ recent build configuration improvements and janitorial
+ cleanups.
+- xkbevd 1.1.2
+ * This release fixes a bug introduced in the configure script in
+ 1.1.1 that broke cross-compilation, as well as other minor bug
+ fixes, configuration improvements, and janitorial cleanups.
+
+-------------------------------------------------------------------
+Thu Dec 9 09:48:57 CET 2010 - werner@suse.de
+
+- Skip first argument in Xsession as it is already parsed and
+ evaluated (bnc#656554)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
xbacklight-1.1.1.tar.bz2
xkbevd-1.1.1.tar.bz2
New:
----
xbacklight-1.1.2.tar.bz2
xkbevd-1.1.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11.spec ++++++
--- /var/tmp/diff_new_pack.yiNeek/_old 2010-12-13 12:33:03.000000000 +0100
+++ /var/tmp/diff_new_pack.yiNeek/_new 2010-12-13 12:33:03.000000000 +0100
@@ -23,7 +23,7 @@
BuildRequires: bison
Url: http://xorg.freedesktop.org/
Version: 7.5
-Release: 36
+Release: 37
License: MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Utilities
@@ -88,7 +88,7 @@
Source54: xhost-1.0.4.tar.bz2
Source55: xinit-1.3.0.tar.bz2
Source56: xkbcomp-1.2.0.tar.bz2
-Source57: xkbevd-1.1.1.tar.bz2
+Source57: xkbevd-1.1.2.tar.bz2
Source58: xkbprint-1.0.2.tar.bz2
Source59: xkbutils-1.0.3.tar.bz2
Source60: xkill-1.0.3.tar.bz2
@@ -125,7 +125,7 @@
Source92: xwud-1.0.3.tar.bz2
Source93: mkcomposecache-1.2.1.tar.bz2
Source94: rendercheck-1.4.tar.bz2
-Source96: xbacklight-1.1.1.tar.bz2
+Source96: xbacklight-1.1.2.tar.bz2
Source97: xinput-1.5.3.tar.bz2
Source98: xcompmgr-1.1.5.tar.bz2
Source99: xrestop-0.4.tar.bz2
++++++ xbacklight-1.1.1.tar.bz2 -> xbacklight-1.1.2.tar.bz2 ++++++
++++ 8556 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xbacklight-1.1.1/ChangeLog new/xbacklight-1.1.2/ChangeLog
--- old/xbacklight-1.1.1/ChangeLog 2009-09-25 02:59:44.000000000 +0200
+++ new/xbacklight-1.1.2/ChangeLog 2010-12-09 08:11:11.000000000 +0100
@@ -1,3 +1,110 @@
+commit 30ed7c0b3f2dc131e9fa4bb53ba702b65b05b46a
+Author: Alan Coopersmith
+Date: Fri Oct 29 23:36:28 2010 -0700
+
+ xbacklight 1.1.2
+
+ Signed-off-by: Alan Coopersmith
+
+commit 3aab2f2e43ba5f9afbf7d20d54b70150ca6773a1
+Author: Alan Coopersmith
+Date: Thu Sep 23 10:04:24 2010 -0700
+
+ config: Remove unnecessary calls from configure.ac
+
+ AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now
+ PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables
+
+ Signed-off-by: Alan Coopersmith
+
+commit 98a594c61ed407facfefc430715df09d5ccc8c6c
+Author: Gaetan Nadon
+Date: Tue Jul 20 18:45:18 2010 -0400
+
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Signed-off-by: Gaetan Nadon
+
+commit 3a5f2d5dad2c281e49be2eb3b1cc041bd9ada715
+Author: Alan Coopersmith
+Date: Thu Jul 1 00:31:18 2010 -0700
+
+ Remove unused direct dependency on libXrender
+
+ Signed-off-by: Alan Coopersmith
+
+commit 5b4cd1f97f578e6574c905b7630841ced0193fc4
+Author: Alan Coopersmith
+Date: Wed Jun 30 23:25:03 2010 -0700
+
+ config: upgrade to util-macros 1.8 for additional man page support
+
+ Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+ The value of MAN_SUBST is the same for all X.Org packages.
+
+ Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
+ The existing statement can now be removed from the configuration file.
+
+ Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED)
+ Enables silent rule and use platform appropriate version of sed.
+
+ Signed-off-by: Alan Coopersmith
+
+commit cc6e442b15988076f5ebc5513654826869378eee
+Author: Gaetan Nadon
+Date: Thu Nov 26 09:19:52 2009 -0500
+
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+
+commit 7fcffe84dccc00f4318179f5237d2937c80abc02
+Author: Gaetan Nadon
+Date: Wed Oct 28 14:09:08 2009 -0400
+
+ INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
+
+ Add missing INSTALL file. Use standard GNU file on building tarball
+ README may have been updated
+ Remove AUTHORS file as it is empty and no content available yet.
+ Remove NEWS file as it is empty and no content available yet.
+
+commit f634bdf93c3623f48f6e9f6baf65ff64835db0f6
+Author: Gaetan Nadon
+Date: Tue Oct 27 15:07:24 2009 -0400
+
+ Deploy the new XORG_DEFAULT_OPTIONS #24242
+
+ This macro aggregate a number of existing macros that sets commmon
+ X.Org components configuration options. It shields the configuration file from
+ future changes.
+
+commit 0fa72795f798e34dd918b51b01fd07adc098cdc5
+Author: Gaetan Nadon
+Date: Mon Oct 26 22:08:38 2009 -0400
+
+ Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
+
+ ChangeLog filename is known to Automake and requires no further
+ coding in the makefile.
+
+commit 36b4b6dba0df92071f54c32154ef8d0366029282
+Author: Gaetan Nadon
+Date: Thu Oct 22 12:34:15 2009 -0400
+
+ .gitignore: use common defaults with custom section # 24239
+
+ Using common defaults will reduce errors and maintenance.
+ Only the very small or inexistent custom section need periodic maintenance
+ when the structure of the component changes. Do not edit defaults.
+
commit cbf474d6751dd32154163b8997519319655f0545
Author: Alan Coopersmith
Date: Thu Sep 24 17:54:45 2009 -0700
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xbacklight-1.1.1/config.h.in new/xbacklight-1.1.2/config.h.in
--- old/xbacklight-1.1.1/config.h.in 2009-09-25 02:59:13.000000000 +0200
+++ new/xbacklight-1.1.2/config.h.in 2010-12-09 08:10:31.000000000 +0100
@@ -42,6 +42,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xbacklight-1.1.1/configure.ac new/xbacklight-1.1.2/configure.ac
--- old/xbacklight-1.1.1/configure.ac 2009-09-25 02:53:57.000000000 +0200
+++ new/xbacklight-1.1.2/configure.ac 2010-10-30 08:34:58.000000000 +0200
@@ -21,25 +21,22 @@
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
-AC_INIT(xbacklight,[1.1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xbacklight)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AC_PREREQ([2.60])
+AC_INIT([xbacklight], [1.1.2],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+ [xbacklight])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
+XORG_DEFAULT_OPTIONS
AM_CONFIG_HEADER(config.h)
-AC_PROG_CC
-AC_PROG_INSTALL
-
-XORG_DEFAULT_OPTIONS
-
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XRANDR, xrandr >= 1.2.0 xrender x11)
-AC_SUBST(XRANDR_CFLAGS)
-AC_SUBST(XRANDR_LIBS)
+PKG_CHECK_MODULES(XRANDR, xrandr >= 1.2.0 x11)
AC_OUTPUT([Makefile])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xbacklight-1.1.1/INSTALL new/xbacklight-1.1.2/INSTALL
--- old/xbacklight-1.1.1/INSTALL 1970-01-01 01:00:00.000000000 +0100
+++ new/xbacklight-1.1.2/INSTALL 2010-12-09 08:11:11.000000000 +0100
@@ -0,0 +1,291 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008 Free Software Foundation, Inc.
+
+ This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+ Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
+
+ The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation. It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions. Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+ It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring. Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+ If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release. If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+ The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system.
+
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
+
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+ the package.
+
+ 4. Type `make install' to install the programs and any data files and
+ documentation.
+
+ 5. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+ also a `make maintainer-clean' target, but that is intended mainly
+ for the package's developers. If you use it, you may have to get
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+ 6. Often, you can also type `make uninstall' to remove the installed
+ files again.
+
+Compilers and Options
+=====================
+
+ Some systems require unusual options for compilation or linking that
+the `configure' script does not know about. Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+ You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment. Here
+is an example:
+
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+ *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+ You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory. To do this, you can use GNU `make'. `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script. `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+ On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor. Like
+this:
+
+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CPP="gcc -E" CXXCPP="g++ -E"
+
+ This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
+Installation Names
+==================
+
+ By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+ You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files. If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+ In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files. Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+ If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+ Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System). The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+ For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Particular systems
+==================
+
+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+ ./configure CC="cc -Ae"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `' header file. The option `-nodtk' can be used as
+a workaround. If GNU CC is not installed, it is therefore recommended
+to try
+
+ ./configure CC="cc"
+
+and if that doesn't work, try
+
+ ./configure CC="cc -nodtk"
+
+Specifying the System Type
+==========================
+
+ There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on. Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option. TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+ CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+ OS KERNEL-OS
+
+ See the file `config.sub' for the possible values of each field. If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+ If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+ If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+ If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists. Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+ Variables not defined in a site shell script can be set in the
+environment passed to `configure'. However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost. In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'. For example:
+
+ ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
+
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+ `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+ Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+ Print a summary of the options unique to this package's
+ `configure', and exit. The `short' variant lists options used
+ only in the top level, while the `recursive' variant lists options
+ also present in any nested packages.
+
+`--version'
+`-V'
+ Print the version of Autoconf used to generate the `configure'
+ script, and exit.
+
+`--cache-file=FILE'
+ Enable the cache: use and save the results of the tests in FILE,
+ traditionally `config.cache'. FILE defaults to `/dev/null' to
+ disable caching.
+
+`--config-cache'
+`-C'
+ Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+ Do not print messages saying which checks are being made. To
+ suppress all normal output, redirect it to `/dev/null' (any error
+ messages will still be shown).
+
+`--srcdir=DIR'
+ Look for the package's source code in directory DIR. Usually
+ `configure' can determine that directory automatically.
+
+`--prefix=DIR'
+ Use DIR as the installation prefix. *Note Installation Names::
+ for more details, including other options available for fine-tuning
+ the installation locations.
+
+`--no-create'
+`-n'
+ Run the configure checks, but stop before creating any output
+ files.
+
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xbacklight-1.1.1/Makefile.am new/xbacklight-1.1.2/Makefile.am
--- old/xbacklight-1.1.1/Makefile.am 2009-09-25 02:45:57.000000000 +0200
+++ new/xbacklight-1.1.2/Makefile.am 2010-08-07 06:33:02.000000000 +0200
@@ -37,38 +37,22 @@
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
EXTRA_DIST = $(appman_PRE) COPYING
+MAINTAINERCLEANFILES = ChangeLog INSTALL
CLEANFILES = $(appman_DATA)
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xservername__|Xorg|g' \
- -e 's|__xconfigfile__|xorg.conf|g' \
- -e 's|__projectroot__|$(prefix)|g' \
- -e 's|__apploaddir__|$(appdefaultdir)|' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
- -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-
SUFFIXES = .$(APP_MAN_SUFFIX) .man
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(APP_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
+
-EXTRA_DIST += ChangeLog
-MAINTAINERCLEANFILES=ChangeLog
+.PHONY: ChangeLog INSTALL
-.PHONY: ChangeLog
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
++++++ xdm.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etc/X11/xdm/sys.xsession new/etc/X11/xdm/sys.xsession
--- old/etc/X11/xdm/sys.xsession 2010-11-02 19:53:24.000000000 +0100
+++ new/etc/X11/xdm/sys.xsession 2010-12-03 18:42:18.000000000 +0100
@@ -148,7 +148,11 @@
test -r "$HOME/.xinitrc" && XINITRCFILE="$HOME/.xinitrc"
if test -f "$XINITRCFILE" ; then
- exec ${1+"$@"} /bin/bash "$XINITRCFILE" "${argv[@]}"
+ if test -x "$XINITRCFILE" ; then
+ exec ${1+"$@"} "$XINITRCFILE" "${argv[@]}"
+ else
+ exec ${1+"$@"} /bin/bash "$XINITRCFILE" "${argv[@]}"
+ fi
else
#
# Source common code shared between the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etc/X11/xdm/Xsession new/etc/X11/xdm/Xsession
--- old/etc/X11/xdm/Xsession 2010-11-03 13:06:20.000000000 +0100
+++ new/etc/X11/xdm/Xsession 2010-12-03 18:42:07.000000000 +0100
@@ -62,7 +62,7 @@
echo "${argv[*]}" > $HOME/.wmrc #save wm
fi
IFS="$OIFS"
-fi
+fi
readonly argv
@@ -162,14 +162,13 @@
# Handle arguments given by xdm/kdm/gdm.
#
forced=no
-set -- "${argv[@]}"
-if test $# -ge 1 ; then
- case "$1" in
+if test ${#argv[@]} -gt 0 ; then
+ case "${argv[0]}" in
failsafe) exec $failsafe ;;
default) ;;
custom) ;;
*) forced=yes
- WINDOWMANAGER=$1 ;;
+ WINDOWMANAGER=${argv[0]} ;;
esac
for l ; do
case "$l" in
@@ -205,6 +204,10 @@
#
. /etc/X11/xinit/xinitrc.common
+# Restore arguments but skip window manager
+set -- "${argv[@]}"
+shift
+
#
# Some common user and system files
#
++++++ xkbevd-1.1.1.tar.bz2 -> xkbevd-1.1.2.tar.bz2 ++++++
++++ 1827 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xkbevd-1.1.1/cfgparse.c new/xkbevd-1.1.2/cfgparse.c
--- old/xkbevd-1.1.1/cfgparse.c 2010-10-30 19:07:11.000000000 +0200
+++ new/xkbevd-1.1.2/cfgparse.c 2010-12-09 06:51:32.000000000 +0100
@@ -138,7 +138,7 @@
/* Copy the first part of user declarations. */
-#line 64 "cfgparse.y"
+#line 62 "cfgparse.y"
#ifdef DEBUG
#define YYDEBUG 1
@@ -167,7 +167,7 @@
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
-#line 77 "cfgparse.y"
+#line 75 "cfgparse.y"
{
char * str;
int ival;
@@ -476,9 +476,9 @@
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const yytype_uint8 yyrline[] =
{
- 0, 88, 88, 92, 104, 107, 115, 118, 135, 152,
- 153, 154, 157, 169, 170, 171, 172, 173, 174, 175,
- 178, 179, 182, 183, 186, 189, 190, 193
+ 0, 86, 86, 90, 102, 105, 113, 116, 133, 150,
+ 151, 152, 155, 167, 168, 169, 170, 171, 172, 173,
+ 176, 177, 180, 181, 184, 187, 188, 191
};
#endif
@@ -1403,13 +1403,13 @@
switch (yyn)
{
case 2:
-#line 89 "cfgparse.y"
+#line 87 "cfgparse.y"
{ InterpretConfigs((yyvsp[(1) - (1)].entry)); }
break;
case 3:
-#line 93 "cfgparse.y"
- {
+#line 91 "cfgparse.y"
+ {
CfgEntryPtr tmp;
if ((yyvsp[(1) - (2)].entry)!=NULL) {
for (tmp=(yyvsp[(1) - (2)].entry);tmp->next!=NULL;tmp=tmp->next) {
@@ -1423,12 +1423,12 @@
break;
case 4:
-#line 104 "cfgparse.y"
+#line 102 "cfgparse.y"
{ (yyval.entry)= (yyvsp[(1) - (1)].entry); }
break;
case 5:
-#line 108 "cfgparse.y"
+#line 106 "cfgparse.y"
{
if (((yyvsp[(1) - (2)].entry))&&((yyvsp[(2) - (2)].act)))
(yyvsp[(1) - (2)].entry)->action= *((yyvsp[(2) - (2)].act));
@@ -1439,12 +1439,12 @@
break;
case 6:
-#line 115 "cfgparse.y"
+#line 113 "cfgparse.y"
{ (yyval.entry)= (yyvsp[(1) - (1)].entry); }
break;
case 7:
-#line 119 "cfgparse.y"
+#line 117 "cfgparse.y"
{
CfgEntryPtr cfg;
cfg= uTypedCalloc(1,CfgEntryRec);
@@ -1462,7 +1462,7 @@
break;
case 8:
-#line 136 "cfgparse.y"
+#line 134 "cfgparse.y"
{
CfgEntryPtr cfg;
cfg= uTypedCalloc(1,CfgEntryRec);
@@ -1480,105 +1480,105 @@
break;
case 9:
-#line 152 "cfgparse.y"
+#line 150 "cfgparse.y"
{ (yyval.ival)= XkbBellNotify; }
break;
case 10:
-#line 153 "cfgparse.y"
+#line 151 "cfgparse.y"
{ (yyval.ival)= XkbAccessXNotify; }
break;
case 11:
-#line 154 "cfgparse.y"
+#line 152 "cfgparse.y"
{ (yyval.ival)= XkbActionMessage; }
break;
case 12:
-#line 158 "cfgparse.y"
- {
+#line 156 "cfgparse.y"
+ {
ActDefPtr act;
act= uTypedCalloc(1,ActDefRec);
if (act) {
act->type= (yyvsp[(1) - (2)].ival);
act->text= (yyvsp[(2) - (2)].str);
}
- (yyval.act)= act;
+ (yyval.act)= act;
}
break;
case 13:
-#line 169 "cfgparse.y"
+#line 167 "cfgparse.y"
{ (yyval.ival) = NoAction; }
break;
case 14:
-#line 170 "cfgparse.y"
+#line 168 "cfgparse.y"
{ (yyval.ival) = NoAction; }
break;
case 15:
-#line 171 "cfgparse.y"
+#line 169 "cfgparse.y"
{ (yyval.ival) = EchoAction; }
break;
case 16:
-#line 172 "cfgparse.y"
+#line 170 "cfgparse.y"
{ (yyval.ival) = PrintEvAction; }
break;
case 17:
-#line 173 "cfgparse.y"
+#line 171 "cfgparse.y"
{ (yyval.ival) = ShellAction; }
break;
case 18:
-#line 174 "cfgparse.y"
+#line 172 "cfgparse.y"
{ (yyval.ival) = SoundAction; }
break;
case 19:
-#line 175 "cfgparse.y"
+#line 173 "cfgparse.y"
{ (yyval.ival) = UnknownAction; }
break;
case 20:
-#line 178 "cfgparse.y"
+#line 176 "cfgparse.y"
{ (yyval.str)= (yyvsp[(1) - (1)].str); }
break;
case 21:
-#line 179 "cfgparse.y"
+#line 177 "cfgparse.y"
{ (yyval.str)= NULL; }
break;
case 22:
-#line 182 "cfgparse.y"
+#line 180 "cfgparse.y"
{ (yyval.str)= (yyvsp[(1) - (1)].str); }
break;
case 23:
-#line 183 "cfgparse.y"
+#line 181 "cfgparse.y"
{ (yyval.str)= (yyvsp[(1) - (1)].str); }
break;
case 24:
-#line 186 "cfgparse.y"
+#line 184 "cfgparse.y"
{ (yyval.str)= scanStr; scanStr= NULL; }
break;
case 25:
-#line 189 "cfgparse.y"
+#line 187 "cfgparse.y"
{ (yyval.str)= (yyvsp[(1) - (1)].str); }
break;
case 26:
-#line 190 "cfgparse.y"
+#line 188 "cfgparse.y"
{ (yyval.str)= NULL; }
break;
case 27:
-#line 193 "cfgparse.y"
+#line 191 "cfgparse.y"
{ (yyval.str)= scanStr; scanStr= NULL; }
break;
@@ -1798,7 +1798,7 @@
}
-#line 195 "cfgparse.y"
+#line 193 "cfgparse.y"
int
yyerror(char *s)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xkbevd-1.1.1/cfgparse.y new/xkbevd-1.1.2/cfgparse.y
--- old/xkbevd-1.1.1/cfgparse.y 2009-10-16 23:39:34.000000000 +0200
+++ new/xkbevd-1.1.2/cfgparse.y 2010-11-21 03:40:53.000000000 +0100
@@ -1,4 +1,3 @@
-/* $Xorg: cfgparse.y,v 1.3 2000/08/17 19:54:49 cpqbld Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
@@ -7,24 +6,23 @@
fee is hereby granted, provided that the above copyright
notice appear in all copies and that both that copyright
notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be
- used in advertising or publicity pertaining to distribution
+ documentation, and that the name of Silicon Graphics not be
+ used in advertising or publicity pertaining to distribution
of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability
+ Silicon Graphics makes no representation about the suitability
of this software for any purpose. It is provided "as is"
without any express or implied warranty.
-
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/xkbevd/cfgparse.y,v 1.4tsi Exp $ */
%token
END_OF_FILE 0
@@ -90,7 +88,7 @@
;
CfgEntryList : CfgEntryList CfgEntry
- {
+ {
CfgEntryPtr tmp;
if ($1!=NULL) {
for (tmp=$1;tmp->next!=NULL;tmp=tmp->next) {
@@ -155,14 +153,14 @@
;
ActionDef : ActionType OptString
- {
+ {
ActDefPtr act;
act= uTypedCalloc(1,ActDefRec);
if (act) {
act->type= $1;
act->text= $2;
}
- $$= act;
+ $$= act;
}
;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xkbevd-1.1.1/cfgscan.c new/xkbevd-1.1.2/cfgscan.c
--- old/xkbevd-1.1.1/cfgscan.c 2009-10-16 23:39:34.000000000 +0200
+++ new/xkbevd-1.1.2/cfgscan.c 2010-11-21 03:40:21.000000000 +0100
@@ -1,4 +1,3 @@
-/* $Xorg: cfgscan.c,v 1.3 2000/08/17 19:54:49 cpqbld Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
@@ -7,24 +6,23 @@
fee is hereby granted, provided that the above copyright
notice appear in all copies and that both that copyright
notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be
- used in advertising or publicity pertaining to distribution
+ documentation, and that the name of Silicon Graphics not be
+ used in advertising or publicity pertaining to distribution
of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability
+ Silicon Graphics makes no representation about the suitability
of this software for any purpose. It is provided "as is"
without any express or implied warranty.
-
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/xkbevd/cfgscan.c,v 3.6 2001/01/17 23:46:07 dawes Exp $ */
#include
#include
@@ -136,7 +134,7 @@
else if ( ch == '0' ) {
int tmp,stop;
ch = stop = 0;
- if (((tmp=getc(yyin))!=EOF) && (isdigit(tmp)) &&
+ if (((tmp=getc(yyin))!=EOF) && (isdigit(tmp)) &&
(tmp!='8') && (tmp!='9')) {
ch= (ch*8)+(tmp-'0');
}
@@ -144,7 +142,7 @@
stop= 1;
ungetc(tmp,yyin);
}
- if ((!stop) && ((tmp=getc(yyin))!=EOF) && (isdigit(tmp)) &&
+ if ((!stop) && ((tmp=getc(yyin))!=EOF) && (isdigit(tmp)) &&
(tmp!='8') && (tmp!='9')) {
ch= (ch*8)+(tmp-'0');
}
@@ -152,7 +150,7 @@
stop= 1;
ungetc(tmp,yyin);
}
- if ((!stop) && ((tmp=getc(yyin))!=EOF) && (isdigit(tmp)) &&
+ if ((!stop) && ((tmp=getc(yyin))!=EOF) && (isdigit(tmp)) &&
(tmp!='8') && (tmp!='9')) {
ch= (ch*8)+(tmp-'0');
}
@@ -165,7 +163,7 @@
else return ERROR;
}
- if ( nInBuf < BUFSIZE-1 )
+ if ( nInBuf < BUFSIZE-1 )
buf[nInBuf++] = ch;
}
if ( ch == '"' ) {
@@ -198,7 +196,7 @@
else if ( ch == '0' ) {
int tmp,stop;
ch = stop = 0;
- if (((tmp=getc(yyin))!=EOF) && (isdigit(tmp)) &&
+ if (((tmp=getc(yyin))!=EOF) && (isdigit(tmp)) &&
(tmp!='8') && (tmp!='9')) {
ch= (ch*8)+(tmp-'0');
}
@@ -206,7 +204,7 @@
stop= 1;
ungetc(tmp,yyin);
}
- if ((!stop) && ((tmp=getc(yyin))!=EOF) && (isdigit(tmp)) &&
+ if ((!stop) && ((tmp=getc(yyin))!=EOF) && (isdigit(tmp)) &&
(tmp!='8') && (tmp!='9')) {
ch= (ch*8)+(tmp-'0');
}
@@ -214,7 +212,7 @@
stop= 1;
ungetc(tmp,yyin);
}
- if ((!stop) && ((tmp=getc(yyin))!=EOF) && (isdigit(tmp)) &&
+ if ((!stop) && ((tmp=getc(yyin))!=EOF) && (isdigit(tmp)) &&
(tmp!='8') && (tmp!='9')) {
ch= (ch*8)+(tmp-'0');
}
@@ -227,7 +225,7 @@
else return ERROR;
}
- if ( nInBuf < BUFSIZE-1 )
+ if ( nInBuf < BUFSIZE-1 )
buf[nInBuf++] = ch;
}
if (( ch == '>' )&&(nInBuf<5)) {
@@ -332,7 +330,7 @@
{
int ch;
int rtrn;
-
+
do {
ch = getc(yyin);
if ( ch == '\n' ) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xkbevd-1.1.1/ChangeLog new/xkbevd-1.1.2/ChangeLog
--- old/xkbevd-1.1.1/ChangeLog 2010-10-30 19:07:11.000000000 +0200
+++ new/xkbevd-1.1.2/ChangeLog 2010-12-09 06:57:08.000000000 +0100
@@ -1,3 +1,101 @@
+commit 95987d19b9802c235f2257eceff663a4a1e286fa
+Author: Alan Coopersmith
+Date: Wed Dec 8 21:51:11 2010 -0800
+
+ xkbevd 1.1.2
+
+ Signed-off-by: Alan Coopersmith
+
+commit 96ec51a0d91920c69d1cfb9e084cc84c4d86ff20
+Author: Alan Coopersmith
+Date: Sat Nov 20 18:42:35 2010 -0800
+
+ Purge RCS/CVS version tags
+
+ Signed-off-by: Alan Coopersmith
+
+commit 2a56e8dda4bac8621dedcb80b1f55c9a25c78d43
+Author: Alan Coopersmith
+Date: Sat Nov 20 18:36:25 2010 -0800
+
+ Fix errors found by gcc's printf attribute check
+
+ xkbevd.c: In function `parseArgs':
+ xkbevd.c:120: warning: too few arguments for format
+ xkbevd.c:139: warning: too few arguments for format
+ xkbevd.c:158: warning: too few arguments for format
+ xkbevd.c:177: warning: too few arguments for format
+ xkbevd.c: In function `InterpretConfigs':
+ xkbevd.c:280: warning: format argument is not a pointer (arg 2)
+ xkbevd.c: In function `FindMatchingConfig':
+ xkbevd.c:374: warning: too few arguments for format
+
+ Signed-off-by: Alan Coopersmith
+
+commit 45d575da032967b8920cf57491b7bd3bcd2991af
+Author: Alan Coopersmith
+Date: Sat Nov 20 18:32:08 2010 -0800
+
+ Add printf attributes to util.c functions
+
+ Signed-off-by: Alan Coopersmith
+
+commit d304e315d8143b4fbcb99e8086a6fad0dd051384
+Author: Alan Coopersmith
+Date: Sat Nov 20 18:21:37 2010 -0800
+
+ Constify arguments to utils.c functions
+
+ Signed-off-by: Alan Coopersmith
+
+commit 517ad56361ff9545bfc9730523e713a2bf641943
+Author: Alan Coopersmith
+Date: Sat Nov 20 18:10:25 2010 -0800
+
+ Remove trailing whitespace
+
+ Signed-off-by: Alan Coopersmith
+
+commit 04208bd63c1e81a2fada019bbf986c4cd93d0272
+Author: Alan Coopersmith
+Date: Sat Nov 20 18:09:30 2010 -0800
+
+ Combine usage message into a single string
+
+ Signed-off-by: Alan Coopersmith
+
+commit e56d87af20b96113dc40510811cadff028fe911f
+Author: Alan Coopersmith
+Date: Sat Nov 20 18:02:46 2010 -0800
+
+ config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+ Regroup AC statements under the Autoconf initialization section.
+ Regroup AM statements under the Automake initialization section.
+ Add missing AC_CONFIG_SRCDIR
+
+ Signed-off-by: Alan Coopersmith
+
+commit a5d49274162fbaad7dfcf5879e4e229bc7801fe0
+Author: Gaetan Nadon
+Date: Mon Nov 1 13:35:06 2010 -0400
+
+ config: cfgparse.c is in the root dir and not in src dir
+
+ The test for the yacc generated file was done in the wrong directory.
+
+ Signed-off-by: Gaetan Nadon
+
+commit c9e521f4ab7d07ee9b4b0ce7779bc939e7051e95
+Author: Martin Jansa
+Date: Mon Nov 1 09:46:20 2010 +0100
+
+ config: replace AC_CHECK_FILE with test -f
+
+ * AC_CHECK_FILE doesn't work for cross compilation
+
+ Signed-off-by: Gaetan Nadon
+
commit 14e12f714eead3f0185ab7996d6a1a38897c25cc
Author: Alan Coopersmith
Date: Sat Oct 30 10:06:46 2010 -0700
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xkbevd-1.1.1/configure.ac new/xkbevd-1.1.2/configure.ac
--- old/xkbevd-1.1.1/configure.ac 2010-10-30 19:06:34.000000000 +0200
+++ new/xkbevd-1.1.2/configure.ac 2010-12-09 06:50:59.000000000 +0100
@@ -1,5 +1,5 @@
dnl Copyright 2005 Red Hat, Inc.
-dnl
+dnl
dnl Permission to use, copy, modify, distribute, and sell this software and its
dnl documentation for any purpose is hereby granted without fee, provided that
dnl the above copyright notice appear in all copies and that both that
@@ -9,7 +9,7 @@
dnl specific, written prior permission. Red Hat makes no
dnl representations about the suitability of this software for any purpose. It
dnl is provided "as is" without express or implied warranty.
-dnl
+dnl
dnl RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
dnl EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
@@ -20,9 +20,14 @@
dnl
dnl Process this file with autoconf to create configure.
+# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([xkbevd], [1.1.1],
+AC_INIT([xkbevd], [1.1.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xkbevd])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
+
+# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
@@ -30,15 +35,15 @@
m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.8)
-
-AM_CONFIG_HEADER(config.h)
+XORG_DEFAULT_OPTIONS
AC_PROG_YACC
AC_PATH_PROG([YACC_INST], $YACC)
-AC_CHECK_FILE([$srcdir/cfgparse.c], [],
- [test -z "$YACC_INST" && AC_MSG_ERROR([yacc not found - unable to compile cfgparse.y])])
-
-XORG_DEFAULT_OPTIONS
+if test ! -f "cfgparse.c"; then
+ if test -z "$YACC_INST"; then
+ AC_MSG_ERROR([yacc not found - unable to compile cfgparse.y])
+ fi
+fi
# Checks for pkg-config packages
PKG_CHECK_MODULES(XKBEVD, xkbfile x11)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xkbevd-1.1.1/evargs.c new/xkbevd-1.1.2/evargs.c
--- old/xkbevd-1.1.1/evargs.c 2009-10-16 23:39:34.000000000 +0200
+++ new/xkbevd-1.1.2/evargs.c 2010-11-21 03:40:21.000000000 +0100
@@ -1,4 +1,3 @@
-/* $Xorg: evargs.c,v 1.3 2000/08/17 19:54:49 cpqbld Exp $ */
/************************************************************
Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc.
@@ -7,24 +6,23 @@
fee is hereby granted, provided that the above copyright
notice appear in all copies and that both that copyright
notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be
- used in advertising or publicity pertaining to distribution
+ documentation, and that the name of Silicon Graphics not be
+ used in advertising or publicity pertaining to distribution
of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability
+ Silicon Graphics makes no representation about the suitability
of this software for any purpose. It is provided "as is"
without any express or implied warranty.
-
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/xkbevd/evargs.c,v 1.3 1999/03/02 11:49:59 dawes Exp $ */
#define DEBUG_VAR evargsDebug
#include "xkbevd.h"
@@ -76,7 +74,7 @@
{
if (uStringEqual(arg,"device")||uStringEqual(arg,"D"))
sprintf(sink,"%d",ev->message.device);
- else if (uStringEqual(arg,"message")||uStringEqual(arg,"m"))
+ else if (uStringEqual(arg,"message")||uStringEqual(arg,"m"))
sprintf(sink,"%s",ev->message.message);
else if (uStringEqual(arg,"keycode")||uStringEqual(arg,"key")||
uStringEqual(arg,"k"))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xkbevd-1.1.1/example.cf new/xkbevd-1.1.2/example.cf
--- old/xkbevd-1.1.1/example.cf 2009-10-16 23:39:34.000000000 +0200
+++ new/xkbevd-1.1.2/example.cf 2010-11-21 03:40:21.000000000 +0100
@@ -1,4 +1,3 @@
-//$Xorg: example.cf,v 1.3 2000/08/17 19:54:49 cpqbld Exp $
soundDirectory = "/space/erik/.xkb/sounds/"
Bell() "ss/08.ting.aifc"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xkbevd-1.1.1/Makefile.am new/xkbevd-1.1.2/Makefile.am
--- old/xkbevd-1.1.1/Makefile.am 2010-09-24 05:39:47.000000000 +0200
+++ new/xkbevd-1.1.2/Makefile.am 2010-11-21 03:40:31.000000000 +0100
@@ -1,5 +1,5 @@
# Copyright 2005 Red Hat, Inc.
-#
+#
# Permission to use, copy, modify, distribute, and sell this software and its
# documentation for any purpose is hereby granted without fee, provided that
# the above copyright notice appear in all copies and that both that
@@ -9,7 +9,7 @@
# specific, written prior permission. Red Hat makes no
# representations about the suitability of this software for any purpose. It
# is provided "as is" without express or implied warranty.
-#
+#
# RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
# EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xkbevd-1.1.1/printev.c new/xkbevd-1.1.2/printev.c
--- old/xkbevd-1.1.1/printev.c 2009-10-16 23:39:34.000000000 +0200
+++ new/xkbevd-1.1.2/printev.c 2010-11-21 03:40:21.000000000 +0100
@@ -1,4 +1,3 @@
-/* $Xorg: printev.c,v 1.3 2000/08/17 19:54:49 cpqbld Exp $ */
/************************************************************
Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc.
@@ -7,24 +6,23 @@
fee is hereby granted, provided that the above copyright
notice appear in all copies and that both that copyright
notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be
- used in advertising or publicity pertaining to distribution
+ documentation, and that the name of Silicon Graphics not be
+ used in advertising or publicity pertaining to distribution
of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability
+ Silicon Graphics makes no representation about the suitability
of this software for any purpose. It is provided "as is"
without any express or implied warranty.
-
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/xkbevd/printev.c,v 3.3 1999/03/02 11:49:59 dawes Exp $ */
#define DEBUG_VAR printevDebug
#include "xkbevd.h"
@@ -153,7 +151,7 @@
do_XkbIndicatorNotify(FILE *file, XkbEvent *xkbev)
{
XkbIndicatorNotifyEvent *leds = &xkbev->indicators;
- if (leds->xkb_type==XkbIndicatorStateNotify)
+ if (leds->xkb_type==XkbIndicatorStateNotify)
fprintf(file," state changes= 0x%08x, new state= 0x%08x\n",
leds->changed,leds->state);
else fprintf(file," map changes= 0x%08x, state= 0x%08x\n",
@@ -391,7 +389,7 @@
printf (" root 0x%lx, subw 0x%lx, time %lu, (%d,%d), root:(%d,%d),\n",
e->root, e->subwindow, e->time, e->x, e->y, e->x_root, e->y_root);
printf (" state 0x%x, group= %d, button %u, same_screen %s\n",
- e->state&0x1FFF, (e->state>>13)&0x7, e->button,
+ e->state&0x1FFF, (e->state>>13)&0x7, e->button,
ynText(e->same_screen));
return;
@@ -412,7 +410,7 @@
printf (" root 0x%lx, subw 0x%lx, time %lu, (%d,%d), root:(%d,%d),\n",
e->root, e->subwindow, e->time, e->x, e->y, e->x_root, e->y_root);
printf (" state 0x%x, group= %d, is_hint %u, same_screen %s\n",
- e->state&0x1FFF, (e->state>>13)&0x7, e->is_hint,
+ e->state&0x1FFF, (e->state>>13)&0x7, e->is_hint,
ynText(e->same_screen));
return;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xkbevd-1.1.1/tokens.h new/xkbevd-1.1.2/tokens.h
--- old/xkbevd-1.1.1/tokens.h 2009-10-16 23:39:34.000000000 +0200
+++ new/xkbevd-1.1.2/tokens.h 2010-11-21 03:40:21.000000000 +0100
@@ -1,4 +1,3 @@
-/* $Xorg: tokens.h,v 1.3 2000/08/17 19:54:49 cpqbld Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
@@ -7,19 +6,19 @@
fee is hereby granted, provided that the above copyright
notice appear in all copies and that both that copyright
notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be
- used in advertising or publicity pertaining to distribution
+ documentation, and that the name of Silicon Graphics not be
+ used in advertising or publicity pertaining to distribution
of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability
+ Silicon Graphics makes no representation about the suitability
of this software for any purpose. It is provided "as is"
without any express or implied warranty.
-
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xkbevd-1.1.1/utils.c new/xkbevd-1.1.2/utils.c
--- old/xkbevd-1.1.1/utils.c 2009-10-16 23:39:34.000000000 +0200
+++ new/xkbevd-1.1.2/utils.c 2010-11-21 03:40:21.000000000 +0100
@@ -1,6 +1,5 @@
/*\
- * $XFree86: xc/programs/xkbevd/utils.c,v 3.5 2001/07/25 15:05:25 dawes Exp $
*
* COPYRIGHT 1990
* DIGITAL EQUIPMENT CORPORATION
@@ -9,8 +8,8 @@
*
* THE INFORMATION IN THIS SOFTWARE IS SUBJECT TO CHANGE WITHOUT NOTICE AND
* SHOULD NOT BE CONSTRUED AS A COMMITMENT BY DIGITAL EQUIPMENT CORPORATION.
- * DIGITAL MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THIS SOFTWARE
- * FOR ANY PURPOSE. IT IS SUPPLIED "AS IS" WITHOUT EXPRESS OR IMPLIED
+ * DIGITAL MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THIS SOFTWARE
+ * FOR ANY PURPOSE. IT IS SUPPLIED "AS IS" WITHOUT EXPRESS OR IMPLIED
* WARRANTY.
*
* IF THE SOFTWARE IS MODIFIED IN A MANNER CREATING DERIVATIVE COPYRIGHT
@@ -22,10 +21,9 @@
* that the above copyright notice appear in all copies and that both that
* copyright notice and this permission notice appear in supporting
* documentation, and that the name of Digital Equipment Corporation not be
- * used in advertising or publicity pertaining to distribution of the
+ * used in advertising or publicity pertaining to distribution of the
* software without specific, written prior permission.
\*/
-/* $Xorg: utils.c,v 1.5 2000/08/17 19:54:49 cpqbld Exp $ */
#define DEBUG_VAR_LOCAL
#include "utils.h"
@@ -96,7 +94,7 @@
static int uEntryLevel;
Boolean
-uSetEntryFile(char *name)
+uSetEntryFile(const char *name)
{
if ((entryFile!=NULL)&&(entryFile!=stderr)) {
fprintf(entryFile,"switching to %s\n",name?name:"stderr");
@@ -112,7 +110,7 @@
}
void
-uEntry(int l, char *s,...)
+uEntry(int l, const char *s,...)
{
int i;
va_list ap;
@@ -128,7 +126,7 @@
}
void
-uExit(int l, char *rtVal)
+uExit(int l, const char *rtVal)
{
int i;
@@ -150,7 +148,7 @@
int uDebugIndentSize= 4;
Boolean
-uSetDebugFile(char *name)
+uSetDebugFile(const char *name)
{
if ((uDebugFile!=NULL)&&(uDebugFile!=stderr)) {
fprintf(uDebugFile,"switching to %s\n",name?name:"stderr");
@@ -166,7 +164,7 @@
}
void
-uDebug(char *s,...)
+uDebug(const char *s,...)
{
int i;
va_list ap;
@@ -182,7 +180,7 @@
}
void
-uDebugNOI(char *s,...)
+uDebugNOI(const char *s,...)
{
va_list ap;
@@ -198,7 +196,7 @@
static FILE *errorFile= NULL;
Boolean
-uSetErrorFile(char *name)
+uSetErrorFile(const char *name)
{
if ((errorFile!=NULL)&&(errorFile!=stderr)) {
fprintf(errorFile,"switching to %s\n",name?name:"stderr");
@@ -214,7 +212,7 @@
}
void
-uInformation(char *s,...)
+uInformation(const char *s,...)
{
va_list ap;
@@ -228,7 +226,7 @@
/***====================================================================***/
void
-uAction(char *s,...)
+uAction(const char *s,...)
{
va_list ap;
@@ -243,7 +241,7 @@
/***====================================================================***/
void
-uWarning(char *s,...)
+uWarning(const char *s,...)
{
va_list ap;
@@ -258,7 +256,7 @@
/***====================================================================***/
void
-uError(char *s,...)
+uError(const char *s,...)
{
va_list ap;
@@ -273,7 +271,7 @@
/***====================================================================***/
void
-uFatalError(char *s,...)
+uFatalError(const char *s,...)
{
va_list ap;
@@ -290,7 +288,7 @@
/***====================================================================***/
void
-uInternalError(char *s,...)
+uInternalError(const char *s,...)
{
va_list ap;
@@ -306,7 +304,7 @@
#ifndef HAVE_STRDUP
char *
-uStringDup(char *str)
+uStringDup(const char *str)
{
char *rtrn;
@@ -320,7 +318,7 @@
#ifndef HAVE_STRCASECMP
int
-uStrCaseCmp(char *str1, char *str2)
+uStrCaseCmp(const char *str1, const char *str2)
{
char buf1[512],buf2[512];
char c, *s;
@@ -346,7 +344,7 @@
}
int
-uStrCasePrefix(char *prefix, char *str)
+uStrCasePrefix(const char *prefix, const char *str)
{
char c1;
char c2;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xkbevd-1.1.1/utils.h new/xkbevd-1.1.2/utils.h
--- old/xkbevd-1.1.1/utils.h 2009-10-16 23:39:34.000000000 +0200
+++ new/xkbevd-1.1.2/utils.h 2010-11-21 03:40:21.000000000 +0100
@@ -2,7 +2,6 @@
#define UTILS_H 1
/*\
- * $Xorg: utils.h,v 1.3 2000/08/17 19:54:49 cpqbld Exp $
*
* COPYRIGHT 1990
* DIGITAL EQUIPMENT CORPORATION
@@ -11,8 +10,8 @@
*
* THE INFORMATION IN THIS SOFTWARE IS SUBJECT TO CHANGE WITHOUT NOTICE AND
* SHOULD NOT BE CONSTRUED AS A COMMITMENT BY DIGITAL EQUIPMENT CORPORATION.
- * DIGITAL MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THIS SOFTWARE
- * FOR ANY PURPOSE. IT IS SUPPLIED "AS IS" WITHOUT EXPRESS OR IMPLIED
+ * DIGITAL MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THIS SOFTWARE
+ * FOR ANY PURPOSE. IT IS SUPPLIED "AS IS" WITHOUT EXPRESS OR IMPLIED
* WARRANTY.
*
* IF THE SOFTWARE IS MODIFIED IN A MANNER CREATING DERIVATIVE COPYRIGHT
@@ -24,10 +23,9 @@
* that the above copyright notice appear in all copies and that both that
* copyright notice and this permission notice appear in supporting
* documentation, and that the name of Digital Equipment Corporation not be
- * used in advertising or publicity pertaining to distribution of the
+ * used in advertising or publicity pertaining to distribution of the
* software without specific, written prior permission.
\*/
-/* $XFree86: xc/programs/xkbevd/utils.h,v 1.6 2002/01/14 18:30:11 dawes Exp $ */
/***====================================================================***/
@@ -79,7 +77,7 @@
int i;
unsigned u;
void *p;
- void *(*fp)();
+ void *(*fp)();
} Union;
#endif
@@ -120,13 +118,13 @@
/***====================================================================***/
-extern Boolean uSetErrorFile ( char *name );
-extern void uInformation ( char *s, ...);
-extern void uAction ( char *s, ... );
-extern void uWarning ( char *s, ... );
-extern void uError ( char *s, ... );
-extern void uFatalError(char *s,...);
-extern void uInternalError ( char *s, ... );
+extern Boolean uSetErrorFile ( const char *name );
+extern void uInformation ( const char *s, ...) _X_ATTRIBUTE_PRINTF(1,2);
+extern void uAction ( const char *s, ... ) _X_ATTRIBUTE_PRINTF(1,2);
+extern void uWarning ( const char *s, ... ) _X_ATTRIBUTE_PRINTF(1,2);
+extern void uError ( const char *s, ... ) _X_ATTRIBUTE_PRINTF(1,2);
+extern void uFatalError( const char *s,...) _X_ATTRIBUTE_PRINTF(1,2);
+extern void uInternalError ( const char *s, ... ) _X_ATTRIBUTE_PRINTF(1,2);
/***====================================================================***/
@@ -142,19 +140,19 @@
#define uStrCasePrefix(p,s) (strncasecmp(p,s,strlen(p))==0)
#else
extern int uStrCaseCmp(
- char * /* s1 */,
- char * /* s2 */
+ const char * /* s1 */,
+ const char * /* s2 */
);
extern int uStrCasePrefix(
- char * /* p */,
- char * /* str */
+ const char * /* p */,
+ const char * /* str */
);
#endif
#ifdef HAVE_STRDUP
#define uStringDup(s1) (strdup(s1))
#else
extern char *uStringDup(
- char * /* s1 */
+ const char * /* s1 */
);
#endif
@@ -176,10 +174,11 @@
extern
unsigned int DEBUG_VAR;
-extern void uDebug( char *s, ... );
-extern void uDebugNOI( char *s, ... ); /* no indent */
+extern void uDebug( const char *s, ... ) _X_ATTRIBUTE_PRINTF(1,2);
+extern void uDebugNOI( const char *s, ... ) /* no indent */
+ _X_ATTRIBUTE_PRINTF(1,2);
extern Boolean uSetDebugFile(
- char *name
+ const char *name
);
extern FILE *uDebugFile;
extern int uDebugIndentLevel;
@@ -215,11 +214,11 @@
#endif
extern Boolean uSetEntryFile(
- char *name
+ const char *name
);
-extern void uEntry(int l, char *s, ... );
+extern void uEntry(int l, const char *s, ... ) _X_ATTRIBUTE_PRINTF(2,3);
extern void uExit(
- int l,char *rtVal
+ int l, const char *rtVal
);
#ifdef ENTRY_TRACKING_ON
#define ENTRY_BIT 0x10
@@ -272,7 +271,7 @@
#define uFLAG_ENTRY7(f,s,a,b,c,d,e,g,h)
#define uFLAG_RETURN(v) { return(v);}
#define uFLAG_VOIDRETURN { return; }
-#endif
+#endif
_XFUNCPROTOEND
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xkbevd-1.1.1/xkbevd.c new/xkbevd-1.1.2/xkbevd.c
--- old/xkbevd-1.1.1/xkbevd.c 2009-10-16 23:39:34.000000000 +0200
+++ new/xkbevd-1.1.2/xkbevd.c 2010-11-21 03:40:21.000000000 +0100
@@ -1,4 +1,3 @@
-/* $Xorg: xkbevd.c,v 1.4 2000/08/17 19:54:49 cpqbld Exp $ */
/************************************************************
Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc.
@@ -7,24 +6,23 @@
fee is hereby granted, provided that the above copyright
notice appear in all copies and that both that copyright
notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be
- used in advertising or publicity pertaining to distribution
+ documentation, and that the name of Silicon Graphics not be
+ used in advertising or publicity pertaining to distribution
of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability
+ Silicon Graphics makes no representation about the suitability
of this software for any purpose. It is provided "as is"
without any express or implied warranty.
-
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/xkbevd/xkbevd.c,v 3.8 2001/01/17 23:46:09 dawes Exp $ */
#define DEBUG_VAR xkbevdDebug
#include
@@ -81,22 +79,19 @@
/***====================================================================***/
-#define M(m) fprintf(stderr,(m))
-#define M1(m,a) fprintf(stderr,(m),(a))
-
static void
Usage(int argc, char *argv[])
{
- M1("Usage: %s [options]...\n",argv[0]);
- M("Legal options:\n");
- M("-?,-help Print this message\n");
- M("-cfg <file> Specify a config file\n");
- M("-sc <cmd> Specify the command to play sounds\n");
- M("-sd <dir> Specify the root directory for sound files\n");
- M("-d[isplay] <dpy> Specify the display to watch\n");
- M("-bg Run in background\n");
- M("-synch Force synchronization\n");
- M("-v Print verbose messages\n");
+ fprintf(stderr, "Usage: %s [options]...\n%s", argv[0],
+ "Legal options:\n"
+ "-?, -help Print this message\n"
+ "-cfg <file> Specify a config file\n"
+ "-sc <cmd> Specify the command to play sounds\n"
+ "-sd <dir> Specify the root directory for sound files\n"
+ "-d[isplay] <dpy> Specify the display to watch\n"
+ "-bg Run in background\n"
+ "-synch Force synchronization\n"
+ "-v Print verbose messages\n");
return;
}
@@ -119,8 +114,9 @@
else {
char *name= argv[++i];
if (cfgFileName!=NULL) {
- if (uStringEqual(cfgFileName,name))
- uWarning("Config file \"%s\" specified twice!\n");
+ if (uStringEqual(cfgFileName,name))
+ uWarning("Config file \"%s\" specified twice!\n",
+ name);
else {
uWarning("Multiple config files on command line\n");
uAction("Using \"%s\", ignoring \"%s\"\n",name,
@@ -138,8 +134,9 @@
else {
char *name= argv[++i];
if (dpyName!=NULL) {
- if (uStringEqual(dpyName,name))
- uWarning("Display \"%s\" specified twice!\n");
+ if (uStringEqual(dpyName,name))
+ uWarning("Display \"%s\" specified twice!\n",
+ name);
else {
uWarning("Multiple displays on command line\n");
uAction("Using \"%s\", ignoring \"%s\"\n",name,
@@ -157,8 +154,9 @@
else {
char *name= argv[++i];
if (soundCmd!=NULL) {
- if (uStringEqual(soundCmd,name))
- uWarning("Sound command \"%s\" specified twice!\n");
+ if (uStringEqual(soundCmd,name))
+ uWarning("Sound command \"%s\" specified twice!\n",
+ name);
else {
uWarning("Multiple sound commands on command line\n");
uAction("Using \"%s\", ignoring \"%s\"\n",name,
@@ -176,8 +174,9 @@
else {
char *name= argv[++i];
if (soundDir!=NULL) {
- if (uStringEqual(soundDir,name))
- uWarning("Sound directory \"%s\" specified twice!\n");
+ if (uStringEqual(soundDir,name))
+ uWarning("Sound directory \"%s\" specified twice!\n",
+ name);
else {
uWarning("Multiple sound dirs on command line\n");
uAction("Using \"%s\", ignoring \"%s\"\n",name,
@@ -280,7 +279,7 @@
}
}
else {
- uWarning("Assignment to unknown variable \"%s\"\n",cfg->name);
+ uWarning("Assignment to unknown variable \"%s\"\n", name);
uAction("Ignored\n");
}
}
@@ -292,9 +291,9 @@
break;
case XkbAccessXNotify:
priv= 0;
- if (name==NULL)
+ if (name==NULL)
priv= XkbAllNewKeyboardEventsMask;
- else if (uStrCaseEqual(name,"skpress"))
+ else if (uStrCaseEqual(name,"skpress"))
priv= XkbAXN_SKPressMask;
else if (uStrCaseEqual(name,"skaccept"))
priv= XkbAXN_SKAcceptMask;
@@ -374,7 +373,8 @@
return cfg;
break;
default:
- uInternalError("Can't handle type %d XKB events yet, Sorry.\n");
+ uInternalError("Can't handle type %d XKB events yet, Sorry.\n",
+ ev->any.xkb_type);
break;
}
}
@@ -501,7 +501,7 @@
if (background) {
if (fork()!=0) {
- if (verbose)
+ if (verbose)
uInformation("Running in the background\n");
exit(0);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xkbevd-1.1.1/xkbevd.h new/xkbevd-1.1.2/xkbevd.h
--- old/xkbevd-1.1.1/xkbevd.h 2009-10-16 23:39:34.000000000 +0200
+++ new/xkbevd-1.1.2/xkbevd.h 2010-11-21 03:40:21.000000000 +0100
@@ -1,4 +1,3 @@
-/* $Xorg: xkbevd.h,v 1.3 2000/08/17 19:54:49 cpqbld Exp $ */
/************************************************************
Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc.
@@ -7,24 +6,23 @@
fee is hereby granted, provided that the above copyright
notice appear in all copies and that both that copyright
notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be
- used in advertising or publicity pertaining to distribution
+ documentation, and that the name of Silicon Graphics not be
+ used in advertising or publicity pertaining to distribution
of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability
+ Silicon Graphics makes no representation about the suitability
of this software for any purpose. It is provided "as is"
without any express or implied warranty.
-
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/xkbevd/xkbevd.h,v 3.4 2001/01/17 23:46:09 dawes Exp $ */
#ifndef XKBEVD_H
#define XKBEVD_H 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xkbevd-1.1.1/xkbevd.man new/xkbevd-1.1.2/xkbevd.man
--- old/xkbevd-1.1.1/xkbevd.man 2009-10-16 23:39:34.000000000 +0200
+++ new/xkbevd-1.1.2/xkbevd.man 2010-11-21 03:41:47.000000000 +0100
@@ -1,7 +1,3 @@
-.\" $XdotOrg: $
-.\" $Xorg: xkbevd.man,v 1.3 2000/08/17 19:54:49 cpqbld Exp $
-.\"
-.\" $XFree86: xc/programs/xkbevd/xkbevd.man,v 1.7 2001/01/27 18:21:16 dawes Exp $
.\"
.TH XKBEVD 1 __xorgversion__
.SH NAME
@@ -11,29 +7,29 @@
[ options ]
.SH DESCRIPTION
.PP
-This command is very raw and is therefore only partially implemented; we
-present it here as a rough prototype for developers, not as a general purpose
+This command is very raw and is therefore only partially implemented; we
+present it here as a rough prototype for developers, not as a general purpose
tool for end users. Something like this might make a suitable replacement
for xev; I'm not signing up, mind you, but it's an interesting idea.
.PP
The
.I xkbevd
event daemon listens for specified XKB events and executes requested commands
-if they occur. The configuration file consists of a list of event
-specification/action pairs and/or variable definitions.
+if they occur. The configuration file consists of a list of event
+specification/action pairs and/or variable definitions.
.PP
-An event specification consists of a short XKB event name followed by a
-string or identifier which serves as a qualifier in parentheses; empty
-parenthesis indicate no qualification and serve to specify the default
-command which is applied to events which do not match any of the other
-specifications. The interpretation of the qualifier depends on the type
-of the event: Bell events match using the name of the bell, message events
-match on the contents of the message string and slow key events accept
-any of \fIpress\fP, \fIrelease\fP, \fIaccept\fP, or \fIreject\fP. No
+An event specification consists of a short XKB event name followed by a
+string or identifier which serves as a qualifier in parentheses; empty
+parenthesis indicate no qualification and serve to specify the default
+command which is applied to events which do not match any of the other
+specifications. The interpretation of the qualifier depends on the type
+of the event: Bell events match using the name of the bell, message events
+match on the contents of the message string and slow key events accept
+any of \fIpress\fP, \fIrelease\fP, \fIaccept\fP, or \fIreject\fP. No
other events are currently recognized.
.PP
-An action consists of an optional keyword followed by an optional string
-argument. Currently, \fIxkbev\fP recognizes the actions: \fInone\fP,
+An action consists of an optional keyword followed by an optional string
+argument. Currently, \fIxkbev\fP recognizes the actions: \fInone\fP,
\fIignore\fP, \fIecho\fP, \fIprintEvent\fP, \fIsound\fP, and \fIshell\fP.
If the action is not specified, the string is taken as the name of a sound
file to be played unless it begins with an exclamation point, in which case
@@ -41,12 +37,12 @@
.PP
Variable definitions in the argument string are expanded with fields from
the event in question before the argument string is passed to the action
-processor. The general syntax for a variable is
+processor. The general syntax for a variable is
either $\fIc\P or $(\fIstr\fP), where \fIc\fP is a single character and
-\fIstr\fP is a string of arbitrary length. All parameters have both
-single-character and long names.
+\fIstr\fP is a string of arbitrary length. All parameters have both
+single-character and long names.
.PP
-The list of recognized parameters varies from event to event and is too long
+The list of recognized parameters varies from event to event and is too long
to list here right now. This is a developer release anyway, so you can
be expected to look at the source code (evargs.c is of particular interest).
.PP
@@ -54,7 +50,7 @@
actions do what you would expect commands named \fIignore\fP, \fIecho\fP,
\fIprintEvent\fP, \fIsound\fP, and \fIshell\fP to do, except that the sound
command has only been implemented and tested for SGI machines. It launches
-an external program right now, so it should be pretty easy to adapt,
+an external program right now, so it should be pretty easy to adapt,
especially if you like audio cues that arrive about a half-second after you
expect them.
.PP
@@ -87,7 +83,7 @@
Forces synchronization of all X requests. Slow.
.TP 8
.B \-v
-Print more information, including debugging messages. Multiple
+Print more information, including debugging messages. Multiple
specifications of \fI-v\fP cause more output, to a point.
.SH "SEE ALSO"
X(__miscmansuffix__)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org