libxres: Changes to 'upstream-unstable'
Makefile.am | 8 ++--
configure.ac | 95 ++++++++++++++++++++++++++++-------------------------------
man/XRes.man | 66 ++++++++++++++++++++--------------------
src/XRes.c | 6 +--
4 files changed, 86 insertions(+), 89 deletions(-)
New commits:
commit e6e0e02e4bf764fa58798540793bdeb44a60cc7f
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Mar 7 20:53:56 2012 -0800
libXres 1.0.6
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 845e91d..bc4e8a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ AC_PREREQ([2.60])
# digit in the version number to track changes which don't affect the
# protocol, so XRes version l.n.m corresponds to protocol version l.n
#
-AC_INIT([libXres], [1.0.5],
+AC_INIT([libXres], [1.0.6],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXres])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
commit 96c59e1c7c61d7e42b8da5ddbe9af1a12567fd47
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Nov 10 21:40:51 2011 -0800
Fix gcc -Wwrite-strings warning
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/src/XRes.c b/src/XRes.c
index d1ba49c..6091c96 100644
--- a/src/XRes.c
+++ b/src/XRes.c
@@ -16,7 +16,7 @@
static XExtensionInfo _xres_ext_info_data;
static XExtensionInfo *xres_ext_info = &_xres_ext_info_data;
-static char *xres_extension_name = XRES_NAME;
+static const char *xres_extension_name = XRES_NAME;
#define XResCheckExtension(dpy,i,val) \
XextCheckExtension (dpy, i, xres_extension_name, val)
commit fb6002c5736eda80a8ae1df46626862ca53a1c25
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Sep 16 22:52:12 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/Makefile.am b/Makefile.am
index 061309f..456e398 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
-#
+#
# Copyright © 2003 Keith Packard, Noah Levitt
-#
+#
# 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. Keith Packard makes no
# representations about the suitability of this software for any purpose. It
# is provided "as is" without express or implied warranty.
-#
+#
# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
@@ -21,7 +21,7 @@
AUTOMAKE_OPTIONS = foreign
-SUBDIRS = src man
+SUBDIRS = src man
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xres.pc
diff --git a/man/XRes.man b/man/XRes.man
index e62c07b..c35dec4 100644
--- a/man/XRes.man
+++ b/man/XRes.man
@@ -1,6 +1,6 @@
.\"
.\" Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved.
-.\"
+.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
.\" a copy of this software and associated documentation files (the
.\" "Software"), to deal in the Software without restriction, including
@@ -8,10 +8,10 @@
.\" distribute, sublicense, and/or sell copies of the Software, and to
.\" permit persons to whom the Software is furnished to do so, subject to
.\" the following conditions:
-.\"
+.\"
.\" 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 NON-INFRINGEMENT.
@@ -19,12 +19,12 @@
.\" 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 XFree86 Project
.\" 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 XFree86 Project.
-.\"
+.\"
.TH XRes __libmansuffix__ __vendorversion__
.SH NAME
XRes \- X-Resource extension client library
@@ -44,19 +44,19 @@ typedef struct {
} XResType;
.fi
.HP
-Bool XResQueryExtension(Display *\fIdpy\fP,
+Bool XResQueryExtension(Display *\fIdpy\fP,
int *\fIevent_base_return\fP, int *\fIerror_base_return\fP\^);
.HP
Status XResQueryVersion(Display *\fIdpy\fP, int *\fImajor_version_return\fP,
int *\fIminor_version_return\fP\^);
.HP
-Status XResQueryClients(Display *\fIdpy\fP, int *\fInum_clients\fP,
+Status XResQueryClients(Display *\fIdpy\fP, int *\fInum_clients\fP,
XResClient **\fIclients\fP\^);
.HP
-Status XResQueryClientResources(Display *\fIdpy\fP, XID \fIxid\fP,
+Status XResQueryClientResources(Display *\fIdpy\fP, XID \fIxid\fP,
int *\fInum_types\fP, XResType **\fItypes\fP\^);
.HP
-Status XResQueryClientPixmapBytes(Display *\fIdpy\fP, XID \fIxid\fP,
+Status XResQueryClientPixmapBytes(Display *\fIdpy\fP, XID \fIxid\fP,
unsigned long *\fIbytes\fP\^);
.PP
.SH DESCRIPTION
@@ -68,10 +68,10 @@ with the X resource database access functions.
.B XResQueryExtension
returns
.B True
-if the
+if the
.I XRes
extension is available on the given display.
-A client must call
+A client must call
.B XResQueryExtension
before calling any other XRes function in order
to negotiate a compatible protocol version; otherwise the client will
@@ -81,57 +81,57 @@ get undefined behavior (XRes may or may not work).
returns
.B True
if the request succeeded; the values of the major and minor protocol
-versions supported by the server are returned in
+versions supported by the server are returned in
.I major_version_return
-and
+and
.I minor_version_return .
.PP
.PP
-.B XResQueryClients
+.B XResQueryClients
fills a list of clients of the given display. For each client it
-returns in the
+returns in the
.I XResClient
structure a mask and a base value of the resources used by these
-clients.
-Returns
+clients.
+Returns
.B True
-on success or
+on success or
.B False
-on failure.
+on failure.
.PP
.B XResQueryClientResources
-fills a list of
+fills a list of
XResType
structures, indicating for each resource type allocated by the client its
-name (as an Atom) and the number of resources of this type allocated.
-Returns
+name (as an Atom) and the number of resources of this type allocated.
+Returns
.B True
-on success or
+on success or
.B False
-on failure.
+on failure.
.PP
.B XResQueryClientPixmapBytes
-gives, for resources of type
+gives, for resources of type
.I PIXMAP
the total number of bytes allocated in the X server by the given
-client.
-Returns
+client.
+Returns
.B True
-on success or
+on success or
.B False
-on failure.
+on failure.
.SH "ERRORS"
.B XResQueryClientResources
and
.B XResQueryClientPixmapBytes
-will return
+will return
.I BadValue
-if passed an illegal client identifier.
+if passed an illegal client identifier.
.SH "SEE ALSO"
X(__miscmansuffix__)
.SH AUTHOR
-Mark Vojkovich, originally for The XFree86 Project Inc.
+Mark Vojkovich, originally for The XFree86 Project Inc.
.SH STABILITY
This API is considered as experimental. The XRes library major
revision may be incremented whenever incompatible changes are done to
-the API without notice. Use with care.
+the API without notice. Use with care.
diff --git a/src/XRes.c b/src/XRes.c
index 518ad01..d1ba49c 100644
--- a/src/XRes.c
+++ b/src/XRes.c
@@ -38,7 +38,7 @@ static XExtensionHooks xres_extension_hooks = {
};
static XEXT_GENERATE_FIND_DISPLAY (find_display, xres_ext_info,
- xres_extension_name,
+ xres_extension_name,
&xres_extension_hooks,
0, NULL)
@@ -186,7 +186,7 @@ Status XResQueryClientResources (
_XEatData(dpy, rep.length << 2);
}
}
-
+
UnlockDisplay (dpy);
SyncHandle ();
return result;
commit 455c02ee9143b2bfbfd99b6481a1b22a0ce2a2bf
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Feb 2 11:43:40 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])
This helps automated maintenance and release activities.
Details can be found in http://wiki.x.org/wiki/NewModuleGuidelines
diff --git a/configure.ac b/configure.ac
index d3ea524..845e91d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,63 +1,62 @@
-dnl
-dnl Copyright © 2003 Keith Packard, Noah Levitt
-dnl
-dnl Permission to use, copy, modify, distribute, and sell this software and its
-dnl documentation for any purpose is hereby granted without fee, provided that
-dnl the above copyright notice appear in all copies and that both that
-dnl copyright notice and this permission notice appear in supporting
-dnl documentation, and that the name of Keith Packard not be used in
-dnl advertising or publicity pertaining to distribution of the software without
-dnl specific, written prior permission. Keith Packard makes no
-dnl representations about the suitability of this software for any purpose. It
-dnl is provided "as is" without express or implied warranty.
-dnl
-dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-dnl 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
-dnl PERFORMANCE OF THIS SOFTWARE.
-dnl
-dnl Process this file with autoconf to create configure.
-
+#
+# Copyright © 2003 Keith Packard, Noah Levitt
+#
+# 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, and that the name of Keith Packard not be used in
+# advertising or publicity pertaining to distribution of the software without
+# specific, written prior permission. Keith Packard makes no
+# representations about the suitability of this software for any purpose. It
+# is provided "as is" without express or implied warranty.
+#
+# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+# EVENT SHALL KEITH PACKARD 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.
+#
+
+# Initialize Autoconf
AC_PREREQ([2.60])
-
-dnl
-dnl Version should match the current XRes version. XResQueryVersion
-dnl returns the version from XResproto.h, NOT the version we set here. But we
-dnl try to keep these the same. Note that the library has an extra
-dnl digit in the version number to track changes which don't affect the
-dnl protocol, so XRes version l.n.m corresponds to protocol version l.n
-dnl
+#
+# Version should match the current XRes version. XResQueryVersion
+# returns the version from XResproto.h, NOT the version we set here. But we
+# try to keep these the same. Note that the library has an extra
+# digit in the version number to track changes which don't affect the
+# protocol, so XRes version l.n.m corresponds to protocol version l.n
+#
AC_INIT([libXres], [1.0.5],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXres])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
+
+# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
+# Initialize libtool
+AC_PROG_LIBTOOL
+
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.8)
-
-AC_CONFIG_HEADERS(config.h)
-
-# Check for progs
-AC_PROG_LIBTOOL
-
XORG_DEFAULT_OPTIONS
-
-# get modules
+XORG_CHECK_MALLOC_ZERO
# Check xres configuration, strip extra digits from package version to
# find the required protocol version
RES_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`]
-PKG_CHECK_MODULES(XRES, x11 xext xextproto [resourceproto >= $RES_VERSION])
-XORG_CHECK_MALLOC_ZERO
-
-AC_OUTPUT([Makefile
- src/Makefile
- man/Makefile
- xres.pc])
+# Obtain compiler/linker options for depedencies
+PKG_CHECK_MODULES(XRES, x11 xext xextproto [resourceproto >= $RES_VERSION])
+AC_CONFIG_FILES([Makefile
+ src/Makefile
+ man/Makefile
+ xres.pc])
+AC_OUTPUT
commit ecb0cb424a93e7de7671353d9514a8bf193ad678
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>
diff --git a/configure.ac b/configure.ac
index 47b4e7c..d3ea524 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,7 +40,7 @@ m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.8)
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
# Check for progs
AC_PROG_LIBTOOL
commit 34e906a430185bd4debc00606321980ac25737db
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Jan 28 16:34:14 2011 -0500
config: remove unrequired AC_CONFIG_AUX_DIR
The default location for the generation of configuation files is the current
package root directory. These files are config.* and friends.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 37ecb28..47b4e7c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,6 @@ dnl protocol, so XRes version l.n.m corresponds to protocol version l.n
dnl
AC_INIT([libXres], [1.0.5],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXres])
-AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 2f16931c01e667a24210b3a76c50c5d5fe46e314
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>
diff --git a/configure.ac b/configure.ac
index 3794b23..37ecb28 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,7 +44,6 @@ XORG_MACROS_VERSION(1.8)
AM_CONFIG_HEADER(config.h)
# Check for progs
-AC_PROG_CC
AC_PROG_LIBTOOL
XORG_DEFAULT_OPTIONS
Reply to: