libice: Changes to 'upstream-unstable'
.gitignore | 5 +++++
Makefile.am | 2 +-
README | 30 ++++++++++++++++++++++++++++++
configure.ac | 18 ++++++++----------
src/.gitignore | 6 ------
src/ICElibint.h | 3 +++
src/Makefile.am | 2 +-
src/getauth.c | 4 ----
8 files changed, 48 insertions(+), 22 deletions(-)
New commits:
commit 94992c686a6850f2303aa78057a64a6369b64692
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 28 14:17:50 2009 +1000
libICE 1.0.6
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 3216b53..65f7948 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ(2.57)
AC_INIT([libICE],
- 1.0.5,
+ 1.0.6,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
libICE)
commit 7a8bb2a2c991919bcdef63359c74e239045a3f4c
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Feb 2 20:34:30 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..7f3381e 100644
--- a/README
+++ b/README
@@ -0,0 +1,30 @@
+libICE - Inter-Client Exchange Library
+
+Documentation for this API can be found in the ICElib document in the
+doc/xorg-docs module of the X.Org source code, or online at:
+
+ http://xorg.freedesktop.org/releases/X11R7.0/doc/PDF/ICElib.pdf
+
+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/libICE
+
+ http://cgit.freedesktop.org/xorg/lib/libICE
+
+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 dbb950061f185e1ccf27bff9c71adc34ab4cfae0
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Wed Jan 28 16:55:37 2009 -0200
Janitor: Correct sparse warnings.
Also reorders some code in configure.ac and Makefile.am to
match pattern used on other packages.
diff --git a/.gitignore b/.gitignore
index 80aa9f0..a428c3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+.deps
+.libs
aclocal.m4
autom4te.cache
config.guess
@@ -21,5 +23,8 @@ stamp-h1
*~
tags
*.o
+*.lo
+*.la
libICE-*.tar.*
ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index 5d3daa9..8e343cf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = src
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = ice.pc
-EXTRA_DIST=ice.pc.in
+EXTRA_DIST=ice.pc.in ChangeLog
.PHONY: ChangeLog
diff --git a/configure.ac b/configure.ac
index 657a38b..3216b53 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,14 +12,20 @@ AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
+# Require xorg-macros at least 1.2.1
+XORG_MACROS_VERSION([1.2.1])
+m4_ifndef([XORG_MACROS_VERSION],
+ [AC_FATAL([must install xorg-macros 1.2.1 or later before running autoconf/autogen])])
AM_CONFIG_HEADER([config.h])
# Checks for programs.
AC_PROG_LIBTOOL
AC_PROG_CC
+XORG_CWARNFLAGS
# Checks for pkg-config packages
PKG_CHECK_MODULES(ICE, xproto)
+ICE_CFLAGS="$CWARNFLAGS $ICE_CFLAGS"
AC_SUBST(ICE_CFLAGS)
AC_SUBST(ICE_LIBS)
@@ -36,21 +42,13 @@ AC_DEFINE(ICE_t, 1, [Xtrans transport type])
# Checks for header files.
AC_HEADER_STDC
-# Require xorg-macros at least 1.2.1
-XORG_MACROS_VERSION([1.2.1])
-m4_ifndef([XORG_MACROS_VERSION],
- [AC_FATAL([must install xorg-macros 1.2.1 or later before running autoconf/autogen])])
-
dnl Allow checking code with lint, sparse, etc.
XORG_WITH_LINT
XORG_LINT_LIBRARY([ICE])
LINT_FLAGS="${LINT_FLAGS} ${ICE_CFLAGS} ${XTRANS_CFLAGS}"
-XORG_CHANGELOG
-
-XORG_CWARNFLAGS
-
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile
src/Makefile
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index f38c26f..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-libICE.la
-.libs
-*.lo
-Makefile
-Makefile.in
diff --git a/src/ICElibint.h b/src/ICElibint.h
index ca61553..42983cc 100644
--- a/src/ICElibint.h
+++ b/src/ICElibint.h
@@ -37,6 +37,7 @@ Author: Ralph Mor, X Consortium
#include <X11/ICE/ICEproto.h>
#include <X11/ICE/ICEconn.h>
#include <X11/ICE/ICEmsg.h>
+#include <X11/ICE/ICEutil.h>
#ifdef WIN32
#include <X11/Xwindows.h>
#endif
@@ -410,6 +411,8 @@ extern _IceWatchProc *_IceWatchProcs;
extern IceErrorHandler _IceErrorHandler;
extern IceIOErrorHandler _IceIOErrorHandler;
+extern IceAuthDataEntry _IcePaAuthDataEntries[];
+extern int _IcePaAuthDataEntryCount;
extern void _IceErrorBadMajor (
IceConn /* iceConn */,
diff --git a/src/Makefile.am b/src/Makefile.am
index dc4a0f5..449aeaf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
lib_LTLIBRARIES=libICE.la
AM_CFLAGS= -I${top_srcdir}/include $(ICE_CFLAGS) $(XTRANS_CFLAGS) \
- -DICE_t -DTRANS_CLIENT -DTRANS_SERVER $(CWARNFLAGS)
+ -DICE_t -DTRANS_CLIENT -DTRANS_SERVER
libICE_la_LDFLAGS = -version-number 6:3:0 -no-undefined
diff --git a/src/getauth.c b/src/getauth.c
index 6641512..0e86044 100644
--- a/src/getauth.c
+++ b/src/getauth.c
@@ -33,14 +33,10 @@ Author: Ralph Mor, X Consortium
#endif
#include <X11/ICE/ICElib.h>
#include "ICElibint.h"
-#include <X11/ICE/ICEutil.h>
static Bool auth_valid (const char *auth_name, int num_auth_names,
char **auth_names, int *index_ret);
-extern int _IcePaAuthDataEntryCount;
-extern IceAuthDataEntry _IcePaAuthDataEntries[];
-
/*
* The functions in this file are not a standard part of ICElib.
Reply to: