qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to libxkbfile 1.0.8

Browse Source
This commit is contained in:
matthieu 2012-03-10 17:16:24 +00:00
parent bbff790d0c
commit d1508600e0
30 changed files with 29219 additions and 22422 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
lib/libxkbfile/ChangeLog
View File

@ -1,3 +1,84 @@
commit 5e3da29093ff5d5b6b8805467a523d5cb7663965
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Mar 7 20:37:20 2012 -0800
libxkbfile 1.0.8
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 7b6123644fe23c2eb9816cf00729253b2dd53b23
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Sep 28 18:17:15 2011 -0700
Add const attributes to fix gcc -Wwrite-strings warnings
Does not fix all of them, as some affect the API and thus need more analysis.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 0c2c504819b8788075115f848343bd45a3bb6605
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri Nov 11 10:37:49 2011 -0800
Include strings.h for strcasecmp
Our minimum requirement for X11 is currently Unix98. Unix98 provides
strcasecmp in <strings.h>. This commit fixes implicit declarations
of this function on systems that closely adhere to the standard.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 9ffdecdfa0a832a129a97735eaf1d22ec6defc13
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Sep 16 22:45:06 2011 -0700
Strip trailing whitespace
Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}'
git diff -w & git diff -b show no diffs from this change
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit cfc92c9b8e5f511010a2e406b147dec3ce64c6fd
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Feb 2 11:43:46 2011 -0500
config: comment, minor upgrade, quote and layout configure.ac
Group statements per section as per Autoconf standard layout
Quote statements where appropriate.
Autoconf recommends not using dnl instead of # for comments
Use AC_CONFIG_FILES to replace the deprecated AC_OUTPUT with parameters.
Add AC_CONFIG_SRCDIR([Makefile.am])
Remove redundant AC_SUBST(*_CFLAGS) and/or *_LIBS
Update minimum version of util-macros to at least 1.8.
No functional configuration changes
This helps automated maintenance and release activities.
Details can be found in http://wiki.x.org/wiki/NewModuleGuidelines
commit f83b3bda908cd6d0e15287d15739344620f12d27
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Jan 28 19:41:37 2011 -0500
config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit edc2a2beea14adef6c833bef456474039e2afab2
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Jan 27 18:50:15 2011 -0500
config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
AC_PROG_C_C99. This sets gcc with -std=gnu99.
If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 5eea77b2c35c10baf899d2b03a85a462fdcf8f93 commit 5eea77b2c35c10baf899d2b03a85a462fdcf8f93
Author: Alan Coopersmith <alan.coopersmith@oracle.com> Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Oct 29 18:16:00 2010 -0700 Date: Fri Oct 29 18:16:00 2010 -0700

31
lib/libxkbfile/Makefile.in
View File

@ -44,9 +44,9 @@ pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = . top_builddir = .
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@ INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644 install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c install_sh_PROGRAM = ${SHELL} $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c install_sh_SCRIPT = ${SHELL} $(install_sh) -c
INSTALL_HEADER = $(INSTALL_DATA) INSTALL_HEADER = $(INSTALL_DATA)
transform = $(program_transform_name) transform = $(program_transform_name)
NORMAL_INSTALL = : NORMAL_INSTALL = :
@ -117,6 +117,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@ AWK = @AWK@
BASE_CFLAGS = @BASE_CFLAGS@
CC = @CC@ CC = @CC@
CCDEPMODE = @CCDEPMODE@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@
@ -124,24 +125,20 @@ CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@ CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@ DEFS = @DEFS@
DEPDIR = @DEPDIR@ DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@ DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DSYMUTIL = @DSYMUTIL@ DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@ DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@ ECHO_T = @ECHO_T@
EGREP = @EGREP@ EGREP = @EGREP@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
F77 = @F77@ FGREP = @FGREP@
FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@ GREP = @GREP@
@ -150,23 +147,30 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@ LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LIPO = @LIPO@
LN_S = @LN_S@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MAN_SUBSTS = @MAN_SUBSTS@ MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@ MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NM = @NM@
NMEDIT = @NMEDIT@ NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@ OBJEXT = @OBJEXT@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_NAME = @PACKAGE_NAME@
@ -179,18 +183,17 @@ RANLIB = @RANLIB@
SED = @SED@ SED = @SED@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
STRICT_CFLAGS = @STRICT_CFLAGS@
STRIP = @STRIP@ STRIP = @STRIP@
VERSION = @VERSION@ VERSION = @VERSION@
XKBFILE_CFLAGS = @XKBFILE_CFLAGS@ XKBFILE_CFLAGS = @XKBFILE_CFLAGS@
XKBFILE_LIBS = @XKBFILE_LIBS@ XKBFILE_LIBS = @XKBFILE_LIBS@
XORG_MAN_PAGE = @XORG_MAN_PAGE@ XORG_MAN_PAGE = @XORG_MAN_PAGE@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@ ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_F77 = @ac_ct_F77@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@ am__include = @am__include@
am__leading_dot = @am__leading_dot@ am__leading_dot = @am__leading_dot@
am__quote = @am__quote@ am__quote = @am__quote@

10442
lib/libxkbfile/aclocal.m4 vendored
View File

File diff suppressed because it is too large Load Diff

4
lib/libxkbfile/config.h.in
View File

@ -33,6 +33,10 @@
/* 'Unlocked stdio' */ /* 'Unlocked stdio' */
#undef HAVE_UNLOCKED_STDIO #undef HAVE_UNLOCKED_STDIO
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
#undef LT_OBJDIR
/* Do not have 'strcasecmp'. */ /* Do not have 'strcasecmp'. */
#undef NEED_STRCASECMP #undef NEED_STRCASECMP

29774
lib/libxkbfile/configure vendored
View File

File diff suppressed because it is too large Load Diff

73
lib/libxkbfile/configure.ac
View File

@ -1,56 +1,55 @@
dnl Copyright 2005 Red Hat, Inc. # Copyright 2005 Red Hat, Inc.
dnl #
dnl Permission to use, copy, modify, distribute, and sell this software and its # Permission to use, copy, modify, distribute, and sell this software and its
dnl documentation for any purpose is hereby granted without fee, provided that # documentation for any purpose is hereby granted without fee, provided that
dnl the above copyright notice appear in all copies and that both that # the above copyright notice appear in all copies and that both that
dnl copyright notice and this permission notice appear in supporting # copyright notice and this permission notice appear in supporting
dnl documentation, and that the name of Red Hat not be used in # documentation, and that the name of Red Hat not be used in
dnl advertising or publicity pertaining to distribution of the software without # advertising or publicity pertaining to distribution of the software without
dnl specific, written prior permission. Red Hat makes no # specific, written prior permission. Red Hat makes no
dnl representations about the suitability of this software for any purpose. It # representations about the suitability of this software for any purpose. It
dnl is provided "as is" without express or implied warranty. # is provided "as is" without express or implied warranty.
dnl #
dnl RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
dnl EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR # EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
dnl PERFORMANCE OF THIS SOFTWARE. # PERFORMANCE OF THIS SOFTWARE.
dnl #
dnl Process this file with autoconf to create configure.
# Initialize Autoconf
AC_PREREQ([2.60]) AC_PREREQ([2.60])
AC_INIT([libxkbfile], [1.0.8],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libxkbfile])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
AC_INIT([libxkbfile], [1.0.7], # Initialize Automake
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[libxkbfile])
AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
# Require xorg-macros: XORG_DEFAULT_OPTIONS # Initialize libtool
m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.3)
XORG_DEFAULT_OPTIONS
AM_CONFIG_HEADER(config.h)
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL AC_PROG_LIBTOOL
# Require X.Org macros 1.8 or later for AC_PROG_INSTALL
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
# Checks for library functions.
AC_CHECK_FUNC(strcasecmp, [], AC_DEFINE([NEED_STRCASECMP], 1, AC_CHECK_FUNC(strcasecmp, [], AC_DEFINE([NEED_STRCASECMP], 1,
[Do not have 'strcasecmp'.])) [Do not have 'strcasecmp'.]))
AC_CHECK_FUNC(getc_unlocked, AC_DEFINE([HAVE_UNLOCKED_STDIO], 1, AC_CHECK_FUNC(getc_unlocked, AC_DEFINE([HAVE_UNLOCKED_STDIO], 1,
['Unlocked stdio']), []) ['Unlocked stdio']), [])
# Check for dependencies # Obtain compiler/linker options for depedencies
PKG_CHECK_MODULES(XKBFILE, x11 kbproto) PKG_CHECK_MODULES(XKBFILE, x11 kbproto)
AC_SUBST(XKBFILE_CFLAGS)
AC_SUBST(XKBFILE_LIBS)
AC_OUTPUT([Makefile AC_CONFIG_FILES([Makefile
src/Makefile src/Makefile
xkbfile.pc]) xkbfile.pc])
AC_OUTPUT

4
lib/libxkbfile/include/X11/extensions/XKBfile.h
View File

@ -83,9 +83,9 @@ typedef void (*XkbFileAddOnFunc)(
#define _XkbErrXReqFailure 25 #define _XkbErrXReqFailure 25
#define _XkbErrBadImplementation 26 #define _XkbErrBadImplementation 26
extern char * _XkbErrMessages[]; extern const char * _XkbErrMessages[];
extern unsigned _XkbErrCode; extern unsigned _XkbErrCode;
extern char * _XkbErrLocation; extern const char * _XkbErrLocation;
extern unsigned _XkbErrData; extern unsigned _XkbErrData;
/***====================================================================***/ /***====================================================================***/

10314
lib/libxkbfile/ltmain.sh
View File

File diff suppressed because it is too large Load Diff

31
lib/libxkbfile/src/Makefile.in
View File

@ -24,9 +24,9 @@ pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = .. top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@ INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644 install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c install_sh_PROGRAM = ${SHELL} $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c install_sh_SCRIPT = ${SHELL} $(install_sh) -c
INSTALL_HEADER = $(INSTALL_DATA) INSTALL_HEADER = $(INSTALL_DATA)
transform = $(program_transform_name) transform = $(program_transform_name)
NORMAL_INSTALL = : NORMAL_INSTALL = :
@ -94,6 +94,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@ AWK = @AWK@
BASE_CFLAGS = @BASE_CFLAGS@
CC = @CC@ CC = @CC@
CCDEPMODE = @CCDEPMODE@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@
@ -101,24 +102,20 @@ CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@ CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@ DEFS = @DEFS@
DEPDIR = @DEPDIR@ DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@ DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DSYMUTIL = @DSYMUTIL@ DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@ DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@ ECHO_T = @ECHO_T@
EGREP = @EGREP@ EGREP = @EGREP@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
F77 = @F77@ FGREP = @FGREP@
FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@ GREP = @GREP@
@ -127,23 +124,30 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@ LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LIPO = @LIPO@
LN_S = @LN_S@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MAN_SUBSTS = @MAN_SUBSTS@ MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@ MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NM = @NM@
NMEDIT = @NMEDIT@ NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@ OBJEXT = @OBJEXT@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_NAME = @PACKAGE_NAME@
@ -156,18 +160,17 @@ RANLIB = @RANLIB@
SED = @SED@ SED = @SED@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
STRICT_CFLAGS = @STRICT_CFLAGS@
STRIP = @STRIP@ STRIP = @STRIP@
VERSION = @VERSION@ VERSION = @VERSION@
XKBFILE_CFLAGS = @XKBFILE_CFLAGS@ XKBFILE_CFLAGS = @XKBFILE_CFLAGS@
XKBFILE_LIBS = @XKBFILE_LIBS@ XKBFILE_LIBS = @XKBFILE_LIBS@
XORG_MAN_PAGE = @XORG_MAN_PAGE@ XORG_MAN_PAGE = @XORG_MAN_PAGE@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@ ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_F77 = @ac_ct_F77@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@ am__include = @am__include@
am__leading_dot = @am__leading_dot@ am__leading_dot = @am__leading_dot@
am__quote = @am__quote@ am__quote = @am__quote@

1
lib/libxkbfile/src/XKBfileInt.h
View File

@ -75,6 +75,7 @@ char *_XkbDupString(const char *s)
extern int _XkbStrCaseCmp(char *s1, char *s2); extern int _XkbStrCaseCmp(char *s1, char *s2);
#else #else
#define _XkbStrCaseCmp strcasecmp #define _XkbStrCaseCmp strcasecmp
#include <strings.h>
#endif #endif
_XFUNCPROTOEND _XFUNCPROTOEND

2
lib/libxkbfile/src/maprules.c
View File

@ -238,7 +238,7 @@ Bool endOfFile,spacePending,slashPending,inComment;
#define PART_MASK 0x000F #define PART_MASK 0x000F
#define COMPONENT_MASK 0x03F0 #define COMPONENT_MASK 0x03F0
static char * cname[MAX_WORDS] = { static const char * cname[MAX_WORDS] = {
"model", "layout", "variant", "option", "model", "layout", "variant", "option",
"keycodes", "symbols", "types", "compat", "geometry", "keymap" "keycodes", "symbols", "types", "compat", "geometry", "keymap"
}; };

2
lib/libxkbfile/src/xkbbells.c
View File

@ -31,7 +31,7 @@
#include <X11/XKBlib.h> #include <X11/XKBlib.h>
#include "XKBbells.h" #include "XKBbells.h"
static char *_xkbStdBellNames[XkbBI_NumBells] = { static const char *_xkbStdBellNames[XkbBI_NumBells] = {
"Info", "Info",
"Warning", "Warning",
"MinorError", "MinorError",

2
lib/libxkbfile/src/xkbconfig.c
View File

@ -1307,7 +1307,7 @@ BAILOUT:
void void
XkbCFReportError(FILE *file,char *name,int error,int line) XkbCFReportError(FILE *file,char *name,int error,int line)
{ {
char * msg; const char *msg;
switch(error) { switch(error) {
case XkbCF_BadAlloc: case XkbCF_BadAlloc:

4
lib/libxkbfile/src/xkberrs.c
View File

@ -41,7 +41,7 @@
#include <X11/XKBlib.h> #include <X11/XKBlib.h>
#include <X11/extensions/XKBfile.h> #include <X11/extensions/XKBfile.h>
char * _XkbErrMessages[] = { const char * _XkbErrMessages[] = {
"success", /* _XkbSuccess */ "success", /* _XkbSuccess */
"key names not defined", /* _XkbErrMissingNames */ "key names not defined", /* _XkbErrMissingNames */
"key types not defined", /* _XkbErrMissingTypes */ "key types not defined", /* _XkbErrMissingTypes */
@ -72,6 +72,6 @@ char * _XkbErrMessages[] = {
}; };
unsigned _XkbErrCode; unsigned _XkbErrCode;
char * _XkbErrLocation= NULL; const char * _XkbErrLocation= NULL;
unsigned _XkbErrData; unsigned _XkbErrData;

2
lib/libxkbfile/src/xkbmisc.c
View File

@ -218,7 +218,7 @@ int nG,eG;
/***===================================================================***/ /***===================================================================***/
static Bool static Bool
XkbWriteSectionFromName(FILE *file,char *sectionName,char *name) XkbWriteSectionFromName(FILE *file, const char *sectionName, const char *name)
{ {
fprintf(file," xkb_%-20s { include \"%s\" };\n",sectionName,name); fprintf(file," xkb_%-20s { include \"%s\" };\n",sectionName,name);
return True; return True;

6
lib/libxkbfile/src/xkbout.c
View File

@ -129,7 +129,7 @@ Atom kcName;
register unsigned i; register unsigned i;
XkbDescPtr xkb; XkbDescPtr xkb;
Display * dpy; Display * dpy;
char * alternate; const char * alternate;
xkb= result->xkb; xkb= result->xkb;
if ((!xkb)||(!xkb->names)||(!xkb->names->keys)) { if ((!xkb)||(!xkb->names)||(!xkb->names->keys)) {
@ -156,7 +156,7 @@ char * alternate;
} }
if (xkb->indicators!=NULL) { if (xkb->indicators!=NULL) {
for (i=0;i<XkbNumIndicators;i++) { for (i=0;i<XkbNumIndicators;i++) {
char *type; const char *type;
if (xkb->indicators->phys_indicators&(1<<i)) if (xkb->indicators->phys_indicators&(1<<i))
type= " "; type= " ";
else type= " virtual "; else type= " virtual ";
@ -433,7 +433,7 @@ Bool showActions;
(showImplicit)) { (showImplicit)) {
int typeNdx,g; int typeNdx,g;
Bool multi; Bool multi;
char * comment=" "; const char * comment=" ";
if ((srv->explicit[i]&XkbExplicitKeyTypesMask)==0) if ((srv->explicit[i]&XkbExplicitKeyTypesMask)==0)
comment= "//"; comment= "//";

20
lib/libxkbfile/src/xkbtext.c
View File

@ -229,7 +229,7 @@ char *str,buf[BUFFER_SIZE];
return rtrn; return rtrn;
} }
static char *modNames[XkbNumModifiers] = { static const char *modNames[XkbNumModifiers] = {
"Shift", "Lock", "Control", "Mod1", "Mod2", "Mod3", "Mod4", "Mod5" "Shift", "Lock", "Control", "Mod1", "Mod2", "Mod3", "Mod4", "Mod5"
}; };
@ -423,7 +423,7 @@ char *rtrn;
/***====================================================================***/ /***====================================================================***/
static char *imWhichNames[]= { static const char *imWhichNames[]= {
"base", "base",
"latched", "latched",
"locked", "locked",
@ -477,7 +477,8 @@ char * buf;
char * char *
XkbAccessXDetailText(unsigned state,unsigned format) XkbAccessXDetailText(unsigned state,unsigned format)
{ {
char *buf,*prefix; char *buf;
const char *prefix;
buf= tbGetBuffer(32); buf= tbGetBuffer(32);
if (format==XkbMessage) prefix= ""; if (format==XkbMessage) prefix= "";
@ -495,7 +496,7 @@ char *buf,*prefix;
return buf; return buf;
} }
static char *nknNames[] = { static const char *nknNames[] = {
"keycodes", "geometry", "deviceID" "keycodes", "geometry", "deviceID"
}; };
#define NUM_NKN (sizeof(nknNames)/sizeof(char *)) #define NUM_NKN (sizeof(nknNames)/sizeof(char *))
@ -503,14 +504,15 @@ static char *nknNames[] = {
char * char *
XkbNKNDetailMaskText(unsigned detail,unsigned format) XkbNKNDetailMaskText(unsigned detail,unsigned format)
{ {
char *buf,*prefix,*suffix; char *buf;
const char *prefix,*suffix;
register int i; register int i;
register unsigned bit; register unsigned bit;
int len,plen,slen; int len,plen,slen;
if ((detail&XkbAllNewKeyboardEventsMask)==0) { if ((detail&XkbAllNewKeyboardEventsMask)==0) {
char *tmp = ""; const char *tmp = "";
if (format==XkbCFile) tmp= "0"; if (format==XkbCFile) tmp= "0";
else if (format==XkbMessage) tmp= "none"; else if (format==XkbMessage) tmp= "none";
buf= tbGetBuffer(strlen(tmp)+1); buf= tbGetBuffer(strlen(tmp)+1);
@ -518,7 +520,7 @@ int len,plen,slen;
return buf; return buf;
} }
else if ((detail&XkbAllNewKeyboardEventsMask)==XkbAllNewKeyboardEventsMask){ else if ((detail&XkbAllNewKeyboardEventsMask)==XkbAllNewKeyboardEventsMask){
char * tmp; const char * tmp;
if (format==XkbCFile) tmp= "XkbAllNewKeyboardEventsMask"; if (format==XkbCFile) tmp= "XkbAllNewKeyboardEventsMask";
else tmp= "all"; else tmp= "all";
buf= tbGetBuffer(strlen(tmp)+1); buf= tbGetBuffer(strlen(tmp)+1);
@ -568,7 +570,7 @@ int len,plen,slen;
return buf; return buf;
} }
static char *ctrlNames[] = { static const char *ctrlNames[] = {
"repeatKeys", "repeatKeys",
"slowKeys", "slowKeys",
"bounceKeys", "bounceKeys",
@ -772,7 +774,7 @@ char *rtrn;
/***====================================================================***/ /***====================================================================***/
static int static int
TryCopyStr(char *to,char *from,int *pLeft) TryCopyStr(char *to,const char *from,int *pLeft)
{ {
register int len; register int len;
if (*pLeft>0) { if (*pLeft>0) {