Hello community,
here is the log from the commit of package xorg-x11-libX11
checked in at Fri Aug 3 17:17:37 CEST 2007.
--------
--- xorg-x11-libX11/xorg-x11-libX11.changes 2007-06-11 17:37:51.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-libX11/xorg-x11-libX11.changes 2007-08-02 12:29:35.735518000 +0200
@@ -1,0 +2,8 @@
+Thu Aug 2 12:28:48 CEST 2007 - sndirsch@suse.de
+
+- update to release 1.1.3
+ * libX11 1.1.3 is a maintenance release that fixes a bug
+ (introduced with libX11 1.1.2) which broke the
+ XGetMotionEvents function.
+
+-------------------------------------------------------------------
Old:
----
libX11-1.1.2-fix-XGetMotionEvents.patch
libX11-1.1.2.tar.bz2
New:
----
libX11-1.1.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-libX11.spec ++++++
--- /var/tmp/diff_new_pack.K12334/_old 2007-08-03 17:17:12.000000000 +0200
+++ /var/tmp/diff_new_pack.K12334/_new 2007-08-03 17:17:12.000000000 +0200
@@ -11,11 +11,15 @@
# norootforbuild
Name: xorg-x11-libX11
-%define dirsuffix 1.1.2
-BuildRequires: pkgconfig xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libxcb-devel xorg-x11-proto-devel xorg-x11-xtrans-devel zlib-devel
+%define xcb 1
+%define dirsuffix 1.1.3
+BuildRequires: pkgconfig xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-proto-devel xorg-x11-xtrans-devel zlib-devel
+%if %xcb
+BuildRequires: xorg-x11-libxcb-devel
+%endif
Url: http://xorg.freedesktop.org/
Version: 7.2
-Release: 55
+Release: 62
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/Libraries
@@ -37,7 +41,6 @@
Patch8: p_khmer-locale.diff
Patch9: p_xlib_skip_ext_env.diff
Patch10: bug-239698_libx11.diff
-Patch11: libX11-1.1.2-fix-XGetMotionEvents.patch
Patch13: bug-221326-xim-sync.patch
%description
@@ -69,7 +72,10 @@
Summary: Include Files and Libraries mandatory for Development.
Group: System/Libraries
Provides: xorg-x11-devel:/usr/X11R6/%{_lib}/libX11.so
-Requires: xorg-x11-proto-devel xorg-x11-xtrans-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libxcb-devel xorg-x11-libX11
+Requires: xorg-x11-proto-devel xorg-x11-xtrans-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libX11
+%if %xcb
+Requires: xorg-x11-libxcb-devel
+%endif
Autoreqprov: on
%description devel
@@ -114,7 +120,6 @@
%patch8
%patch9
%patch10 -p1
-%patch11 -p1
%patch13 -p1
%build
@@ -123,7 +128,11 @@
--prefix=/usr \
--libdir=%{_libdir} \
--mandir=%{_mandir} \
+%if %xcb
--with-xcb \
+%else
+ --without-xcb \
+%endif
--datadir=/usr/share
# currently broken since xlcUTF-8 plugin is not built
#--enable-loadable-i18n
@@ -184,6 +193,11 @@
%{_mandir}/man3/*
%changelog
+* Thu Aug 02 2007 - sndirsch@suse.de
+- update to release 1.1.3
+ * libX11 1.1.3 is a maintenance release that fixes a bug
+ (introduced with libX11 1.1.2) which broke the
+ XGetMotionEvents function.
* Mon Jun 11 2007 - sndirsch@suse.de
- libX11-1.1.2-fix-XGetMotionEvents.patch:
* fix argument orders (X.Org Bug #11222)
++++++ libX11-1.1.2.tar.bz2 -> libX11-1.1.3.tar.bz2 ++++++
++++ 29409 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libX11-1.1.2/acinclude.m4 new/libX11-1.1.3/acinclude.m4
--- old/libX11-1.1.2/acinclude.m4 2006-10-04 19:42:02.000000000 +0200
+++ new/libX11-1.1.3/acinclude.m4 2007-08-01 18:02:31.000000000 +0200
@@ -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
+# Copyright (c) 2006 Andreas Schwab
+# Copyright (c) 2006 Guido U. Draheim
+# 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=
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libX11-1.1.2/ChangeLog new/libX11-1.1.3/ChangeLog
--- old/libX11-1.1.2/ChangeLog 2007-06-04 06:45:08.000000000 +0200
+++ new/libX11-1.1.3/ChangeLog 2007-08-01 20:37:10.000000000 +0200
@@ -1,3 +1,78 @@
+commit ac00a44b4875de70382da5a40dd87f976e5b9327
+Author: Tilman Sauerbeck
+Date: Wed Aug 1 20:36:03 2007 +0200
+
+ Bumped version to 1.1.3.
+
+commit 76fae9cba1e9bdf7f0eb2ff2b90153d622136cf0
+Author: Joerg Sonnenberger
+Date: Fri Jul 27 11:15:47 2007 -0700
+
+ Fail properly on errors in recursive make.
+
+commit 1a18319b3bde08dd9ef69c7cd735a76000cf3177
+Author: Brice Goglin
+Date: Thu Jul 26 23:31:15 2007 +0200
+
+ Add missing override parameter in XrmCombineDatabase prototype in the manpage
+
+ Reported by Arnaud Giersch
+ 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.
+
+commit 6f0764d4b56f64786b4980839ca262f10a51af6f
+Author: Brice Goglin
+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
+ in http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=133348
+ and https://bugs.freedesktop.org/show_bug.cgi?id=9828
+
+commit b8bef57342632cc2d25580bb7daa3839bae04d89
+Author: Alan Coopersmith
+Date: Wed Jul 25 17:44:06 2007 -0700
+
+ Include comment/copyright/license for AC_DEFINE_DIR in acinclude.m4
+
+commit 590cde811a79375231c59ed8583e02b111ed567c
+Author: Kean Johnston
+Date: Thu Jul 19 16:44:20 2007 -0700
+
+ Reset hostname when falling back from :0 to hostname/localhost:0 as well
+
+commit d334665e619e9db657a2ea2764a8b852401d4a3f
+Author: Kean Johnston
+Date: Tue Jul 17 16:34:30 2007 -0700
+
+ LOCALCONN fallback changes DisplayString() output, breaks KDE
+
+ See http://lists.freedesktop.org/archives/xorg/2007-July/026443.html
+
+commit 8e76bcf3cafda85058ce5f35f1f81929f4772f72
+Author: Olivier Blin
+Date: Mon Jun 11 18:32:09 2007 +1000
+
+ fix XGetMotionEvents arguments order - Fixes bug 11222
+
+commit c2f88cdf5cd9c94b77e5bfdac572b5ac06ab4aa8
+Author: Jamey Sharp
+Date: Sun Jun 10 16:19:59 2007 -0700
+
+ Fix locking in _XimGetWindowEventmask.
+
+ Now that XFilterEvent drops the Display lock before invoking callback
+ functions, _XimGetWindowEventmask is called without the lock held. So
+ when it called _XGetWindowAttributes, a variant of XGetWindowAttributes
+ that does not lock the Display, Xlib/XCB would assert:
+
+ xcb_xlib.c:50: xcb_xlib_unlock: Assertion `c->xlib.lock' failed.
+
+ Should fix Gentoo #156367, Ubuntu #87947, Debian #427296. And others?
+
commit 65f0ab5d46d80d55fc04d4eb14fa05f130eb8b9c
Author: Jamey Sharp
Date: Sun Jun 3 21:41:47 2007 -0700
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libX11-1.1.2/compile new/libX11-1.1.3/compile
--- old/libX11-1.1.2/compile 2006-11-23 12:13:24.000000000 +0100
+++ new/libX11-1.1.3/compile 1970-01-01 01:00:00.000000000 +0100
@@ -1,142 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
-
-scriptversion=2005-05-14.22
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-# Written by Tom Tromey .
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to or send patches to
-# .
-
-case $1 in
- '')
- echo "$0: No command. Try \`$0 --help' for more information." 1>&2
- exit 1;
- ;;
- -h | --h*)
- cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand `-c -o'.
-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
-
-Report bugs to .
-EOF
- exit $?
- ;;
- -v | --v*)
- echo "compile $scriptversion"
- exit $?
- ;;
-esac
-
-ofile=
-cfile=
-eat=
-
-for arg
-do
- if test -n "$eat"; then
- eat=
- else
- case $1 in
- -o)
- # configure might choose to run compile as `compile cc -o foo foo.c'.
- # So we strip `-o arg' only if arg is an object.
- eat=1
- case $2 in
- *.o | *.obj)
- ofile=$2
- ;;
- *)
- set x "$@" -o "$2"
- shift
- ;;
- esac
- ;;
- *.c)
- cfile=$1
- set x "$@" "$1"
- shift
- ;;
- *)
- set x "$@" "$1"
- shift
- ;;
- esac
- fi
- shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
- # If no `-o' option was seen then we might have been invoked from a
- # pattern rule where we don't need one. That is ok -- this is a
- # normal compilation that the losing compiler can handle. If no
- # `.c' file was seen then we are probably linking. That is also
- # ok.
- exec "$@"
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use `[/.-]' here to ensure that we don't use the same name
-# that we are using for the .o file. Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
-while true; do
- if mkdir "$lockdir" >/dev/null 2>&1; then
- break
- fi
- sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir '$lockdir'; exit 1" 1 2 15
-
-# Run the compile.
-"$@"
-ret=$?
-
-if test -f "$cofile"; then
- mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
- mv "${cofile}bj" "$ofile"
-fi
-
-rmdir "$lockdir"
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libX11-1.1.2/configure.ac new/libX11-1.1.3/configure.ac
--- old/libX11-1.1.2/configure.ac 2007-06-04 01:37:59.000000000 +0200
+++ new/libX11-1.1.3/configure.ac 2007-08-01 20:35:46.000000000 +0200
@@ -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])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libX11-1.1.2/man/XrmMergeDatabases.man new/libX11-1.1.3/man/XrmMergeDatabases.man
--- old/libX11-1.1.2/man/XrmMergeDatabases.man 2006-10-11 06:36:59.000000000 +0200
+++ new/libX11-1.1.3/man/XrmMergeDatabases.man 2007-08-01 18:02:31.000000000 +0200
@@ -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);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libX11-1.1.2/man/XSetCommand.man new/libX11-1.1.3/man/XSetCommand.man
--- old/libX11-1.1.2/man/XSetCommand.man 2006-10-11 06:36:59.000000000 +0200
+++ new/libX11-1.1.3/man/XSetCommand.man 2007-08-01 18:02:31.000000000 +0200
@@ -189,7 +189,7 @@
.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.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libX11-1.1.2/missing new/libX11-1.1.3/missing
--- old/libX11-1.1.2/missing 2006-11-23 12:13:14.000000000 +0100
+++ new/libX11-1.1.3/missing 2007-08-01 20:36:37.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libX11-1.1.2/modules/im/ximcp/imDefLkup.c new/libX11-1.1.3/modules/im/ximcp/imDefLkup.c
--- old/libX11-1.1.2/modules/im/ximcp/imDefLkup.c 2006-09-25 12:57:47.000000000 +0200
+++ new/libX11-1.1.3/modules/im/ximcp/imDefLkup.c 2007-07-21 10:45:39.000000000 +0200
@@ -466,7 +466,7 @@
Xim im = (Xim )ic->core.im;
XWindowAttributes atr;
- if (!_XGetWindowAttributes(im->core.display, ic->core.focus_window, &atr))
+ if (!XGetWindowAttributes(im->core.display, ic->core.focus_window, &atr))
return 0;
return (EVENTMASK)atr.your_event_mask;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libX11-1.1.2/src/config.h.in new/libX11-1.1.3/src/config.h.in
--- old/libX11-1.1.2/src/config.h.in 2007-06-03 06:56:16.000000000 +0200
+++ new/libX11-1.1.3/src/config.h.in 2007-08-01 20:36:36.000000000 +0200
@@ -72,6 +72,9 @@
/* Support IPv6 for TCP connections */
#undef IPv6
+/* Support os-specific local connections */
+#undef LOCALCONN
+
/* Disable XLOCALEDIR environment variable */
#undef NO_XLOCALEDIR
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libX11-1.1.2/src/ConnDis.c new/libX11-1.1.3/src/ConnDis.c
--- old/libX11-1.1.2/src/ConnDis.c 2006-10-04 19:43:17.000000000 +0200
+++ new/libX11-1.1.3/src/ConnDis.c 2007-07-21 10:45:39.000000000 +0200
@@ -150,6 +150,9 @@
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;
# ifdef UNIXCONN
@@ -245,6 +248,8 @@
else
tcphostname = copystring("localhost", 9);
#endif
+ if (!phostname)
+ reset_hostname = True;
Xfree (phostname);
phostname = copystring ("unix", 4);
}
@@ -429,6 +434,16 @@
*
* [host] : [:] dpy . scr \0
*/
+#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;
+ }
+#endif
len = ((phostname ? strlen(phostname) : 0) + 1 + (dnet ? 1 : 0) +
strlen(pdpynum) + 1 + (pscrnum ? strlen(pscrnum) : 1) + 1);
*fullnamep = (char *) Xmalloc (len);
@@ -478,6 +493,7 @@
pprotocol = copystring("tcp", 3);
phostname = tcphostname;
tcphostname = NULL;
+ reset_hostname = True;
goto connect;
}
#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libX11-1.1.2/src/GetMoEv.c new/libX11-1.1.3/src/GetMoEv.c
--- old/libX11-1.1.2/src/GetMoEv.c 2007-06-02 19:46:55.000000000 +0200
+++ new/libX11-1.1.3/src/GetMoEv.c 2007-07-21 10:45:39.000000000 +0200
@@ -33,9 +33,9 @@
XTimeCoord *XGetMotionEvents(
register Display *dpy,
+ Window w,
Time start,
Time stop,
- Window w,
int *nEvents) /* RETURN */
{
xGetMotionEventsReply rep;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libX11-1.1.2/src/Makefile.am new/libX11-1.1.3/src/Makefile.am
--- old/libX11-1.1.2/src/Makefile.am 2006-10-07 01:40:27.000000000 +0200
+++ new/libX11-1.1.3/src/Makefile.am 2007-08-01 18:02:31.000000000 +0200
@@ -413,6 +413,6 @@
mv ks_tables_h $@
$(top_builddir)/src/util/makekeys$(EXEEXT): force
- cd util; $(MAKE)
+ cd util && $(MAKE)
force:
++++++ p_xlib-threadsafe.diff ++++++
--- /var/tmp/diff_new_pack.K12334/_old 2007-08-03 17:17:15.000000000 +0200
+++ /var/tmp/diff_new_pack.K12334/_new 2007-08-03 17:17:15.000000000 +0200
@@ -1,19 +1,3 @@
-Index: imDefLkup.c
-===================================================================
-RCS file: /home/eich/cvs/xc/lib/X11/imDefLkup.c,v
-retrieving revision 1.1.1.9
-diff -u -r1.1.1.9 imDefLkup.c
---- imDefLkup.c 14 Sep 2004 10:49:40 -0000 1.1.1.9
-+++ modules/im/ximcp/imDefLkup.c 7 Jul 2005 13:11:33 -0000
-@@ -463,7 +463,7 @@
- Xim im = (Xim )ic->core.im;
- XWindowAttributes atr;
-
-- if (!_XGetWindowAttributes(im->core.display, ic->core.focus_window, &atr))
-+ if (!XGetWindowAttributes(im->core.display, ic->core.focus_window, &atr))
- return 0;
- return (EVENTMASK)atr.your_event_mask;
- }
Index: imLcFlt.c
===================================================================
RCS file: /home/eich/cvs/xc/lib/X11/imLcFlt.c,v
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org