libxkbfile: Changes to 'debian-unstable'
COPYING | 24 +++++-----
ChangeLog | 81 +++++++++++++++++++++++++++++++++++++
Makefile.am | 6 +-
configure.ac | 81 ++++++++++++++++++-------------------
debian/changelog | 10 ++++
debian/control | 10 +++-
debian/libxkbfile-dev.install | 6 +-
debian/libxkbfile1-udeb.install | 2
debian/libxkbfile1.install | 2
debian/rules | 8 +--
include/X11/extensions/XKBbells.h | 18 ++++----
include/X11/extensions/XKBconfig.h | 18 ++++----
include/X11/extensions/XKBfile.h | 24 +++++-----
include/X11/extensions/XKBrules.h | 18 ++++----
include/X11/extensions/XKM.h | 18 ++++----
include/X11/extensions/XKMformat.h | 20 ++++-----
src/XKBfileInt.h | 19 ++++----
src/cout.c | 18 ++++----
src/maprules.c | 44 ++++++++++----------
src/srvmisc.c | 18 ++++----
src/xkbatom.c | 30 ++++++-------
src/xkbbells.c | 2
src/xkbconfig.c | 56 ++++++++++++-------------
src/xkbdraw.c | 18 ++++----
src/xkberrs.c | 4 -
src/xkbmisc.c | 40 +++++++++---------
src/xkbout.c | 30 ++++++-------
src/xkbtext.c | 46 ++++++++++-----------
src/xkmout.c | 26 +++++------
src/xkmread.c | 24 +++++-----
30 files changed, 409 insertions(+), 312 deletions(-)
New commits:
commit 33f05ac67c12d21d479411189a6c157ee2bb2bca
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Apr 21 00:03:27 2012 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 69b3e1c..0856ae3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxkbfile (1:1.0.8-1) UNRELEASED; urgency=low
+libxkbfile (1:1.0.8-1) unstable; urgency=low
* New upstream release.
* Remove David Nusinow from Uploaders.
@@ -6,7 +6,7 @@ libxkbfile (1:1.0.8-1) UNRELEASED; urgency=low
* Build-Depend on newer xutils-dev for util-macros 1.8.
* Build for multiarch.
- -- Julien Cristau <jcristau@debian.org> Fri, 20 Apr 2012 23:09:14 +0200
+ -- Julien Cristau <jcristau@debian.org> Sat, 21 Apr 2012 00:01:05 +0200
libxkbfile (1:1.0.7-1) unstable; urgency=low
commit bc13540c30a991ae534e5d57a2b847d981f26963
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Apr 20 23:54:31 2012 +0200
Build for multiarch.
diff --git a/debian/changelog b/debian/changelog
index 7bdf270..69b3e1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ libxkbfile (1:1.0.8-1) UNRELEASED; urgency=low
* Remove David Nusinow from Uploaders.
* Don't require (fake)root for debian/rules clean.
* Build-Depend on newer xutils-dev for util-macros 1.8.
+ * Build for multiarch.
-- Julien Cristau <jcristau@debian.org> Fri, 20 Apr 2012 23:09:14 +0200
diff --git a/debian/control b/debian/control
index fa08494..064e4c6 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Drew Parsons <dparsons@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends:
- debhelper (>= 5.0.0),
+ debhelper (>= 8.1.3),
libx11-dev (>= 2:1.3.3-2),
x11proto-kb-dev,
pkg-config,
@@ -18,6 +18,8 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxkbfile.git
Package: libxkbfile1
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: X11 keyboard file manipulation library
libxkbfile provides an interface to read and manipulate description files for
@@ -40,6 +42,7 @@ Description: X11 keyboard file manipulation library
Package: libxkbfile1-dbg
Section: debug
Architecture: any
+Multi-Arch: same
Priority: extra
Depends: ${shlibs:Depends}, ${misc:Depends}, libxkbfile1 (= ${binary:Version})
Description: X11 keyboard file manipulation library (debug package)
@@ -61,6 +64,7 @@ Description: X11 keyboard file manipulation library (debug package)
Package: libxkbfile-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
Depends: ${shlibs:Depends}, ${misc:Depends}, libxkbfile1 (= ${binary:Version}), libx11-dev, x11proto-core-dev, x11proto-kb-dev
Description: X11 keyboard file manipulation library (development headers)
libxkbfile provides an interface to read and manipulate description files for
diff --git a/debian/libxkbfile-dev.install b/debian/libxkbfile-dev.install
index efb29a1..0bcaf9c 100644
--- a/debian/libxkbfile-dev.install
+++ b/debian/libxkbfile-dev.install
@@ -1,4 +1,4 @@
usr/include/X11/*
-usr/lib/libxkbfile.a
-usr/lib/libxkbfile.so
-usr/lib/pkgconfig/xkbfile.pc
+usr/lib/*/libxkbfile.a
+usr/lib/*/libxkbfile.so
+usr/lib/*/pkgconfig/xkbfile.pc
diff --git a/debian/libxkbfile1-udeb.install b/debian/libxkbfile1-udeb.install
index b2e9e0b..0c8f8c2 100644
--- a/debian/libxkbfile1-udeb.install
+++ b/debian/libxkbfile1-udeb.install
@@ -1 +1 @@
-usr/lib/libxkbfile.so.1*
+usr/lib/*/libxkbfile.so.1* usr/lib/
diff --git a/debian/libxkbfile1.install b/debian/libxkbfile1.install
index b2e9e0b..9aa7eac 100644
--- a/debian/libxkbfile1.install
+++ b/debian/libxkbfile1.install
@@ -1 +1 @@
-usr/lib/libxkbfile.so.1*
+usr/lib/*/libxkbfile.so.1*
diff --git a/debian/rules b/debian/rules
index 249a702..a761b1d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,6 +24,7 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
endif
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
@@ -40,6 +41,7 @@ build-stamp:
mkdir -p build
cd build && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
--infodir=\$${prefix}/share/info $(confflags) \
CFLAGS="$(CFLAGS)"
cd build && $(MAKE)
@@ -75,7 +77,8 @@ binary-arch: build install
dh_install --sourcedir=debian/tmp --fail-missing --exclude=libxkbfile.la
dh_installchangelogs ChangeLog
dh_link
- dh_strip --dbg-package=$(PACKAGE)-dbg
+ dh_strip -p$(PACKAGE) --dbg-package=$(PACKAGE)-dbg
+ dh_strip -N$(PACKAGE)
dh_compress
dh_fixperms
dh_makeshlibs --add-udeb=$(PACKAGE)-udeb
commit fadd79d35283b3d52460e0dcce6ad0e9c80dd274
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Apr 20 23:40:51 2012 +0200
Build-Depend on newer xutils-dev for util-macros 1.8.
diff --git a/debian/changelog b/debian/changelog
index 6607755..7bdf270 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libxkbfile (1:1.0.8-1) UNRELEASED; urgency=low
* New upstream release.
* Remove David Nusinow from Uploaders.
* Don't require (fake)root for debian/rules clean.
+ * Build-Depend on newer xutils-dev for util-macros 1.8.
-- Julien Cristau <jcristau@debian.org> Fri, 20 Apr 2012 23:09:14 +0200
diff --git a/debian/control b/debian/control
index c8bbfad..fa08494 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
pkg-config,
automake,
libtool,
- xutils-dev (>= 1:7.5~1)
+ xutils-dev (>= 1:7.5+4),
Standards-Version: 3.8.4
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxkbfile
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxkbfile.git
commit ab4f9bdaabef2c56c3a65a0da35d33ec877130dc
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Apr 20 23:11:04 2012 +0200
Don't require (fake)root for debian/rules clean.
diff --git a/debian/changelog b/debian/changelog
index 0882002..6607755 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libxkbfile (1:1.0.8-1) UNRELEASED; urgency=low
* New upstream release.
* Remove David Nusinow from Uploaders.
+ * Don't require (fake)root for debian/rules clean.
-- Julien Cristau <jcristau@debian.org> Fri, 20 Apr 2012 23:09:14 +0200
diff --git a/debian/rules b/debian/rules
index b8fc246..249a702 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,9 +47,7 @@ build-stamp:
clean:
dh_testdir
- dh_testroot
rm -f build-stamp
-
rm -f config.cache config.log config.status
rm -f */config.cache */config.log */config.status
rm -f conftest* */conftest*
@@ -58,7 +56,6 @@ clean:
rm -f aclocal.m4 config.guess config.h.in config.sub configure
rm -f depcomp install-sh ltmain.sh missing mkinstalldirs
find -name Makefile.in -delete
-
dh_clean
install: build
commit 2b2d69d6548e3c9c64f6d0d9483ed20ce5efa113
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Apr 20 23:10:38 2012 +0200
Remove David Nusinow from Uploaders.
diff --git a/debian/changelog b/debian/changelog
index 6ec9b9c..0882002 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
libxkbfile (1:1.0.8-1) UNRELEASED; urgency=low
* New upstream release.
+ * Remove David Nusinow from Uploaders.
-- Julien Cristau <jcristau@debian.org> Fri, 20 Apr 2012 23:09:14 +0200
diff --git a/debian/control b/debian/control
index 5feb367..c8bbfad 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libxkbfile
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Drew Parsons <dparsons@debian.org>, Cyril Brulebois <kibi@debian.org>
+Uploaders: Drew Parsons <dparsons@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
libx11-dev (>= 2:1.3.3-2),
commit 2dab898633e9673a50e3c7567bcf2f16171fe37f
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Apr 20 23:09:39 2012 +0200
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index 133ddb1..eb608bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Oct 29 18:16:00 2010 -0700
diff --git a/debian/changelog b/debian/changelog
index af54d2a..6ec9b9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxkbfile (1:1.0.8-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Julien Cristau <jcristau@debian.org> Fri, 20 Apr 2012 23:09:14 +0200
+
libxkbfile (1:1.0.7-1) unstable; urgency=low
* New upstream release.
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>
diff --git a/configure.ac b/configure.ac
index 0a84e9c..1efaaeb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libxkbfile], [1.0.7],
+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])
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>
diff --git a/include/X11/extensions/XKBfile.h b/include/X11/extensions/XKBfile.h
index 6d5e910..0d2f52b 100644
--- a/include/X11/extensions/XKBfile.h
+++ b/include/X11/extensions/XKBfile.h
@@ -83,9 +83,9 @@ typedef void (*XkbFileAddOnFunc)(
#define _XkbErrXReqFailure 25
#define _XkbErrBadImplementation 26
-extern char * _XkbErrMessages[];
+extern const char * _XkbErrMessages[];
extern unsigned _XkbErrCode;
-extern char * _XkbErrLocation;
+extern const char * _XkbErrLocation;
extern unsigned _XkbErrData;
/***====================================================================***/
diff --git a/src/maprules.c b/src/maprules.c
index 3507852..81102a3 100644
--- a/src/maprules.c
+++ b/src/maprules.c
@@ -238,7 +238,7 @@ Bool endOfFile,spacePending,slashPending,inComment;
#define PART_MASK 0x000F
#define COMPONENT_MASK 0x03F0
-static char * cname[MAX_WORDS] = {
+static const char * cname[MAX_WORDS] = {
"model", "layout", "variant", "option",
"keycodes", "symbols", "types", "compat", "geometry", "keymap"
};
diff --git a/src/xkbbells.c b/src/xkbbells.c
index 1571d1e..10b2725 100644
--- a/src/xkbbells.c
+++ b/src/xkbbells.c
@@ -31,7 +31,7 @@
#include <X11/XKBlib.h>
#include "XKBbells.h"
-static char *_xkbStdBellNames[XkbBI_NumBells] = {
+static const char *_xkbStdBellNames[XkbBI_NumBells] = {
"Info",
"Warning",
"MinorError",
diff --git a/src/xkbconfig.c b/src/xkbconfig.c
index 1934983..b60017f 100644
--- a/src/xkbconfig.c
+++ b/src/xkbconfig.c
@@ -1307,7 +1307,7 @@ BAILOUT:
void
XkbCFReportError(FILE *file,char *name,int error,int line)
{
-char * msg;
+const char *msg;
switch(error) {
case XkbCF_BadAlloc:
diff --git a/src/xkberrs.c b/src/xkberrs.c
index a34417a..f28f02b 100644
--- a/src/xkberrs.c
+++ b/src/xkberrs.c
@@ -41,7 +41,7 @@
#include <X11/XKBlib.h>
#include <X11/extensions/XKBfile.h>
-char * _XkbErrMessages[] = {
+const char * _XkbErrMessages[] = {
"success", /* _XkbSuccess */
"key names not defined", /* _XkbErrMissingNames */
"key types not defined", /* _XkbErrMissingTypes */
@@ -72,6 +72,6 @@ char * _XkbErrMessages[] = {
};
unsigned _XkbErrCode;
-char * _XkbErrLocation= NULL;
+const char * _XkbErrLocation= NULL;
unsigned _XkbErrData;
diff --git a/src/xkbmisc.c b/src/xkbmisc.c
index 314580e..e0b9bd6 100644
--- a/src/xkbmisc.c
+++ b/src/xkbmisc.c
@@ -218,7 +218,7 @@ int nG,eG;
/***===================================================================***/
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);
return True;
diff --git a/src/xkbout.c b/src/xkbout.c
index ad1fd03..91cd1ba 100644
--- a/src/xkbout.c
+++ b/src/xkbout.c
@@ -129,7 +129,7 @@ Atom kcName;
register unsigned i;
XkbDescPtr xkb;
Display * dpy;
-char * alternate;
+const char * alternate;
xkb= result->xkb;
if ((!xkb)||(!xkb->names)||(!xkb->names->keys)) {
@@ -156,7 +156,7 @@ char * alternate;
}
if (xkb->indicators!=NULL) {
for (i=0;i<XkbNumIndicators;i++) {
- char *type;
+ const char *type;
if (xkb->indicators->phys_indicators&(1<<i))
type= " ";
else type= " virtual ";
@@ -433,7 +433,7 @@ Bool showActions;
(showImplicit)) {
int typeNdx,g;
Bool multi;
- char * comment=" ";
+ const char * comment=" ";
if ((srv->explicit[i]&XkbExplicitKeyTypesMask)==0)
comment= "//";
diff --git a/src/xkbtext.c b/src/xkbtext.c
index 3eabb5d..3a82b17 100644
--- a/src/xkbtext.c
+++ b/src/xkbtext.c
@@ -229,7 +229,7 @@ char *str,buf[BUFFER_SIZE];
return rtrn;
}
-static char *modNames[XkbNumModifiers] = {
+static const char *modNames[XkbNumModifiers] = {
"Shift", "Lock", "Control", "Mod1", "Mod2", "Mod3", "Mod4", "Mod5"
};
@@ -423,7 +423,7 @@ char *rtrn;
/***====================================================================***/
-static char *imWhichNames[]= {
+static const char *imWhichNames[]= {
"base",
"latched",
"locked",
@@ -477,7 +477,8 @@ char * buf;
char *
XkbAccessXDetailText(unsigned state,unsigned format)
{
-char *buf,*prefix;
+char *buf;
+const char *prefix;
buf= tbGetBuffer(32);
if (format==XkbMessage) prefix= "";
@@ -495,7 +496,7 @@ char *buf,*prefix;
return buf;
}
-static char *nknNames[] = {
+static const char *nknNames[] = {
"keycodes", "geometry", "deviceID"
};
#define NUM_NKN (sizeof(nknNames)/sizeof(char *))
@@ -503,14 +504,15 @@ static char *nknNames[] = {
char *
XkbNKNDetailMaskText(unsigned detail,unsigned format)
{
-char *buf,*prefix,*suffix;
+char *buf;
+const char *prefix,*suffix;
register int i;
register unsigned bit;
int len,plen,slen;
if ((detail&XkbAllNewKeyboardEventsMask)==0) {
- char *tmp = "";
+ const char *tmp = "";
if (format==XkbCFile) tmp= "0";
else if (format==XkbMessage) tmp= "none";
buf= tbGetBuffer(strlen(tmp)+1);
@@ -518,7 +520,7 @@ int len,plen,slen;
return buf;
}
else if ((detail&XkbAllNewKeyboardEventsMask)==XkbAllNewKeyboardEventsMask){
- char * tmp;
+ const char * tmp;
if (format==XkbCFile) tmp= "XkbAllNewKeyboardEventsMask";
else tmp= "all";
buf= tbGetBuffer(strlen(tmp)+1);
@@ -568,7 +570,7 @@ int len,plen,slen;
return buf;
}
-static char *ctrlNames[] = {
+static const char *ctrlNames[] = {
"repeatKeys",
"slowKeys",
"bounceKeys",
@@ -772,7 +774,7 @@ char *rtrn;
/***====================================================================***/
static int
-TryCopyStr(char *to,char *from,int *pLeft)
+TryCopyStr(char *to,const char *from,int *pLeft)
{
register int len;
if (*pLeft>0) {
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>
diff --git a/src/XKBfileInt.h b/src/XKBfileInt.h
index d0e842f..e810e61 100644
--- a/src/XKBfileInt.h
+++ b/src/XKBfileInt.h
@@ -75,6 +75,7 @@ char *_XkbDupString(const char *s)
extern int _XkbStrCaseCmp(char *s1, char *s2);
#else
#define _XkbStrCaseCmp strcasecmp
+#include <strings.h>
#endif
_XFUNCPROTOEND
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>
diff --git a/COPYING b/COPYING
index f070a71..d013932 100644
--- a/COPYING
+++ b/COPYING
@@ -5,19 +5,19 @@ 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
+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.
@@ -48,13 +48,13 @@ in this Software without prior written authorization from The Open Group.
Copyright 1987 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,
+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
+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.
+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
diff --git a/Makefile.am b/Makefile.am
index 006ba86..ae1edc1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
-#
+#
# 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
@@ -10,7 +10,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 --git a/configure.ac b/configure.ac
index 9d80de5..0a84e9c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,7 +48,7 @@ AC_CHECK_FUNC(getc_unlocked, AC_DEFINE([HAVE_UNLOCKED_STDIO], 1,
# Obtain compiler/linker options for depedencies
PKG_CHECK_MODULES(XKBFILE, x11 kbproto)
-
+
AC_CONFIG_FILES([Makefile
src/Makefile
xkbfile.pc])
diff --git a/include/X11/extensions/XKBbells.h b/include/X11/extensions/XKBbells.h
index c78811b..585b36a 100644
--- a/include/X11/extensions/XKBbells.h
+++ b/include/X11/extensions/XKBbells.h
@@ -9,19 +9,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 --git a/include/X11/extensions/XKBconfig.h b/include/X11/extensions/XKBconfig.h
index 4816917..668a358 100644
--- a/include/X11/extensions/XKBconfig.h
+++ b/include/X11/extensions/XKBconfig.h
@@ -9,19 +9,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 --git a/include/X11/extensions/XKBfile.h b/include/X11/extensions/XKBfile.h
index 0451938..6d5e910 100644
--- a/include/X11/extensions/XKBfile.h
+++ b/include/X11/extensions/XKBfile.h
@@ -10,19 +10,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.
@@ -285,7 +285,7 @@ typedef struct _XkbDrawable {
XkbSectionPtr section;
} u;
struct _XkbDrawable * next;
-} XkbDrawableRec,*XkbDrawablePtr;
+} XkbDrawableRec,*XkbDrawablePtr;
extern XkbDrawablePtr
XkbGetOrderedDrawables(
diff --git a/include/X11/extensions/XKBrules.h b/include/X11/extensions/XKBrules.h
index 59d11cd..2832e67 100644
--- a/include/X11/extensions/XKBrules.h
+++ b/include/X11/extensions/XKBrules.h
@@ -9,19 +9,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 --git a/include/X11/extensions/XKM.h b/include/X11/extensions/XKM.h
index 13dbed5..da272e0 100644
--- a/include/X11/extensions/XKM.h
+++ b/include/X11/extensions/XKM.h
@@ -6,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 --git a/include/X11/extensions/XKMformat.h b/include/X11/extensions/XKMformat.h
index 6204e5d..8dae18f 100644
--- a/include/X11/extensions/XKMformat.h
+++ b/include/X11/extensions/XKMformat.h
@@ -6,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.
@@ -168,7 +168,7 @@ typedef struct _xkmShapeDesc {
CARD8 primary_ndx;
CARD8 approx_ndx;
CARD8 pad;
-} xkmShapeDesc;
+} xkmShapeDesc;
#define sz_xkmShapeDesc 4
typedef struct _xkmSectionDesc {
diff --git a/src/XKBfileInt.h b/src/XKBfileInt.h
index 71d7834..d0e842f 100644
--- a/src/XKBfileInt.h
+++ b/src/XKBfileInt.h
@@ -9,19 +9,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 --git a/src/cout.c b/src/cout.c
index 9048031..399512f 100644
--- a/src/cout.c
Reply to: