Hello community,
here is the log from the commit of package xorg-x11-libs
checked in at Sat Jul 5 01:52:40 CEST 2008.
--------
--- xorg-x11-libs/xorg-x11-libs.changes 2008-06-12 23:16:12.000000000 +0200
+++ xorg-x11-libs/xorg-x11-libs.changes 2008-07-04 05:33:40.134261000 +0200
@@ -1,0 +2,29 @@
+Fri Jul 4 05:22:20 CEST 2008 - sndirsch@suse.de
+
+- libXrandr 1.2.3
+ * Hide some private symbols.
+ * bfo #14388: Remove XRRScreenConfig() and XRRConfig() from
+ Xrandr.h.
+ * Rename parameters to clarify QueryVersion/QueryExtension.
+ * bfo #16430: Ignore ConfigureNotify on non-root windows in
+ UpdateConfiguration
+- libXfont 1.3.3
+ * Don't allow a font alias to point to itself and create a loop
+ * FontFileDirectoryChanged: check length of "fonts.alias" as well
+ as "fonts.dir"
+ * Add missing include in src/FreeType/ftfuncs.c
+ * Do not call FT_Get_BDF_Charset_ID() if configured with
+ --disable-bdfformat
+- obsoletes libXfont-commit-0f9db4a.diff
+- libXxf86vm 1.0.2
+ * bfo #10846: Fix XF86VidModeGetMonitor when vendor or model are
+ null.
+ * Don't terminate zero-length strings.
+- libXft 2.1.13
+ * bfo #14232: Fix XftDrawRect when Render not supported.
+ * XftFontOpenInfo: Use of uninitialised value of size 8
+ (bfo #11200)
+ * Register objects used by libXft.
+- obsoletes p_xft_register.diff
+
+-------------------------------------------------------------------
Old:
----
libXfont-1.3.2.tar.bz2
libXfont-commit-0f9db4a.diff
libXft-2.1.12.tar.bz2
libXrandr-1.2.2.tar.bz2
libXxf86vm-X11R7.1-1.0.1.tar.bz2
p_xft_register.diff
New:
----
libXfont-1.3.3.tar.bz2
libXft-2.1.13.tar.bz2
libXrandr-1.2.3.tar.bz2
libXxf86vm-1.0.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-libs.spec ++++++
--- /var/tmp/diff_new_pack.w15889/_old 2008-07-05 01:51:10.000000000 +0200
+++ /var/tmp/diff_new_pack.w15889/_new 2008-07-05 01:51:10.000000000 +0200
@@ -20,7 +20,7 @@
%endif
Url: http://xorg.freedesktop.org/
Version: 7.3
-Release: 66
+Release: 68
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/Libraries
@@ -35,18 +35,18 @@
Source7: libXcursor-1.1.9.tar.bz2
Source8: libXdamage-1.1.1.tar.bz2
Source9: libXevie-1.0.2.tar.bz2
-Source10: libXfont-1.3.2.tar.bz2
+Source10: libXfont-1.3.3.tar.bz2
Source11: libXfontcache-1.0.4.tar.bz2
-Source12: libXft-2.1.12.tar.bz2
+Source12: libXft-2.1.13.tar.bz2
Source13: libXi-1.1.3.tar.bz2
Source14: libXinerama-1.0.3.tar.bz2
Source15: libXprintAppUtil-X11R7.0-1.0.1.tar.bz2
-Source16: libXrandr-1.2.2.tar.bz2
+Source16: libXrandr-1.2.3.tar.bz2
Source17: libXtst-1.0.3.tar.bz2
Source18: libXvMC-1.0.4.tar.bz2
Source19: libXxf86dga-1.0.2.tar.bz2
Source20: libXxf86misc-X11R7.1-1.0.1.tar.bz2
-Source21: libXxf86vm-X11R7.1-1.0.1.tar.bz2
+Source21: libXxf86vm-1.0.2.tar.bz2
Source22: libdmx-X11R7.1-1.0.2.tar.bz2
Source23: liblbxutil-X11R7.1-1.0.1.tar.bz2
Source24: liboldX-X11R7.0-1.0.1.tar.bz2
@@ -62,10 +62,8 @@
Patch: libXrandr.diff
Patch2: libXft-2.1.7-lcd-filter-2.patch
Patch3: p_xft_cjk.diff
-Patch4: p_xft_register.diff
Patch5: libxkbui.diff
Patch10: libXxf86misc-xcb.diff
-Patch11: libXfont-commit-0f9db4a.diff
%description
This package contains the remaining X.Org libraries.
@@ -143,7 +141,6 @@
%patch2 -p1
%endif
%patch3 -p1
-%patch4 -p3
popd
pushd libxkbui-*
%patch5
@@ -151,9 +148,6 @@
pushd libXxf86misc-*
%patch10 -p0
popd
-pushd libXfont-*
-%patch11 -p1
-popd
%build
for dir in libXft1-* xbitmaps-* $(ls | grep -v -e libXft1 -e xbitmaps); do
@@ -226,6 +220,32 @@
%{_mandir}/man3/*
%changelog
+* Fri Jul 04 2008 sndirsch@suse.de
+- libXrandr 1.2.3
+ * Hide some private symbols.
+ * bfo #14388: Remove XRRScreenConfig() and XRRConfig() from
+ Xrandr.h.
+ * Rename parameters to clarify QueryVersion/QueryExtension.
+ * bfo #16430: Ignore ConfigureNotify on non-root windows in
+ UpdateConfiguration
+- libXfont 1.3.3
+ * Don't allow a font alias to point to itself and create a loop
+ * FontFileDirectoryChanged: check length of "fonts.alias" as well
+ as "fonts.dir"
+ * Add missing include in src/FreeType/ftfuncs.c
+ * Do not call FT_Get_BDF_Charset_ID() if configured with
+ --disable-bdfformat
+- obsoletes libXfont-commit-0f9db4a.diff
+- libXxf86vm 1.0.2
+ * bfo #10846: Fix XF86VidModeGetMonitor when vendor or model are
+ null.
+ * Don't terminate zero-length strings.
+- libXft 2.1.13
+ * bfo #14232: Fix XftDrawRect when Render not supported.
+ * XftFontOpenInfo: Use of uninitialised value of size 8
+ (bfo #11200)
+ * Register objects used by libXft.
+- obsoletes p_xft_register.diff
* Fri Jun 13 2008 sndirsch@suse.de
- libpciaccess 0.10.3
* Thu May 22 2008 sndirsch@suse.de
++++++ libXfont-1.3.2.tar.bz2 -> libXfont-1.3.3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXfont-1.3.2/ChangeLog new/libXfont-1.3.3/ChangeLog
--- old/libXfont-1.3.2/ChangeLog 2008-03-06 04:01:17.000000000 +0100
+++ new/libXfont-1.3.3/ChangeLog 2008-07-02 21:30:32.000000000 +0200
@@ -1,3 +1,69 @@
+commit 684c000e57f30344777cf763f2f1b540ef008b38
+Author: Adam Jackson
+Date: Wed Jul 2 15:30:03 2008 -0400
+
+ libXfont 1.3.3
+
+commit 11edbc3a818e15ea2b622b31e6f87159ee68ae4a
+Author: Maarten ter Huurne
+Date: Sat Jun 28 15:34:50 2008 -0400
+
+ Do not call FT_Get_BDF_Charset_ID() if configured with --disable-bdfformat
+
+ When I configure libXfont-1.3.2 with --disable-bdfformat and link it against
+ FreeType that is built without BDF support, I get the following link error:
+
+ libXfont.so: undefined reference to ‘FT_Get_BDF_Charset_ID’
+
+ I fixed it by checking XFONT_BDFFORMAT and if BDF support is disabled, the call
+ to FT_Get_BDF_Charset_ID() is omitted and the result code is set as if the call
+ had failed.
+
+ Signed-off-by: James Cloos
+
+commit 1ab07ce0eec4f6c7ed66c7aba3edf8c4315dd907
+Author: Alan Coopersmith
+Date: Tue May 13 17:26:57 2008 -0700
+
+ FontFileDirectoryChanged: check length of "fonts.alias" as well as "fonts.dir"
+
+commit 0f9db4aa7de6e0644ac9c5811b949e5f936c9d61
+Author: Alan Coopersmith
+Date: Fri May 9 12:36:30 2008 -0700
+
+ Don't allow a font alias to point to itself and create a loop
+
+ Part of fix for Sun bug 4258475
+ http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=4258475
+
+commit 67311922a2e02d8a763831831b65bb4833db58b5
+Author: Colin Harrison
+Date: Mon May 5 22:17:55 2008 +0100
+
+ Fix build for WIN32
+
+commit 6ba408c956ca8e241d10d463c45b4e987b757333
+Author: Matthieu Herrb
+Date: Sun Mar 9 08:21:34 2008 +0100
+
+ nuke RCS Ids
+
+commit 754cabe62e91b9ad50c3027c063f4269775f7add
+Author: Julien Cristau
+Date: Fri Mar 7 12:19:22 2008 +0100
+
+ Add missing include in src/FreeType/ftfuncs.c
+
+ Fixes compiler warning:
+ ../../../src/FreeType/ftfuncs.c: In function 'restrict_code_range_by_str':
+ ../../../src/FreeType/ftfuncs.c:2081: warning: implicit declaration of function 'isspace'
+
+commit 0fd2a1428df56d8b29e148b08dcec2dfed9302fa
+Author: Adam Jackson
+Date: Wed Mar 5 22:04:06 2008 -0500
+
+ libXfont 1.3.2
+
commit b76df66d2c507898472bba0f9986ef5700029a36
Author: Matthieu Herrb
Date: Thu Jan 17 15:30:37 2008 +0100
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXfont-1.3.2/configure new/libXfont-1.3.3/configure
--- old/libXfont-1.3.2/configure 2008-03-06 04:00:50.000000000 +0100
+++ new/libXfont-1.3.3/configure 2008-07-02 21:30:21.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for libXfont 1.3.2.
+# Generated by GNU Autoconf 2.61 for libXfont 1.3.3.
#
# Report bugs to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg.
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='libXfont'
PACKAGE_TARNAME='libXfont'
-PACKAGE_VERSION='1.3.2'
-PACKAGE_STRING='libXfont 1.3.2'
+PACKAGE_VERSION='1.3.3'
+PACKAGE_STRING='libXfont 1.3.3'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
# Factoring default headers for most tests.
@@ -1432,7 +1432,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libXfont 1.3.2 to adapt to many kinds of systems.
+\`configure' configures libXfont 1.3.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1502,7 +1502,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libXfont 1.3.2:";;
+ short | recursive ) echo "Configuration of libXfont 1.3.3:";;
esac
cat <<\_ACEOF
@@ -1638,7 +1638,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libXfont configure 1.3.2
+libXfont configure 1.3.3
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1652,7 +1652,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libXfont $as_me 1.3.2, which was
+It was created by libXfont $as_me 1.3.3, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2342,7 +2342,7 @@
# Define the identity of the package.
PACKAGE='libXfont'
- VERSION='1.3.2'
+ VERSION='1.3.3'
cat >>confdefs.h <<_ACEOF
@@ -21654,7 +21654,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libXfont $as_me 1.3.2, which was
+This file was extended by libXfont $as_me 1.3.3, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21707,7 +21707,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-libXfont config.status 1.3.2
+libXfont config.status 1.3.3
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXfont-1.3.2/configure.ac new/libXfont-1.3.3/configure.ac
--- old/libXfont-1.3.2/configure.ac 2008-03-06 03:58:43.000000000 +0100
+++ new/libXfont-1.3.3/configure.ac 2008-07-02 21:29:49.000000000 +0200
@@ -23,7 +23,7 @@
AC_PREREQ([2.57])
AC_INIT([libXfont],
- 1.3.2,
+ 1.3.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
libXfont)
dnl
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXfont-1.3.2/include/X11/fonts/fontconf.h.in new/libXfont-1.3.3/include/X11/fonts/fontconf.h.in
--- old/libXfont-1.3.2/include/X11/fonts/fontconf.h.in 2008-03-06 03:58:28.000000000 +0100
+++ new/libXfont-1.3.3/include/X11/fonts/fontconf.h.in 2008-05-12 23:31:00.000000000 +0200
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2005 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXfont-1.3.2/Makefile.am new/libXfont-1.3.3/Makefile.am
--- old/libXfont-1.3.2/Makefile.am 2008-03-06 03:58:28.000000000 +0100
+++ new/libXfont-1.3.3/Makefile.am 2008-05-12 23:31:00.000000000 +0200
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# Copyright © 2003 Keith Packard, Noah Levitt
#
# Permission to use, copy, modify, distribute, and sell this software and its
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXfont-1.3.2/Makefile.in new/libXfont-1.3.3/Makefile.in
--- old/libXfont-1.3.2/Makefile.in 2008-03-06 04:00:52.000000000 +0100
+++ new/libXfont-1.3.3/Makefile.in 2008-07-02 21:30:24.000000000 +0200
@@ -15,8 +15,6 @@
@SET_MAKE@
#
-# $Id$
-#
# Copyright © 2003 Keith Packard, Noah Levitt
#
# Permission to use, copy, modify, distribute, and sell this software and its
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXfont-1.3.2/src/fc/fstrans.c new/libXfont-1.3.3/src/fc/fstrans.c
--- old/libXfont-1.3.2/src/fc/fstrans.c 2008-03-06 03:58:28.000000000 +0100
+++ new/libXfont-1.3.3/src/fc/fstrans.c 2008-05-12 23:31:00.000000000 +0200
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2004 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXfont-1.3.2/src/fontfile/dirfile.c new/libXfont-1.3.3/src/fontfile/dirfile.c
--- old/libXfont-1.3.2/src/fontfile/dirfile.c 2008-03-06 03:58:28.000000000 +0100
+++ new/libXfont-1.3.3/src/fontfile/dirfile.c 2008-07-02 21:29:37.000000000 +0200
@@ -66,6 +66,9 @@
status;
struct stat statb;
static char format[24] = "";
+#if defined(__UNIXOS2__) || defined(WIN32)
+ int i;
+#endif
FontDirectoryPtr dir = NullFontDirectory;
@@ -173,6 +176,9 @@
}
if (dir->dir_mtime != statb.st_mtime)
return TRUE;
+
+ if ((strlen(dir->directory) + sizeof(FontAliasFile)) > sizeof(dir_file))
+ return FALSE;
strcpy (dir_file, dir->directory);
strcat (dir_file, FontAliasFile);
if (stat (dir_file, &statb) == -1)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXfont-1.3.2/src/fontfile/fontdir.c new/libXfont-1.3.3/src/fontfile/fontdir.c
--- old/libXfont-1.3.2/src/fontfile/fontdir.c 2008-03-06 03:58:28.000000000 +0100
+++ new/libXfont-1.3.3/src/fontfile/fontdir.c 2008-05-12 23:31:00.000000000 +0200
@@ -811,6 +811,10 @@
{
FontEntryRec entry;
+ if (strcmp(aliasName,fontName) == 0) {
+ /* Don't allow an alias to point to itself and create a loop */
+ return FALSE;
+ }
entry.name.length = strlen (aliasName);
CopyISOLatin1Lowered (aliasName, aliasName, entry.name.length);
entry.name.name = aliasName;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXfont-1.3.2/src/FreeType/ftenc.c new/libXfont-1.3.3/src/FreeType/ftenc.c
--- old/libXfont-1.3.2/src/FreeType/ftenc.c 2008-03-06 03:58:28.000000000 +0100
+++ new/libXfont-1.3.3/src/FreeType/ftenc.c 2008-07-02 21:29:37.000000000 +0200
@@ -86,7 +86,11 @@
symbol = FTEncFontSpecific(encoding_name);
+#if XFONT_BDFFORMAT
ftrc = FT_Get_BDF_Charset_ID(face, &enc, ®);
+#else
+ ftrc = -1;
+#endif
if(ftrc == 0) {
/* Disable reencoding for non-Unicode fonts. This will
currently only work for BDFs. */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXfont-1.3.2/src/FreeType/ftfuncs.c new/libXfont-1.3.3/src/FreeType/ftfuncs.c
--- old/libXfont-1.3.2/src/FreeType/ftfuncs.c 2008-03-06 03:58:28.000000000 +0100
+++ new/libXfont-1.3.3/src/FreeType/ftfuncs.c 2008-05-12 23:31:00.000000000 +0200
@@ -42,6 +42,7 @@
#include "Xdefs.h"
#include "xf86_ansic.h"
#endif
+#include
#include
#include
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXfont-1.3.2/src/Makefile.am new/libXfont-1.3.3/src/Makefile.am
--- old/libXfont-1.3.2/src/Makefile.am 2008-03-06 03:58:28.000000000 +0100
+++ new/libXfont-1.3.3/src/Makefile.am 2008-05-12 23:31:00.000000000 +0200
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# Copyright © 2003 Keith Packard, Noah Levitt
#
# Permission to use, copy, modify, distribute, and sell this software and its
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXfont-1.3.2/src/Makefile.in new/libXfont-1.3.3/src/Makefile.in
--- old/libXfont-1.3.2/src/Makefile.in 2008-03-06 04:00:51.000000000 +0100
+++ new/libXfont-1.3.3/src/Makefile.in 2008-07-02 21:30:23.000000000 +0200
@@ -15,8 +15,6 @@
@SET_MAKE@
#
-# $Id$
-#
# Copyright © 2003 Keith Packard, Noah Levitt
#
# Permission to use, copy, modify, distribute, and sell this software and its
++++++ libXft-2.1.12.tar.bz2 -> libXft-2.1.13.tar.bz2 ++++++
++++ 11150 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/libXft-2.1.12/ChangeLog new/libXft-2.1.13/ChangeLog
--- old/libXft-2.1.12/ChangeLog 2006-12-07 11:17:19.000000000 +0100
+++ new/libXft-2.1.13/ChangeLog 2008-07-02 21:43:03.000000000 +0200
@@ -1,20 +1,346 @@
-2006-06-03 Daniel Stone
+commit 1a34928cd823ef1452b973bd7c4c1d12cd976bba
+Author: Adam Jackson
+Date: Wed Jul 2 15:42:37 2008 -0400
- * configure.ac:
- * include/X11/Xft/Xft.h:
- Bump to 2.1.9.
-
- * src/*.c:
- * include/X11/Xft/Xft.h:
- Bug #4711: Don't export unnecessary symbols. (Alan Coopersmith)
+ libXft 2.1.13
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 19240d3605b5f1e88ca5509afffd48acdb7e1c5f
+Author: Julien Cristau
+Date: Wed Jun 11 02:12:05 2008 +0200
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Revert "Drop Requires, use Requires.private instead."
+
+ This reverts commit a1c78ce68c5f2106c38b6cb93a6b22420e1a80ab.
+
+ Unfortunately this doesn't work on old pkg-config, which made
+ Requires.private completely useless. That's fixed in 0.22, but...
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit a1c78ce68c5f2106c38b6cb93a6b22420e1a80ab
+Author: Julien Cristau
+Date: Tue Jun 10 17:29:27 2008 +0200
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Drop Requires, use Requires.private instead.
+
+ Users of libXft don't need to link with fontconfig, freetype and
+ Xrender directly if they don't use them.
+commit 541c6194d986e7849ee9541a9fd60b0724647a44
+Author: Adam Jackson
+Date: Mon Mar 24 12:10:19 2008 -0400
+
+ Bug #14232: Fix XftDrawRect when Render not supported.
+
+commit 8661a88789dce4fe06d45faec70f8e74834abdd6
+Author: Matthieu Herrb
+Date: Sun Mar 9 08:28:43 2008 +0100
+
+ nuke RCS Ids
+
+commit 9e25c9019bd6788076c12cb4356c7d27d6c7d9af
+Author: James Cloos
+Date: Thu Dec 6 16:38:28 2007 -0500
+
+ Replace static ChangeLog with dist-hook to generate from git log
+
+commit 8a7f3d450c1f339f429dbce55df523d026c92375
+Author: Stefan Dirsch
+Date: Sun Nov 4 11:31:44 2007 -0800
+
+ Register objects used by libXft.
+
+ libXft uses XFT_MAX_GLYPH_MEMORY without first registering with fontconfig.
+
+commit 8ae5ea8c75a7850fa0aca0acc3962b6263f55094
+Author: Karl Tomlinson
+Date: Wed Sep 12 12:00:43 2007 +0100
+
+ XftFontOpenInfo: Use of uninitialised value of size 8 (bug 11200)
+
+ This is due to XftFontInfoFill using the binary representation of the
+ XftFontInfo to generate fi->hash.
+
+ With 64-bit pointers there is padding between .hash and .file in struct
+ _XftFontInfo. This padding is not initialized, and the hash uses these
+ bytes.
+
+ This will interfere with finding "a matching previously opened font" in
+ XftFontOpenInfo, and XftFontInfoEqual, which uses memcmp, will have similar
+ problems.
+
+ This fix makes no assumptions about the sizes and alignment of members of
+ struct _XftFontInfo by using memset. (It also makes no assumptions about
+ what FcPatternGet* does to its output parameter when it returns
+ FcResultNoMatch.)
+
+commit a782fe3fbed05344e2a12f53ede6101e120ed485
+Author: James Cloos
+Date: Mon Sep 3 05:53:39 2007 -0400
+
+ Add *~ to .gitignore to skip patch/emacs droppings
+
+commit 3c68c68fc20b875b405f2640778e32a41a807e27
+Author: Daniel Stone
+Date: Thu Dec 7 12:20:44 2006 +0200
+
+ bump to 2.1.12
+
+commit 22112a0ee3bd16b40e414bac32c532a73cbabbcb
+Author: Daniel Stone
+Date: Thu Dec 7 12:20:05 2006 +0200
+
+ XftNameUnparse: re-export to public API (bug #8900)
+ Fix botched git import, which reverted some changes from CVS, by
+ re-exporting XftNameUnparse.
+
+commit 6159d185048fbbb67627667d60dcd475def5bb44
+Author: Adam Jackson
+Date: Fri Oct 13 17:08:55 2006 -0400
+
+ Bump to 2.1.11
+
+commit 661199d47ff8e9842542f9e407da50629c8a17b6
+Author: Adam Jackson
+Date: Fri Oct 13 16:18:47 2006 -0400
+
+ Bump to 2.1.10
+
+commit 5e5d0c7597e7f494ad3010f6d4656c5209b09f88
+Author: Alan Coopersmith
+Date: Thu Jul 13 14:58:58 2006 -0700
+
+ renamed: .cvsignore -> .gitignore
+
+commit 8fc012344f8f072ee3bd1b09c336fed8d47826c5
+Author: Kjartan Maraas
+Date: Thu Jul 13 10:28:30 2006 -0400
+
+ Bug #7259: Various Coverity fixes.
+
+commit 824f87ba102e36808c59e92d7f527ca2f8b00026
+Author: Daniel Stone
+Date: Sat Jun 3 10:41:03 2006 +0000
+
+ Bug #4711: Don't export unnecessary symbols. (Alan Coopersmith). Bump to
+ 2.1.9.
+
+commit 250b95f857cdd7fadab9e06f1a6f69706467aac2
+Author: Kevin E Martin
+Date: Thu Dec 15 00:24:30 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit 2a43efac053b9fa0a460d47f5154511cfaf4f2ba
+Author: Kevin E Martin
+Date: Sat Dec 3 05:49:44 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit 88a1de23e126cde06bf4136b56007dc24ad991e8
+Author: Eric Anholt
+Date: Sun Nov 20 23:17:41 2005 +0000
+
+ Add/improve libs .cvsignores.
+
+commit bcbcdcdb0f41b61351454db5032a514215f2f089
+Author: Kevin E Martin
+Date: Sat Nov 19 07:15:49 2005 +0000
+
+ Update pkgconfig files to separate library build-time dependencies from
+ application build-time dependencies, and update package deps to work
+ with separate build roots.
+
+commit 143f9e1b8d328ebc806067fb44809a8a8fd419e4
+Author: Kevin E Martin
+Date: Wed Oct 19 02:48:10 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 34dc7dbd584f2bbef39248c26236186e08c79a25
+Author: Kevin E Martin
+Date: Wed Oct 19 02:46:56 2005 +0000
+
+ lib/Xcomposite/Xcomposite.h
+ lib/Xft/Imakefile
+ lib/Xft/Xft.h Update library version numbers to match updated package
+ versions.
+ Update driver version numbers for RC1.
+
+commit 11bc8208939991e9cd3eba2900827fd2e37b04a5
+Author: Kevin E Martin
+Date: Wed Oct 5 19:46:16 2005 +0000
+
+ Clean up generated files
+
+commit edfb44c93c03c41f13240af318a45f0f04dde6d1
+Author: Alan Coopersmith
+Date: Thu Aug 4 16:15:48 2005 +0000
+
+ If --with-freetype-config is not specified, try pkgconfig freetype2, then
+ fall back to freetype-config if pkgconfig fails.
+
+commit a09401affaf007aef2585711cd5eb499f554be9b
+Author: Kevin E Martin
+Date: Fri Jul 29 21:22:51 2005 +0000
+
+ Various changes preparing packages for RC0:
+ - Verify and update package version numbers as needed
+ - Implement versioning scheme
+ - Change bug address to point to bugzilla bug entry form
+ - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+ reenable it)
+ - Fix makedepend to use pkgconfig and pass distcheck
+ - Update build script to build macros first
+ - Update modular Xorg version
+
+commit 0dd89a9e7ba09ed0c3f90a415b506a4ed89b91bb
+Author: Søren Sandmann Pedersen
+Date: Wed Jul 27 21:48:38 2005 +0000
+
+ Build system for Xft
+
+commit db7a51a120898eda2824ec15d55641589571ed5d
+Author: Daniel Stone
+Date: Sun Jul 3 07:00:57 2005 +0000
+
+ Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.
+ Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings.
+ Add #include or , as appropriate, to all
+ source files in the xserver/xorg tree, predicated on defines of
+ HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to
+ .
+
+commit 403c9f9886cea9fd390a242e7c031ba2cc26217f
+Author: Alan Coopersmith
+Date: Fri Jun 24 22:43:20 2005 +0000
+
+ Sync with Xft from xlibs CVS (2.1.7 plus man page updates from Branden
+ Robinson) - see lib/Xft/ChangeLog for full details
+
+commit 1d14cc37d43bf349ee18e748f62913a0963f6e85
+Author: Egbert Eich
+Date: Tue May 17 08:10:10 2005 +0000
+
+ gcc4 allows to check if sentinels are correct (a sentinel is the
+ terminating element in a varargs list). A sentinel needs to be NULL,
+ not 0 - which doesn't make a difference on 32bit but matters on 64bit.
+ Furthermore it can be told that functions have a printf-like format
+ string and argument list so that they can verify that both match. To
+ use these features certain attributes need to be set - which are
+ compiler specific. To do this we define macros which are expanded
+ depending on the compiler version. For now we put those in
+ include/Xfuncproto.h (the XFree86 DDX layer contains a file compiler.h
+ which however is not visible outside the DDX) (Bugzilla #3268).
+
+commit 0161d08ecd543c80e5625bf63d0091dbccd95f4e
+Author: Søren Sandmann Pedersen
+Date: Fri Aug 13 19:03:15 2004 +0000
+
+ Fri Aug 13 21:01:34 2004 Soeren Sandmann
+ Fix the build
+
+commit 0641e99b21eead5aaee0c1136dd2d640028f6783
+Author: Søren Sandmann Pedersen
+Date: Fri Aug 13 18:24:06 2004 +0000
+
+ Fri Aug 13 19:53:10 2004 Soeren Sandmann
+ Fix for lockups on some versions of Matrox Mystique. #687, Patch from Mike
+ Harris.
+ Call xf86EnableDisableFBAccess though the function pointer instead of
+ directly. #1041, Patch from Aaron Plattner.
+ Swap the phsyical size of the screen when rotiation. #1050, Patch from
+ Aaron Plattner.
+ Fri Aug 13 19:47:12 2004 Soeren Sandmann
+ Make HAVE_FT_BITMAP_SIZE_Y_PPEM conditional on the FreeType version instead
+ of proping it. This way it will work with the monolithic version too.
+ #1062, Patch by Owen Taylor.
+
+commit 14c188e8b0a0d88f97bcde21c8e1b1da8541bdf8
+Author: Kevin E Martin
+Date: Wed Aug 11 23:37:34 2004 +0000
+
+ Called strlen with (f->file) without checking for NULL (which happens when
+ directly using FT_Face objects) (Bug #1047, Keith Packard).
+
+commit 591dcad65f73450a07ac7477a3a827d95eb6f726
+Author: Egbert Eich
+Date: Fri Apr 23 18:43:42 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit c7e70c7e31897e00caaeb177176a8c24b834bc78
+Author: Egbert Eich
+Date: Sun Mar 14 08:32:10 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 113366a92f315a2178d19c6bb9bed54109697864
+Author: Egbert Eich
+Date: Thu Mar 11 14:16:10 2004 +0000
+
+ file Xft.3.in was initially added on branch XORG-RELEASE-1.
+
+commit 30761fcb5a6f3f2f23466f1b0ec1d290b5002e4e
+Author: Egbert Eich
+Date: Thu Mar 11 14:16:09 2004 +0000
+
+ file NEWS was initially added on branch XORG-RELEASE-1.
+
+commit be5842a55ddd89141de2f238e9b41541a247d13b
+Author: Egbert Eich
+Date: Thu Mar 11 14:16:09 2004 +0000
+
+ file AUTHORS was initially added on branch XORG-RELEASE-1.
+
+commit 4214b9fb11baea4347bb2279b800819ee9792c46
+Author: Egbert Eich
+Date: Tue Mar 9 16:52:30 2004 +0000
+
+ file README was initially added on branch XORG-RELEASE-1.
+
+commit 14f8861ef153e64359e062a96212eb5358a32fd4
+Author: Egbert Eich
+Date: Tue Mar 9 16:52:30 2004 +0000
+
+ file INSTALL was initially added on branch XORG-RELEASE-1.
+
+commit fabef42954896dca3d43fb414c564e9750112bf5
+Author: Egbert Eich
+Date: Tue Mar 9 16:52:30 2004 +0000
+
+ file COPYING was initially added on branch XORG-RELEASE-1.
+
+commit 3ff3e952c6095488466f71da06c6664a056e4c03
+Author: Egbert Eich
+Date: Wed Mar 3 12:11:28 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 00bdde8b2e4521b5058ee988c32dd814b852813d
+Author: Egbert Eich
+Date: Thu Feb 26 13:35:33 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit f328c0a0fff3ec647c3f1d7c06b3d701850eb955
+Author: Egbert Eich
+Date: Thu Feb 26 09:22:43 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 1781965aa5fac8f0737251ca883301e1aec7b12b
+Author: Kaleb Keithley
+Date: Tue Nov 25 19:28:09 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit ac1033d4dc0ff95ab31dd2eb4752e7b4520fe819
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:48:48 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 52a3d6a04aa1a18223059334f8d5ed2955461b7d
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:48:48 2003 +0000
+
+ Initial revision
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/libXft-2.1.12/configure.ac new/libXft-2.1.13/configure.ac
--- old/libXft-2.1.12/configure.ac 2006-12-07 11:20:33.000000000 +0100
+++ new/libXft-2.1.13/configure.ac 2008-07-02 21:40:20.000000000 +0200
@@ -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
@@ -32,7 +30,7 @@
dnl not possible to extract the version number here from Xft.h
dnl Please bump the minor library number at each release as well.
dnl
-AC_INIT(libXft, 2.1.12, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXft)
+AC_INIT(libXft, 2.1.13, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXft)
AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([dist-bzip2])
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/libXft-2.1.12/COPYING new/libXft-2.1.13/COPYING
--- old/libXft-2.1.12/COPYING 2006-12-07 11:17:19.000000000 +0100
+++ new/libXft-2.1.13/COPYING 2008-05-12 23:31:03.000000000 +0200
@@ -1,4 +1,3 @@
-$Id$
Copyright © 2001,2003 Keith Packard
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/libXft-2.1.12/include/X11/Xft/XftCompat.h new/libXft-2.1.13/include/X11/Xft/XftCompat.h
--- old/libXft-2.1.12/include/X11/Xft/XftCompat.h 2006-12-07 11:17:19.000000000 +0100
+++ new/libXft-2.1.13/include/X11/Xft/XftCompat.h 2008-05-12 23:31:03.000000000 +0200
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2001 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
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/libXft-2.1.12/include/X11/Xft/Xft.h new/libXft-2.1.13/include/X11/Xft/Xft.h
--- old/libXft-2.1.12/include/X11/Xft/Xft.h 2006-12-07 11:20:30.000000000 +0100
+++ new/libXft-2.1.13/include/X11/Xft/Xft.h 2008-07-02 21:40:28.000000000 +0200
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -33,7 +31,7 @@
#define XFT_MAJOR 2
#define XFT_MINOR 1
-#define XFT_REVISION 12
+#define XFT_REVISION 13
#define XFT_VERSION ((XFT_MAJOR * 10000) + (XFT_MINOR * 100) + (XFT_REVISION))
#define XftVersion XFT_VERSION
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/libXft-2.1.12/Makefile.am new/libXft-2.1.13/Makefile.am
--- old/libXft-2.1.12/Makefile.am 2006-12-07 11:17:19.000000000 +0100
+++ new/libXft-2.1.13/Makefile.am 2008-05-12 23:31:03.000000000 +0200
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# Copyright © 2003 Keith Packard, Noah Levitt
#
# Permission to use, copy, modify, distribute, and sell this software and its
@@ -31,3 +29,13 @@
CLEANFILES = xft-config
EXTRA_DIST = xft-config.in xft.pc.in autogen.sh
+
+EXTRA_DIST += 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)
+
+dist-hook: ChangeLog
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/libXft-2.1.12/man/Xft.3 new/libXft-2.1.13/man/Xft.3
--- old/libXft-2.1.12/man/Xft.3 2006-12-07 11:27:58.000000000 +0100
+++ new/libXft-2.1.13/man/Xft.3 2008-07-02 21:43:02.000000000 +0200
@@ -1,6 +1,4 @@
.\"
-.\" $Id$
-.\"
.\" Copyright © 2000 Keith Packard
.\"
.\" Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,7 @@
.\" TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
.\" PERFORMANCE OF THIS SOFTWARE.
.\"
-.TH Xft 3 "Version 2.1.12" "Xft"
+.TH Xft 3 "Version 2.1.13" "Xft"
.SH NAME
Xft \- X FreeType interface library
.SH DESCRIPTION
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/libXft-2.1.12/man/Xft.3.in new/libXft-2.1.13/man/Xft.3.in
--- old/libXft-2.1.12/man/Xft.3.in 2006-12-07 11:17:19.000000000 +0100
+++ new/libXft-2.1.13/man/Xft.3.in 2008-05-12 23:31:03.000000000 +0200
@@ -1,6 +1,4 @@
.\"
-.\" $Id$
-.\"
.\" Copyright © 2000 Keith Packard
.\"
.\" Permission to use, copy, modify, distribute, and sell this software and its
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/libXft-2.1.12/man/xft-config.1 new/libXft-2.1.13/man/xft-config.1
--- old/libXft-2.1.12/man/xft-config.1 2006-12-07 11:27:58.000000000 +0100
+++ new/libXft-2.1.13/man/xft-config.1 2008-07-02 21:43:02.000000000 +0200
@@ -17,7 +17,7 @@
.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE DOCUMENT OR THE USE OR OTHER
.\" DEALINGS IN THE DOCUMENT.
-.TH xft-config 1 "Version 2.1.12" "Xft"
+.TH xft-config 1 "Version 2.1.13" "Xft"
.SH NAME
xft\-config \- report Xft version, compiler, linker, and/or installation \
directory information
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/libXft-2.1.12/missing new/libXft-2.1.13/missing
--- old/libXft-2.1.12/missing 2006-12-07 11:27:43.000000000 +0100
+++ new/libXft-2.1.13/missing 2008-07-02 21:42:56.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/libXft-2.1.12/src/Makefile.am new/libXft-2.1.13/src/Makefile.am
--- old/libXft-2.1.12/src/Makefile.am 2006-12-07 11:17:19.000000000 +0100
+++ new/libXft-2.1.13/src/Makefile.am 2008-07-02 21:42:29.000000000 +0200
@@ -24,7 +24,7 @@
libXft_la_LIBADD = @FONTCONFIG_LIBS@ @FREETYPE_LIBS@ @XRENDER_LIBS@
# -version-number requires libtool >= 1.5
-libXft_la_LDFLAGS = -version-number 2:1:2 -no-undefined
+libXft_la_LDFLAGS = -version-number 2:1:13 -no-undefined
libXftincludedir = $(includedir)/X11/Xft
libXftinclude_HEADERS = \
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/libXft-2.1.12/src/xftcolor.c new/libXft-2.1.13/src/xftcolor.c
--- old/libXft-2.1.12/src/xftcolor.c 2006-12-07 11:17:19.000000000 +0100
+++ new/libXft-2.1.13/src/xftcolor.c 2008-05-12 23:31:03.000000000 +0200
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
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/libXft-2.1.12/src/xftcore.c new/libXft-2.1.13/src/xftcore.c
--- old/libXft-2.1.12/src/xftcore.c 2006-12-07 11:17:19.000000000 +0100
+++ new/libXft-2.1.13/src/xftcore.c 2008-05-12 23:31:03.000000000 +0200
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
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/libXft-2.1.12/src/xftdbg.c new/libXft-2.1.13/src/xftdbg.c
--- old/libXft-2.1.12/src/xftdbg.c 2006-12-07 11:17:19.000000000 +0100
+++ new/libXft-2.1.13/src/xftdbg.c 2008-05-12 23:31:03.000000000 +0200
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
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/libXft-2.1.12/src/xftdpy.c new/libXft-2.1.13/src/xftdpy.c
--- old/libXft-2.1.12/src/xftdpy.c 2006-12-07 11:17:19.000000000 +0100
+++ new/libXft-2.1.13/src/xftdpy.c 2008-05-12 23:31:03.000000000 +0200
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
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/libXft-2.1.12/src/xftdraw.c new/libXft-2.1.13/src/xftdraw.c
--- old/libXft-2.1.12/src/xftdraw.c 2006-12-07 11:17:19.000000000 +0100
+++ new/libXft-2.1.13/src/xftdraw.c 2008-05-12 23:31:03.000000000 +0200
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -809,7 +807,10 @@
}
else if (_XftDrawCorePrepare (draw, color))
{
- XftRectCore (draw, color, x, y, width, height);
+ /* note: not XftRectCore() */
+ XSetForeground (draw->dpy, draw->core.gc, color->pixel);
+ XFillRectangle (draw->dpy, draw->drawable, draw->core.gc,
+ x, y, width, height);
}
}
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/libXft-2.1.12/src/xftextent.c new/libXft-2.1.13/src/xftextent.c
--- old/libXft-2.1.12/src/xftextent.c 2006-12-07 11:17:19.000000000 +0100
+++ new/libXft-2.1.13/src/xftextent.c 2008-05-12 23:31:03.000000000 +0200
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
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/libXft-2.1.12/src/xftfont.c new/libXft-2.1.13/src/xftfont.c
--- old/libXft-2.1.12/src/xftfont.c 2006-12-07 11:17:19.000000000 +0100
+++ new/libXft-2.1.13/src/xftfont.c 2008-05-12 23:31:03.000000000 +0200
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
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/libXft-2.1.12/src/xftfreetype.c new/libXft-2.1.13/src/xftfreetype.c
--- old/libXft-2.1.12/src/xftfreetype.c 2006-12-07 11:17:19.000000000 +0100
+++ new/libXft-2.1.13/src/xftfreetype.c 2008-05-12 23:31:03.000000000 +0200
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -392,6 +390,13 @@
return FcFalse;
/*
+ * Initialize the whole XftFontInfo so that padding doesn't interfere with
+ * hash or XftFontInfoEqual().
+ */
+
+ memset (fi, '\0', sizeof(*fi));
+
+ /*
* Find the associated file
*/
switch (FcPatternGetString (pattern, FC_FILE, 0, &filename)) {
@@ -419,8 +424,6 @@
else if (FcPatternGetFTFace (pattern, FC_FT_FACE, 0, &face) == FcResultMatch
&& face)
fi->file = _XftGetFaceFile (face);
- else
- fi->file = 0;
if (!fi->file)
goto bail0;
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/libXft-2.1.12/src/xftglyphs.c new/libXft-2.1.13/src/xftglyphs.c
--- old/libXft-2.1.12/src/xftglyphs.c 2006-12-07 11:17:19.000000000 +0100
+++ new/libXft-2.1.13/src/xftglyphs.c 2008-05-12 23:31:03.000000000 +0200
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
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/libXft-2.1.12/src/xftinit.c new/libXft-2.1.13/src/xftinit.c
--- old/libXft-2.1.12/src/xftinit.c 2006-12-07 11:17:19.000000000 +0100
+++ new/libXft-2.1.13/src/xftinit.c 2008-05-12 23:31:03.000000000 +0200
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
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/libXft-2.1.12/src/xftint.h new/libXft-2.1.13/src/xftint.h
--- old/libXft-2.1.12/src/xftint.h 2006-12-07 11:17:19.000000000 +0100
+++ new/libXft-2.1.13/src/xftint.h 2008-05-12 23:31:03.000000000 +0200
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
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/libXft-2.1.12/src/xftlist.c new/libXft-2.1.13/src/xftlist.c
--- old/libXft-2.1.12/src/xftlist.c 2006-12-07 11:17:19.000000000 +0100
+++ new/libXft-2.1.13/src/xftlist.c 2008-05-12 23:31:03.000000000 +0200
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
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/libXft-2.1.12/src/xftname.c new/libXft-2.1.13/src/xftname.c
--- old/libXft-2.1.12/src/xftname.c 2006-12-07 11:17:45.000000000 +0100
+++ new/libXft-2.1.13/src/xftname.c 2008-05-12 23:31:03.000000000 +0200
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -28,6 +26,7 @@
{ XFT_CORE, FcTypeBool, },
{ XFT_XLFD, FcTypeString, },
{ XFT_RENDER, FcTypeBool, },
+ { XFT_MAX_GLYPH_MEMORY, FcTypeInteger, },
};
#define NUM_OBJECT_TYPES (sizeof _XftObjectTypes / sizeof _XftObjectTypes[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/libXft-2.1.12/src/xftrender.c new/libXft-2.1.13/src/xftrender.c
--- old/libXft-2.1.12/src/xftrender.c 2006-12-07 11:17:19.000000000 +0100
+++ new/libXft-2.1.13/src/xftrender.c 2008-05-12 23:31:03.000000000 +0200
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
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/libXft-2.1.12/src/xftstr.c new/libXft-2.1.13/src/xftstr.c
--- old/libXft-2.1.12/src/xftstr.c 2006-12-07 11:17:19.000000000 +0100
+++ new/libXft-2.1.13/src/xftstr.c 2008-05-12 23:31:03.000000000 +0200
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
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/libXft-2.1.12/src/xftswap.c new/libXft-2.1.13/src/xftswap.c
--- old/libXft-2.1.12/src/xftswap.c 2006-12-07 11:17:19.000000000 +0100
+++ new/libXft-2.1.13/src/xftswap.c 2008-05-12 23:31:03.000000000 +0200
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2002 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
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/libXft-2.1.12/src/xftxlfd.c new/libXft-2.1.13/src/xftxlfd.c
--- old/libXft-2.1.12/src/xftxlfd.c 2006-12-07 11:17:19.000000000 +0100
+++ new/libXft-2.1.13/src/xftxlfd.c 2008-05-12 23:31:03.000000000 +0200
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
++++++ libXrandr-1.2.2.tar.bz2 -> libXrandr-1.2.3.tar.bz2 ++++++
++++ 21512 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/libXrandr-1.2.2/ChangeLog new/libXrandr-1.2.3/ChangeLog
--- old/libXrandr-1.2.2/ChangeLog 2007-09-05 18:56:56.000000000 +0200
+++ new/libXrandr-1.2.3/ChangeLog 2008-07-02 21:28:33.000000000 +0200
@@ -1,231 +1,536 @@
-2006-02-12 Alan Coopersmith
+commit bf476779616b24c6456339bc77896460f1a2545a
+Author: Adam Jackson
+Date: Wed Jul 2 15:28:08 2008 -0400
- * man/Makefile.am:
- Bug #5628 https://bugs.freedesktop.org/show_bug.cgi?id=5628
- Shadow pages not created correctly when MANDIR & MANSUFFIX don't match.
+ libXrandr 1.2.3
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 203fc002b6948c3942f0461a0346dd07b633222d
+Author: thb
+Date: Mon Jun 23 13:25:12 2008 -0400
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Bug #16430: Ignore ConfigureNotify on non-root windows in UpdateConfiguration
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 332eee90c4d00be3b11049e0261323abe89a96dc
+Author: Peter Hutterer
+Date: Mon May 19 17:34:36 2008 +0930
- * man/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ 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
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 824f3d4a3a4669526a5c391c6668df0384b49cdb
+Author: Julien Cristau
+Date: Tue Feb 5 15:37:32 2008 +0100
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Bug #14388: Remove XRRScreenConfig() and XRRConfig() from Xrandr.h.
+
+ It seems that they were never actually implemented.
+ Also remove the corresponding manpage symlinks.
-2005-12-02 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit dc0ce2e363dbdac560fc2a8c1296c5468d75f644
+Author: Matthieu Herrb
+Date: Sun Mar 9 08:37:17 2008 +0100
- * configure.ac:
- * src/Makefile.am:
- Add check and cflags for malloc(0) returning NULL.
+ nuke RCS Ids
-2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 23a47035818390ca197179a9a69a54badb370990
+Author: Julien Cristau
+Date: Tue Feb 5 15:35:30 2008 +0100
- * xrandr.pc.in:
- Update pkgconfig files to separate library build-time dependencies
- from application build-time dependencies.
- * configure.ac:
- Update dependencies to work with separate build roots.
+ Hide some private symbols.
+
+ XExtensionInfo, XRRExtensionName, XRRFindDisplay, _XRRHasRates and
+ _XRRVersionHandler are internal to libXrandr. Don't export them.
-2005-11-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 732ae92882383b33384791c2e9136a54e0fd06f3
+Author: James Cloos
+Date: Thu Dec 6 16:38:42 2007 -0500
- * configure.ac:
- * src/Makefile.am:
- Fix pkgconfig deps for separate build roots.
+ Replace static ChangeLog with dist-hook to generate from git log
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit e56fa06624dc240dbe8d3e127cc3b65da580fe6e
+Merge: 27b91d1... 0294912...
+Author: James Cloos
+Date: Sun Nov 11 10:27:35 2007 -0500
- * configure.ac:
- Update package version number for X11R7 RC2 release.
+ Merge branch 'master' of git://git.freedesktop.org/git/xorg/lib/libXrandr
-2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 029491243b43c2e03a62c143ac21941449f335aa
+Author: Eric Anholt
+Date: Wed Sep 5 10:01:06 2007 -0700
- * configure.ac:
- * src/Makefile.am:
- Update pkgcheck dependencies to work with separate build roots.
+ Bump version to 1.2.2.
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 27b91d1d62acb70da7d131ee4b6da265d64cb835
+Author: James Cloos
+Date: Mon Sep 3 05:53:48 2007 -0400
- * configure.ac:
- Update package version number for RC1 release.
+ Add *~ to .gitignore to skip patch/emacs droppings
-2005-10-12 Alan Coopersmith
+commit 126143add5349fc34488b23d54d1bdcc7e8847b9
+Author: Keith Packard
+Date: Tue Jul 3 09:58:09 2007 -0700
- * configure.ac:
- * man/Makefile.am:
- Use sed to fill in variables in man page
- Add shadow man pages for man pages that document multiple functions.
-
-2005-07-08 Keith Packard
+ CrtcChange event format conversion was using 'height' for 'width'.
+
+ CrtcChange events were getting the source 'height' value stored in the
+ 'width' target in both conversion directions.
- * .cvsignore:
- * man/.cvsignore:
- * src/.cvsignore:
- * src/Makefile.am:
- Add .cvsignore files
- Switch _la_CFLAGS for AM_CFLAGS to clean up directory
+commit 3e753542bcf0fd49fe977e56b7ab7e540bbd4282
+Author: Keith Packard
+Date: Sun Mar 4 20:03:59 2007 -0800
-2005-06-09 Alexander Gottwald
+ Set version to 1.2.1 for release.
- * configure.ac:
- Require renderproto instead of render for pkgconfig
+commit c279b64ccca18b14974e413b0b1d55ac81abceda
+Author: Fredrik Höglund
+Date: Tue Feb 20 22:30:00 2007 +0100
-2005-01-16 Chris Larson
+ Fix the use of a C++ keyword as a parameter name in Xrandr.h
- * configure.ac: Fix to work with automake 1.9.x.
+commit 75d9944484651d4180e3079a739be4edb36545fe
+Author: Keith Packard
+Date: Sun Feb 18 20:57:31 2007 -0800
-2004-09-19 Carlos Romero
+ Reset version from 1.2.0.0 to 1.2.0
- * Makefile.am:
- Include man pages in EXTRA_DIST.
+commit ac82ee50f3938b7b4d6dbcec850d38500258bfe0
+Author: Keith Packard
+Date: Thu Feb 15 16:56:11 2007 -0800
-2004-02-03 Jim Gettys
+ Must pass size information in SetCrtcGamma request.
- * AUTHORS: Get a author's list.
+commit 9c4fea702a0382689898fc14cbdab456fb18c403
+Merge: c85237a... 382b7a3...
+Author: Keith Packard
+Date: Wed Jan 31 14:24:57 2007 -0800
-2004-01-15 Daniel Stone
- * Tag release 1.0.2 for first freedesktop.org clientside lib release.
+ Merge 64-bit fixes in
-2004-01-15 Harold L Hunt II
- * Makefile.am: Pass -no-undefined to libtool via LDFLAGS. Add
- -lXext and -lXrender to LIBADD.
+commit c85237a1651ae8e1abe9ae442ffa04dcb20c1d3e
+Author: Keith Packard
+Date: Wed Jan 31 14:20:33 2007 -0800
-2003-06-12 07:12 eich
+ Fix read sizes for 64-bit machines.
+
+ Be consistent in variable usage:
+ nbytes = network byte length.
+ rbytes = memory byte length.
+ nbytesRead = actual network bytes read.
+ Malloc rbytes data to pass to _XRead*, but use nbytes as the
+ amount of data to read (yes, this is insane, welcome to Xlib).
+ Some of this patch is semi-gratuitous, but the goal is to be consistent
+ everywhere.
- * Xrandr.man: 214. Changed any occurance of x86_64 to AMD64, the
- official name of the
- architecture (Egbert Eich).
- 213. Removed Copyright sign from man pages as this causes some
- formatters
- to choke (Egbert Eich).
+commit 382b7a3cfabdd37a6231e18a2ac92bc8a3722b79
+Author: Eric Anholt
+Date: Tue Jan 16 13:10:49 2007 -0800
-2003-05-29 14:48 herrb
+ Return a valid property info even if we lack valid value sets.
+
+ Previously, XRRQueryOutputProperty90 would return an uninitialized pointer if
+ num_values was 0.
- * Xrandr.man: Fix manual pages typos (Bugzilla #316, Jens
- Schweikhardt).
+commit 36a4a633a93a89bd854f49e670777925c9751de3
+Author: Keith Packard
+Date: Sat Jan 6 12:42:47 2007 -0800
-2003-05-29 08:04 dawes
+ Avoid nested LockDisplay calls.
+
+ XRRFindDisplay must make extension requests that use LockDisplay, so don't
+ call it with the display locked, instead pass the info around to the
+ internal functions that were calling it themselves, having acquired the info
+ before the outer LockDisplay is called.
- * Xrandr.man: Remove reference to non-existent Xrender(3) man page
- (reported to webmaster).
+commit d70a3e7f111cb65c37edfa78ca66449338d3bb8f
+Author: Keith Packard
+Date: Sat Dec 30 13:11:10 2006 -0800
-2003-05-27 15:26 tsi
+ Failed to copy rotations from reply to XRRCrtcInfo.
+
+ XRRGetCrtcInfo was not moving the rotations value from the wire reply
+ structure to the XRRCrtcInfo being returned, leaving the value uninitialized.
- * Xrandr.c: 194. IRIX 6.5 build fixes and noise reductions (Marc
- La France).
+commit bc75a92cac23dad4a661a13e6af121f6072cecc8
+Merge: 7fcdcbb... 370fa28...
+Author: Dave Airlie
+Date: Sat Dec 2 11:27:36 2006 +1100
-2003-03-24 20:18 dawes
+ Merge branch 'randr-1.2'
- * Xrandr-def.cpp: 26. Updates for building on OS/2 (#5650, Frank
- Giessler).
+commit 370fa28a6afd70ec91411edf1413c0e448ae45b6
+Author: Keith Packard
+Date: Thu Nov 30 21:56:59 2006 -0800
-2003-02-07 03:21 eich
+ Add initial implementation of crtc gamma and mode adding requests.
+
+ They build. More testing seems indicated.
- * Xrandr.c: - followup for patch 844 - fixed typo in savage driver
+commit 7fcdcbb0f9c4736bd678be7f9bf76d472293233f
+Merge: 875867f... 0dba1be...
+Author: Eric Anholt
+Date: Mon Nov 27 15:41:03 2006 -0800
-2003-02-05 04:59 eich
+ Merge branch 'randr-1.2'
+
+ Conflicts:
+
+ configure.ac
- * Xrandr.c: 844. Fixing a double free in libXRandr (Egbert Eich).
+commit 0dba1be7969aa56f934d93889cbd589b3dafd3d4
+Author: Keith Packard
+Date: Mon Nov 20 20:59:18 2006 -0800
-2002-11-29 18:27 tsi
+ Change properties to have a pending value and report valid values.
+
+ Pending values are transferred to current values at mode set, allowing a
+ queue of values to accrue in preparation for the modeset operation while
+ still reporting valid 'current' values for applications.
+
+ The set of valid values is also available so applications can present
+ a reasonable list to the user during configuration.
- * Xrandr.c: Build fix
+commit 8edabfeba65562f026111b35ec14a9801b4b6a5c
+Author: Keith Packard
+Date: Thu Nov 16 13:35:46 2006 -0800
-2002-11-26 21:37 keithp
+ Remove RandR output options.
+
+ Options are to be implemented as properties instead.
- * Xrandr.c: LockDisplay re-executed during configuration fetching
+commit 7ac8dba76fe33b13620e023699bf971fe8c99fb2
+Author: Eric Anholt
+Date: Thu Nov 9 20:26:33 2006 -0800
-2002-11-03 16:21 keithp
+ Return the right actual property type for XRRGetOutputProperty.
- * Xrandr.c: correct randr reply length computation
+commit b49342b58d17267fae81205f1a89263ec4d3d114
+Author: Eric Anholt
+Date: Thu Nov 9 17:07:55 2006 -0800
-2002-10-14 11:01 keithp
+ Add support for various output property requests.
+
+ These should be reviewed by someone with proto clue, which I'm generally
+ lacking.
- * Xrandr.c, Xrandr.h, Xrandrint.h: Add refresh rates to RandR
- (v1.1)
+commit 6676505b6012c97d2f711a84237fa14a62d1d33d
+Author: Keith Packard
+Date: Wed Nov 1 00:25:45 2006 -0800
-2002-10-08 06:00 keithp
+ Moving physical size from mode to output.
+
+ Follows protocol change which places physical size
+ information in the output rather than (inappropriately)
+ in each mode line.
- * Xrandr.man: Add comments about interaction of reflection and
- rotation (from Jim Gettys)
+commit 875867f275803682e58f0649f054a83293c6e02c
+Author: Adam Jackson
+Date: Fri Oct 13 17:09:57 2006 -0400
-2002-10-02 15:11 tsi
+ Bump to 1.1.2
- * Xrandr.man: Fix man page
+commit 6eacf491a094add48363d530357dce0d25b8f244
+Author: Adam Jackson
+Date: Fri Oct 13 16:25:00 2006 -0400
-2002-10-02 09:55 keithp
+ Bump to 1.1.1
- * Imakefile, Xrandr.man: Add Xrandr manual, update xrandr manual
+commit d914d05d34991b4cfa3af411fd2a3e281ea0e73b
+Author: Jamey Sharp
+Date: Thu Oct 12 17:42:48 2006 -0700
-2002-10-01 11:24 keithp
+ Do not call UnlockDisplay without calling LockDisplay.
+
+ Thanks to Magnus Kessler for reporting this
+ bug and a correct fix.
- * Xrandr.h: Remove spurious member from XRRScreenSize structure.
+commit ab4207db14d70384f017cc2a22379d7c358b60e0
+Author: Keith Packard
+Date: Wed Oct 4 20:04:09 2006 -0700
-2002-09-29 16:39 keithp
+ Remove mode origins. Add preferred mode count.
- * Xrandr.c, Xrandr.h, Xrandrint.h: Update RandR to 1.0 (library
- version 2.0)
+commit dd0fb435a0168d4041ecd81024d6493295651c61
+Author: Keith Packard
+Date: Tue Oct 3 21:03:10 2006 -0700
-2001-11-23 15:26 keithp
+ Add mode origins and output options.
- * Xrandr.h: Add C++ support to RandR library header
+commit cb1dbb7c2446ddf514ee709fba940cc4e75438a0
+Author: Keith Packard
+Date: Wed Sep 20 20:00:57 2006 -0700
-2001-08-19 08:22 alanh
+ XRRGetScreenSizeRange returns Status. Lots more requests added.
+
+ XRRGetCrtcInfo
+ XRRSetCrtcConfig
+ XRRGetScreenSizeRange
+ XRRSetScreenSize
+
+ properties still to do.
- * Xrandr-def.cpp: new file
+commit c712df73eeb0cb84aad6a0bec2be0f480418c217
+Author: Keith Packard
+Date: Tue Sep 19 00:42:49 2006 -0700
-2001-08-06 14:46 dawes
+ Start update to 1.2, splitting code across multiple files.
- * test.c: missing ident lines
+commit a8abbe92f0486f174fb89ca2c81eabede646bf32
+Author: Alan Coopersmith
+Date: Thu Jul 13 14:59:05 2006 -0700
-2001-07-31 17:44 tsi
+ renamed: .cvsignore -> .gitignore
- * Xrandr.h: 168. Fix 16bpp colour maps on Mach64's (Marc La
- France).
- 167. Fix Mach64 DPMS bug (Marc La France).
- 166. Fix bug that prevented hardware cursors on Mach64 CT's (Marc
- La France).
- 165. Document what a ChipAdjustFrame() function should to to
- prevent moving
- of hardware cursors during mode switches (Marc La France).
- 164. -Wimplicit warning cleanup [`make World` >required<] (Marc La
- France).
- 163. Ensure installed headers can find the headers they, in turn,
- #include
- (Marc La France).
- 162. Make imake pass its -W* flags to cpp (Marc La France).
- 161. More accomodations for newer GCC's (Mike A. Harris).
+commit 88f4e37d937f171352dc0089a0903c0a3d9487d8
+Author: Alan Coopersmith
+Date: Sun Feb 12 18:19:22 2006 +0000
-2001-06-10 18:37 keithp
+ Bug #5628 https://bugs.freedesktop.org/show_bug.cgi?id=5628 Shadow pages
+ not created correctly when MANDIR & MANSUFFIX don't match.
- * Xrandr.c, Xrandr.h: Add XRRCurrentConfig to get current setup,
- implement XRRTimes as per header
+commit c6541af3ef1cfaba57a73369090b6ac1a38b9b1e
+Author: Kevin E Martin
+Date: Thu Dec 15 00:24:33 2005 +0000
-2001-06-07 10:54 keithp
+ Update package version number for final X11R7 release candidate.
- * Xrandr.c, Xrandr.h: Change randr event and set config reply
+commit be2b102d0ce89f4ac2eb2c2aad5b2e3af947abba
+Author: Kevin E Martin
+Date: Tue Dec 6 22:48:44 2005 +0000
-2001-06-07 08:33 keithp
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
- * Xrandr.c, Xrandr.h, Xrandrint.h: Update Xrandr library to add
- events
+commit 8f9937022d259917ea7f1a3fefab58607300756a
+Author: Kevin E Martin
+Date: Sat Dec 3 05:49:45 2005 +0000
-2001-06-03 14:52 keithp
+ Update package version number for X11R7 RC3 release.
- * Xrandr.c, Xrandr.h: Update RandR protocol
+commit 127ec4993118efe56caef761febef86eae2b7300
+Author: Kevin E Martin
+Date: Sat Dec 3 04:41:50 2005 +0000
-2001-05-25 18:25 keithp
+ Add check and cflags for malloc(0) returning NULL.
- * Xrandr.c, Xrandr.h: Add initial RandR support to Xvesa
+commit 89f4aca8d76806edf51d4999223011cbff1c3f55
+Author: Alan Coopersmith
+Date: Mon Nov 28 22:03:06 2005 +0000
-2001-05-22 20:29 keithp
+ Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
+ update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
- * Imakefile, Xrandr.c, Xrandr.h, Xrandrint.h, test.c: Add RandR
- extension
+commit bf2fcad15b7bf2c505f5478648bf6ecbc0be701a
+Author: Kevin E Martin
+Date: Sat Nov 19 07:15:43 2005 +0000
+ Update pkgconfig files to separate library build-time dependencies from
+ application build-time dependencies, and update package deps to work
+ with separate build roots.
+
+commit a27c3d61d107fe4af33181a63f8ea951367ff418
+Author: Kevin E Martin
+Date: Mon Nov 14 22:02:13 2005 +0000
+
+ Fix pkgconfig deps for separate build roots.
+
+commit 1d690983d20e3d874b7f0e7f430e3d0cf2710c53
+Author: Kevin E Martin
+Date: Wed Nov 9 21:19:13 2005 +0000
+
+ Update package version number for X11R7 RC2 release.
+
+commit 090314b101b9d3626dc0dc970be68aec7e382d0f
+Author: Kevin E Martin
+Date: Tue Nov 1 15:11:51 2005 +0000
+
+ Update pkgcheck dependencies to work with separate build roots.
+
+commit 2deac5f213ee0a1cedccc721cd015691661b8002
+Author: Kevin E Martin
+Date: Wed Oct 19 02:48:11 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 33d17445401ec09bb0c2305d477b00c3abc2182a
+Author: Alan Coopersmith
+Date: Tue Oct 18 00:00:09 2005 +0000
+
+ Use @LIB_MAN_SUFFIX@ instead of $(LIB_MAN_SUFFIX) in macro substitutions to
+ work better with BSD make
+
+commit a42c72fe8924e98f0794e37dec8e5ef49fd7423c
+Author: Alan Coopersmith
+Date: Mon Oct 17 21:13:22 2005 +0000
+
+ Rename .shadows.DONE to shadows.DONE to avoid some make's thinking it's a
+ suffix rule (reported by Matthieu Herrb)
+
+commit 13ec5d5d689bb03e01d8f269d2c7a72e4cf0b5f1
+Author: Alan Coopersmith
+Date: Thu Oct 13 05:06:10 2005 +0000
+
+ [lib/Xrandr]
+ Use sed to fill in variables in man page Add shadow man pages for man pages
+ that document multiple functions.
+
+commit 544ec9ae021fecc6001df97a6000095f294b7422
+Author: Alan Coopersmith
+Date: Thu Oct 13 02:56:42 2005 +0000
+
+ Fix troff macros from last commit to not generate cpp warnings
+
+commit f678f6cc9b73960c3ad61cc93fc61acefbe40ef5
+Author: Alan Coopersmith
+Date: Wed Oct 12 23:45:05 2005 +0000
+
+ Use troff macros to prevent cpp eating C comments & #defines that are
+ supposed to appear in man page output.
+
+commit a42516d3a5aa532ed7c19fa128afd63d159676f8
+Author: Aaron Plattner
+Date: Fri Sep 30 04:25:14 2005 +0000
+
+ Bug #2965 https://bugs.freedesktop.org/show_bug.cgi?id=2965 Patch #2994
+ https://bugs.freedesktop.org/attachment.cgi?id=2994 Swap the screen
+ dimensions when handling XRRScreenChangeNotify events for 90- and
+ 270-degree rotations. This fixes KDE's panel placement for rotated
+ screens.
+
+commit f9c9043f2a6787cdb6ab130f66fd39b29e7f2506
+Author: Kevin E Martin
+Date: Fri Jul 29 21:22:52 2005 +0000
+
+ Various changes preparing packages for RC0:
+ - Verify and update package version numbers as needed
+ - Implement versioning scheme
+ - Change bug address to point to bugzilla bug entry form
+ - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+ reenable it)
+ - Fix makedepend to use pkgconfig and pass distcheck
+ - Update build script to build macros first
+ - Update modular Xorg version
+
+commit 6fd64a5c552ce5f0559838b2b4ae5a27b40e52f1
+Author: Kevin E Martin
+Date: Sat Jul 23 05:27:00 2005 +0000
+
+ Fix distchecks
+
+commit bceba127b9b671e378030b348f36602eb44278af
+Author: Daniel Stone
+Date: Sat Jul 16 07:34:59 2005 +0000
+
+ Set soversion to 2.0.0 with -version-number.
+
+commit 63538e6c68e1697e027e55a5015791de3af7bc8c
+Author: Keith Packard
+Date: Sat Jul 9 06:48:05 2005 +0000
+
+ Add .cvsignore files Switch _la_CFLAGS for AM_CFLAGS to clean up directory
+
+commit 3f5e389cb5bd5305cc45aca522086d3b92506265
+Author: Kevin E Martin
+Date: Sat Jul 2 06:35:03 2005 +0000
+
+ Add appropriate lib*_CFLAGS to Makefile.am's -- fixes build problems
+
+commit 48a3a08206e827a5af88d6a2d8ac62aa3bbbe122
+Author: Daniel Stone
+Date: Fri Jun 10 14:10:29 2005 +0000
+
+ Bug #1976: Fix deadlock when attempting to initialise with threads.
+
+commit 1279a7f95e654bb33c9057e25a291e2a093f2dee
+Author: Alexander Gottwald
+Date: Thu Jun 9 12:52:44 2005 +0000
+
+ Require renderproto instead of render for pkgconfig
+
+commit 9c36643810a7e837f325970ddd5964bbff4971b6
+Author: Søren Sandmann Pedersen
+Date: Wed Jun 8 20:22:47 2005 +0000
+
+ - Don't search for non-autoconf'ed X libs in Xrandr
+ - Rename man page Xrandr.3
+
+commit 73b3dff9d12d417716c19a33a95eac5f73e5da13
+Author: Søren Sandmann Pedersen
+Date: Wed Jun 8 19:19:31 2005 +0000
+
+ Add Xcursor
+ conditionally include config.h
+
+commit 32107cdd57b4796c3f41ac56c9ba683be3d894af
+Author: Søren Sandmann Pedersen
+Date: Wed Jun 8 17:48:03 2005 +0000
+
+ Check in build system for Xrandr
+
+commit 84264cf7a9ce88850f3bc18428e2c046ff0251ed
+Author: Markus Kuhn
+Date: Sat Dec 4 00:42:48 2004 +0000
+
+ Encoding of numerous files changed to UTF-8
+
+commit a9b18ca5a13816d4ffbbd00d3fc80a048e84e94f
+Author: Egbert Eich
+Date: Mon May 24 19:06:58 2004 +0000
+
+ Fix build glitches when building modules independently using Imake.
+
+commit 76f134caf8da6a08f0fb3587868efaec401c7e74
+Author: Egbert Eich
+Date: Fri Apr 23 18:43:47 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 634976e69c2d0cd014ac537acb1e52884c1d89b2
+Author: Egbert Eich
+Date: Sun Mar 14 08:32:25 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit f07005c663731709ec6c5d7f36492ff3ac253845
+Author: Egbert Eich
+Date: Wed Mar 3 12:11:30 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit e61377128a66342b8e39a4c5b7e2acd34f38799f
+Author: Egbert Eich
+Date: Thu Feb 26 13:35:33 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 696a58bfcb75b56cad6e5994f8c974ac4bb884da
+Author: Egbert Eich
+Date: Thu Feb 26 09:22:44 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 731775dea70f37fd41e4a384d484236e9d0ce4ef
+Author: Kaleb Keithley
+Date: Thu Dec 4 22:02:57 2003 +0000
+
+ XFree86 4.3.99.901 (RC 1)
+
+commit 35eca17cac066690575683bc1367b1fdaba1f4cc
+Author: Kaleb Keithley
+Date: Tue Nov 25 19:28:15 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit 8a8b419755dd3c815cc70265ed0d44e5f31028cc
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:48:49 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 52d0891b9e3c51d43fd13d0b2680b7e24b2f2e2d
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:48:49 2003 +0000
+
+ Initial revision
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/libXrandr-1.2.2/configure.ac new/libXrandr-1.2.3/configure.ac
--- old/libXrandr-1.2.2/configure.ac 2007-09-05 19:00:57.000000000 +0200
+++ new/libXrandr-1.2.3/configure.ac 2008-07-02 21:27:58.000000000 +0200
@@ -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
@@ -32,7 +30,7 @@
dnl digit in the version number to track changes which don't affect the
dnl protocol, so Xrandr version l.n.m corresponds to protocol version l.n
dnl
-AC_INIT(libXrandr, 1.2.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXrandr)
+AC_INIT(libXrandr, 1.2.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXrandr)
AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
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/libXrandr-1.2.2/include/X11/extensions/Xrandr.h new/libXrandr-1.2.3/include/X11/extensions/Xrandr.h
--- old/libXrandr-1.2.2/include/X11/extensions/Xrandr.h 2007-09-05 18:56:56.000000000 +0200
+++ new/libXrandr-1.2.3/include/X11/extensions/Xrandr.h 2008-06-23 19:24:52.000000000 +0200
@@ -119,10 +119,12 @@
/* internal representation is private to the library */
typedef struct _XRRScreenConfiguration XRRScreenConfiguration;
-Bool XRRQueryExtension (Display *dpy, int *event_basep, int *error_basep);
+Bool XRRQueryExtension (Display *dpy,
+ int *event_base_return,
+ int *error_base_return);
Status XRRQueryVersion (Display *dpy,
- int *major_versionp,
- int *minor_versionp);
+ int *major_version_return,
+ int *minor_version_return);
XRRScreenConfiguration *XRRGetScreenInfo (Display *dpy,
Window window);
@@ -177,8 +179,6 @@
*/
-XRRScreenConfiguration *XRRScreenConfig(Display *dpy, int screen);
-XRRScreenConfiguration *XRRConfig(Screen *screen);
void XRRSelectInput(Display *dpy, Window window, int 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/libXrandr-1.2.2/Makefile.am new/libXrandr-1.2.3/Makefile.am
--- old/libXrandr-1.2.2/Makefile.am 2007-09-05 18:56:56.000000000 +0200
+++ new/libXrandr-1.2.3/Makefile.am 2008-05-12 23:31:27.000000000 +0200
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# Copyright © 2003 Keith Packard, Noah Levitt
#
# Permission to use, copy, modify, distribute, and sell this software and its
@@ -29,3 +27,13 @@
pkgconfig_DATA = xrandr.pc
EXTRA_DIST = xrandr.pc.in autogen.sh
+
+EXTRA_DIST += 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)
+
+dist-hook: ChangeLog
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/libXrandr-1.2.2/man/Makefile.am new/libXrandr-1.2.3/man/Makefile.am
--- old/libXrandr-1.2.2/man/Makefile.am 2007-09-05 18:56:56.000000000 +0200
+++ new/libXrandr-1.2.3/man/Makefile.am 2008-05-12 23:31:27.000000000 +0200
@@ -1,4 +1,3 @@
-# $Id$
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
@@ -71,8 +70,6 @@
XRRConfigCurrentConfiguration \
XRRConfigCurrentRate \
XRRRootToScreen \
- XRRScreenConfig \
- XRRConfig \
XRRSelectInput
shadows.DONE:
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/libXrandr-1.2.2/man/Xrandr.man new/libXrandr-1.2.3/man/Xrandr.man
--- old/libXrandr-1.2.2/man/Xrandr.man 2007-09-05 18:56:56.000000000 +0200
+++ new/libXrandr-1.2.3/man/Xrandr.man 2008-06-23 19:24:52.000000000 +0200
@@ -35,11 +35,11 @@
.nf
.sp
Bool XRRQueryExtension \^(\^Display *\fIdpy\fP,
- int *\fIevent_basep\fP, int *\fIerror_basep\fP\^);
+ int *\fIevent_base_return\fP, int *\fIerror_base_return\fP\^);
.sp
Status XRRQueryVersion \^(\^Display *\fIdpy\fP,
- int *\fImajor_versionp\fP,
- int *\fIminor_versionp\fP\^);
+ int *\fImajor_version_return\fP,
+ int *\fIminor_version_return\fP\^);
.sp
XRRScreenConfiguration *XRRGetScreenInfo \^(\^Display *dpy,
Drawable \fIdraw\fP\^);
@@ -90,11 +90,6 @@
Display *\fIdpy\fP,
Window \fIroot\fP\^);
.sp
-XRRScreenConfiguration *XRRScreenConfig\^(\^
- Display *\fIdpy\fP, int \fIscreen\fP\^);
-.sp
-XRRScreenConfiguration *XRRConfig\^(\^Screen *\fIscreen\fP\^);
-.sp
void XRRSelectInput\^(\^Display *\fIdpy\fP, Window \fIwindow\fP, int \fImask\fP\^);
.sp
/\(**
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/libXrandr-1.2.2/src/Xrandr.c new/libXrandr-1.2.3/src/Xrandr.c
--- old/libXrandr-1.2.2/src/Xrandr.c 2007-09-05 18:56:56.000000000 +0200
+++ new/libXrandr-1.2.3/src/Xrandr.c 2008-06-23 19:25:06.000000000 +0200
@@ -36,8 +36,8 @@
#include
#include "Xrandrint.h"
-XExtensionInfo XRRExtensionInfo;
-char XRRExtensionName[] = RANDR_NAME;
+_X_HIDDEN XExtensionInfo XRRExtensionInfo;
+_X_HIDDEN char XRRExtensionName[] = RANDR_NAME;
static Bool XRRWireToEvent(Display *dpy, XEvent *event, xEvent *wire);
static Status XRREventToWire(Display *dpy, XEvent *event, xEvent *wire);
@@ -210,7 +210,7 @@
return False;
}
-XExtDisplayInfo *
+_X_HIDDEN XExtDisplayInfo *
XRRFindDisplay (Display *dpy)
{
XExtDisplayInfo *dpyinfo;
@@ -272,20 +272,22 @@
}
-Bool XRRQueryExtension (Display *dpy, int *event_basep, int *error_basep)
+Bool XRRQueryExtension (Display *dpy,
+ int *event_base_return,
+ int *error_base_return)
{
XExtDisplayInfo *info = XRRFindDisplay (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;
}
}
-Bool
+_X_HIDDEN Bool
_XRRHasRates (int major, int minor)
{
return major > 1 || (major == 1 && minor >= 1);
@@ -330,7 +332,7 @@
return 1;
}
-Bool
+_X_HIDDEN Bool
_XRRVersionHandler (Display *dpy,
xReply *rep,
char *buf,
@@ -393,9 +395,11 @@
if (event->type == ConfigureNotify) {
rcevent = (XConfigureEvent *) event;
snum = XRRRootToScreen(dpy, rcevent->window);
- dpy->screens[snum].width = rcevent->width;
- dpy->screens[snum].height = rcevent->height;
- return 1;
+ if (snum != -1) {
+ dpy->screens[snum].width = rcevent->width;
+ dpy->screens[snum].height = rcevent->height;
+ return 1;
+ }
}
info = XRRFindDisplay(dpy);
++++++ libXxf86vm-X11R7.1-1.0.1.tar.bz2 -> libXxf86vm-1.0.2.tar.bz2 ++++++
++++ 20485 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/libXxf86vm-X11R7.1-1.0.1/ChangeLog new/libXxf86vm-1.0.2/ChangeLog
--- old/libXxf86vm-X11R7.1-1.0.1/ChangeLog 2006-04-27 02:26:53.000000000 +0200
+++ new/libXxf86vm-1.0.2/ChangeLog 2008-07-02 21:37:40.000000000 +0200
@@ -1,64 +1,236 @@
-2006-04-26 Adam Jackson
+commit 2cba02334e948e215ab32635763e739c8c4a2f56
+Author: Adam Jackson
+Date: Wed Jul 2 15:37:20 2008 -0400
- * configure.ac:
- Bump to 1.0.1
+ libXxf86vm 1.0.2
-2006-04-20 Jeremy C. Reed
+commit 31cb01986bc3527152d0e3501b38d1b5cfad3155
+Author: Adam Jackson
+Date: Fri Jun 13 13:07:49 2008 -0400
- * man/XF86VM.man:
- Fix typo.
+ Don't terminate zero-length strings.
+
+ Just leave vendor and model NULL if the response didn't include them.
-2006-02-12 Alan Coopersmith
+commit 0aa2ae83518b14e927fb5b8ced182a4f25cecc76
+Author: Adam Jackson
+Date: Mon Mar 24 15:13:14 2008 -0400
- * man/Makefile.am:
- Bug #5628 https://bugs.freedesktop.org/show_bug.cgi?id=5628
- Shadow pages not created correctly when MANDIR & MANSUFFIX don't match.
+ Bug #10846: Fix XF86VidModeGetMonitor when vendor or model are null.
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 230197a970aec8d5550c2697249ba2e351b2de0b
+Author: Matthieu Herrb
+Date: Sun Mar 9 08:50:55 2008 +0100
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ nuke RCS Ids
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit a3bf552ea28f6275f604f114190b0c69d9bf4ef8
+Author: James Cloos
+Date: Thu Dec 6 16:38:47 2007 -0500
- * man/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ Replace static ChangeLog with dist-hook to generate from git log
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 89dd6f2e9f0322001bcc9f5b42705e150414c37d
+Author: James Cloos
+Date: Mon Sep 3 05:53:52 2007 -0400
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Add *~ to .gitignore to skip patch/emacs droppings
-2005-12-02 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 52a0ff653601e603faa9c994a240814f9ddc277c
+Author: Alan Coopersmith
+Date: Thu Jul 13 14:59:14 2006 -0700
- * configure.ac:
- * src/Makefile.am:
- Add check and cflags for malloc(0) returning NULL.
+ renamed: .cvsignore -> .gitignore
-2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 3e980bb302befb4c463fa861ab08034c83208622
+Author: Adam Jackson
+Date: Thu Apr 27 00:26:53 2006 +0000
- * xxf86vm.pc.in:
- Update pkgconfig files to separate library build-time dependencies
- from application build-time dependencies.
+ Bump to 1.0.1
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 227f7dc999517fc477b63327372fc846e5f44b7d
+Author: Jeremy C. Reed
+Date: Thu Apr 20 23:44:33 2006 +0000
- * configure.ac:
- Update package version number for RC1 release.
+ Fixed typo. Library was spell wrong.
-2005-10-12 Alan Coopersmith
+commit 789ff24df047508e04a40fd4b9605e6f40f86638
+Author: Alan Coopersmith
+Date: Sun Feb 12 18:19:23 2006 +0000
- * man/Makefile.am:
- * configure.ac:
- Use sed to fill in variables in man page
- Add shadow man pages for man pages that document multiple functions.
+ Bug #5628 https://bugs.freedesktop.org/show_bug.cgi?id=5628 Shadow pages
+ not created correctly when MANDIR & MANSUFFIX don't match.
-2005-07-08 Keith Packard
+commit 6455000546cf8fd14f165a4f13590f94fc9948dc
+Author: Kevin E Martin
+Date: Thu Dec 15 00:24:35 2005 +0000
- * .cvsignore:
- * man/.cvsignore:
- * src/.cvsignore:
- * src/Makefile.am:
- Add .cvsignore files
- Switch _la_CFLAGS for AM_CFLAGS to clean up directory
+ Update package version number for final X11R7 release candidate.
+commit 22c88452663d7c0b4f854f056968527298b412d2
+Author: Kevin E Martin
+Date: Tue Dec 6 22:48:45 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit 5898da0a5deed350973064bf446c97831e42d575
+Author: Kevin E Martin
+Date: Sat Dec 3 05:49:46 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit 914624d1fb3924c76e5dc358bb43b4dff800280c
+Author: Kevin E Martin
+Date: Sat Dec 3 04:41:52 2005 +0000
+
+ Add check and cflags for malloc(0) returning NULL.
+
+commit 0f0572fd4b9de8747741ff81d668edfe23db0e15
+Author: Alan Coopersmith
+Date: Mon Nov 28 22:03:07 2005 +0000
+
+ Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
+ update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
+
+commit 3d042fdd3fb1d2d30ede743741698589e868701b
+Author: Kevin E Martin
+Date: Sat Nov 19 07:15:44 2005 +0000
+
+ Update pkgconfig files to separate library build-time dependencies from
+ application build-time dependencies, and update package deps to work
+ with separate build roots.
+
+commit eb9d4a646a4dfc30fde31deb926a954c2c41ec98
+Author: Kevin E Martin
+Date: Wed Oct 19 02:48:12 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit b46825c7ec5c50be0309b52759a2fba05fd2f350
+Author: Alan Coopersmith
+Date: Tue Oct 18 00:00:09 2005 +0000
+
+ Use @LIB_MAN_SUFFIX@ instead of $(LIB_MAN_SUFFIX) in macro substitutions to
+ work better with BSD make
+
+commit 736aad1287fa65e82cbcb12073ba99ca8d63c0db
+Author: Alan Coopersmith
+Date: Mon Oct 17 21:13:23 2005 +0000
+
+ Rename .shadows.DONE to shadows.DONE to avoid some make's thinking it's a
+ suffix rule (reported by Matthieu Herrb)
+
+commit 5735da3f59d36568cfe198eeb1579e51b105491d
+Author: Alan Coopersmith
+Date: Thu Oct 13 04:25:46 2005 +0000
+
+ Add generated man pages to .cvsignores
+
+commit d0f4698f0cf843f6dfdba11eae687ada11e3d4f0
+Author: Alan Coopersmith
+Date: Thu Oct 13 01:20:52 2005 +0000
+
+ [lib/Xxf86vm manpage cleanup]
+ Use sed to fill in variables in man page Add shadow man pages for man pages
+ that document multiple functions.
+
+commit 72995528798d388422e6e09ee26a0edaffadb779
+Author: Kristian Høgsberg
+Date: Mon Sep 26 20:55:17 2005 +0000
+
+ Simple whitespace change to change ownership of ,v file on server. Required
+ so that I can change permissions of file.
+
+commit 8f19f14ada44daf9d85f4d65f0bc130ae5b2f4bf
+Author: Kevin E Martin
+Date: Fri Jul 29 21:22:53 2005 +0000
+
+ Various changes preparing packages for RC0:
+ - Verify and update package version numbers as needed
+ - Implement versioning scheme
+ - Change bug address to point to bugzilla bug entry form
+ - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+ reenable it)
+ - Fix makedepend to use pkgconfig and pass distcheck
+ - Update build script to build macros first
+ - Update modular Xorg version
+
+commit 417a69a7e9ad4df9b3a7f03b09e4694ad5c2bcbc
+Author: Keith Packard
+Date: Sat Jul 9 21:10:32 2005 +0000
+
+ Add .cvsignore files Switch _la_CFLAGS for AM_CFLAGS to clean up directory
+
+commit 4b8ad01b53792d4220579a259290e6bf59eb3d8b
+Author: Alan Coopersmith
+Date: Fri Jul 1 16:16:15 2005 +0000
+
+ spell freedesktop.org correctly
+
+commit a26154988a9367521a15e0876939d8ff7810cd81
+Author: Søren Sandmann Pedersen
+Date: Fri Jun 10 22:38:47 2005 +0000
+
+ Apply patch from Jeff Smith (whydoubt@yahoo.com):
+ - Add file linking for Xxf86misc, Xxf86dga, and Xxf86vm.
+ - Check in build system for Xxf86misc, Xxf86dga, and Xxf86vm.
+
+commit c421f84a2d14fbf2995cba23d2ea614b59eadfd5
+Author: Egbert Eich
+Date: Fri Apr 23 19:23:08 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 045fa2a95d6eac5db1c6d8781ef48f86d00b655f
+Author: Egbert Eich
+Date: Sun Mar 14 08:33:12 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit d8913570296903c3686969f8c6dbeaf70064f23e
+Author: Egbert Eich
+Date: Wed Mar 3 12:12:14 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 2e3edee344aee8f8cebe139541ebecccec570d8b
+Author: Egbert Eich
+Date: Thu Feb 26 13:35:46 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 44926b9d3066d939b66aef57d091b8a878591e1e
+Author: Egbert Eich
+Date: Thu Feb 26 09:23:14 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 56ddf834f4d3cca8afd7d36a63d7b825d1d7ffc0
+Author: Kaleb Keithley
+Date: Thu Dec 4 22:03:15 2003 +0000
+
+ XFree86 4.3.99.901 (RC 1)
+
+commit db365c73e467868938ad5b15343c3b79b87994d5
+Author: Kaleb Keithley
+Date: Tue Nov 25 19:28:33 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit ed50d6847a012bef0bf7274626bb0ed8018d5e23
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:48:54 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 252d1a944ccf5ebfc2c7e0c349254be055402c17
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:48:49 2003 +0000
+
+ Initial revision
+
+commit 83bc8003b46b0602c36a84ee5b44665887400305
+Author: Kaleb Keithley
+Date: Fri Nov 14 15:54:49 2003 +0000
+
+ R6.6 is the Xorg base-line
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/libXxf86vm-X11R7.1-1.0.1/configure.ac new/libXxf86vm-1.0.2/configure.ac
--- old/libXxf86vm-X11R7.1-1.0.1/configure.ac 2006-04-27 02:26:53.000000000 +0200
+++ new/libXxf86vm-1.0.2/configure.ac 2008-07-02 21:36:29.000000000 +0200
@@ -1,6 +1,6 @@
AC_PREREQ([2.57])
-AC_INIT(libXxf86vm, 1.0.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86vm)
+AC_INIT(libXxf86vm, 1.0.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86vm)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
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/libXxf86vm-X11R7.1-1.0.1/Makefile.am new/libXxf86vm-1.0.2/Makefile.am
--- old/libXxf86vm-X11R7.1-1.0.1/Makefile.am 2005-06-11 00:38:47.000000000 +0200
+++ new/libXxf86vm-1.0.2/Makefile.am 2008-05-12 23:31:50.000000000 +0200
@@ -4,3 +4,13 @@
pkgconfig_DATA = xxf86vm.pc
EXTRA_DIST = xxf86vm.pc.in autogen.sh
+
+EXTRA_DIST += 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)
+
+dist-hook: ChangeLog
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/libXxf86vm-X11R7.1-1.0.1/man/Makefile.am new/libXxf86vm-1.0.2/man/Makefile.am
--- old/libXxf86vm-X11R7.1-1.0.1/man/Makefile.am 2006-02-12 19:19:23.000000000 +0100
+++ new/libXxf86vm-1.0.2/man/Makefile.am 2008-05-12 23:31:50.000000000 +0200
@@ -1,4 +1,3 @@
-# $Id: Makefile.am,v 1.6 2005/12/06 22:48:45 kem Exp $
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
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/libXxf86vm-X11R7.1-1.0.1/man/XF86VM.man new/libXxf86vm-1.0.2/man/XF86VM.man
--- old/libXxf86vm-X11R7.1-1.0.1/man/XF86VM.man 2006-04-21 01:44:33.000000000 +0200
+++ new/libXxf86vm-1.0.2/man/XF86VM.man 2008-05-12 23:31:50.000000000 +0200
@@ -1,4 +1,4 @@
-.\" $XdotOrg: lib/Xxf86vm/man/XF86VM.man,v 1.3 2006/04/20 23:44:33 reed Exp $
+.\" $XdotOrg: lib/Xxf86vm/man/XF86VM.man,v 1.2 2004/04/23 19:23:08 eich Exp $
.\" $TOG: XF86VM.man /main/6 1997/07/19 10:30:39 kaleb $
.\"
.\"
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/libXxf86vm-X11R7.1-1.0.1/missing new/libXxf86vm-1.0.2/missing
--- old/libXxf86vm-X11R7.1-1.0.1/missing 2006-05-22 03:45:51.000000000 +0200
+++ new/libXxf86vm-1.0.2/missing 2008-07-02 21:37:34.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/libXxf86vm-X11R7.1-1.0.1/src/config.h.in new/libXxf86vm-1.0.2/src/config.h.in
--- old/libXxf86vm-X11R7.1-1.0.1/src/config.h.in 2006-05-22 03:45:48.000000000 +0200
+++ new/libXxf86vm-1.0.2/src/config.h.in 2008-07-02 21:37:33.000000000 +0200
@@ -48,6 +48,15 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
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/libXxf86vm-X11R7.1-1.0.1/src/XF86VMode.c new/libXxf86vm-1.0.2/src/XF86VMode.c
--- old/libXxf86vm-X11R7.1-1.0.1/src/XF86VMode.c 2004-04-23 20:43:56.000000000 +0200
+++ new/libXxf86vm-1.0.2/src/XF86VMode.c 2008-06-13 19:07:45.000000000 +0200
@@ -1,5 +1,3 @@
-/* $XConsortium: XF86VMode.c /main/2 1995/11/14 18:17:58 kaleb $ */
-/* $XFree86: xc/lib/Xxf86vm/XF86VMode.c,v 3.33 2002/10/16 00:37:34 dawes Exp $ */
/*
Copyright (c) 1995 Kaleb S. KEITHLEY
@@ -29,7 +27,6 @@
from Kaleb S. KEITHLEY.
*/
-/* $XConsortium: XF86VMode.c /main/4 1996/01/16 07:52:25 kaleb CHECKEDOUT $ */
/* THIS IS NOT AN X CONSORTIUM STANDARD */
@@ -966,12 +963,8 @@
}
if (rep.vendorLength)
_XReadPad(dpy, monitor->vendor, rep.vendorLength);
- else
- monitor->vendor = "";
if (rep.modelLength)
_XReadPad(dpy, monitor->model, rep.modelLength);
- else
- monitor->model = "";
UnlockDisplay(dpy);
SyncHandle();
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org