libx11: Changes to 'upstream-experimental'
acinclude.m4 | 34 +++++++++++++++++++++++++++++++++-
configure.ac | 2 +-
man/XSetCommand.man | 2 +-
man/XrmMergeDatabases.man | 5 +++--
src/ConnDis.c | 11 +++++++++--
src/Makefile.am | 2 +-
6 files changed, 48 insertions(+), 8 deletions(-)
New commits:
commit ac00a44b4875de70382da5a40dd87f976e5b9327
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Wed Aug 1 20:36:03 2007 +0200
Bumped version to 1.1.3.
diff --git a/configure.ac b/configure.ac
index 55186a4..f49b9ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ(2.57)
AC_INIT([libX11],
- 1.1.2,
+ 1.1.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
libX11)
AC_CONFIG_SRCDIR([Makefile.am])
commit 76fae9cba1e9bdf7f0eb2ff2b90153d622136cf0
Author: Joerg Sonnenberger <joerg@netbsd.org>
Date: Fri Jul 27 11:15:47 2007 -0700
Fail properly on errors in recursive make.
diff --git a/src/Makefile.am b/src/Makefile.am
index 18e4cbb..7c44f5b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -413,6 +413,6 @@ ks_tables.h: $(KEYSYMDEF) $(top_builddir)/src/util/makekeys$(EXEEXT)
mv ks_tables_h $@
$(top_builddir)/src/util/makekeys$(EXEEXT): force
- cd util; $(MAKE)
+ cd util && $(MAKE)
force:
commit 1a18319b3bde08dd9ef69c7cd735a76000cf3177
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Thu Jul 26 23:31:15 2007 +0200
Add missing override parameter in XrmCombineDatabase prototype in the manpage
Reported by Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
in http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=393434
and https://bugs.freedesktop.org/show_bug.cgi?id=9948
Also add the type of the second argument in XrmMergeDatabases.
diff --git a/man/XrmMergeDatabases.man b/man/XrmMergeDatabases.man
index 22fc8f4..e1dc75a 100644
--- a/man/XrmMergeDatabases.man
+++ b/man/XrmMergeDatabases.man
@@ -145,10 +145,11 @@
XrmMergeDatabases, XrmCombineDatabase, XrmCombineFileDatabase \- merge resource databases
.SH SYNTAX
.HP
-void XrmMergeDatabases(\^XrmDatabase \fIsource_db\fP, *\fItarget_db\fP\^);
+void XrmMergeDatabases(\^XrmDatabase \fIsource_db\fP, XrmDatabase
+*\fItarget_db\fP\^);
.HP
void XrmCombineDatabase(\^XrmDatabase \fIsource_db\fP, XrmDatabase
-*\fItarget_db\fP\^);
+*\fItarget_db\fP, Bool \fIoverride\fP\^);
.HP
Status XrmCombineFileDatabase(\^char *\fIfilename\fP, XrmDatabase
*\fItarget_db\fP\^, Bool \fIoverride\fP);
commit 6f0764d4b56f64786b4980839ca262f10a51af6f
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Thu Jul 26 22:53:52 2007 +0200
Clarify return value of XGetCommand in case of error in the manpage
Reported by Sean Perry <shalehperry@attbi.com>
in http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=133348
and https://bugs.freedesktop.org/show_bug.cgi?id=9828
diff --git a/man/XSetCommand.man b/man/XSetCommand.man
index c5f03e7..c64e270 100644
--- a/man/XSetCommand.man
+++ b/man/XSetCommand.man
@@ -189,7 +189,7 @@ If sufficient memory can be allocated to contain the string list,
.ZN XGetCommand
fills in the argv_return and argc_return arguments
and returns a nonzero status.
-Otherwise, it returns a zero status.
+Otherwise, or if any other error is encountered, it returns a zero status.
If the data returned by the server is in the Latin Portable Character Encoding,
then the returned strings are in the Host Portable Character Encoding.
Otherwise, the result is implementation-dependent.
commit b8bef57342632cc2d25580bb7daa3839bae04d89
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jul 25 17:44:06 2007 -0700
Include comment/copyright/license for AC_DEFINE_DIR in acinclude.m4
diff --git a/acinclude.m4 b/acinclude.m4
index 4c60e33..f3d8734 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,4 +1,36 @@
-# AC_DEFINE_DIR macro from autoconf-archive.cryp.to
+##### http://autoconf-archive.cryp.to/ac_define_dir.html
+#
+# SYNOPSIS
+#
+# AC_DEFINE_DIR(VARNAME, DIR [, DESCRIPTION])
+#
+# DESCRIPTION
+#
+# This macro sets VARNAME to the expansion of the DIR variable,
+# taking care of fixing up ${prefix} and such.
+#
+# VARNAME is then offered as both an output variable and a C
+# preprocessor symbol.
+#
+# Example:
+#
+# AC_DEFINE_DIR([DATADIR], [datadir], [Where data are placed to.])
+#
+# LAST MODIFICATION
+#
+# 2006-10-13
+#
+# COPYLEFT
+#
+# Copyright (c) 2006 Stepan Kasal <kasal@ucw.cz>
+# Copyright (c) 2006 Andreas Schwab <schwab@suse.de>
+# Copyright (c) 2006 Guido U. Draheim <guidod@gmx.de>
+# Copyright (c) 2006 Alexandre Oliva
+#
+# Copying and distribution of this file, with or without
+# modification, are permitted in any medium without royalty provided
+# the copyright notice and this notice are preserved.
+
AC_DEFUN([AC_DEFINE_DIR], [
prefix_NONE=
exec_prefix_NONE=
commit 590cde811a79375231c59ed8583e02b111ed567c
Author: Kean Johnston <kean@armory.com>
Date: Thu Jul 19 16:44:20 2007 -0700
Reset hostname when falling back from :0 to hostname/localhost:0 as well
diff --git a/src/ConnDis.c b/src/ConnDis.c
index 8da5140..2f0cd49 100644
--- a/src/ConnDis.c
+++ b/src/ConnDis.c
@@ -150,9 +150,11 @@ _X11TransConnectDisplay (
char* address = addrbuf;
XtransConnInfo trans_conn = NULL; /* transport connection object */
int connect_stat;
+#if defined(LOCALCONN) || defined(TCPCONN)
+ Bool reset_hostname = False; /* Reset hostname? */
+#endif
#ifdef LOCALCONN
struct utsname sys;
- Bool reset_hostname = False; /* Reset hostname? */
# ifdef UNIXCONN
Bool try_unix_socket = False; /* Try unix if local fails */
# endif
@@ -432,7 +434,11 @@ _X11TransConnectDisplay (
*
* [host] : [:] dpy . scr \0
*/
-#ifdef LOCALCONN
+#if defined(LOCALCONN) || defined(TCPCONN)
+ /*
+ * If we computed the host name, get rid of it so that
+ * XDisplayString() and XDisplayName() agree.
+ */
if (reset_hostname) {
Xfree (phostname);
phostname = NULL;
@@ -487,6 +493,7 @@ _X11TransConnectDisplay (
pprotocol = copystring("tcp", 3);
phostname = tcphostname;
tcphostname = NULL;
+ reset_hostname = True;
goto connect;
}
#endif
Reply to: