Update to xkbcomp 1.0.4
This commit is contained in:
matthieu
parent
33acf34151
commit
b0446f754a
@ -1,12 +1,90 @@
|
||||
This is a stub file. This package has not yet had its complete licensing
|
||||
information compiled. Please see the individual source files for details on
|
||||
your rights to use and modify this software.
|
||||
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
|
||||
|
||||
Please submit updated COPYING files to the Xorg bugzilla:
|
||||
Permission to use, copy, modify, and distribute this
|
||||
software and its documentation for any purpose and without
|
||||
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
|
||||
of the software without specific prior written permission.
|
||||
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.
|
||||
|
||||
https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
|
||||
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
|
||||
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
|
||||
THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
|
||||
All licensing questions regarding this software should be directed at the
|
||||
Xorg mailing list:
|
||||
|
||||
http://lists.freedesktop.org/mailman/listinfo/xorg
|
||||
Copyright 1988, 1998 The Open Group
|
||||
|
||||
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
|
||||
copyright notice and this permission notice appear in supporting
|
||||
documentation.
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
|
||||
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
Except as contained in this notice, the name of The Open Group shall not be
|
||||
used in advertising or otherwise to promote the sale, use or other dealings
|
||||
in this Software without prior written authorization from The Open Group.
|
||||
|
||||
|
||||
Copyright 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
|
||||
|
||||
All Rights Reserved
|
||||
|
||||
Permission to use, copy, modify, and distribute this software and its
|
||||
documentation for any purpose and without 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 Digital not be
|
||||
used in advertising or publicity pertaining to distribution of the
|
||||
software without specific, written prior permission.
|
||||
|
||||
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
|
||||
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
|
||||
DIGITAL 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.
|
||||
|
||||
|
||||
COPYRIGHT 1990
|
||||
DIGITAL EQUIPMENT CORPORATION
|
||||
MAYNARD, MASSACHUSETTS
|
||||
ALL RIGHTS RESERVED.
|
||||
|
||||
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
|
||||
WARRANTY.
|
||||
|
||||
IF THE SOFTWARE IS MODIFIED IN A MANNER CREATING DERIVATIVE COPYRIGHT
|
||||
RIGHTS, APPROPRIATE LEGENDS MAY BE PLACED ON THE DERIVATIVE WORK IN
|
||||
ADDITION TO THAT SET FORTH ABOVE.
|
||||
|
||||
Permission to use, copy, modify, and distribute this software and its
|
||||
documentation for any purpose and without 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 Digital Equipment Corporation not be
|
||||
used in advertising or publicity pertaining to distribution of the
|
||||
software without specific, written prior permission.
|
||||
|
||||
@ -1,51 +1,317 @@
|
||||
2006-04-26 Adam Jackson <ajax@freedesktop.org>
|
||||
commit c1cc023fc50ce3a4a23f4682ebefd2301fd13170
|
||||
Author: Adam Jackson <ajax@redhat.com>
|
||||
Date: Fri Feb 29 15:30:34 2008 -0500
|
||||
|
||||
* configure.ac:
|
||||
Bump to 1.0.2
|
||||
Bug #7645: Fix a conditional that always evaluates to FALSE.
|
||||
|
||||
Since it's if (0 || foo), simplify to if (foo).
|
||||
|
||||
2006-04-03 Daniel Stone <daniel@freedesktop.org>
|
||||
commit 3f8bd7e68d0028bce5075124a32cc004166486c6
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Tue Jan 22 16:05:14 2008 -0800
|
||||
|
||||
* compat.c:
|
||||
Bug #4851: Fix up have-no-file test.
|
||||
Bug 14185: MAINTAINERCLEANFILES multiply defined in Makefile.am
|
||||
|
||||
<http://bugs.freedesktop.org/show_bug.cgi?id=14185>
|
||||
|
||||
2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
commit 2421069a3686f7bff702383675fdb77be108021e
|
||||
Author: Matthieu Herrb <matthieu@bluenote.herrb.com>
|
||||
Date: Sun Jan 6 11:40:30 2008 +0100
|
||||
|
||||
* configure.ac:
|
||||
Update package version for X11R7 release.
|
||||
Revert "Also mark xkbparse.h as a generated file."
|
||||
Apparently only yacc generates it.
|
||||
|
||||
This reverts commit 3e5b0d615b94c66a2b5a8b3d2e4a04713a442002.
|
||||
|
||||
2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
commit 3e5b0d615b94c66a2b5a8b3d2e4a04713a442002
|
||||
Author: Matthieu Herrb <matthieu@bluenote.herrb.com>
|
||||
Date: Sun Jan 6 11:17:07 2008 +0100
|
||||
|
||||
* configure.ac:
|
||||
Update package version number for final X11R7 release candidate.
|
||||
Also mark xkbparse.h as a generated file.
|
||||
|
||||
2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
commit 686e8b6d33602f5fb7de7a768e532a4ac8090c26
|
||||
Author: James Cloos <cloos@jhcloos.com>
|
||||
Date: Thu Dec 6 16:37:18 2007 -0500
|
||||
|
||||
* Makefile.am:
|
||||
Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
|
||||
Replace static ChangeLog with dist-hook to generate from git log
|
||||
|
||||
2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
commit 6aae208fe5bd8f71757c294a441d7c599a1ec4a1
|
||||
Author: Tilman Sauerbeck <tilman@code-monkey.de>
|
||||
Date: Sun Sep 23 20:15:47 2007 +0200
|
||||
|
||||
* configure.ac:
|
||||
Update package version number for X11R7 RC3 release.
|
||||
Ignore *.o and ylwrap.
|
||||
|
||||
2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
commit 829cb75130d1edd88fa1d33e277f49167daedacf
|
||||
Author: Tilman Sauerbeck <tilman@code-monkey.de>
|
||||
Date: Sun Sep 23 20:15:13 2007 +0200
|
||||
|
||||
* configure.ac:
|
||||
Update package version number for RC1 release.
|
||||
Fixed a bunch of const correctness bugs.
|
||||
|
||||
2005-10-15 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
commit e8ffa513a109209849b11a3c608356cc28314a8e
|
||||
Author: Tilman Sauerbeck <tilman@code-monkey.de>
|
||||
Date: Sun Sep 23 17:50:41 2007 +0200
|
||||
|
||||
* Makefile.am: Have generated files be cleaned by maintainer in
|
||||
order to pass check-tarball test.
|
||||
Fixed an invalid memory access.
|
||||
|
||||
Some keynames are less than 3 characters long (not counting the
|
||||
terminator). We're now also initializing all of the keyName array.
|
||||
|
||||
2005-09-01 Kristian Høgsberg <krh@redhat.com>
|
||||
commit dfa65b0c8df6a6aab4f86c32a0acb41f44201e7c
|
||||
Author: Daniel Drake <ddrake@brontes3d.com>
|
||||
Date: Mon May 21 13:41:00 2007 -0800
|
||||
|
||||
* Makefile.am (AM_CFLAGS): Define DFLT_XKB_CONFIG_ROOT to
|
||||
$(datadir)/X11/xkb so we look in the right place.
|
||||
Bug #11025: xkbcomp COPYING file
|
||||
|
||||
X.Org Bugzilla #11025 <https://bugs.freedesktop.org/show_bug.cgi?id=11025>
|
||||
|
||||
2005-08-02 Keith Packard <keithp@keithp.com>
|
||||
commit 3ca028cf767258fd62fb7a1b0eb22d13d333a3ae
|
||||
Author: James Cloos <cloos@jhcloos.com>
|
||||
Date: Mon Sep 3 05:51:25 2007 -0400
|
||||
|
||||
* Makefile.am:
|
||||
Mark generated files as BUILT_SOURCES and CLEANFILES
|
||||
to ensure they are regenerated after 'make clean' and
|
||||
to make parallel builds work right.
|
||||
Add *~ to .gitignore to skip patch/emacs droppings
|
||||
|
||||
commit b00e474ca8dbbb0166f2108e4b08cc3f9c36c735
|
||||
Author: James Cloos <cloos@jhcloos.com>
|
||||
Date: Thu Aug 23 19:24:52 2007 -0400
|
||||
|
||||
Rename .cvsignore to .gitignore
|
||||
|
||||
commit 313a2748d3dff872e067d515d6deabe1bbd56fbe
|
||||
Author: Daniel Stone <daniel@fooishbar.org>
|
||||
Date: Wed Nov 8 16:30:57 2006 +0200
|
||||
|
||||
bump to 1.0.3
|
||||
|
||||
commit 337ed258a1cd3f5a16fa69ef15e98781e76f63a1
|
||||
Author: Etsushi Kato <ek.kato@gmail.com>
|
||||
Date: Wed Nov 8 16:29:16 2006 +0200
|
||||
|
||||
compat: avoid use of uninitialised variable (bug #8846)
|
||||
si.interp.match may be unused, so just clobber it, which means we don't
|
||||
end up with stuff like LevelOneOnlyMask wandering in.
|
||||
|
||||
commit d920bbadb94684287f70e50ded2a35d65186c188
|
||||
Author: Andriy Gapon <avg@icyb.net.ua>
|
||||
Date: Sun Oct 29 02:59:53 2006 +0300
|
||||
|
||||
parser: accept negative numbers in geometry co-ordinates (bug #8763)
|
||||
Accept negative co-ordinates for geometry, per the spec.
|
||||
|
||||
commit 0e8fd676de161ba52bb4544f8641be756bc580a1
|
||||
Author: Adam Jackson <ajax@nwnk.net>
|
||||
Date: Wed Apr 26 23:41:58 2006 +0000
|
||||
|
||||
Bump to 1.0.2
|
||||
|
||||
commit 58c77c8db1bfdc739fac7b100fb813028d0449c7
|
||||
Author: Daniel Stone <daniel@fooishbar.org>
|
||||
Date: Mon Apr 3 11:28:43 2006 +0000
|
||||
|
||||
Bug #4851: Fix up have-no-file test.
|
||||
|
||||
commit 02d32f8dbc79116d33ef428d5b064009cdd6a06e
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Wed Dec 21 02:29:51 2005 +0000
|
||||
|
||||
Update package version for X11R7 release.
|
||||
|
||||
commit 836db774d1f08a050af8717c4c8501f337f36281
|
||||
Author: Adam Jackson <ajax@nwnk.net>
|
||||
Date: Mon Dec 19 16:22:44 2005 +0000
|
||||
|
||||
Stub COPYING files
|
||||
|
||||
commit e9f680c5654cd93d30b16bc4b626ae5b25f84e87
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Thu Dec 15 00:24:08 2005 +0000
|
||||
|
||||
Update package version number for final X11R7 release candidate.
|
||||
|
||||
commit b158f550fce661d67604f4a23d33a9f3b7bc22a1
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Tue Dec 6 22:48:22 2005 +0000
|
||||
|
||||
Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
|
||||
|
||||
commit f1370c50b199c3c8b2760ebf0228d741855390d7
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Sat Dec 3 05:49:24 2005 +0000
|
||||
|
||||
Update package version number for X11R7 RC3 release.
|
||||
|
||||
commit 8eb3737f5bce19b89c80d9ab256204f0fa62529b
|
||||
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
|
||||
Date: Mon Nov 28 22:01:43 2005 +0000
|
||||
|
||||
Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
|
||||
update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
|
||||
|
||||
commit f19c3028c34a0dba4ffb9ae19c13421e7ff0ff12
|
||||
Author: Eric Anholt <anholt@freebsd.org>
|
||||
Date: Mon Nov 21 10:35:01 2005 +0000
|
||||
|
||||
Another pass at .cvsignores for apps.
|
||||
|
||||
commit 3ada747f1cb5400404e4b63430f7a817dbf0c4cb
|
||||
Author: Eric Anholt <anholt@freebsd.org>
|
||||
Date: Sun Nov 20 22:08:53 2005 +0000
|
||||
|
||||
Add/improve .cvsignore files for apps.
|
||||
|
||||
commit 4eeb611f17bdc01f7a6cb4db3f0997ce5ecc6361
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Wed Oct 19 02:47:54 2005 +0000
|
||||
|
||||
Update package version number for RC1 release.
|
||||
|
||||
commit 958d09064c96cb50df6f92bfb8d4754c87451920
|
||||
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
|
||||
Date: Mon Oct 17 23:56:23 2005 +0000
|
||||
|
||||
Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
|
||||
work better with BSD make
|
||||
|
||||
commit 950fba3262905c58891773a8795305e685dc1cb3
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Sat Oct 15 19:32:52 2005 +0000
|
||||
|
||||
Have generated files be cleaned by maintainer in order to pass
|
||||
check-tarball test.
|
||||
|
||||
commit a83e4bb777d6f9b1b42a7fb3ff84a5e0d7e123c7
|
||||
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
|
||||
Date: Fri Oct 14 00:25:46 2005 +0000
|
||||
|
||||
Use sed to fill in variables in man page
|
||||
|
||||
commit 8c0d310c1acccc424dae29554a5075f9b339e95f
|
||||
Author: Kristian Høgsberg <krh@redhat.com>
|
||||
Date: Thu Sep 1 19:37:02 2005 +0000
|
||||
|
||||
Define DFLT_XKB_CONFIG_ROOT to $(datadir)/X11/xkb so we look in the right
|
||||
place.
|
||||
|
||||
commit fabda6a820bdccae85a7c22ad0b30f089952606b
|
||||
Author: Keith Packard <keithp@keithp.com>
|
||||
Date: Tue Aug 2 18:03:01 2005 +0000
|
||||
|
||||
Mark generated files as BUILT_SOURCES and CLEANFILES to ensure they are
|
||||
regenerated after 'make clean' and to make parallel builds work right.
|
||||
|
||||
commit 35e0b7ef41ffe1f17ad8f21dbda10267961231ea
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Fri Jul 29 21:22:35 2005 +0000
|
||||
|
||||
Various changes preparing packages for RC0:
|
||||
- Verify and update package version numbers as needed
|
||||
- Implement versioning scheme
|
||||
- Change bug address to point to bugzilla bug entry form
|
||||
- Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
|
||||
reenable it)
|
||||
- Fix makedepend to use pkgconfig and pass distcheck
|
||||
- Update build script to build macros first
|
||||
- Update modular Xorg version
|
||||
|
||||
commit e447fee50a8014b5281a5abfcc5e468f8cc130ca
|
||||
Author: Daniel Stone <daniel@fooishbar.org>
|
||||
Date: Fri Jul 22 15:08:19 2005 +0000
|
||||
|
||||
Use YACC to compile xkbparse.y.
|
||||
|
||||
commit 34cd161f5947b4dc185356bc65653717f56ced00
|
||||
Author: Adam Jackson <ajax@nwnk.net>
|
||||
Date: Wed Jul 20 19:31:57 2005 +0000
|
||||
|
||||
Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global
|
||||
configure cache, you cache it, and the cached value is probably wrong.
|
||||
|
||||
commit 8335e5fa471e25675c6a369ec2348883953fcdd0
|
||||
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
|
||||
Date: Sat Jul 16 20:56:47 2005 +0000
|
||||
|
||||
Add xkbcomp data to symlink.sh. Some fixes to xkbcomp/Makefile.am
|
||||
|
||||
commit d7b3354575f31caa9044b6c5f7aee4f010f6192a
|
||||
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
|
||||
Date: Fri Jul 15 18:02:35 2005 +0000
|
||||
|
||||
Build system for xkbcomp
|
||||
|
||||
commit 59e48918e7c252926bb5e51a077bcbc8a7eec829
|
||||
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
|
||||
Date: Mon Nov 15 15:06:52 2004 +0000
|
||||
|
||||
Bufzilla #1802, http://freedesktop.org/bugzilla/show_bug.cgi?id=1802 Added
|
||||
mingw (Win32) port
|
||||
|
||||
commit 0336e043fab6f2a8828d90bc9eef2e23878f6dd1
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Fri Sep 3 23:41:22 2004 +0000
|
||||
|
||||
Update formatted docs.
|
||||
|
||||
commit 20240438ef9d3a6c66443ca9f095a2766ef6ed4e
|
||||
Author: Egbert Eich <eich@suse.de>
|
||||
Date: Fri Apr 23 19:54:50 2004 +0000
|
||||
|
||||
Merging XORG-CURRENT into trunk
|
||||
|
||||
commit a3729a9f9fcda07b233f434266148c8751684347
|
||||
Author: Egbert Eich <eich@suse.de>
|
||||
Date: Sun Mar 14 08:35:25 2004 +0000
|
||||
|
||||
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
|
||||
|
||||
commit 37a1152a4024fb799fe1272ce378e6c7c97ee951
|
||||
Author: Egbert Eich <eich@suse.de>
|
||||
Date: Wed Mar 3 12:13:08 2004 +0000
|
||||
|
||||
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
|
||||
|
||||
commit 55f40d0286d0e2e4b1602f983b749352188c3ec4
|
||||
Author: Egbert Eich <eich@suse.de>
|
||||
Date: Thu Feb 26 13:36:25 2004 +0000
|
||||
|
||||
readding XFree86's cvs IDs
|
||||
|
||||
commit 2a95cda1d358fc309c78dc5201a1dbacaba9d0bf
|
||||
Author: Egbert Eich <eich@suse.de>
|
||||
Date: Thu Feb 26 09:24:08 2004 +0000
|
||||
|
||||
Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
|
||||
|
||||
commit dbba2cffbc57e5bbdec8f24417a8a5dcfef7c2a2
|
||||
Author: Egbert Eich <eich@suse.de>
|
||||
Date: Thu Jan 29 08:09:12 2004 +0000
|
||||
|
||||
Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004
|
||||
|
||||
commit 8aa5bcfe58d3776746d7b0d627f2fb8744fb0817
|
||||
Author: Kaleb Keithley <kaleb@freedesktop.org>
|
||||
Date: Fri Dec 19 20:55:58 2003 +0000
|
||||
|
||||
XFree86 4.3.99.902 (RC 2)
|
||||
|
||||
commit 37ebbbe7b11febaf548006a9b73db0eebf79881a
|
||||
Author: Kaleb Keithley <kaleb@freedesktop.org>
|
||||
Date: Tue Nov 25 19:29:13 2003 +0000
|
||||
|
||||
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
|
||||
|
||||
commit 287ac4c6af61d8f9f95cd3b3219c979e1329a2fe
|
||||
Author: Kaleb Keithley <kaleb@freedesktop.org>
|
||||
Date: Fri Nov 14 16:49:22 2003 +0000
|
||||
|
||||
XFree86 4.3.0.1
|
||||
|
||||
commit 262961d88faf67f69f4630acb8234a4f2c5a6e80
|
||||
Author: Kaleb Keithley <kaleb@freedesktop.org>
|
||||
Date: Fri Nov 14 16:49:22 2003 +0000
|
||||
|
||||
Initial revision
|
||||
|
||||
commit 2af3aabf0e7eb1514d39b29a6b58fcd0d4de41d1
|
||||
Author: Kaleb Keithley <kaleb@freedesktop.org>
|
||||
Date: Fri Nov 14 15:54:54 2003 +0000
|
||||
|
||||
R6.6 is the Xorg base-line
|
||||
|
||||
@ -98,3 +98,13 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man
|
||||
|
||||
.man.$(APP_MAN_SUFFIX):
|
||||
sed $(MAN_SUBSTS) < $< > $@
|
||||
|
||||
EXTRA_DIST += ChangeLog
|
||||
MAINTAINERCLEANFILES += ChangeLog
|
||||
|
||||
.PHONY: ChangeLog
|
||||
|
||||
ChangeLog:
|
||||
(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
|
||||
|
||||
dist-hook: ChangeLog
|
||||
|
||||
@ -254,8 +254,8 @@ appman_PRE = \
|
||||
xkbcomp.man
|
||||
|
||||
BUILT_SOURCES = xkbparse.c
|
||||
MAINTAINERCLEANFILES = $(BUILT_SOURCES)
|
||||
EXTRA_DIST = README.config README.enhancing $(appman_PRE)
|
||||
MAINTAINERCLEANFILES = $(BUILT_SOURCES) ChangeLog
|
||||
EXTRA_DIST = README.config README.enhancing $(appman_PRE) ChangeLog
|
||||
appmandir = $(APP_MAN_DIR)
|
||||
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
|
||||
CLEANFILES = $(appman_DATA)
|
||||
@ -516,6 +516,9 @@ distdir: $(DISTFILES)
|
||||
|| exit 1; \
|
||||
fi; \
|
||||
done
|
||||
$(MAKE) $(AM_MAKEFLAGS) \
|
||||
top_distdir="$(top_distdir)" distdir="$(distdir)" \
|
||||
dist-hook
|
||||
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
|
||||
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
|
||||
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
|
||||
@ -705,8 +708,8 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
|
||||
|
||||
.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
|
||||
clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \
|
||||
dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
|
||||
distclean-compile distclean-generic distclean-hdr \
|
||||
dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \
|
||||
distclean distclean-compile distclean-generic distclean-hdr \
|
||||
distclean-tags distcleancheck distdir distuninstallcheck dvi \
|
||||
dvi-am html html-am info info-am install install-am \
|
||||
install-appmanDATA install-binPROGRAMS install-data \
|
||||
@ -721,6 +724,13 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
|
||||
|
||||
.man.$(APP_MAN_SUFFIX):
|
||||
sed $(MAN_SUBSTS) < $< > $@
|
||||
|
||||
.PHONY: ChangeLog
|
||||
|
||||
ChangeLog:
|
||||
(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
|
||||
|
||||
dist-hook: ChangeLog
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||
.NOEXPORT:
|
||||
|
||||
12
app/xkbcomp/aclocal.m4
vendored
12
app/xkbcomp/aclocal.m4
vendored
@ -1042,7 +1042,7 @@ AC_DEFUN([XORG_MACROS_VERSION],[
|
||||
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.5
|
||||
[XORG_MACROS_version=1.1.6
|
||||
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
|
||||
@ -1191,7 +1191,11 @@ AC_DEFUN([XORG_CHECK_LINUXDOC],[
|
||||
XORG_SGML_PATH=$prefix/share/sgml
|
||||
HAVE_DEFS_ENT=
|
||||
|
||||
AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
|
||||
if test x"$cross_compiling" = x"yes" ; then
|
||||
HAVE_DEFS_ENT=no
|
||||
else
|
||||
AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
|
||||
fi
|
||||
|
||||
AC_PATH_PROG(LINUXDOC, linuxdoc)
|
||||
AC_PATH_PROG(PS2PDF, ps2pdf)
|
||||
@ -1463,14 +1467,14 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
|
||||
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`
|
||||
PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
|
||||
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`
|
||||
PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
|
||||
if test "x$PVP" = "x"; then
|
||||
PVP="0"
|
||||
fi
|
||||
|
||||
@ -185,7 +185,7 @@ static char buf[32];
|
||||
/***====================================================================***/
|
||||
|
||||
static Bool
|
||||
ReportMismatch(unsigned action,unsigned field,char *type)
|
||||
ReportMismatch(unsigned action, unsigned field, const char *type)
|
||||
{
|
||||
ERROR2("Value of %s field must be of type %s\n",fieldText(field),type);
|
||||
ACTION1("Action %s definition ignored\n",
|
||||
@ -214,7 +214,7 @@ ReportActionNotArray(unsigned action,unsigned field)
|
||||
}
|
||||
|
||||
static Bool
|
||||
ReportNotFound(unsigned action,unsigned field,char *what,char *bad)
|
||||
ReportNotFound(unsigned action, unsigned field, const char *what, char *bad)
|
||||
{
|
||||
ERROR2("%s named %s not found\n",what,bad);
|
||||
ACTION2("Ignoring the %s field of an %s action\n",fieldText(field),
|
||||
|
||||
@ -246,8 +246,7 @@ unsigned merge;
|
||||
|
||||
merge= newGC->merge;
|
||||
gc= &info->groupCompat[group];
|
||||
if ((newGC->fileID<0)||
|
||||
((gc->real_mods==newGC->real_mods)&&(gc->vmods==newGC->vmods))) {
|
||||
if (((gc->real_mods==newGC->real_mods)&&(gc->vmods==newGC->vmods))) {
|
||||
return True;
|
||||
}
|
||||
if (((gc->fileID==newGC->fileID)&&(warningLevel>0))||(warningLevel>9)) {
|
||||
|
||||
24
app/xkbcomp/configure
vendored
24
app/xkbcomp/configure
vendored
@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.59 for xkbcomp 1.0.3.
|
||||
# Generated by GNU Autoconf 2.59 for xkbcomp 1.0.4.
|
||||
#
|
||||
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
|
||||
#
|
||||
@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
|
||||
# Identity of this package.
|
||||
PACKAGE_NAME='xkbcomp'
|
||||
PACKAGE_TARNAME='xkbcomp'
|
||||
PACKAGE_VERSION='1.0.3'
|
||||
PACKAGE_STRING='xkbcomp 1.0.3'
|
||||
PACKAGE_VERSION='1.0.4'
|
||||
PACKAGE_STRING='xkbcomp 1.0.4'
|
||||
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
|
||||
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE YACC PKG_CONFIG ac_pt_PKG_CONFIG XKBCOMP_CFLAGS XKBCOMP_LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX MISC_MAN_SUFFIX DRIVER_MAN_SUFFIX ADMIN_MAN_SUFFIX APP_MAN_DIR LIB_MAN_DIR FILE_MAN_DIR MISC_MAN_DIR DRIVER_MAN_DIR ADMIN_MAN_DIR LIBOBJS LTLIBOBJS'
|
||||
@ -750,7 +750,7 @@ if test "$ac_init_help" = "long"; then
|
||||
# Omit some internal or obsolete options to make the list less imposing.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<_ACEOF
|
||||
\`configure' configures xkbcomp 1.0.3 to adapt to many kinds of systems.
|
||||
\`configure' configures xkbcomp 1.0.4 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
@ -816,7 +816,7 @@ fi
|
||||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of xkbcomp 1.0.3:";;
|
||||
short | recursive ) echo "Configuration of xkbcomp 1.0.4:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
@ -946,7 +946,7 @@ fi
|
||||
test -n "$ac_init_help" && exit 0
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
xkbcomp configure 1.0.3
|
||||
xkbcomp configure 1.0.4
|
||||
generated by GNU Autoconf 2.59
|
||||
|
||||
Copyright (C) 2003 Free Software Foundation, Inc.
|
||||
@ -960,7 +960,7 @@ cat >&5 <<_ACEOF
|
||||
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.3, which was
|
||||
It was created by xkbcomp $as_me 1.0.4, which was
|
||||
generated by GNU Autoconf 2.59. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
@ -1558,7 +1558,7 @@ fi
|
||||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='xkbcomp'
|
||||
VERSION='1.0.3'
|
||||
VERSION='1.0.4'
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
@ -3306,7 +3306,7 @@ cat >>confdefs.h <<_ACEOF
|
||||
#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
|
||||
_ACEOF
|
||||
|
||||
PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
|
||||
PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
|
||||
if test "x$PVM" = "x"; then
|
||||
PVM="0"
|
||||
fi
|
||||
@ -3315,7 +3315,7 @@ cat >>confdefs.h <<_ACEOF
|
||||
#define PACKAGE_VERSION_MINOR $PVM
|
||||
_ACEOF
|
||||
|
||||
PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
|
||||
PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
|
||||
if test "x$PVP" = "x"; then
|
||||
PVP="0"
|
||||
fi
|
||||
@ -3710,7 +3710,7 @@ _ASBOX
|
||||
} >&5
|
||||
cat >&5 <<_CSEOF
|
||||
|
||||
This file was extended by xkbcomp $as_me 1.0.3, which was
|
||||
This file was extended by xkbcomp $as_me 1.0.4, which was
|
||||
generated by GNU Autoconf 2.59. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
@ -3773,7 +3773,7 @@ _ACEOF
|
||||
|
||||
cat >>$CONFIG_STATUS <<_ACEOF
|
||||
ac_cs_version="\\
|
||||
xkbcomp config.status 1.0.3
|
||||
xkbcomp config.status 1.0.4
|
||||
configured by $0, generated by GNU Autoconf 2.59,
|
||||
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
|
||||
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
|
||||
dnl Copyright 2005 Red Hat, Inc.
|
||||
dnl
|
||||
dnl Permission to use, copy, modify, distribute, and sell this software and its
|
||||
@ -22,7 +21,7 @@ dnl
|
||||
dnl Process this file with autoconf to create configure.
|
||||
|
||||
AC_PREREQ([2.57])
|
||||
AC_INIT(xkbcomp,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xkbcomp)
|
||||
AC_INIT(xkbcomp,[1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xkbcomp)
|
||||
AM_INIT_AUTOMAKE([dist-bzip2])
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
|
||||
@ -62,7 +62,7 @@ typedef struct _LookupPriv {
|
||||
} LookupPriv;
|
||||
|
||||
typedef struct _LookupEntry {
|
||||
char * name;
|
||||
const char *name;
|
||||
unsigned result;
|
||||
} LookupEntry;
|
||||
|
||||
|
||||
@ -740,7 +740,7 @@ ShapeInfo * si;
|
||||
}
|
||||
|
||||
static ShapeInfo *
|
||||
FindShape(GeometryInfo *info,Atom name,char *type,char *which)
|
||||
FindShape(GeometryInfo *info, Atom name, const char *type, const char *which)
|
||||
{
|
||||
ShapeInfo * old;
|
||||
|
||||
@ -1310,7 +1310,7 @@ SetShapeDoodadField( DoodadInfo * di,
|
||||
GeometryInfo * info)
|
||||
{
|
||||
ExprResult tmp;
|
||||
char * typeName;
|
||||
const char *typeName;
|
||||
|
||||
typeName= (di->type==XkbSolidDoodad?"solid doodad":"outline doodad");
|
||||
if ((!uStrCaseCmp(field,"corner"))||(!uStrCaseCmp(field,"cornerradius"))) {
|
||||
@ -1804,7 +1804,7 @@ ExprResult tmp;
|
||||
|
||||
static int
|
||||
SetKeyField( KeyInfo *key,
|
||||
char *field,
|
||||
const char *field,
|
||||
ExprDef *arrayNdx,
|
||||
ExprDef *value,
|
||||
GeometryInfo *info)
|
||||
|
||||
@ -147,7 +147,7 @@ AddIndicatorName(KeyNamesInfo *info,IndicatorNameInfo *new)
|
||||
{
|
||||
IndicatorNameInfo *old;
|
||||
Bool replace;
|
||||
char * action;
|
||||
const char *action;
|
||||
|
||||
replace= (new->defs.merge==MergeReplace)||
|
||||
(new->defs.merge==MergeOverride);
|
||||
@ -200,7 +200,7 @@ char * action;
|
||||
if ((old->name==new->name)&&(old->virtual==new->virtual))
|
||||
action= "Identical definitions ignored\n";
|
||||
else {
|
||||
char *oldType,*newType;
|
||||
const char *oldType,*newType;
|
||||
Atom using,ignoring;
|
||||
if (old->virtual) oldType= "virtual indicator";
|
||||
else oldType= "real indicator";
|
||||
|
||||
@ -258,7 +258,7 @@ KeyTypeInfo *old;
|
||||
}
|
||||
|
||||
static Bool
|
||||
ReportTypeBadWidth(char *type,int has,int needs)
|
||||
ReportTypeBadWidth(const char *type, int has, int needs)
|
||||
{
|
||||
ERROR3("Key type \"%s\" has %d levels, must have %d\n",type,has,needs);
|
||||
ACTION("Illegal type definition ignored\n");
|
||||
|
||||
@ -111,7 +111,7 @@ int oldLine = lineNum;
|
||||
/***====================================================================***/
|
||||
|
||||
int
|
||||
ReportNotArray(char *type,char *field,char *name)
|
||||
ReportNotArray(const char *type, const char *field, const char *name)
|
||||
{
|
||||
ERROR2("The %s %s field is not an array\n",type,field);
|
||||
ACTION1("Ignoring illegal assignment in %s\n",name);
|
||||
@ -119,7 +119,7 @@ ReportNotArray(char *type,char *field,char *name)
|
||||
}
|
||||
|
||||
int
|
||||
ReportShouldBeArray(char *type,char *field,char *name)
|
||||
ReportShouldBeArray(const char *type, const char *field, char *name)
|
||||
{
|
||||
ERROR2("Missing subscript for %s %s\n",type,field);
|
||||
ACTION1("Ignoring illegal assignment in %s\n",name);
|
||||
@ -127,7 +127,8 @@ ReportShouldBeArray(char *type,char *field,char *name)
|
||||
}
|
||||
|
||||
int
|
||||
ReportBadType(char *type,char *field,char *name,char *wanted)
|
||||
ReportBadType(const char *type, const char *field,
|
||||
const char *name, const char *wanted)
|
||||
{
|
||||
ERROR3("The %s %s field must be a %s\n",type,field,wanted);
|
||||
ACTION1("Ignoring illegal assignment in %s\n",name);
|
||||
@ -143,7 +144,7 @@ ReportBadIndexType(char *type,char *field,char *name,char *wanted)
|
||||
}
|
||||
|
||||
int
|
||||
ReportBadField(char *type,char *field,char *name)
|
||||
ReportBadField(const char *type, const char *field, const char *name)
|
||||
{
|
||||
ERROR3("Unknown %s field %s in %s\n",type,field,name);
|
||||
ACTION1("Ignoring assignment to unknown field in %s\n",name);
|
||||
|
||||
@ -60,22 +60,22 @@ extern XPointer AddCommonInfo(
|
||||
);
|
||||
|
||||
extern int ReportNotArray(
|
||||
char * /* type */,
|
||||
char * /* field */,
|
||||
char * /* name */
|
||||
const char * /* type */,
|
||||
const char * /* field */,
|
||||
const char * /* name */
|
||||
);
|
||||
|
||||
extern int ReportShouldBeArray(
|
||||
char * /* type */,
|
||||
char * /* field */,
|
||||
const char * /* type */,
|
||||
const char * /* field */,
|
||||
char * /* name */
|
||||
);
|
||||
|
||||
extern int ReportBadType(
|
||||
char * /* type */,
|
||||
char * /* field */,
|
||||
char * /* name */,
|
||||
char * /* wanted */
|
||||
const char * /* type */,
|
||||
const char * /* field */,
|
||||
const char * /* name */,
|
||||
const char * /* wanted */
|
||||
);
|
||||
|
||||
extern int ReportBadIndexType(
|
||||
@ -86,9 +86,9 @@ extern int ReportBadIndexType(
|
||||
);
|
||||
|
||||
extern int ReportBadField(
|
||||
char * /* type */,
|
||||
char * /* field */,
|
||||
char * /* name */
|
||||
const char * /* type */,
|
||||
const char * /* field */,
|
||||
const char * /* name */
|
||||
);
|
||||
|
||||
extern int ReportMultipleDefs(
|
||||
|
||||
@ -228,7 +228,7 @@ extern XkbFile *CreateXKBFile(
|
||||
);
|
||||
|
||||
extern void yyerror(
|
||||
char * /* s */
|
||||
const char * /* s */
|
||||
);
|
||||
|
||||
extern int yywrap(
|
||||
|
||||
@ -754,7 +754,7 @@ GetGroupIndex( KeyInfo * key,
|
||||
unsigned what,
|
||||
unsigned * ndx_rtrn)
|
||||
{
|
||||
char * name;
|
||||
const char *name;
|
||||
ExprResult tmp;
|
||||
|
||||
if (what==SYMBOLS) name= "symbols";
|
||||
|
||||
@ -213,7 +213,7 @@ uSetErrorFile(char *name)
|
||||
}
|
||||
|
||||
void
|
||||
uInformation(char *s, ...)
|
||||
uInformation(const char *s, ...)
|
||||
{
|
||||
va_list args;
|
||||
|
||||
@ -226,7 +226,7 @@ va_list args;
|
||||
/***====================================================================***/
|
||||
|
||||
void
|
||||
uAction(char *s, ...)
|
||||
uAction(const char *s, ...)
|
||||
{
|
||||
va_list args;
|
||||
|
||||
@ -242,7 +242,7 @@ va_list args;
|
||||
/***====================================================================***/
|
||||
|
||||
void
|
||||
uWarning(char *s, ...)
|
||||
uWarning(const char *s, ...)
|
||||
{
|
||||
va_list args;
|
||||
|
||||
@ -261,7 +261,7 @@ va_list args;
|
||||
/***====================================================================***/
|
||||
|
||||
void
|
||||
uError(char *s, ...)
|
||||
uError(const char *s, ...)
|
||||
{
|
||||
va_list args;
|
||||
|
||||
@ -280,7 +280,7 @@ va_list args;
|
||||
/***====================================================================***/
|
||||
|
||||
void
|
||||
uFatalError(char *s, ...)
|
||||
uFatalError(const char *s, ...)
|
||||
{
|
||||
va_list args;
|
||||
|
||||
@ -302,7 +302,7 @@ va_list args;
|
||||
/***====================================================================***/
|
||||
|
||||
void
|
||||
uInternalError(char *s, ...)
|
||||
uInternalError(const char *s, ...)
|
||||
{
|
||||
va_list args;
|
||||
|
||||
@ -352,7 +352,7 @@ uFinishUp(void)
|
||||
|
||||
#ifndef HAVE_STRDUP
|
||||
char *
|
||||
uStringDup(char *str)
|
||||
uStringDup(const char *str)
|
||||
{
|
||||
char *rtrn;
|
||||
|
||||
@ -366,7 +366,7 @@ char *rtrn;
|
||||
|
||||
#ifndef HAVE_STRCASECMP
|
||||
int
|
||||
uStrCaseCmp(char *str1,char *str2)
|
||||
uStrCaseCmp(const char *str1, const char *str2)
|
||||
{
|
||||
char buf1[512],buf2[512];
|
||||
char c, *s;
|
||||
@ -392,7 +392,7 @@ uStrCaseCmp(char *str1,char *str2)
|
||||
}
|
||||
|
||||
int
|
||||
uStrCasePrefix(char *my_prefix,char *str)
|
||||
uStrCasePrefix(const char *my_prefix, char *str)
|
||||
{
|
||||
char c1;
|
||||
char c2;
|
||||
|
||||
@ -130,7 +130,7 @@ extern Boolean uSetErrorFile(
|
||||
#define INFO uInformation
|
||||
|
||||
extern void uInformation(
|
||||
char * /* s */, ...
|
||||
const char * /* s */, ...
|
||||
)
|
||||
#if defined(__GNUC__) && \
|
||||
((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 6)))
|
||||
@ -147,7 +147,7 @@ __attribute__((format(printf, 1, 2)))
|
||||
#define ACTION uAction
|
||||
|
||||
extern void uAction(
|
||||
char * /* s */, ...
|
||||
const char * /* s */, ...
|
||||
)
|
||||
#if defined(__GNUC__) && \
|
||||
((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 6)))
|
||||
@ -164,7 +164,7 @@ __attribute__((format(printf, 1, 2)))
|
||||
#define WARN uWarning
|
||||
|
||||
extern void uWarning(
|
||||
char * /* s */, ...
|
||||
const char * /* s */, ...
|
||||
)
|
||||
#if defined(__GNUC__) && \
|
||||
((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 6)))
|
||||
@ -181,7 +181,7 @@ __attribute__((format(printf, 1, 2)))
|
||||
#define ERROR uError
|
||||
|
||||
extern void uError(
|
||||
char * /* s */, ...
|
||||
const char * /* s */, ...
|
||||
)
|
||||
#if defined(__GNUC__) && \
|
||||
((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 6)))
|
||||
@ -198,7 +198,7 @@ __attribute__((format(printf, 1, 2)))
|
||||
#define FATAL uFatalError
|
||||
|
||||
extern void uFatalError(
|
||||
char * /* s */, ...
|
||||
const char * /* s */, ...
|
||||
)
|
||||
#if defined(__GNUC__) && \
|
||||
((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 6)))
|
||||
@ -216,7 +216,7 @@ __attribute__((format(printf, 1, 2)))
|
||||
#define WSGO uInternalError
|
||||
|
||||
extern void uInternalError(
|
||||
char * /* s */, ...
|
||||
const char * /* s */, ...
|
||||
)
|
||||
#if defined(__GNUC__) && \
|
||||
((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 6)))
|
||||
@ -256,11 +256,11 @@ extern void uFinishUp(
|
||||
#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 */,
|
||||
const char * /* p */,
|
||||
char * /* str */
|
||||
);
|
||||
#endif
|
||||
@ -268,7 +268,7 @@ extern int uStrCasePrefix(
|
||||
#define uStringDup(s1) (strdup(s1))
|
||||
#else
|
||||
extern char *uStringDup(
|
||||
char * /* s1 */
|
||||
const char * /* s1 */
|
||||
);
|
||||
#endif
|
||||
|
||||
|
||||
@ -90,7 +90,8 @@ Atom stmtName;
|
||||
if (stmt->value==NULL)
|
||||
return True;
|
||||
else {
|
||||
char *str1,*str2 = "";
|
||||
char *str1;
|
||||
const char *str2 = "";
|
||||
if (!ExprResolveModMask(stmt->value,&mod,NULL,NULL)) {
|
||||
str1= XkbAtomText(NULL,stmt->name,XkbMessage);
|
||||
ACTION1("Declaration of %s ignored\n",str1);
|
||||
|
||||
@ -76,7 +76,7 @@
|
||||
#define INPUT_XKB 1
|
||||
#define INPUT_XKM 2
|
||||
|
||||
static char *fileTypeExt[] = {
|
||||
static const char *fileTypeExt[] = {
|
||||
"XXX",
|
||||
"xkm",
|
||||
"h",
|
||||
@ -721,9 +721,8 @@ Status status;
|
||||
}
|
||||
if (inputFile!=NULL) {
|
||||
if (uStringEqual(inputFile,"-")) {
|
||||
static char *in= "stdin";
|
||||
file= stdin;
|
||||
inputFile= in;
|
||||
inputFile= "stdin";
|
||||
}
|
||||
else {
|
||||
file= fopen(inputFile,"r");
|
||||
|
||||
@ -705,7 +705,8 @@ Terminal : String
|
||||
{
|
||||
ExprDef *expr;
|
||||
expr= ExprCreate(ExprValue,TypeKeyName);
|
||||
memcpy(expr->value.keyName,$1,4);
|
||||
memset(expr->value.keyName,0,5);
|
||||
strncpy(expr->value.keyName,$1,4);
|
||||
free($1);
|
||||
$$= expr;
|
||||
}
|
||||
@ -778,7 +779,7 @@ MapName : STRING { $$= scanStr; scanStr= NULL; }
|
||||
;
|
||||
%%
|
||||
void
|
||||
yyerror(char *s)
|
||||
yyerror(const char *s)
|
||||
{
|
||||
if (warningLevel>0) {
|
||||
(void)fprintf(stderr,"%s: line %d of %s\n",s,lineNum,
|
||||
|
||||
@ -157,7 +157,7 @@ register int i;
|
||||
}
|
||||
|
||||
Bool
|
||||
XkbAddDirectoryToPath(char *dir)
|
||||
XkbAddDirectoryToPath(const char *dir)
|
||||
{
|
||||
int len;
|
||||
if ((dir==NULL)||(dir[0]=='\0')) {
|
||||
|
||||
@ -42,7 +42,7 @@ extern void XkbAddDefaultDirectoriesToPath(
|
||||
);
|
||||
|
||||
extern Bool XkbAddDirectoryToPath(
|
||||
char * /* dir */
|
||||
const char * /* dir */
|
||||
);
|
||||
|
||||
extern char * XkbDirectoryForInclude(
|
||||
|
||||
@ -281,7 +281,7 @@ int ch;
|
||||
}
|
||||
|
||||
struct _Keyword {
|
||||
char *keyword;
|
||||
const char *keyword;
|
||||
int token;
|
||||
} keywords[] = {
|
||||
{ "xkb_keymap", XKB_KEYMAP },
|
||||
|
||||
Loading…
Reference in New Issue
Block a user