libxres: Changes to 'upstream-unstable'
.gitignore | 10 ++++++++++
Makefile.am | 11 ++++-------
README | 25 +++++++++++++++++++++++++
configure.ac | 34 +++++++++++++---------------------
include/X11/extensions/XRes.h | 8 ++++----
man/.gitignore | 3 ---
man/Makefile.am | 17 +++++++----------
man/XRes.man | 19 ++++++++-----------
src/.gitignore | 6 ------
src/Makefile.am | 4 ++--
src/XRes.c | 16 ++++++++--------
11 files changed, 81 insertions(+), 72 deletions(-)
New commits:
commit 08032a51fccda19ad4722015f4cc0b1a587592f7
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Oct 9 07:54:44 2009 -0700
libXres 1.0.4
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/configure.ac b/configure.ac
index 8b6fad4..0313ba3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,7 @@ 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
-AC_INIT(libXres, 1.0.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXres)
+AC_INIT(libXres, 1.0.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXres)
AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([dist-bzip2])
commit 619eec21134a0ca9a8adb92383a05deea05b768d
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Oct 8 23:48:41 2009 -0700
XRes.man: Fix typo, improve wording, drop RCS tags
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/man/XRes.man b/man/XRes.man
index 20de262..e62c07b 100644
--- a/man/XRes.man
+++ b/man/XRes.man
@@ -1,7 +1,4 @@
.\"
-.\" $XdotOrg$
-.\" $XFree86: xc/lib/XRes/XRes.man,v 1.2 2003/10/13 21:22:54 herrb Exp $
-.\"
.\" Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved.
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
@@ -28,7 +25,7 @@
.\" or other dealings in this Software without prior written authorization
.\" from the XFree86 Project.
.\"
-.TH XRes 3 __vendorversion__
+.TH XRes __libmansuffix__ __vendorversion__
.SH NAME
XRes \- X-Resource extension client library
.SH SYNOPSIS
@@ -65,7 +62,7 @@ unsigned long *\fIbytes\fP\^);
.SH DESCRIPTION
.B X-Resource
is an extension that allows a client to query the X
-server about its usage of various resources. It should not be mixed
+server about its usage of various resources. It should not be confused
with the X resource database access functions.
.PP
.B XResQueryExtension
@@ -113,7 +110,7 @@ on success or
.B False
on failure.
.PP
-.B XresQueryClientPixmapBytes
+.B XResQueryClientPixmapBytes
gives, for resources of type
.I PIXMAP
the total number of bytes allocated in the X server by the given
commit e854448a9bfcdfdeb6262b89a93bcbe8bcd7545c
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Oct 8 23:39:04 2009 -0700
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/configure.ac b/configure.ac
index ce4ab28..8b6fad4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,15 +33,19 @@ dnl
AC_INIT(libXres, 1.0.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXres)
AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([dist-bzip2])
-# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.2)
+
+# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+
AM_CONFIG_HEADER(config.h)
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
-XORG_CWARNFLAGS
+
+XORG_DEFAULT_OPTIONS
# get modules
@@ -54,9 +58,6 @@ AC_SUBST(XRES_CFLAGS)
AC_SUBST(XRES_LIBS)
XORG_CHECK_MALLOC_ZERO
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
AC_OUTPUT([Makefile
src/Makefile
diff --git a/man/Makefile.am b/man/Makefile.am
index 52e5ad3..40467c4 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -30,14 +30,12 @@ LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
libman_PRE = XRes.man
-BUILT_SOURCES = shadows.DONE
-
EXTRA_DIST = $(libman_PRE)
CLEANFILES = $(libman_DATA) $(BUILT_SOURCES)
libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
- $(XRes_shadows:=.@LIB_MAN_SUFFIX@)
+ $(XRes_shadowmen)
SED = sed
@@ -56,7 +54,7 @@ MAN_SUBSTS = \
SUFFIXES = .$(LIB_MAN_SUFFIX) .man
.man.$(LIB_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
# Generate man page shadow files (Replaces InstallManPageAliases from Imake)
@@ -67,8 +65,8 @@ XRes_shadows = \
XResQueryClientResources \
XResQueryClientPixmapBytes
-shadows.DONE:
- -rm -f $(XRes_shadows:=.@LIB_MAN_SUFFIX@)
- (for i in $(XRes_shadows:=.@LIB_MAN_SUFFIX@) ; do \
- echo .so man$(LIB_MAN_DIR_SUFFIX)/XRes.$(LIB_MAN_SUFFIX) > $$i; \
- done)
+XRes_shadowmen = $(XRes_shadows:=.@LIB_MAN_SUFFIX@)
+
+$(XRes_shadowmen):
+ $(AM_V_GEN) echo .so man$(LIB_MAN_DIR_SUFFIX)/XRes.$(LIB_MAN_SUFFIX) > $@
+
diff --git a/src/Makefile.am b/src/Makefile.am
index 16a7c04..a64c939 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,7 +5,7 @@ libXRes_la_SOURCES = \
libXRes_la_LIBADD = @XRES_LIBS@
-AM_CFLAGS = @XRES_CFLAGS@ @MALLOC_ZERO_CFLAGS@
+AM_CFLAGS = $(CWARNFLAGS) @XRES_CFLAGS@ @MALLOC_ZERO_CFLAGS@
INCLUDES = -I$(top_srcdir)/include
commit 1805655654217830ae943806e6a7d653cdc48047
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Feb 2 20:34:31 2009 -0800
Add README with pointers to mailing list, bugzilla & git repos
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/README b/README
index e69de29..2704086 100644
--- a/README
+++ b/README
@@ -0,0 +1,25 @@
+libXRes - X-Resource extension client library
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+Please submit bug reports to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/lib/libXRes
+
+ http://cgit.freedesktop.org/xorg/lib/libXRes
+
+For patch submission instructions, see:
+
+ http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
+
commit 13ee4d00a06421dfb5ee613cbd99a3111135c379
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Fri Jan 30 16:56:38 2009 -0200
Janitor: Correct make distcheck and remove extra .gitignore files.
diff --git a/.gitignore b/.gitignore
index 8da2fdd..c5dd7a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+.deps
+.libs
aclocal.m4
autom4te.cache
compile
@@ -20,3 +22,10 @@ mkinstalldirs
stamp-h1
xres.pc
*~
+*.3
+*.o
+*.la
+*.lo
+libXres-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index 4f08347..6a30fce 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,18 +23,15 @@ AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
-AM_CFLAGS = $(RESOURCEEXT_CFLAGS) $(XRES_CFLAGS)
-
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xres.pc
-EXTRA_DIST = xres.pc.in autogen.sh ChangeLog
-
-CLEANFILES = ChangeLog
+EXTRA_DIST = xres.pc.in 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)
+ $(CHANGELOG_CMD)
dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index 97397bc..ce4ab28 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,37 +33,30 @@ dnl
AC_INIT(libXres, 1.0.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXres)
AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([dist-bzip2])
+# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
AM_CONFIG_HEADER(config.h)
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
+XORG_CWARNFLAGS
# get modules
-PKG_CHECK_MODULES(XRES, x11 xext xextproto)
-
-AC_SUBST(XRES_CFLAGS)
-AC_SUBST(XRES_LIBS)
# 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(RESOURCEEXT, resourceproto >= $RES_VERSION)
-
-AC_SUBST(RESOURCEEXT_CFLAGS)
-AC_SUBST(RESOURCEEXT_LIBS)
-
-if test "x$GCC" = "xyes"; then
- GCC_WARNINGS="-Wall -Wpointer-arith -Wstrict-prototypes \
- -Wmissing-prototypes -Wmissing-declarations \
- -Wnested-externs -fno-strict-aliasing"
- CFLAGS="$GCC_WARNINGS $CFLAGS"
-fi
+PKG_CHECK_MODULES(XRES, x11 xext xextproto [resourceproto >= $RES_VERSION])
+XRES_CFLAGS="$CWARNFLAGS $XRES_CFLAGS"
+AC_SUBST(XRES_CFLAGS)
+AC_SUBST(XRES_LIBS)
XORG_CHECK_MALLOC_ZERO
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile
src/Makefile
diff --git a/man/.gitignore b/man/.gitignore
deleted file mode 100644
index 2d0f344..0000000
--- a/man/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-Makefile.in
-*.3*
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index a2564a4..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-libXRes.la
-*.lo
-Makefile
-Makefile.in
diff --git a/src/Makefile.am b/src/Makefile.am
index 085d520..16a7c04 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,9 +3,9 @@ lib_LTLIBRARIES = libXRes.la
libXRes_la_SOURCES = \
XRes.c
-libXRes_la_LIBADD = @RESOURCEEXT_LIBS@ @XRES_LIBS@
+libXRes_la_LIBADD = @XRES_LIBS@
-AM_CFLAGS = @RESOURCEEXT_CFLAGS@ @XRES_CFLAGS@ @MALLOC_ZERO_CFLAGS@
+AM_CFLAGS = @XRES_CFLAGS@ @MALLOC_ZERO_CFLAGS@
INCLUDES = -I$(top_srcdir)/include
commit 168153d1e7d196ca46c5b2e286fcf7e7793f2804
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon May 19 17:53:23 2008 +0930
Rename parameters to clarify QueryVersion/QueryExtension.
These parameters are not treated as input. Rename them to make the inner
workings slightly more obvious.
X.Org Bug 14511 <http://bugs.freedesktop.org/show_bug.cgi?id=14511>
diff --git a/include/X11/extensions/XRes.h b/include/X11/extensions/XRes.h
index 5b3374e..26c8362 100644
--- a/include/X11/extensions/XRes.h
+++ b/include/X11/extensions/XRes.h
@@ -24,14 +24,14 @@ _XFUNCPROTOBEGIN
Bool XResQueryExtension (
Display *dpy,
- int *event_base,
- int *error_base
+ int *event_base_return,
+ int *error_base_return
);
Status XResQueryVersion (
Display *dpy,
- int *major_versionp,
- int *minor_versionp
+ int *major_version_return,
+ int *minor_version_return
);
Status XResQueryClients (
diff --git a/man/XRes.man b/man/XRes.man
index d08290c..20de262 100644
--- a/man/XRes.man
+++ b/man/XRes.man
@@ -48,10 +48,10 @@ typedef struct {
.fi
.HP
Bool XResQueryExtension(Display *\fIdpy\fP,
-int *\fIevent_basep\fP, int *\fIerror_basep\fP\^);
+int *\fIevent_base_return\fP, int *\fIerror_base_return\fP\^);
.HP
-Status XResQueryVersion(Display *\fIdpy\fP, int *\fImajor_versionp\fP,
-int *\fIminor_versionp\fP\^);
+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,
XResClient **\fIclients\fP\^);
@@ -85,9 +85,9 @@ returns
.B True
if the request succeeded; the values of the major and minor protocol
versions supported by the server are returned in
-.I major_versionp
+.I major_version_return
and
-.I minor_versionp .
+.I minor_version_return .
.PP
.PP
.B XResQueryClients
diff --git a/src/XRes.c b/src/XRes.c
index 06cc78d..ed6fe52 100644
--- a/src/XRes.c
+++ b/src/XRes.c
@@ -47,15 +47,15 @@ static XEXT_GENERATE_FIND_DISPLAY (find_display, xres_ext_info,
Bool XResQueryExtension (
Display *dpy,
- int *event_basep,
- int *error_basep
+ int *event_base_return,
+ int *error_base_return
)
{
XExtDisplayInfo *info = find_display (dpy);
if (XextHasExtension(info)) {
- *event_basep = info->codes->first_event;
- *error_basep = info->codes->first_error;
+ *event_base_return = info->codes->first_event;
+ *error_base_return = info->codes->first_error;
return True;
} else {
return False;
@@ -64,8 +64,8 @@ Bool XResQueryExtension (
Status XResQueryVersion(
Display *dpy,
- int *major_versionp,
- int *minor_versionp
+ int *major_version_return,
+ int *minor_version_return
)
{
XExtDisplayInfo *info = find_display (dpy);
@@ -85,8 +85,8 @@ Status XResQueryVersion(
SyncHandle ();
return 0;
}
- *major_versionp = rep.server_major;
- *minor_versionp = rep.server_minor;
+ *major_version_return = rep.server_major;
+ *minor_version_return = rep.server_minor;
UnlockDisplay (dpy);
SyncHandle ();
return 1;
commit 5d2e4b05ff988a0f941aa78e62857791ae2d56aa
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Mar 9 00:19:31 2008 +0100
nuke RCS Ids
diff --git a/Makefile.am b/Makefile.am
index c0cc03b..4f08347 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# Copyright © 2003 Keith Packard, Noah Levitt
#
# Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/configure.ac b/configure.ac
index fad8f15..97397bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,4 @@
dnl
-dnl $Id$
-dnl
dnl Copyright © 2003 Keith Packard, Noah Levitt
dnl
dnl Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/man/Makefile.am b/man/Makefile.am
index 7494551..52e5ad3 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,4 +1,3 @@
-# $Id$
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
commit a4323e1bb491cbfc5b5090311cc16c805b9dd7d6
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Dec 6 15:51:14 2007 -0500
Add missing PHONY line for automatic ChangeLog generation
diff --git a/Makefile.am b/Makefile.am
index 6af1602..c0cc03b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,6 +34,8 @@ EXTRA_DIST = xres.pc.in autogen.sh ChangeLog
CLEANFILES = 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)
commit 04381b5f703975ffa6514d474f5fe31bc76540c4
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Sep 3 05:53:33 2007 -0400
Add *~ to .gitignore to skip patch/emacs droppings
diff --git a/.gitignore b/.gitignore
index 1223f7f..8da2fdd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ missing
mkinstalldirs
stamp-h1
xres.pc
+*~
Reply to: