Hello community,
here is the log from the commit of package xorg-x11-libs
checked in at Mon Oct 16 19:13:59 CEST 2006.
--------
--- xorg-x11-libs/xorg-x11-libs.changes 2006-10-09 15:53:55.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-libs/xorg-x11-libs.changes 2006-10-14 06:28:18.000000000 +0200
@@ -1,0 +2,14 @@
+Sat Oct 14 06:27:12 CEST 2006 - sndirsch@suse.de
+
+- package update to X.Org 7.2RC1
+ * libXevie-1.0.2
+ * libXfontcache-1.0.3
+ * libXres-1.0.2
+ * libXfont-1.2.3
+ * libXcomposite-0.3.1
+ * libXcursor-1.1.8
+ * libXrandr-1.1.2
+ * libXScrnSaver-1.1.1
+ * libXft-2.1.11
+
+-------------------------------------------------------------------
Old:
----
libXScrnSaver-X11R7.1-1.1.0.tar.bz2
libXcomposite-X11R7.1-0.3.tar.bz2
libXcursor-1.1.7.tar.bz2
libXcursor.diff
libXevie-X11R7.1-1.0.1.tar.bz2
libXfont-1.2.2.tar.bz2
libXfontcache-X11R7.1-1.0.2.tar.bz2
libXft-2.1.10.tar.bz2
libXrandr-X11R7.1-1.1.1.tar.bz2
libXres-X11R7.1-1.0.1.tar.bz2
New:
----
libXScrnSaver-1.1.1.tar.bz2
libXcomposite-0.3.1.tar.bz2
libXcursor-1.1.8.tar.bz2
libXevie-1.0.2.tar.bz2
libXfont-1.2.3.tar.bz2
libXfontcache-1.0.3.tar.bz2
libXft-2.1.11.tar.bz2
libXrandr-1.1.2.tar.bz2
libXres-1.0.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-libs.spec ++++++
--- /var/tmp/diff_new_pack.GcoiHP/_old 2006-10-16 19:13:23.000000000 +0200
+++ /var/tmp/diff_new_pack.GcoiHP/_new 2006-10-16 19:13:23.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package xorg-x11-libs (Version 7.1)
+# spec file for package xorg-x11-libs (Version 7.2)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -18,8 +18,8 @@
Provides: libXaw.so.8 libXaw.so.7 libXaw.so.6
%endif
URL: http://xorg.freedesktop.org/
-Version: 7.1
-Release: 17
+Version: 7.2
+Release: 1
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/Libraries
@@ -27,20 +27,20 @@
Source0: libAppleWM-X11R7.0-1.0.0.tar.bz2
Source1: libFS-X11R7.0-1.0.0.tar.bz2
Source2: libWindowsWM-X11R7.0-1.0.0.tar.bz2
-Source3: libXScrnSaver-X11R7.1-1.1.0.tar.bz2
+Source3: libXScrnSaver-1.1.1.tar.bz2
Source4: libXTrap-X11R7.0-1.0.0.tar.bz2
Source5: libXaw-X11R7.1-1.0.2.tar.bz2
-Source6: libXcomposite-X11R7.1-0.3.tar.bz2
-Source7: libXcursor-1.1.7.tar.bz2
+Source6: libXcomposite-0.3.1.tar.bz2
+Source7: libXcursor-1.1.8.tar.bz2
Source8: libXdamage-X11R7.1-1.0.3.tar.bz2
-Source9: libXevie-X11R7.1-1.0.1.tar.bz2
-Source10: libXfont-1.2.2.tar.bz2
-Source11: libXfontcache-X11R7.1-1.0.2.tar.bz2
-Source12: libXft-2.1.10.tar.bz2
+Source9: libXevie-1.0.2.tar.bz2
+Source10: libXfont-1.2.3.tar.bz2
+Source11: libXfontcache-1.0.3.tar.bz2
+Source12: libXft-2.1.11.tar.bz2
Source13: libXi-X11R7.1-1.0.1.tar.bz2
Source14: libXinerama-X11R7.0-1.0.1.tar.bz2
Source15: libXprintAppUtil-X11R7.0-1.0.1.tar.bz2
-Source16: libXrandr-X11R7.1-1.1.1.tar.bz2
+Source16: libXrandr-1.1.2.tar.bz2
Source17: libXtst-X11R7.0-1.0.1.tar.bz2
Source18: libXvMC-1.0.3.tar.bz2
Source19: libXxf86dga-X11R7.1-1.0.1.tar.bz2
@@ -51,9 +51,8 @@
Source24: liboldX-X11R7.0-1.0.1.tar.bz2
Source25: libxkbui-X11R7.1-1.0.2.tar.bz2
Source26: xbitmaps-X11R7.0-1.0.1.tar.bz2
-Source27: libXres-X11R7.1-1.0.1.tar.bz2
+Source27: libXres-1.0.2.tar.bz2
Source28: libXft1-X11R6.9-1.2.tar.bz2
-Patch1: libXcursor.diff
Patch3: p_xft_cjk.diff
Patch4: p_xft_register.diff
@@ -125,9 +124,6 @@
%setup -n . -T -D
rm -rf $RPM_BUILD_DIR/*
for i in $RPM_SOURCE_DIR/*.tar.bz2; do tar xjf $i; done
-pushd libXcursor-*
-%patch1
-popd
pushd libXft-*/src
%patch3 -p2
%patch4 -p3
@@ -195,6 +191,17 @@
%{_mandir}/man3/*
%changelog -n xorg-x11-libs
+* Sat Oct 14 2006 - sndirsch@suse.de
+- package update to X.Org 7.2RC1
+ * libXevie-1.0.2
+ * libXfontcache-1.0.3
+ * libXres-1.0.2
+ * libXfont-1.2.3
+ * libXcomposite-0.3.1
+ * libXcursor-1.1.8
+ * libXrandr-1.1.2
+ * libXScrnSaver-1.1.1
+ * libXft-2.1.11
* Mon Oct 09 2006 - sndirsch@suse.de
- updated to libXvMC 1.0.3:
* Minor cleanup release - just some sparse warning cleanups, and
++++++ libXScrnSaver-X11R7.1-1.1.0.tar.bz2 -> libXScrnSaver-1.1.1.tar.bz2 ++++++
++++ 1851 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/libXScrnSaver-X11R7.1-1.1.0/ChangeLog new/libXScrnSaver-1.1.1/ChangeLog
--- old/libXScrnSaver-X11R7.1-1.1.0/ChangeLog 2006-03-31 20:43:09.000000000 +0200
+++ new/libXScrnSaver-1.1.1/ChangeLog 2006-10-13 22:29:07.000000000 +0200
@@ -1,91 +1,254 @@
-2006-03-31 Fredrik Höglund
+commit 3705540d62bab68c5d41b73b59e2a7a23b001118
+Author: Adam Jackson
+Date: Thu Oct 12 20:25:51 2006 -0400
- * configure.ac:
- Update the package version number to 1.1.
- Require scrnsaverproto >= 1.1.
+ Fix the ChangeLog hook to distcheck.
- * man/Makefile.am:
- * man/Xss.man:
- Update the manpage to document the new XScreenSaverSuspend function.
+commit be1d6f234b8366be9cc81bbc6e1774243102cb6d
+Author: Matthieu Herrb
+Date: Sat Jul 29 21:30:25 2006 +0200
- * src/XScrnSaver.c (XScreenSaverSuspend):
- Add the implementation of XScreenSaverSuspend.
+ Remove ChangeLog. Add a rule in Makefile.am to generate it using git-log.
-2006-02-12 Alan Coopersmith
+commit 27ce5ef4924cd162f9313d2c444d2830dc71e9ae
+Author: Federico G. Schwindt
+Date: Sat Jul 29 21:24:50 2006 +0200
- * 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.
+ correct header path.
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 5cbdc1b7dc3dedf341afdf6c7df741c015ceb6fa
+Author: Alan Coopersmith
+Date: Thu Jul 13 14:58:47 2006 -0700
- * configure.ac:
- Update package version for X11R7 release.
+ renamed: .cvsignore -> .gitignore
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit a183fb1a70d48155b67d98fb4e4aaca825842f12
+Author: Fredrik Höglund
+Date: Fri Mar 31 18:43:09 2006 +0000
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Update the package version number to 1.1. Require scrnsaverproto >= 1.1.
+ Update the manpage to document the new XScreenSaverSuspend function.
+ Add the implementation of XScreenSaverSuspend.
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 8bc4acacd1079637be310b71fb5b74a5b0717cc2
+Author: Alan Coopersmith
+Date: Sun Feb 12 18:19:21 2006 +0000
- * man/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ Bug #5628 https://bugs.freedesktop.org/show_bug.cgi?id=5628 Shadow pages
+ not created correctly when MANDIR & MANSUFFIX don't match.
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 10b822d58304884aad0f9b321b7e97f354bb0601
+Author: Kevin E Martin
+Date: Wed Dec 21 02:30:05 2005 +0000
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Update package version for X11R7 release.
-2005-12-02 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit e81e373c1263fb6934253661aaa4631456ca2766
+Author: Adam Jackson
+Date: Mon Dec 19 16:28:26 2005 +0000
- * configure.ac:
- * src/Makefile.am:
- Add check and cflags for malloc(0) returning NULL.
+ Stub COPYING files
-2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit d939ce79b74a502e2c66a9049f8c9daf4c47bbf6
+Author: Kevin E Martin
+Date: Thu Dec 15 00:24:28 2005 +0000
- * xscrnsaver.pc.in:
- Update pkgconfig files to separate library build-time dependencies
- from application build-time dependencies.
+ Update package version number for final X11R7 release candidate.
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit a7fe9e9fa7e2d358788758fe1031595d322d874f
+Author: Kevin E Martin
+Date: Tue Dec 6 22:48:42 2005 +0000
- * configure.ac:
- Update package version number for RC1 release.
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
-2005-10-12 Alan Coopersmith
+commit 0e2a03621d3779ebc922b3629b4239bc311e690c
+Author: Kevin E Martin
+Date: Sat Dec 3 05:49:42 2005 +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.
+ Update package version number for X11R7 RC3 release.
-2005-07-28 Adam Jackson
+commit c7e4c70be3431073765fad255d81f02e390a92d0
+Author: Kevin E Martin
+Date: Sat Dec 3 04:41:48 2005 +0000
- * src/Makefile.am:
- * configure.ac:
- * xscrnsaver.pc.in:
- Bug #4149: Keep the soname as libXss and the version at 1.0.0, for
- monolith compatibility. Bump to 0.99.1. (Christophe Saout)
+ Add check and cflags for malloc(0) returning NULL.
-2005-07-08 Keith Packard
+commit 754c50dc72c217f8cd4a9da36f42dd2e55407733
+Author: Alan Coopersmith
+Date: Mon Nov 28 22:03:05 2005 +0000
- * .cvsignore:
- * man/.cvsignore:
- * src/.cvsignore:
- Add .cvsignore files
+ 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)
-2005-06-23 Theo van Klaveren
+commit d0b21d4a6ad67657b8a24f2bfaf4eaaddcf9f757
+Author: Eric Anholt
+Date: Sun Nov 20 23:17:40 2005 +0000
- Fix make distcheck.
+ Add/improve libs .cvsignores.
- * man/Makefile.am: Fix typo (man3_MANS -> man_MANS).
+commit b58dced9ca72778438a1a57a314d18450891b7a5
+Author: Kevin E Martin
+Date: Sat Nov 19 07:15:40 2005 +0000
-2005-06-21 Alexander Gottwald <ago at freedesktop dot org>
+ Update pkgconfig files to separate library build-time dependencies from
+ application build-time dependencies, and update package deps to work
+ with separate build roots.
- * configure.ac
- * src/Makefile.am
- Add missing xext.pc and xextproto.pc
- Add DEPS_CFLAGS to Makefile.am
+commit 73316750771ef55c3d9723be3c321221a482f584
+Author: Kevin E Martin
+Date: Wed Oct 19 02:48:09 2005 +0000
+ Update package version number for RC1 release.
+
+commit abb8966bbb2b78d16032bff72d5e2c53bbaaeca4
+Author: Alan Coopersmith
+Date: Tue Oct 18 00:00:08 2005 +0000
+
+ Use @LIB_MAN_SUFFIX@ instead of $(LIB_MAN_SUFFIX) in macro substitutions to
+ work better with BSD make
+
+commit e5b2cfc00086fbc28cbcff0c25a5f6cc648974b2
+Author: Alan Coopersmith
+Date: Mon Oct 17 21:13:15 2005 +0000
+
+ Rename .shadows.DONE to shadows.DONE to avoid some make's thinking it's a
+ suffix rule (reported by Matthieu Herrb)
+
+commit a90094021482a3e4093a4adc9a013c4084bd8712
+Author: Alan Coopersmith
+Date: Thu Oct 13 04:25:46 2005 +0000
+
+ Add generated man pages to .cvsignores
+
+commit 572497b3413a67795306fc0df9554c4cb6c974fb
+Author: Alan Coopersmith
+Date: Thu Oct 13 02:13:37 2005 +0000
+
+ [lib/XScrnSaver manpage cleanup]
+ Use sed to fill in variables in man page Add shadow man pages for man pages
+ that document multiple functions.
+
+commit 3aa74d1b757936676dbd8bd640b51d72d5c28da1
+Author: Adam Jackson
+Date: Sun Aug 28 19:59:15 2005 +0000
+
+ Bug #4149: Keep the soname as libXss and the version at 1.0.0, for monolith
+ compatibility. Bump to 0.99.1. (Christophe Saout)
+
+commit d0080f2f901247d12b78f90c747d543a1c96c8ab
+Author: Adam Jackson
+Date: Wed Aug 3 03:28:00 2005 +0000
+
+ Do PKG_CHECK_MODULES on a unique token instead of on "DEP", so builds with
+ a global configure cache don't get confused.
+
+commit 2581b891b58754e29a2af759c3ca277bf5a06d97
+Author: Kevin E Martin
+Date: Fri Jul 29 21:22:50 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 f00570af369d1a516062fec225095cc94e6fab53
+Author: Keith Packard
+Date: Sat Jul 9 06:04:32 2005 +0000
+
+ Add .cvsignore files
+
+commit 3817722549db9a2377f034b0af5768f8c36bbf62
+Author: Søren Sandmann Pedersen
+Date: Wed Jun 22 22:46:39 2005 +0000
+
+ Apply these patches from Theo van Klaveren:
+ lib-dmx.patch lib-FS.patch lib-X11.patch lib-XRes.patch
+ lib-XScrnSaver.patch lib-xtrans.patch
+ to make the libraries distcheck.
+
+commit 1d4fab032a4b9924adbc6853798e98b4101c96d8
+Author: Alexander Gottwald
+Date: Tue Jun 21 15:41:36 2005 +0000
+
+ lib/XScrnSaver/configure.ac
+ lib/XScrnSaver/src/Makefile.am
+ lib/Xfontcache/configure.ac
+ lib/Xfontcache/src/Makefile.am
+ lib/Xinerama/configure.ac
+ lib/Xinerama/src/Makefile.am
+ lib/Xtst/configure.ac
+ lib/Xv/configure.ac
+ lib/XvMC/configure.ac
+ lib/dmx/configure.ac Add missing xext.pc and xextproto.pc Add DEP_CFLAGS to
+ src/Makefile.am
+
+commit 21286ccdf3418566b424a9f086289994ac0877f1
+Author: Søren Sandmann Pedersen
+Date: Fri Jun 10 19:57:07 2005 +0000
+
+ Build system for XScrnSaver
+
+commit c3a1a641b1a003ac7b4558b7897e77f0d0f0fdfa
+Author: Egbert Eich
+Date: Fri Apr 23 18:43:51 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 903b9ea09dadfd395120db1e844ce0fe374dfcef
+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 d5b14ebddf3dd3ca09a98f9c185fcb76822d3644
+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 fa532ec60428670bbcb68c9a5caee8c85da97e8b
+Author: Egbert Eich
+Date: Thu Feb 26 13:35:33 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit a1af44719975f0c2e00b0d4b74a19ac308ae9832
+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 b518e5d7bd7970dc558b3218b5f5ff13cd4f5bca
+Author: Kaleb Keithley
+Date: Thu Dec 4 22:02:57 2003 +0000
+
+ XFree86 4.3.99.901 (RC 1)
+
+commit b48caae437787a65e83c1b1f914ae0871bdc19f8
+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 444958cdf3fae56c7a82fa9086db33c095db511f
+Author: Kaleb Keithley
+Date: Tue Nov 25 19:28:15 2003 +0000
+
+ Initial revision
+
+commit 1c910af9cb665120abbbf03b3c351853715a34f8
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:48:49 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 4a9983332a9f46ae835c1fbcb14b88ad24dc56f7
+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/libXScrnSaver-X11R7.1-1.1.0/Makefile.am new/libXScrnSaver-1.1.1/Makefile.am
--- old/libXScrnSaver-X11R7.1-1.1.0/Makefile.am 2005-06-10 21:57:07.000000000 +0200
+++ new/libXScrnSaver-1.1.1/Makefile.am 2006-10-13 02:25:42.000000000 +0200
@@ -24,5 +24,10 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xscrnsaver.pc
-EXTRA_DIST = xscrnsaver.pc.in autogen.sh
+EXTRA_DIST = xscrnsaver.pc.in autogen.sh ChangeLog
+CLEANFILES = ChangeLog
+
+ChangeLog: FORCE
+ git-log > ChangeLog
+FORCE: 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/libXScrnSaver-X11R7.1-1.1.0/configure.ac new/libXScrnSaver-1.1.1/configure.ac
--- old/libXScrnSaver-X11R7.1-1.1.0/configure.ac 2006-03-31 20:43:09.000000000 +0200
+++ new/libXScrnSaver-1.1.1/configure.ac 2006-10-13 21:06:02.000000000 +0200
@@ -23,7 +23,7 @@
AC_PREREQ([2.57])
-AC_INIT(libXScrnSaver, 1.1.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXScrnSaver)
+AC_INIT(libXScrnSaver, 1.1.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXScrnSaver)
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/libXScrnSaver-X11R7.1-1.1.0/man/Makefile.am new/libXScrnSaver-1.1.1/man/Makefile.am
--- old/libXScrnSaver-X11R7.1-1.1.0/man/Makefile.am 2006-03-31 20:43:09.000000000 +0200
+++ new/libXScrnSaver-1.1.1/man/Makefile.am 2006-10-12 00:30:23.000000000 +0200
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.7 2005/12/06 22:48:42 kem Exp $
+# $Id$
#
# 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/libXScrnSaver-X11R7.1-1.1.0/man/Xss.man new/libXScrnSaver-1.1.1/man/Xss.man
--- old/libXScrnSaver-X11R7.1-1.1.0/man/Xss.man 2006-03-31 20:43:09.000000000 +0200
+++ new/libXScrnSaver-1.1.1/man/Xss.man 2006-10-12 00:30:23.000000000 +0200
@@ -1,6 +1,6 @@
.\"
.\" $XFree86: xc/lib/Xss/Xss.man,v 1.1 2003/10/26 19:00:24 herrb Exp $
-.\" $XdotOrg: lib/XScrnSaver/man/Xss.man,v 1.3 2006/03/31 18:43:09 fredrik Exp $
+.\" $XdotOrg: lib/XScrnSaver/man/Xss.man,v 1.2 2004/04/23 18:43:51 eich Exp $
.\"
.\" Copyright (C) 2003 The XFree86 Project, Inc. All Rights Reserved.
.\"
@@ -32,7 +32,7 @@
.SH NAME
XScreenSaver \- X11 Screen Saver extension client library
.SH SYNOPSIS
-.B #include
+.B #include
.PP
.nf
.ta .5i 2i
++++++ libXcomposite-X11R7.1-0.3.tar.bz2 -> libXcomposite-0.3.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXcomposite-X11R7.1-0.3/COPYING new/libXcomposite-0.3.1/COPYING
--- old/libXcomposite-X11R7.1-0.3/COPYING 2005-07-07 20:25:28.000000000 +0200
+++ new/libXcomposite-0.3.1/COPYING 2006-10-12 00:30:42.000000000 +0200
@@ -1,4 +1,4 @@
-$Id: COPYING,v 1.1.1.1 2003/11/07 04:22:59 keithp Exp $
+$Id$
Copyright © 2001,2003 Keith Packard
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXcomposite-X11R7.1-0.3/Makefile.am new/libXcomposite-0.3.1/Makefile.am
--- old/libXcomposite-X11R7.1-0.3/Makefile.am 2005-07-07 20:25:28.000000000 +0200
+++ new/libXcomposite-0.3.1/Makefile.am 2006-10-12 00:30:42.000000000 +0200
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.am,v 1.3 2004/07/08 07:33:23 keithp Exp $
+# $Id$
#
# Copyright © 2003 Keith Packard, Noah Levitt
#
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXcomposite-X11R7.1-0.3/Makefile.in new/libXcomposite-0.3.1/Makefile.in
--- old/libXcomposite-X11R7.1-0.3/Makefile.in 2006-05-22 03:29:12.000000000 +0200
+++ new/libXcomposite-0.3.1/Makefile.in 2006-10-13 21:58:57.000000000 +0200
@@ -15,7 +15,7 @@
@SET_MAKE@
#
-# $Id: Makefile.am,v 1.3 2004/07/08 07:33:23 keithp Exp $
+# $Id$
#
# Copyright © 2003 Keith Packard, Noah Levitt
#
@@ -159,6 +159,7 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXcomposite-X11R7.1-0.3/aclocal.m4 new/libXcomposite-0.3.1/aclocal.m4
--- old/libXcomposite-X11R7.1-0.3/aclocal.m4 2006-05-22 03:29:03.000000000 +0200
+++ new/libXcomposite-0.3.1/aclocal.m4 2006-10-13 21:58:52.000000000 +0200
@@ -1597,7 +1597,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
@@ -4305,6 +4305,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$_LT_AC_TAGVAR(GCC, $1)
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -4438,11 +4441,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
+predep_objects=\`echo $lt_[]_LT_AC_TAGVAR(predep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
+postdep_objects=\`echo $lt_[]_LT_AC_TAGVAR(postdep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -4454,7 +4457,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
+compiler_lib_search_path=\`echo $lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -4534,7 +4537,7 @@
link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -6370,6 +6373,7 @@
done
done
done
+IFS=$as_save_IFS
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -6402,6 +6406,7 @@
done
])
SED=$lt_cv_path_SED
+AC_SUBST([SED])
AC_MSG_RESULT([$SED])
])
@@ -6543,7 +6548,8 @@
_PKG_TEXT
])],
- [$4])
+ [AC_MSG_RESULT([no])
+ $4])
elif test $pkg_failed = untried; then
ifelse([$4], , [AC_MSG_FAILURE(dnl
[The pkg-config script could not be found or is too old. Make sure it
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXcomposite-X11R7.1-0.3/configure new/libXcomposite-0.3.1/configure
--- old/libXcomposite-X11R7.1-0.3/configure 2006-05-22 03:37:33.000000000 +0200
+++ new/libXcomposite-0.3.1/configure 2006-10-13 21:58:55.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for libXcomposite 0.3.
+# Generated by GNU Autoconf 2.59 for libXcomposite 0.3.1.
#
# Report bugs to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg.
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='libXcomposite'
PACKAGE_TARNAME='libXcomposite'
-PACKAGE_VERSION='0.3'
-PACKAGE_STRING='libXcomposite 0.3'
+PACKAGE_VERSION='0.3.1'
+PACKAGE_STRING='libXcomposite 0.3.1'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
# Factoring default headers for most tests.
@@ -464,7 +464,7 @@
# include
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXX
CPP F77 FFLAGS ac_ct_F77 LIBTOOL COMPOSITEEXT_VERSION PKG_CONFIG ac_pt_PKG_CONFIG XCOMPOSITE_CFLAGS XCOMPOSITE_LIBS LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE
CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL COMPOSITEEXT_VERSION PKG_CONFIG ac_pt_PKG_CONFIG XCOMPOSITE_CFLAGS XCOMPOSITE_LIBS LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -965,7 +965,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 libXcomposite 0.3 to adapt to many kinds of systems.
+\`configure' configures libXcomposite 0.3.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1031,7 +1031,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libXcomposite 0.3:";;
+ short | recursive ) echo "Configuration of libXcomposite 0.3.1:";;
esac
cat <<\_ACEOF
@@ -1179,7 +1179,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-libXcomposite configure 0.3
+libXcomposite configure 0.3.1
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1193,7 +1193,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libXcomposite $as_me 0.3, which was
+It was created by libXcomposite $as_me 0.3.1, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1836,7 +1836,7 @@
# Define the identity of the package.
PACKAGE='libXcomposite'
- VERSION='0.3'
+ VERSION='0.3.1'
cat >>confdefs.h <<_ACEOF
@@ -3245,6 +3245,7 @@
done
done
done
+IFS=$as_save_IFS
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -3279,6 +3280,7 @@
fi
SED=$lt_cv_path_SED
+
echo "$as_me:$LINENO: result: $SED" >&5
echo "${ECHO_T}$SED" >&6
@@ -3719,7 +3721,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 3722 "configure"' > conftest.$ac_ext
+ echo '#line 3724 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5318,7 +5320,7 @@
# Provide some information about the compiler.
-echo "$as_me:5321:" \
+echo "$as_me:5323:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5
@@ -6381,11 +6383,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6384: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6386: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6388: \$? = $ac_status" >&5
+ echo "$as_me:6390: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6649,11 +6651,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6652: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6654: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6656: \$? = $ac_status" >&5
+ echo "$as_me:6658: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6753,11 +6755,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6756: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6758: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:6760: \$? = $ac_status" >&5
+ echo "$as_me:6762: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8222,7 +8224,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 8225 "configure"' > conftest.$ac_ext
+ echo '#line 8227 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -8241,7 +8243,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
@@ -9119,7 +9121,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext < conftest.$ac_ext <&5)
+ (eval echo "\"\$as_me:11567: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11566: \$? = $ac_status" >&5
+ echo "$as_me:11571: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -11663,11 +11668,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11666: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11671: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11670: \$? = $ac_status" >&5
+ echo "$as_me:11675: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12199,7 +12204,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 12202 "configure"' > conftest.$ac_ext
+ echo '#line 12207 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -12218,7 +12223,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
@@ -12603,6 +12608,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_CXX
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -12736,11 +12744,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_predep_objects_CXX
+predep_objects=\`echo $lt_predep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_postdep_objects_CXX
+postdep_objects=\`echo $lt_postdep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -12752,7 +12760,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -12832,7 +12840,7 @@
link_all_deplibs=$link_all_deplibs_CXX
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -13254,11 +13262,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13257: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13265: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13261: \$? = $ac_status" >&5
+ echo "$as_me:13269: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13358,11 +13366,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13361: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13369: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13365: \$? = $ac_status" >&5
+ echo "$as_me:13373: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14807,7 +14815,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 14810 "configure"' > conftest.$ac_ext
+ echo '#line 14818 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -14826,7 +14834,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
@@ -15211,6 +15219,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_F77
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -15344,11 +15355,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_predep_objects_F77
+predep_objects=\`echo $lt_predep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_postdep_objects_F77
+postdep_objects=\`echo $lt_postdep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -15360,7 +15371,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_F77
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -15440,7 +15451,7 @@
link_all_deplibs=$link_all_deplibs_F77
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -15582,11 +15593,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15585: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15596: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15589: \$? = $ac_status" >&5
+ echo "$as_me:15600: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15850,11 +15861,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15853: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15864: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15857: \$? = $ac_status" >&5
+ echo "$as_me:15868: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15954,11 +15965,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15957: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15968: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15961: \$? = $ac_status" >&5
+ echo "$as_me:15972: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17423,7 +17434,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 17426 "configure"' > conftest.$ac_ext
+ echo '#line 17437 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -17442,7 +17453,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
@@ -17827,6 +17838,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_GCJ
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -17960,11 +17974,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_predep_objects_GCJ
+predep_objects=\`echo $lt_predep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_postdep_objects_GCJ
+postdep_objects=\`echo $lt_postdep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -17976,7 +17990,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -18056,7 +18070,7 @@
link_all_deplibs=$link_all_deplibs_GCJ
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -18308,6 +18322,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_RC
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -18441,11 +18458,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_predep_objects_RC
+predep_objects=\`echo $lt_predep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_postdep_objects_RC
+postdep_objects=\`echo $lt_postdep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -18457,7 +18474,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_RC
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -18537,7 +18554,7 @@
link_all_deplibs=$link_all_deplibs_RC
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -19278,7 +19295,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by libXcomposite $as_me 0.3, which was
+This file was extended by libXcomposite $as_me 0.3.1, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -19341,7 +19358,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-libXcomposite config.status 0.3
+libXcomposite config.status 0.3.1
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@@ -19590,6 +19607,7 @@
s,@host_cpu@,$host_cpu,;t t
s,@host_vendor@,$host_vendor,;t t
s,@host_os@,$host_os,;t t
+s,@SED@,$SED,;t t
s,@EGREP@,$EGREP,;t t
s,@LN_S@,$LN_S,;t t
s,@ECHO@,$ECHO,;t t
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXcomposite-X11R7.1-0.3/configure.ac new/libXcomposite-0.3.1/configure.ac
--- old/libXcomposite-X11R7.1-0.3/configure.ac 2006-03-13 22:59:04.000000000 +0100
+++ new/libXcomposite-0.3.1/configure.ac 2006-10-13 20:58:15.000000000 +0200
@@ -1,5 +1,5 @@
dnl
-dnl $Id: configure.ac,v 1.10 2005/12/03 05:49:43 kem Exp $
+dnl $Id$
dnl
dnl Copyright © 2003 Keith Packard, Noah Levitt
dnl
@@ -34,7 +34,7 @@
dnl that 'revision' number appears in Xcomposite.h and has to be manually
dnl synchronized.
dnl
-AC_INIT(libXcomposite, 0.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXcomposite)
+AC_INIT(libXcomposite, 0.3.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXcomposite)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXcomposite-X11R7.1-0.3/include/X11/extensions/Xcomposite.h new/libXcomposite-0.3.1/include/X11/extensions/Xcomposite.h
--- old/libXcomposite-X11R7.1-0.3/include/X11/extensions/Xcomposite.h 2006-03-13 22:59:05.000000000 +0100
+++ new/libXcomposite-0.3.1/include/X11/extensions/Xcomposite.h 2006-10-12 00:30:42.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * $Id: Xcomposite.h,v 1.5 2005/11/09 21:31:19 kem Exp $
+ * $Id$
*
* Copyright © 2006 Sun Microsystems
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXcomposite-X11R7.1-0.3/ltmain.sh new/libXcomposite-0.3.1/ltmain.sh
--- old/libXcomposite-X11R7.1-0.3/ltmain.sh 2006-02-12 01:50:49.000000000 +0100
+++ new/libXcomposite-0.3.1/ltmain.sh 2006-07-13 09:12:13.000000000 +0200
@@ -46,10 +46,16 @@
VERSION=1.5.22
TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes.
-if test -n "${ZSH_VERSION+set}" ; then
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
+else
+ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
fi
# Check that we have a working $echo.
@@ -105,12 +111,14 @@
# These must not be set unconditionally because not all systems understand
# e.g. LANG=C (notably SCO).
# We save the old values to restore during execute mode.
-if test "${LC_ALL+set}" = set; then
- save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
-fi
-if test "${LANG+set}" = set; then
- save_LANG="$LANG"; LANG=C; export LANG
-fi
+for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+ eval "if test \"\${$lt_var+set}\" = set; then
+ save_$lt_var=\$$lt_var
+ $lt_var=C
+ export $lt_var
+ fi"
+done
# Make sure IFS has a sensible default
lt_nl='
@@ -136,6 +144,8 @@
preserve_args=
lo2o="s/\\.lo\$/.${objext}/"
o2lo="s/\\.${objext}\$/.lo/"
+extracted_archives=
+extracted_serial=0
#####################################
# Shell function definitions:
@@ -327,7 +337,17 @@
*) my_xabs=`pwd`"/$my_xlib" ;;
esac
my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
- my_xdir="$my_gentop/$my_xlib"
+ my_xlib_u=$my_xlib
+ while :; do
+ case " $extracted_archives " in
+ *" $my_xlib_u "*)
+ extracted_serial=`expr $extracted_serial + 1`
+ my_xlib_u=lt$extracted_serial-$my_xlib ;;
+ *) break ;;
+ esac
+ done
+ extracted_archives="$extracted_archives $my_xlib_u"
+ my_xdir="$my_gentop/$my_xlib_u"
$show "${rm}r $my_xdir"
$run ${rm}r "$my_xdir"
@@ -758,6 +778,7 @@
*.f90) xform=f90 ;;
*.for) xform=for ;;
*.java) xform=java ;;
+ *.obj) xform=obj ;;
esac
libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
@@ -1138,8 +1159,9 @@
for arg
do
case $arg in
- -all-static | -static)
- if test "X$arg" = "X-all-static"; then
+ -all-static | -static | -static-libtool-libs)
+ case $arg in
+ -all-static)
if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
$echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
fi
@@ -1147,12 +1169,20 @@
dlopen_self=$dlopen_self_static
fi
prefer_static_libs=yes
- else
+ ;;
+ -static)
if test -z "$pic_flag" && test -n "$link_static_flag"; then
dlopen_self=$dlopen_self_static
fi
prefer_static_libs=built
- fi
+ ;;
+ -static-libtool-libs)
+ if test -z "$pic_flag" && test -n "$link_static_flag"; then
+ dlopen_self=$dlopen_self_static
+ fi
+ prefer_static_libs=yes
+ ;;
+ esac
build_libtool_libs=no
build_old_libs=yes
break
@@ -1712,7 +1742,7 @@
continue
;;
- -static)
+ -static | -static-libtool-libs)
# The effects of -static are defined in a previous loop.
# We used to do the same as -all-static on platforms that
# didn't have a PIC flag, but the assumption that the effects
@@ -2490,7 +2520,9 @@
if test "$linkmode,$pass" = "prog,link"; then
if test -n "$library_names" &&
- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+ { { test "$prefer_static_libs" = no ||
+ test "$prefer_static_libs,$installed" = "built,yes"; } ||
+ test -z "$old_library"; }; then
# We need to hardcode the library path
if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
# Make sure the rpath contains only unique directories.
@@ -3186,7 +3218,7 @@
# which has an extra 1 added just for fun
#
case $version_type in
- darwin|linux|osf|windows)
+ darwin|linux|osf|windows|none)
current=`expr $number_major + $number_minor`
age="$number_minor"
revision="$number_revision"
@@ -3410,11 +3442,11 @@
fi
# Eliminate all temporary directories.
- for path in $notinst_path; do
- lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
- deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
- dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
- done
+# for path in $notinst_path; do
+# lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
+# deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
+# dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
+# done
if test -n "$xrpath"; then
# If the user specified any rpath flags, then add them.
@@ -3515,13 +3547,12 @@
int main() { return 0; }
EOF
$rm conftest
- $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
- if test "$?" -eq 0 ; then
+ if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
ldd_output=`ldd conftest`
for i in $deplibs; do
name=`expr $i : '-l\(.*\)'`
# If $name is empty we are operating on a -L argument.
- if test "$name" != "" && test "$name" -ne "0"; then
+ if test "$name" != "" && test "$name" != "0"; then
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
@@ -3560,9 +3591,7 @@
# If $name is empty we are operating on a -L argument.
if test "$name" != "" && test "$name" != "0"; then
$rm conftest
- $LTCC $LTCFLAGS -o conftest conftest.c $i
- # Did it work?
- if test "$?" -eq 0 ; then
+ if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
ldd_output=`ldd conftest`
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
@@ -3594,7 +3623,7 @@
droppeddeps=yes
$echo
$echo "*** Warning! Library $i is needed by this library but I was not able to"
- $echo "*** make it link in! You will probably need to install it or some"
+ $echo "*** make it link in! You will probably need to install it or some"
$echo "*** library that it depends on before this library will be fully"
$echo "*** functional. Installing it before continuing would be even better."
fi
@@ -4239,12 +4268,14 @@
reload_conv_objs=
gentop=
# reload_cmds runs $LD directly, so let us get rid of
- # -Wl from whole_archive_flag_spec
+ # -Wl from whole_archive_flag_spec and hope we can get by with
+ # turning comma into space..
wl=
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
- eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+ reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
else
gentop="$output_objdir/${obj}x"
generated="$generated $gentop"
@@ -4692,16 +4723,16 @@
case $host in
*cygwin* | *mingw* )
if test -f "$output_objdir/${outputname}.def" ; then
- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
else
- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
fi
;;
* )
- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
;;
esac
;;
@@ -4716,13 +4747,13 @@
# really was required.
# Nullify the symbol file.
- compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
fi
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
# Replace the output file specification.
- compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
link_command="$compile_command$compile_rpath"
# We have no uninstalled library dependencies, so finalize right now.
@@ -4809,7 +4840,7 @@
if test "$fast_install" != no; then
link_command="$finalize_var$compile_command$finalize_rpath"
if test "$fast_install" = yes; then
- relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+ relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
else
# fast_install is set to needless
relink_command=
@@ -4846,7 +4877,7 @@
fi
done
relink_command="(cd `pwd`; $relink_command)"
- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
fi
# Quote $echo for shipping.
@@ -5253,6 +5284,18 @@
Xsed='${SED} -e 1s/^X//'
sed_quote_subst='$sed_quote_subst'
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+ # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '\${1+\"\$@\"}'='\"\$@\"'
+ setopt NO_GLOB_SUBST
+else
+ case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
+fi
+
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
@@ -5395,7 +5438,7 @@
;;
esac
$echo >> $output "\
- \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+ \$echo \"\$0: cannot exec \$program \$*\"
exit $EXIT_FAILURE
fi
else
@@ -5581,7 +5624,7 @@
done
# Quote the link command for shipping.
relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
if test "$hardcode_automatic" = yes ; then
relink_command=
fi
@@ -5926,9 +5969,9 @@
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
else
- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
fi
$echo "$modename: warning: relinking \`$file'" 1>&2
@@ -6137,7 +6180,7 @@
file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
outputname="$tmpdir/$file"
# Replace the output file specification.
- relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
$show "$relink_command"
if $run eval "$relink_command"; then :
@@ -6413,12 +6456,15 @@
fi
# Restore saved environment variables
- if test "${save_LC_ALL+set}" = set; then
- LC_ALL="$save_LC_ALL"; export LC_ALL
- fi
- if test "${save_LANG+set}" = set; then
- LANG="$save_LANG"; export LANG
- fi
+ for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+ do
+ eval "if test \"\${save_$lt_var+set}\" = set; then
+ $lt_var=\$save_$lt_var; export $lt_var
+ else
+ $lt_unset $lt_var
+ fi"
+ done
+
# Now prepare to actually exec the command.
exec_cmd="\$cmd$args"
@@ -6775,9 +6821,9 @@
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-export-symbols SYMFILE
- try to export only the symbols listed in SYMFILE
+ try to export only the symbols listed in SYMFILE
-export-symbols-regex REGEX
- try to export only the symbols matching REGEX
+ try to export only the symbols matching REGEX
-LLIBDIR search LIBDIR for required installed libraries
-lNAME OUTPUT-FILE requires the installed library libNAME
-module build a library that can dlopened
@@ -6791,9 +6837,11 @@
-release RELEASE specify package release information
-rpath LIBDIR the created library will eventually be installed in LIBDIR
-R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
- -static do not do any dynamic linking of libtool libraries
+ -static do not do any dynamic linking of uninstalled libtool libraries
+ -static-libtool-libs
+ do not do any dynamic linking of libtool libraries
-version-info CURRENT[:REVISION[:AGE]]
- specify library version info [each variable defaults to 0]
+ specify library version info [each variable defaults to 0]
All other options (arguments beginning with \`-') are ignored.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXcomposite-X11R7.1-0.3/src/Makefile.am new/libXcomposite-0.3.1/src/Makefile.am
--- old/libXcomposite-X11R7.1-0.3/src/Makefile.am 2005-08-03 05:28:01.000000000 +0200
+++ new/libXcomposite-0.3.1/src/Makefile.am 2006-10-12 00:30:42.000000000 +0200
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.am,v 1.4 2005/07/16 06:33:36 daniels Exp $
+# $Id$
#
# Copyright © 2003 Keith Packard, Noah Levitt
#
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXcomposite-X11R7.1-0.3/src/Makefile.in new/libXcomposite-0.3.1/src/Makefile.in
--- old/libXcomposite-X11R7.1-0.3/src/Makefile.in 2006-05-22 03:29:11.000000000 +0200
+++ new/libXcomposite-0.3.1/src/Makefile.in 2006-10-13 21:58:57.000000000 +0200
@@ -15,7 +15,7 @@
@SET_MAKE@
#
-# $Id: Makefile.am,v 1.4 2005/07/16 06:33:36 daniels Exp $
+# $Id$
#
# Copyright © 2003 Keith Packard, Noah Levitt
#
@@ -157,6 +157,7 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXcomposite-X11R7.1-0.3/src/Xcomposite.c new/libXcomposite-0.3.1/src/Xcomposite.c
--- old/libXcomposite-X11R7.1-0.3/src/Xcomposite.c 2006-04-03 03:03:11.000000000 +0200
+++ new/libXcomposite-0.3.1/src/Xcomposite.c 2006-10-13 20:47:29.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * $Id: Xcomposite.c,v 1.2 2005/07/03 07:00:56 daniels Exp $
+ * $Id$
*
* Copyright © 2006 Sun Microsystems
*
@@ -235,8 +235,6 @@
XCompositeCheckExtension (dpy, info, 0);
*major_versionp = info->major_version;
*minor_versionp = info->minor_version;
- UnlockDisplay (dpy);
- SyncHandle ();
return 1;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXcomposite-X11R7.1-0.3/src/xcompositeint.h new/libXcomposite-0.3.1/src/xcompositeint.h
--- old/libXcomposite-X11R7.1-0.3/src/xcompositeint.h 2006-03-13 22:59:05.000000000 +0100
+++ new/libXcomposite-0.3.1/src/xcompositeint.h 2006-10-12 00:30:42.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * $Id: xcompositeint.h,v 1.1.1.1 2003/11/07 04:22:59 keithp Exp $
+ * $Id$
*
* Copyright © 2006 Sun Microsystems
*
++++++ libXcursor-1.1.7.tar.bz2 -> libXcursor-1.1.8.tar.bz2 ++++++
++++ 5099 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/libXcursor-1.1.7/Makefile.am new/libXcursor-1.1.8/Makefile.am
--- old/libXcursor-1.1.7/Makefile.am 2005-07-03 02:02:27.000000000 +0200
+++ new/libXcursor-1.1.8/Makefile.am 2006-10-12 00:30:45.000000000 +0200
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.am,v 1.2 2005/07/03 00:02:27 anholt Exp $
+# $Id$
#
# Copyright © 2003 Keith Packard, Noah Levitt
#
@@ -29,3 +29,8 @@
pkgconfig_DATA = xcursor.pc
EXTRA_DIST = xcursor.pc.in autogen.sh
+
+if LINT
+lint:
+ (cd src && $(MAKE) $(MFLAGS) lint)
+endif LINT
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/libXcursor-1.1.7/configure.ac new/libXcursor-1.1.8/configure.ac
--- old/libXcursor-1.1.7/configure.ac 2006-06-03 12:03:16.000000000 +0200
+++ new/libXcursor-1.1.8/configure.ac 2006-10-13 20:58:22.000000000 +0200
@@ -1,5 +1,5 @@
dnl
-dnl $Id: configure.ac,v 1.13 2005/12/08 17:55:18 kem Exp $
+dnl $Id$
dnl
dnl Copyright © 2003 Keith Packard
dnl
@@ -30,12 +30,16 @@
dnl Yes, it is a pain to synchronize version numbers. Unfortunately, it's
dnl not possible to extract the version number here from Xcursor.h
dnl
-AC_INIT([libXcursor],1.1.7,[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],[libXcursor])
+AC_INIT([libXcursor],1.1.8,[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],[libXcursor])
AM_INIT_AUTOMAKE([dist-bzip2])
AC_CONFIG_SRCDIR([Makefile.am])
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
+# Require xorg-macros version 1.1.0 or newer for XORG_WITH_LINT macro
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.1)
+
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
@@ -65,6 +69,9 @@
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
+dnl Allow checking code with lint, sparse, etc.
+XORG_WITH_LINT
+
AC_OUTPUT([Makefile
src/Makefile
man/Makefile
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/libXcursor-1.1.7/include/X11/Xcursor/Xcursor.h new/libXcursor-1.1.8/include/X11/Xcursor/Xcursor.h
--- old/libXcursor-1.1.7/include/X11/Xcursor/Xcursor.h 2006-06-03 12:03:29.000000000 +0200
+++ new/libXcursor-1.1.8/include/X11/Xcursor/Xcursor.h 2006-10-12 00:30:45.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * $Id: Xcursor.h,v 1.6 2005/11/09 21:31:19 kem Exp $
+ * $Id$
*
* Copyright © 2002 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/libXcursor-1.1.7/man/Makefile.am new/libXcursor-1.1.8/man/Makefile.am
--- old/libXcursor-1.1.7/man/Makefile.am 2005-12-06 23:48:42.000000000 +0100
+++ new/libXcursor-1.1.8/man/Makefile.am 2006-10-12 00:30:45.000000000 +0200
@@ -10,6 +10,9 @@
SUFFIXES = .$(LIB_MAN_SUFFIX) .man
+# Strings to replace in man pages
+XORGRELSTRING = @PACKAGE_STRING@
+
.man.$(LIB_MAN_SUFFIX):
-rm -f $@
- $(LN_S) $< $@
+ sed 's/__xorgversion__/"$(XORGRELSTRING)"/; s/__LIB_MAN_SUFFIX__/$(LIB_MAN_SUFFIX)/; s%__prefix__%$(prefix)%g; s%__ICONDIR__%$(ICONDIR)%g' < $< > $@
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/libXcursor-1.1.7/man/Xcursor.man new/libXcursor-1.1.8/man/Xcursor.man
--- old/libXcursor-1.1.7/man/Xcursor.man 2005-10-13 04:22:47.000000000 +0200
+++ new/libXcursor-1.1.8/man/Xcursor.man 2006-10-12 00:30:45.000000000 +0200
@@ -1,5 +1,5 @@
.\"
-.\" $Id: Xcursor.man,v 1.4 2005/10/13 02:22:47 alanc Exp $
+.\" $Id$
.\"
.\" Copyright © 2002 Keith Packard
.\"
@@ -26,7 +26,7 @@
.ns
.TP \\$1
..
-.TH XCURSOR 3 "Version 1.0" "Keith Packard"
+.TH XCURSOR __LIB_MAN_SUFFIX__ __xorgversion__ "Keith Packard"
.SH NAME
XCURSOR \- Cursor management library
@@ -71,6 +71,7 @@
\fIversion\fP\^: CARD32 file version number
.br
\fIntoc\fP\^: CARD32 number of toc entries
+.br
\fItoc\fP\^: LISTofTOC table of contents
.in -.2i
.P
@@ -78,7 +79,9 @@
.LP
.in +.2i
\fItype\fP\^: CARD32 entry type
+.br
\fIsubtype\fP\^: CARD32 type-specific label - size for images
+.br
\fIposition\fP\^: CARD32 absolute byte position of table in file
.in -.2i
.P
@@ -139,9 +142,9 @@
.SS THEMES
Xcursor (mostly) follows the freedesktop.org spec for theming icons. The
-default search path it uses is $HOME/.icons, /usr/share/icons,
-/usr/share/pimaps, /usr/X11R6/lib/X11/icons. Within each of these
-directorys, it searches for a directory using the theme name. Within the
+default search path it uses is $HOME/.icons, __prefix__/share/icons,
+__prefix__/share/pixmaps, __ICONDIR__. Within each of these
+directories, it searches for a directory using the theme name. Within the
theme directory, it looks for cursor files in the 'cursors' subdirectory.
It uses the first cursor file found along the path.
.PP
@@ -362,12 +365,11 @@
Gets the default cursor size.
.TP
-XcursorBool
-XcursorSetTheme (Display *dpy, const char *theme)
+XcursorBool XcursorSetTheme (Display *dpy, const char *theme)
Sets the current theme name.
-char *
-XcursorGetTheme (Display *dpy)
+.TP
+char *XcursorGetTheme (Display *dpy)
Gets the current theme name.
.SH RESTRICTIONS
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/libXcursor-1.1.7/src/Makefile.am new/libXcursor-1.1.8/src/Makefile.am
--- old/libXcursor-1.1.7/src/Makefile.am 2005-12-08 18:55:19.000000000 +0100
+++ new/libXcursor-1.1.8/src/Makefile.am 2006-10-12 00:30:45.000000000 +0200
@@ -18,3 +18,11 @@
libXcursorincludedir = $(includedir)/X11/Xcursor
libXcursorinclude_HEADERS = $(top_srcdir)/include/X11/Xcursor/Xcursor.h
+
+if LINT
+ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
+
+lint:
+ $(LINT) $(ALL_LINT_FLAGS) $(libXcursor_la_SOURCES) $(XCURSOR_LIBS)
+endif LINT
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/libXcursor-1.1.7/src/cursor.c new/libXcursor-1.1.8/src/cursor.c
--- old/libXcursor-1.1.7/src/cursor.c 2005-07-03 09:00:56.000000000 +0200
+++ new/libXcursor-1.1.8/src/cursor.c 2006-10-12 00:30:45.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * $Id: cursor.c,v 1.6 2005/07/03 07:00:56 daniels Exp $
+ * $Id$
*
* Copyright © 2002 Keith Packard
*
@@ -34,7 +34,7 @@
cursors = malloc (sizeof (XcursorCursors) +
size * sizeof (Cursor));
if (!cursors)
- return 0;
+ return NULL;
cursors->ref = 1;
cursors->dpy = dpy;
cursors->ncursor = 0;
@@ -47,6 +47,9 @@
{
int n;
+ if (!cursors)
+ return;
+
--cursors->ref;
if (cursors->ref > 0)
return;
@@ -63,7 +66,7 @@
animate = malloc (sizeof (XcursorAnimate));
if (!animate)
- return 0;
+ return NULL;
animate->cursors = cursors;
cursors->ref++;
animate->sequence = 0;
@@ -73,6 +76,9 @@
void
XcursorAnimateDestroy (XcursorAnimate *animate)
{
+ if (!animate)
+ return;
+
XcursorCursorsDestroy (animate->cursors);
free (animate);
}
@@ -570,17 +576,17 @@
ximage.red_mask = 0xff0000;
ximage.green_mask = 0x00ff00;
ximage.blue_mask = 0x0000ff;
- ximage.obdata = 0;
+ ximage.obdata = NULL;
if (!XInitImage (&ximage))
return None;
pixmap = XCreatePixmap (dpy, RootWindow (dpy, screen),
image->width, image->height, 32);
- gc = XCreateGC (dpy, pixmap, 0, 0);
+ gc = XCreateGC (dpy, pixmap, 0, NULL);
XPutImage (dpy, pixmap, gc, &ximage,
0, 0, 0, 0, image->width, image->height);
XFreeGC (dpy, gc);
format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
- picture = XRenderCreatePicture (dpy, pixmap, format, 0, 0);
+ picture = XRenderCreatePicture (dpy, pixmap, format, 0, NULL);
XFreePixmap (dpy, pixmap);
cursor = XRenderCreateCursor (dpy, picture,
image->xhot, image->yhot);
@@ -596,13 +602,13 @@
GC gc;
XGCValues gcv;
- core.src_image = XCreateImage (dpy, 0, 1, ZPixmap,
- 0, 0, image->width, image->height,
+ core.src_image = XCreateImage (dpy, NULL, 1, ZPixmap,
+ 0, NULL, image->width, image->height,
32, 0);
core.src_image->data = Xmalloc (image->height *
core.src_image->bytes_per_line);
- core.msk_image = XCreateImage (dpy, 0, 1, ZPixmap,
- 0, 0, image->width, image->height,
+ core.msk_image = XCreateImage (dpy, NULL, 1, ZPixmap,
+ 0, NULL, image->width, image->height,
32, 0);
core.msk_image->data = Xmalloc (image->height *
core.msk_image->bytes_per_line);
@@ -672,14 +678,14 @@
int n;
if (!cursors)
- return 0;
+ return NULL;
for (n = 0; n < images->nimage; n++)
{
cursors->cursors[n] = XcursorImageLoadCursor (dpy, images->images[n]);
if (!cursors->cursors[n])
{
XcursorCursorsDestroy (cursors);
- return 0;
+ return NULL;
}
cursors->ncursor++;
}
@@ -745,7 +751,7 @@
XcursorCursors *cursors;
if (!images)
- return 0;
+ return NULL;
cursors = XcursorImagesLoadCursors (dpy, images);
XcursorImagesDestroy (images);
return cursors;
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/libXcursor-1.1.7/src/display.c new/libXcursor-1.1.8/src/display.c
--- old/libXcursor-1.1.7/src/display.c 2006-04-16 20:37:55.000000000 +0200
+++ new/libXcursor-1.1.8/src/display.c 2006-10-12 00:30:45.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * $Id: display.c,v 1.5 2005/07/03 07:00:56 daniels Exp $
+ * $Id$
*
* Copyright © 2002 Keith Packard
*
@@ -118,15 +118,15 @@
return info;
info = (XcursorDisplayInfo *) malloc (sizeof (XcursorDisplayInfo));
if (!info)
- return 0;
- info->next = 0;
+ return NULL;
+ info->next = NULL;
info->display = dpy;
info->codes = XAddExtension (dpy);
if (!info->codes)
{
free (info);
- return 0;
+ return NULL;
}
(void) XESetCloseDisplay (dpy, info->codes->extension, _XcursorCloseDisplay);
@@ -200,8 +200,8 @@
info->size = dim / 48;
}
- info->theme = 0;
- info->theme_from_config = 0;
+ info->theme = NULL;
+ info->theme_from_config = NULL;
/*
* Get the desired theme
@@ -258,7 +258,7 @@
info->theme_core = i;
}
- info->fonts = 0;
+ info->fonts = NULL;
for (i = 0; i < NUM_BITMAPS; i++)
info->bitmaps[i].bitmap = None;
@@ -343,7 +343,7 @@
strcpy (copy, theme);
}
else
- copy = 0;
+ copy = NULL;
if (info->theme)
free (info->theme);
info->theme = copy;
@@ -356,7 +356,7 @@
XcursorDisplayInfo *info = _XcursorGetDisplayInfo (dpy);
if (!info)
- return 0;
+ return NULL;
return info->theme;
}
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/libXcursor-1.1.7/src/file.c new/libXcursor-1.1.8/src/file.c
--- old/libXcursor-1.1.7/src/file.c 2006-06-03 12:03:03.000000000 +0200
+++ new/libXcursor-1.1.8/src/file.c 2006-10-12 00:30:45.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * $Id: file.c,v 1.5 2005/07/03 07:00:56 daniels Exp $
+ * $Id$
*
* Copyright © 2002 Keith Packard
*
@@ -34,7 +34,7 @@
image = malloc (sizeof (XcursorImage) +
width * height * sizeof (XcursorPixel));
if (!image)
- return 0;
+ return NULL;
image->version = XCURSOR_IMAGE_VERSION;
image->pixels = (XcursorPixel *) (image + 1);
image->size = width > height ? width : height;
@@ -47,8 +47,7 @@
void
XcursorImageDestroy (XcursorImage *image)
{
- if (image)
- free (image);
+ free (image);
}
XcursorImages *
@@ -59,10 +58,10 @@
images = malloc (sizeof (XcursorImages) +
size * sizeof (XcursorImage *));
if (!images)
- return 0;
+ return NULL;
images->nimage = 0;
images->images = (XcursorImage **) (images + 1);
- images->name = 0;
+ images->name = NULL;
return images;
}
@@ -106,11 +105,11 @@
XcursorComment *comment;
if (length > XCURSOR_COMMENT_MAX_LEN)
- return 0;
+ return NULL;
comment = malloc (sizeof (XcursorComment) + length + 1);
if (!comment)
- return 0;
+ return NULL;
comment->version = XCURSOR_COMMENT_VERSION;
comment->comment_type = comment_type;
comment->comment = (char *) (comment + 1);
@@ -121,8 +120,7 @@
void
XcursorCommentDestroy (XcursorComment *comment)
{
- if (!comment)
- free (comment);
+ free (comment);
}
XcursorComments *
@@ -133,7 +131,7 @@
comments = malloc (sizeof (XcursorComments) +
size * sizeof (XcursorComment *));
if (!comments)
- return 0;
+ return NULL;
comments->ncomment = 0;
comments->comments = (XcursorComment **) (comments + 1);
return comments;
@@ -205,8 +203,7 @@
static void
_XcursorFileHeaderDestroy (XcursorFileHeader *fileHeader)
{
- if (!fileHeader)
- free (fileHeader);
+ free (fileHeader);
}
static XcursorFileHeader *
@@ -215,11 +212,11 @@
XcursorFileHeader *fileHeader;
if (ntoc > 0x10000)
- return 0;
+ return NULL;
fileHeader = malloc (sizeof (XcursorFileHeader) +
ntoc * sizeof (XcursorFileToc));
if (!fileHeader)
- return 0;
+ return NULL;
fileHeader->magic = XCURSOR_MAGIC;
fileHeader->header = XCURSOR_FILE_HEADER_LEN;
fileHeader->version = XCURSOR_FILE_VERSION;
@@ -239,22 +236,22 @@
return NULL;
if (!_XcursorReadUInt (file, &head.magic))
- return 0;
+ return NULL;
if (head.magic != XCURSOR_MAGIC)
- return 0;
+ return NULL;
if (!_XcursorReadUInt (file, &head.header))
- return 0;
+ return NULL;
if (!_XcursorReadUInt (file, &head.version))
- return 0;
+ return NULL;
if (!_XcursorReadUInt (file, &head.ntoc))
- return 0;
+ return NULL;
skip = head.header - XCURSOR_FILE_HEADER_LEN;
if (skip)
if ((*file->seek) (file, skip, SEEK_CUR) == EOF)
- return 0;
+ return NULL;
fileHeader = _XcursorFileHeaderCreate (head.ntoc);
if (!fileHeader)
- return 0;
+ return NULL;
fileHeader->magic = head.magic;
fileHeader->header = head.header;
fileHeader->version = head.version;
@@ -271,7 +268,7 @@
if (n != fileHeader->ntoc)
{
_XcursorFileHeaderDestroy (fileHeader);
- return 0;
+ return NULL;
}
return fileHeader;
}
@@ -442,24 +439,24 @@
return NULL;
if (!_XcursorFileReadChunkHeader (file, fileHeader, toc, &chunkHeader))
- return 0;
+ return NULL;
if (!_XcursorReadUInt (file, &head.width))
- return 0;
+ return NULL;
if (!_XcursorReadUInt (file, &head.height))
- return 0;
+ return NULL;
if (!_XcursorReadUInt (file, &head.xhot))
- return 0;
+ return NULL;
if (!_XcursorReadUInt (file, &head.yhot))
- return 0;
+ return NULL;
if (!_XcursorReadUInt (file, &head.delay))
- return 0;
+ return NULL;
/* sanity check data */
if (head.width >= 0x10000 || head.height > 0x10000)
- return 0;
+ return NULL;
if (head.width == 0 || head.height == 0)
- return 0;
+ return NULL;
if (head.xhot > head.width || head.yhot > head.height)
- return 0;
+ return NULL;
/* Create the image and initialize it */
image = XcursorImageCreate (head.width, head.height);
@@ -476,7 +473,7 @@
if (!_XcursorReadUInt (file, p))
{
XcursorImageDestroy (image);
- return 0;
+ return NULL;
}
p++;
}
@@ -561,17 +558,17 @@
/* read chunk header */
if (!_XcursorFileReadChunkHeader (file, fileHeader, toc, &chunkHeader))
- return 0;
+ return NULL;
/* read extra comment header fields */
if (!_XcursorReadUInt (file, &length))
- return 0;
+ return NULL;
comment = XcursorCommentCreate (chunkHeader.subtype, length);
if (!comment)
- return 0;
+ return NULL;
if (!_XcursorReadBytes (file, comment->comment, length))
{
XcursorCommentDestroy (comment);
- return 0;
+ return NULL;
}
comment->comment[length] = '\0';
return comment;
@@ -629,16 +626,16 @@
XcursorImage *image;
if (size < 0)
- return 0;
+ return NULL;
fileHeader = _XcursorReadFileHeader (file);
if (!fileHeader)
- return 0;
+ return NULL;
bestSize = _XcursorFindBestSize (fileHeader, (XcursorDim) size, &nsize);
if (!bestSize)
- return 0;
+ return NULL;
toc = _XcursorFindImageToc (fileHeader, bestSize, 0);
if (toc < 0)
- return 0;
+ return NULL;
image = _XcursorReadImage (file, fileHeader, toc);
_XcursorFileHeaderDestroy (fileHeader);
return image;
@@ -686,7 +683,7 @@
if (images->nimage != nsize)
{
XcursorImagesDestroy (images);
- images = 0;
+ images = NULL;
}
return images;
}
@@ -702,11 +699,11 @@
int toc;
if (!file)
- return 0;
+ return NULL;
fileHeader = _XcursorReadFileHeader (file);
if (!fileHeader)
- return 0;
+ return NULL;
nimage = 0;
for (n = 0; n < fileHeader->ntoc; n++)
{
@@ -718,7 +715,7 @@
}
images = XcursorImagesCreate (nimage);
if (!images)
- return 0;
+ return NULL;
for (toc = 0; toc < fileHeader->ntoc; toc++)
{
switch (fileHeader->tocs[toc].type) {
@@ -736,7 +733,7 @@
if (images->nimage != nimage)
{
XcursorImagesDestroy (images);
- images = 0;
+ images = NULL;
}
return images;
}
@@ -808,8 +805,8 @@
{
XcursorImagesDestroy (images);
XcursorCommentsDestroy (comments);
- images = 0;
- comments = 0;
+ images = NULL;
+ comments = NULL;
return XcursorFalse;
}
*imagesp = images;
@@ -1013,7 +1010,7 @@
f = fopen (file, "r");
if (!f)
- return 0;
+ return NULL;
image = XcursorFileLoadImage (f, size);
fclose (f);
return image;
@@ -1030,7 +1027,7 @@
f = fopen (file, "r");
if (!f)
- return 0;
+ return NULL;
images = XcursorFileLoadImages (f, size);
fclose (f);
return images;
@@ -1047,7 +1044,7 @@
f = fopen (file, "r");
if (!f)
- return 0;
+ return NULL;
images = XcursorFileLoadAllImages (f);
fclose (f);
return images;
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/libXcursor-1.1.7/src/library.c new/libXcursor-1.1.8/src/library.c
--- old/libXcursor-1.1.7/src/library.c 2005-12-08 18:54:40.000000000 +0100
+++ new/libXcursor-1.1.8/src/library.c 2006-10-12 00:30:45.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * $Id: library.c,v 1.6 2005/12/08 17:54:40 kem Exp $
+ * $Id$
*
* Copyright © 2002 Keith Packard
*
@@ -98,13 +98,13 @@
themelen = tcolon - theme;
- home = 0;
+ home = NULL;
homelen = 0;
if (*dir == '~')
{
home = getenv ("HOME");
if (!home)
- return 0;
+ return NULL;
homelen = strlen (home);
dir++;
dirlen--;
@@ -118,7 +118,7 @@
full = malloc (len);
if (!full)
- return 0;
+ return NULL;
full[0] = '\0';
if (home)
@@ -138,7 +138,7 @@
full = malloc (strlen (dir) + 1 + strlen (subdir) + 1 + strlen (file) + 1);
if (!full)
- return 0;
+ return NULL;
full[0] = '\0';
_XcursorAddPathElt (full, dir, -1);
_XcursorAddPathElt (full, subdir, -1);
@@ -152,7 +152,7 @@
char *colon = strchr (path, ':');
if (!colon)
- return 0;
+ return NULL;
return colon + 1;
}
@@ -163,7 +163,7 @@
_XcursorThemeInherits (const char *full)
{
char line[8192];
- char *result = 0;
+ char *result = NULL;
FILE *f;
if (!full)
@@ -212,11 +212,11 @@
static FILE *
XcursorScanTheme (const char *theme, const char *name)
{
- FILE *f = 0;
+ FILE *f = NULL;
char *full;
char *dir;
const char *path;
- char *inherits = 0;
+ char *inherits = NULL;
const char *i;
if (!theme || !name)
@@ -263,7 +263,7 @@
*/
for (i = inherits; i && f == 0; i = _XcursorNextPath (i))
f = XcursorScanTheme (i, name);
- if (inherits)
+ if (inherits != NULL)
free (inherits);
return f;
}
@@ -271,8 +271,8 @@
XcursorImage *
XcursorLibraryLoadImage (const char *file, const char *theme, int size)
{
- FILE *f = 0;
- XcursorImage *image = 0;
+ FILE *f = NULL;
+ XcursorImage *image = NULL;
if (!file)
return NULL;
@@ -282,7 +282,7 @@
if (!f)
f = XcursorScanTheme ("default", file);
if (f == XCURSOR_SCAN_CORE)
- return 0;
+ return NULL;
if (f)
{
image = XcursorFileLoadImage (f, size);
@@ -294,8 +294,8 @@
XcursorImages *
XcursorLibraryLoadImages (const char *file, const char *theme, int size)
{
- FILE *f = 0;
- XcursorImages *images = 0;
+ FILE *f = NULL;
+ XcursorImages *images = NULL;
if (!file)
return NULL;
@@ -305,7 +305,7 @@
if (!f)
f = XcursorScanTheme ("default", file);
if (f == XCURSOR_SCAN_CORE)
- return 0;
+ return NULL;
if (f)
{
images = XcursorFileLoadImages (f, size);
@@ -368,14 +368,14 @@
if (cursors->cursors[0] == None)
{
XcursorCursorsDestroy (cursors);
- cursors = 0;
+ cursors = NULL;
}
else
cursors->ncursor = 1;
}
}
else
- cursors = 0;
+ cursors = NULL;
}
else
{
@@ -428,7 +428,7 @@
return XcursorLibraryLoadImage (_XcursorStandardNames[id],
theme, size);
else
- return 0;
+ return NULL;
}
XcursorImages *
@@ -440,7 +440,7 @@
return XcursorLibraryLoadImages (_XcursorStandardNames[id],
theme, size);
else
- return 0;
+ return NULL;
}
Cursor
@@ -462,7 +462,7 @@
if (id < NUM_STANDARD_NAMES)
return XcursorLibraryLoadCursors (dpy, _XcursorStandardNames[id]);
else
- return 0;
+ return NULL;
}
int
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/libXcursor-1.1.7/src/xcursorint.h new/libXcursor-1.1.8/src/xcursorint.h
--- old/libXcursor-1.1.7/src/xcursorint.h 2005-10-20 00:26:55.000000000 +0200
+++ new/libXcursor-1.1.8/src/xcursorint.h 2006-10-12 00:30:45.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * $Id: xcursorint.h,v 1.6 2005/10/19 22:26:55 ajax Exp $
+ * $Id$
*
* Copyright © 2002 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/libXcursor-1.1.7/src/xlib.c new/libXcursor-1.1.8/src/xlib.c
--- old/libXcursor-1.1.7/src/xlib.c 2005-07-03 09:00:56.000000000 +0200
+++ new/libXcursor-1.1.8/src/xlib.c 2006-10-12 00:30:45.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * $Id: xlib.c,v 1.5 2005/07/03 07:00:56 daniels Exp $
+ * $Id$
*
* Copyright © 2002 Keith Packard
*
@@ -179,7 +179,7 @@
info = _XcursorGetDisplayInfo (dpy);
if (!info)
- return 0;
+ return NULL;
LockDisplay (dpy);
for (i = 0; i < NUM_BITMAPS; i++)
if (info->bitmaps[i].bitmap == bitmap)
@@ -189,7 +189,7 @@
return &info->bitmaps[i];
}
UnlockDisplay (dpy);
- return 0;
+ return NULL;
}
static Bool
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/libXcursor-1.1.7/xcursor.pc.in new/libXcursor-1.1.8/xcursor.pc.in
--- old/libXcursor-1.1.7/xcursor.pc.in 2005-12-09 20:28:41.000000000 +0100
+++ new/libXcursor-1.1.8/xcursor.pc.in 2006-10-12 00:30:45.000000000 +0200
@@ -2,6 +2,7 @@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
+datarootdir=@datarootdir@
icondir=@ICONDIR@
Name: Xcursor
++++++ libXevie-X11R7.1-1.0.1.tar.bz2 -> libXevie-1.0.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXevie-X11R7.1-1.0.1/Makefile.am new/libXevie-1.0.2/Makefile.am
--- old/libXevie-X11R7.1-1.0.1/Makefile.am 2005-10-13 06:22:14.000000000 +0200
+++ new/libXevie-1.0.2/Makefile.am 2006-10-12 00:30:50.000000000 +0200
@@ -1,4 +1,4 @@
-# $Id: $
+# $Id$
AM_CFLAGS = $(XEVIE_CFLAGS) $(X_CFLAGS)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXevie-X11R7.1-1.0.1/Makefile.in new/libXevie-1.0.2/Makefile.in
--- old/libXevie-X11R7.1-1.0.1/Makefile.in 2006-05-22 03:30:48.000000000 +0200
+++ new/libXevie-1.0.2/Makefile.in 2006-10-13 22:03:26.000000000 +0200
@@ -14,7 +14,7 @@
@SET_MAKE@
-# $Id: $
+# $Id$
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -150,6 +150,7 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXevie-X11R7.1-1.0.1/aclocal.m4 new/libXevie-1.0.2/aclocal.m4
--- old/libXevie-X11R7.1-1.0.1/aclocal.m4 2006-05-22 03:30:39.000000000 +0200
+++ new/libXevie-1.0.2/aclocal.m4 2006-10-13 22:03:22.000000000 +0200
@@ -1597,7 +1597,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
@@ -4305,6 +4305,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$_LT_AC_TAGVAR(GCC, $1)
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -4438,11 +4441,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
+predep_objects=\`echo $lt_[]_LT_AC_TAGVAR(predep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
+postdep_objects=\`echo $lt_[]_LT_AC_TAGVAR(postdep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -4454,7 +4457,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
+compiler_lib_search_path=\`echo $lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -4534,7 +4537,7 @@
link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -6370,6 +6373,7 @@
done
done
done
+IFS=$as_save_IFS
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -6402,6 +6406,7 @@
done
])
SED=$lt_cv_path_SED
+AC_SUBST([SED])
AC_MSG_RESULT([$SED])
])
@@ -6543,7 +6548,8 @@
_PKG_TEXT
])],
- [$4])
+ [AC_MSG_RESULT([no])
+ $4])
elif test $pkg_failed = untried; then
ifelse([$4], , [AC_MSG_FAILURE(dnl
[The pkg-config script could not be found or is too old. Make sure it
@@ -6562,35 +6568,69 @@
fi[]dnl
])# PKG_CHECK_MODULES
-dnl $Id: xorg-macros.m4,v 1.8 2005/12/09 15:28:41 kem Exp $
dnl
-dnl Copyright 2005 Sun Microsystems, Inc. All rights reserved.
-dnl
-dnl Permission to use, copy, modify, distribute, and sell this software and its
-dnl documentation for any purpose is hereby granted without fee, provided that
-dnl the above copyright notice appear in all copies and that both that
-dnl copyright notice and this permission notice appear in supporting
-dnl documentation.
-dnl
-dnl The above copyright notice and this permission notice shall be included
-dnl in all copies or substantial portions of the Software.
+dnl Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved.
dnl
+dnl Permission is hereby granted, free of charge, to any person obtaining a
+dnl copy of this software and associated documentation files (the
+dnl "Software"), to deal in the Software without restriction, including
+dnl without limitation the rights to use, copy, modify, merge, publish,
+dnl distribute, and/or sell copies of the Software, and to permit persons
+dnl to whom the Software is furnished to do so, provided that the above
+dnl copyright notice(s) and this permission notice appear in all copies of
+dnl the Software and that both the above copyright notice(s) and this
+dnl permission notice appear in supporting documentation.
+dnl
dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-dnl OTHER DEALINGS IN THE SOFTWARE.
-dnl
-dnl Except as contained in this notice, the name of the copyright holders shall
-dnl not be used in advertising or otherwise to promote the sale, use or
-dnl other dealings in this Software without prior written authorization
-dnl from the copyright holders.
-dnl
+dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+dnl OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+dnl HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+dnl INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+dnl FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+dnl NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+dnl WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+dnl
+dnl Except as contained in this notice, the name of a copyright holder
+dnl shall not be used in advertising or otherwise to promote the sale, use
+dnl or other dealings in this Software without prior written authorization
+dnl of the copyright holder.
+
+# XORG_MACROS_VERSION(required-version)
+# -------------------------------------
+# Minimum version: 1.1.0
+#
+# If you're using a macro added in Version 1.1 or newer, include this in
+# your configure.ac with the minimum required version, such as:
+# XORG_MACROS_VERSION(1.1)
+#
+# To force at least a version with this macro defined, also add:
+# m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
+#
+#
+# See the "minimum version" comment for each macro you use to see what
+# version you require.
+AC_DEFUN([XORG_MACROS_VERSION],[
+ [XORG_MACROS_needed_version=$1
+ XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
+ XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
+ AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
+ [XORG_MACROS_version=1.1.1
+ XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
+ XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
+ if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
+ AC_MSG_ERROR([configure built with incompatible version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.x])
+ fi
+ if test $XORG_MACROS_minor -lt $XORG_MACROS_needed_minor ; then
+ AC_MSG_ERROR([configure built with too old of a version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.${XORG_MACROS_minor}.0 or newer])
+ fi
+ AC_MSG_RESULT([yes, $XORG_MACROS_version])
+]) # XORG_MACROS_VERSION
# XORG_PROG_RAWCPP()
# ------------------
+# Minimum version: 1.0.0
+#
# Find cpp program and necessary flags for use in pre-processing text files
# such as man pages and config files
AC_DEFUN([XORG_PROG_RAWCPP],[
@@ -6633,6 +6673,8 @@
# XORG_MANPAGE_SECTIONS()
# -----------------------
+# Minimum version: 1.0.0
+#
# Determine which sections man pages go in for the different man page types
# on this OS - replaces *ManSuffix settings in old Imake *.cf per-os files.
# Not sure if there's any better way than just hardcoding by OS name.
@@ -6642,75 +6684,47 @@
AC_REQUIRE([AC_CANONICAL_HOST])
if test x$APP_MAN_SUFFIX = x ; then
- case $host_os in
- linux*) APP_MAN_SUFFIX=1x ;;
- *) APP_MAN_SUFFIX=1 ;;
- esac
+ APP_MAN_SUFFIX=1
fi
if test x$APP_MAN_DIR = x ; then
- case $host_os in
- linux*) APP_MAN_DIR='$(mandir)/man1' ;;
- *) APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' ;;
- esac
+ APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)'
fi
if test x$LIB_MAN_SUFFIX = x ; then
- case $host_os in
- linux*) LIB_MAN_SUFFIX=3x ;;
- *) LIB_MAN_SUFFIX=3 ;;
- esac
+ LIB_MAN_SUFFIX=3
fi
if test x$LIB_MAN_DIR = x ; then
- case $host_os in
- linux*) LIB_MAN_DIR='$(mandir)/man3' ;;
- *) LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' ;;
- esac
+ LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)'
fi
if test x$FILE_MAN_SUFFIX = x ; then
case $host_os in
- linux*) FILE_MAN_SUFFIX=5x ;;
solaris*) FILE_MAN_SUFFIX=4 ;;
*) FILE_MAN_SUFFIX=5 ;;
esac
fi
if test x$FILE_MAN_DIR = x ; then
- case $host_os in
- linux*) FILE_MAN_DIR='$(mandir)/man5' ;;
- *) FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' ;;
- esac
+ FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)'
fi
-# In Imake's linux.cf, the misc man suffix & dir was only changed for
-# LinuxDebian, not other Linuxes, so we leave it unchanged here
if test x$MISC_MAN_SUFFIX = x ; then
case $host_os in
-# linux*) MISC_MAN_SUFFIX=7x ;;
solaris*) MISC_MAN_SUFFIX=5 ;;
*) MISC_MAN_SUFFIX=7 ;;
esac
fi
if test x$MISC_MAN_DIR = x ; then
- case $host_os in
-# linux*) MISC_MAN_DIR='$(mandir)/man7' ;;
- *) MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)' ;;
- esac
+ MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)'
fi
-# In Imake's linux.cf, the driver man suffix & dir was only changed for
-# LinuxDebian, not other Linuxes, so we leave it unchanged here
if test x$DRIVER_MAN_SUFFIX = x ; then
case $host_os in
-# linux*) DRIVER_MAN_SUFFIX=4x ;;
solaris*) DRIVER_MAN_SUFFIX=7 ;;
*) DRIVER_MAN_SUFFIX=4 ;;
esac
fi
if test x$DRIVER_MAN_DIR = x ; then
- case $host_os in
-# linux*) DRIVER_MAN_DIR='$(mandir)/man4' ;;
- *) DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)' ;;
- esac
+ DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)'
fi
if test x$ADMIN_MAN_SUFFIX = x ; then
@@ -6740,6 +6754,8 @@
# XORG_CHECK_LINUXDOC
# -------------------
+# Minimum version: 1.0.0
+#
# Defines the variable MAKE_TEXT if the necessary tools and
# files are found. $(MAKE_TEXT) blah.sgml will then produce blah.txt.
# Whether or not the necessary tools and files are found can be checked
@@ -6791,6 +6807,8 @@
# XORG_CHECK_MALLOC_ZERO
# ----------------------
+# Minimum version: 1.0.0
+#
# Defines {MALLOC,XMALLOC,XTMALLOC}_ZERO_CFLAGS appropriately if
# malloc(0) returns NULL. Packages should add one of these cflags to
# their AM_CFLAGS (or other appropriate *_CFLAGS) to use them.
@@ -6835,6 +6853,78 @@
AC_SUBST([XTMALLOC_ZERO_CFLAGS])
]) # XORG_CHECK_MALLOC_ZERO
+# XORG_WITH_LINT()
+# ----------------
+# Minimum version: 1.1.0
+#
+# Sets up flags for source checkers such as lint and sparse if --with-lint
+# is specified. (Use --with-lint=sparse for sparse.)
+# Sets $LINT to name of source checker passed with --with-lint (default: lint)
+# Sets $LINT_FLAGS to flags to pass to source checker
+# Sets LINT automake conditional if enabled (default: disabled)
+#
+AC_DEFUN([XORG_WITH_LINT],[
+
+# Allow checking code with lint, sparse, etc.
+AC_ARG_WITH(lint, [AC_HELP_STRING([--with-lint],
+ [Use a lint-style source code checker (default: disabled)])],
+ [use_lint=$withval], [use_lint=no])
+if test "x$use_lint" = "xyes" ; then
+ LINT="lint"
+else
+ LINT="$use_lint"
+fi
+if test "x$LINT_FLAGS" = "x" -a "x$LINT" != "xno" ; then
+ case $LINT in
+ lint|*/lint)
+ case $host_os in
+ solaris*)
+ LINT_FLAGS="-u -b -h -erroff=E_INDISTING_FROM_TRUNC2"
+ ;;
+ esac
+ ;;
+ esac
+fi
+
+AC_SUBST(LINT)
+AC_SUBST(LINT_FLAGS)
+AM_CONDITIONAL(LINT, [test x$LINT != xno])
+
+]) # XORG_WITH_LINT
+
+# XORG_LINT_LIBRARY(LIBNAME)
+# --------------------------
+# Minimum version: 1.1.0
+#
+# Sets up flags for building lint libraries for checking programs that call
+# functions in the library.
+# Disabled by default, enable with --enable-lint-library
+# Sets:
+# @LINTLIB@ - name of lint library file to make
+# MAKE_LINT_LIB - automake conditional
+#
+
+AC_DEFUN([XORG_LINT_LIBRARY],[
+AC_REQUIRE([XORG_WITH_LINT])
+# Build lint "library" for more indepth checks of programs calling this library
+AC_ARG_ENABLE(lint-library, [AC_HELP_STRING([--enable-lint-library],
+ [Create lint library (default: disabled)])],
+ [make_lint_lib=$enableval], [make_lint_lib=no])
+if test "x$make_lint_lib" != "xno" ; then
+ if test "x$LINT" = "xno" ; then
+ AC_MSG_ERROR([Cannot make lint library without --with-lint])
+ fi
+ if test "x$make_lint_lib" = "xyes" ; then
+ LINTLIB=llib-l$1.ln
+ else
+ LINTLIB=$make_lint_lib
+ fi
+fi
+AC_SUBST(LINTLIB)
+AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno])
+
+]) # XORG_LINT_LIBRARY
+
dnl Copyright 2005 Red Hat, Inc
dnl
dnl Permission to use, copy, modify, distribute, and sell this software and its
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXevie-X11R7.1-1.0.1/configure new/libXevie-1.0.2/configure
--- old/libXevie-X11R7.1-1.0.1/configure 2006-05-22 03:38:49.000000000 +0200
+++ new/libXevie-1.0.2/configure 2006-10-13 22:03:25.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for libXevie 1.0.1.
+# Generated by GNU Autoconf 2.59 for libXevie 1.0.2.
#
# Report bugs to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg.
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='libXevie'
PACKAGE_TARNAME='libXevie'
-PACKAGE_VERSION='1.0.1'
-PACKAGE_STRING='libXevie 1.0.1'
+PACKAGE_VERSION='1.0.2'
+PACKAGE_STRING='libXevie 1.0.2'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
# Factoring default headers for most tests.
@@ -464,7 +464,7 @@
# include
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXX
CPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG ac_pt_PKG_CONFIG XEVIE_CFLAGS XEVIE_LIBS MALLOC_ZERO_CFLAGS XMALLOC_ZERO_CFLAGS XTMALLOC_ZERO_CFLAGS APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX MISC_MAN_SUFFIX DRIVER_MAN_SUFFIX ADMIN_MAN_SUFFIX APP_MAN_DIR LIB_MAN_DIR FILE_MAN_DIR MISC_MAN_DIR DRIVER_MAN_DIR ADMIN_MAN_DIR LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE
CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG ac_pt_PKG_CONFIG XEVIE_CFLAGS XEVIE_LIBS MALLOC_ZERO_CFLAGS XMALLOC_ZERO_CFLAGS XTMALLOC_ZERO_CFLAGS APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX MISC_MAN_SUFFIX DRIVER_MAN_SUFFIX ADMIN_MAN_SUFFIX APP_MAN_DIR LIB_MAN_DIR FILE_MAN_DIR MISC_MAN_DIR DRIVER_MAN_DIR ADMIN_MAN_DIR LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -965,7 +965,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 libXevie 1.0.1 to adapt to many kinds of systems.
+\`configure' configures libXevie 1.0.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1031,7 +1031,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libXevie 1.0.1:";;
+ short | recursive ) echo "Configuration of libXevie 1.0.2:";;
esac
cat <<\_ACEOF
@@ -1180,7 +1180,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-libXevie configure 1.0.1
+libXevie configure 1.0.2
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1194,7 +1194,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libXevie $as_me 1.0.1, which was
+It was created by libXevie $as_me 1.0.2, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1837,7 +1837,7 @@
# Define the identity of the package.
PACKAGE='libXevie'
- VERSION='1.0.1'
+ VERSION='1.0.2'
cat >>confdefs.h <<_ACEOF
@@ -3246,6 +3246,7 @@
done
done
done
+IFS=$as_save_IFS
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -3280,6 +3281,7 @@
fi
SED=$lt_cv_path_SED
+
echo "$as_me:$LINENO: result: $SED" >&5
echo "${ECHO_T}$SED" >&6
@@ -3720,7 +3722,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 3723 "configure"' > conftest.$ac_ext
+ echo '#line 3725 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5319,7 +5321,7 @@
# Provide some information about the compiler.
-echo "$as_me:5322:" \
+echo "$as_me:5324:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5
@@ -6382,11 +6384,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6385: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6387: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6389: \$? = $ac_status" >&5
+ echo "$as_me:6391: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6650,11 +6652,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6653: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6655: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6657: \$? = $ac_status" >&5
+ echo "$as_me:6659: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6754,11 +6756,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6757: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6759: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:6761: \$? = $ac_status" >&5
+ echo "$as_me:6763: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8223,7 +8225,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 8226 "configure"' > conftest.$ac_ext
+ echo '#line 8228 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -8242,7 +8244,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
@@ -9120,7 +9122,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext < conftest.$ac_ext <&5)
+ (eval echo "\"\$as_me:11568: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11567: \$? = $ac_status" >&5
+ echo "$as_me:11572: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -11664,11 +11669,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11667: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11672: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11671: \$? = $ac_status" >&5
+ echo "$as_me:11676: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12200,7 +12205,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 12203 "configure"' > conftest.$ac_ext
+ echo '#line 12208 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -12219,7 +12224,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
@@ -12604,6 +12609,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_CXX
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -12737,11 +12745,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_predep_objects_CXX
+predep_objects=\`echo $lt_predep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_postdep_objects_CXX
+postdep_objects=\`echo $lt_postdep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -12753,7 +12761,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -12833,7 +12841,7 @@
link_all_deplibs=$link_all_deplibs_CXX
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -13255,11 +13263,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13258: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13266: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13262: \$? = $ac_status" >&5
+ echo "$as_me:13270: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13359,11 +13367,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13362: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13370: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13366: \$? = $ac_status" >&5
+ echo "$as_me:13374: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14808,7 +14816,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 14811 "configure"' > conftest.$ac_ext
+ echo '#line 14819 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -14827,7 +14835,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
@@ -15212,6 +15220,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_F77
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -15345,11 +15356,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_predep_objects_F77
+predep_objects=\`echo $lt_predep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_postdep_objects_F77
+postdep_objects=\`echo $lt_postdep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -15361,7 +15372,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_F77
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -15441,7 +15452,7 @@
link_all_deplibs=$link_all_deplibs_F77
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -15583,11 +15594,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15586: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15597: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15590: \$? = $ac_status" >&5
+ echo "$as_me:15601: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15851,11 +15862,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15854: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15865: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15858: \$? = $ac_status" >&5
+ echo "$as_me:15869: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15955,11 +15966,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15958: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15969: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15962: \$? = $ac_status" >&5
+ echo "$as_me:15973: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17424,7 +17435,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 17427 "configure"' > conftest.$ac_ext
+ echo '#line 17438 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -17443,7 +17454,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
@@ -17828,6 +17839,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_GCJ
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -17961,11 +17975,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_predep_objects_GCJ
+predep_objects=\`echo $lt_predep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_postdep_objects_GCJ
+postdep_objects=\`echo $lt_postdep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -17977,7 +17991,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -18057,7 +18071,7 @@
link_all_deplibs=$link_all_deplibs_GCJ
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -18309,6 +18323,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_RC
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -18442,11 +18459,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_predep_objects_RC
+predep_objects=\`echo $lt_predep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_postdep_objects_RC
+postdep_objects=\`echo $lt_postdep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -18458,7 +18475,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_RC
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -18538,7 +18555,7 @@
link_all_deplibs=$link_all_deplibs_RC
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -18941,75 +18958,47 @@
if test x$APP_MAN_SUFFIX = x ; then
- case $host_os in
- linux*) APP_MAN_SUFFIX=1x ;;
- *) APP_MAN_SUFFIX=1 ;;
- esac
+ APP_MAN_SUFFIX=1
fi
if test x$APP_MAN_DIR = x ; then
- case $host_os in
- linux*) APP_MAN_DIR='$(mandir)/man1' ;;
- *) APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' ;;
- esac
+ APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)'
fi
if test x$LIB_MAN_SUFFIX = x ; then
- case $host_os in
- linux*) LIB_MAN_SUFFIX=3x ;;
- *) LIB_MAN_SUFFIX=3 ;;
- esac
+ LIB_MAN_SUFFIX=3
fi
if test x$LIB_MAN_DIR = x ; then
- case $host_os in
- linux*) LIB_MAN_DIR='$(mandir)/man3' ;;
- *) LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' ;;
- esac
+ LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)'
fi
if test x$FILE_MAN_SUFFIX = x ; then
case $host_os in
- linux*) FILE_MAN_SUFFIX=5x ;;
solaris*) FILE_MAN_SUFFIX=4 ;;
*) FILE_MAN_SUFFIX=5 ;;
esac
fi
if test x$FILE_MAN_DIR = x ; then
- case $host_os in
- linux*) FILE_MAN_DIR='$(mandir)/man5' ;;
- *) FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' ;;
- esac
+ FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)'
fi
-# In Imake's linux.cf, the misc man suffix & dir was only changed for
-# LinuxDebian, not other Linuxes, so we leave it unchanged here
if test x$MISC_MAN_SUFFIX = x ; then
case $host_os in
-# linux*) MISC_MAN_SUFFIX=7x ;;
solaris*) MISC_MAN_SUFFIX=5 ;;
*) MISC_MAN_SUFFIX=7 ;;
esac
fi
if test x$MISC_MAN_DIR = x ; then
- case $host_os in
-# linux*) MISC_MAN_DIR='$(mandir)/man7' ;;
- *) MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)' ;;
- esac
+ MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)'
fi
-# In Imake's linux.cf, the driver man suffix & dir was only changed for
-# LinuxDebian, not other Linuxes, so we leave it unchanged here
if test x$DRIVER_MAN_SUFFIX = x ; then
case $host_os in
-# linux*) DRIVER_MAN_SUFFIX=4x ;;
solaris*) DRIVER_MAN_SUFFIX=7 ;;
*) DRIVER_MAN_SUFFIX=4 ;;
esac
fi
if test x$DRIVER_MAN_DIR = x ; then
- case $host_os in
-# linux*) DRIVER_MAN_DIR='$(mandir)/man4' ;;
- *) DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)' ;;
- esac
+ DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)'
fi
if test x$ADMIN_MAN_SUFFIX = x ; then
@@ -19444,7 +19433,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by libXevie $as_me 1.0.1, which was
+This file was extended by libXevie $as_me 1.0.2, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -19507,7 +19496,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-libXevie config.status 1.0.1
+libXevie config.status 1.0.2
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@@ -19757,6 +19746,7 @@
s,@host_cpu@,$host_cpu,;t t
s,@host_vendor@,$host_vendor,;t t
s,@host_os@,$host_os,;t t
+s,@SED@,$SED,;t t
s,@EGREP@,$EGREP,;t t
s,@LN_S@,$LN_S,;t t
s,@ECHO@,$ECHO,;t t
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXevie-X11R7.1-1.0.1/configure.ac new/libXevie-1.0.2/configure.ac
--- old/libXevie-X11R7.1-1.0.1/configure.ac 2006-04-27 02:08:01.000000000 +0200
+++ new/libXevie-1.0.2/configure.ac 2006-10-13 20:58:28.000000000 +0200
@@ -1,10 +1,10 @@
-dnl $Id: configure.ac,v 1.8 2005/12/03 05:49:43 kem Exp $
+dnl $Id$
dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(libXevie, 1.0.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXevie)
+AC_INIT(libXevie, 1.0.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXevie)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXevie-X11R7.1-1.0.1/include/X11/extensions/Xevie.h new/libXevie-1.0.2/include/X11/extensions/Xevie.h
--- old/libXevie-X11R7.1-1.0.1/include/X11/extensions/Xevie.h 2005-05-22 03:20:14.000000000 +0200
+++ new/libXevie-1.0.2/include/X11/extensions/Xevie.h 2006-10-12 00:30:50.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XdotOrg: lib/Xevie/include/X11/extensions/Xevie.h,v 1.3 2005/05/22 01:20:14 alanc Exp $ */
+/* $XdotOrg: $ */
/************************************************************
Copyright 2003 Sun Microsystems, Inc.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXevie-X11R7.1-1.0.1/ltmain.sh new/libXevie-1.0.2/ltmain.sh
--- old/libXevie-X11R7.1-1.0.1/ltmain.sh 2006-02-12 01:50:49.000000000 +0100
+++ new/libXevie-1.0.2/ltmain.sh 2006-07-13 09:12:13.000000000 +0200
@@ -46,10 +46,16 @@
VERSION=1.5.22
TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes.
-if test -n "${ZSH_VERSION+set}" ; then
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
+else
+ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
fi
# Check that we have a working $echo.
@@ -105,12 +111,14 @@
# These must not be set unconditionally because not all systems understand
# e.g. LANG=C (notably SCO).
# We save the old values to restore during execute mode.
-if test "${LC_ALL+set}" = set; then
- save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
-fi
-if test "${LANG+set}" = set; then
- save_LANG="$LANG"; LANG=C; export LANG
-fi
+for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+ eval "if test \"\${$lt_var+set}\" = set; then
+ save_$lt_var=\$$lt_var
+ $lt_var=C
+ export $lt_var
+ fi"
+done
# Make sure IFS has a sensible default
lt_nl='
@@ -136,6 +144,8 @@
preserve_args=
lo2o="s/\\.lo\$/.${objext}/"
o2lo="s/\\.${objext}\$/.lo/"
+extracted_archives=
+extracted_serial=0
#####################################
# Shell function definitions:
@@ -327,7 +337,17 @@
*) my_xabs=`pwd`"/$my_xlib" ;;
esac
my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
- my_xdir="$my_gentop/$my_xlib"
+ my_xlib_u=$my_xlib
+ while :; do
+ case " $extracted_archives " in
+ *" $my_xlib_u "*)
+ extracted_serial=`expr $extracted_serial + 1`
+ my_xlib_u=lt$extracted_serial-$my_xlib ;;
+ *) break ;;
+ esac
+ done
+ extracted_archives="$extracted_archives $my_xlib_u"
+ my_xdir="$my_gentop/$my_xlib_u"
$show "${rm}r $my_xdir"
$run ${rm}r "$my_xdir"
@@ -758,6 +778,7 @@
*.f90) xform=f90 ;;
*.for) xform=for ;;
*.java) xform=java ;;
+ *.obj) xform=obj ;;
esac
libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
@@ -1138,8 +1159,9 @@
for arg
do
case $arg in
- -all-static | -static)
- if test "X$arg" = "X-all-static"; then
+ -all-static | -static | -static-libtool-libs)
+ case $arg in
+ -all-static)
if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
$echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
fi
@@ -1147,12 +1169,20 @@
dlopen_self=$dlopen_self_static
fi
prefer_static_libs=yes
- else
+ ;;
+ -static)
if test -z "$pic_flag" && test -n "$link_static_flag"; then
dlopen_self=$dlopen_self_static
fi
prefer_static_libs=built
- fi
+ ;;
+ -static-libtool-libs)
+ if test -z "$pic_flag" && test -n "$link_static_flag"; then
+ dlopen_self=$dlopen_self_static
+ fi
+ prefer_static_libs=yes
+ ;;
+ esac
build_libtool_libs=no
build_old_libs=yes
break
@@ -1712,7 +1742,7 @@
continue
;;
- -static)
+ -static | -static-libtool-libs)
# The effects of -static are defined in a previous loop.
# We used to do the same as -all-static on platforms that
# didn't have a PIC flag, but the assumption that the effects
@@ -2490,7 +2520,9 @@
if test "$linkmode,$pass" = "prog,link"; then
if test -n "$library_names" &&
- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+ { { test "$prefer_static_libs" = no ||
+ test "$prefer_static_libs,$installed" = "built,yes"; } ||
+ test -z "$old_library"; }; then
# We need to hardcode the library path
if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
# Make sure the rpath contains only unique directories.
@@ -3186,7 +3218,7 @@
# which has an extra 1 added just for fun
#
case $version_type in
- darwin|linux|osf|windows)
+ darwin|linux|osf|windows|none)
current=`expr $number_major + $number_minor`
age="$number_minor"
revision="$number_revision"
@@ -3410,11 +3442,11 @@
fi
# Eliminate all temporary directories.
- for path in $notinst_path; do
- lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
- deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
- dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
- done
+# for path in $notinst_path; do
+# lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
+# deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
+# dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
+# done
if test -n "$xrpath"; then
# If the user specified any rpath flags, then add them.
@@ -3515,13 +3547,12 @@
int main() { return 0; }
EOF
$rm conftest
- $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
- if test "$?" -eq 0 ; then
+ if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
ldd_output=`ldd conftest`
for i in $deplibs; do
name=`expr $i : '-l\(.*\)'`
# If $name is empty we are operating on a -L argument.
- if test "$name" != "" && test "$name" -ne "0"; then
+ if test "$name" != "" && test "$name" != "0"; then
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
@@ -3560,9 +3591,7 @@
# If $name is empty we are operating on a -L argument.
if test "$name" != "" && test "$name" != "0"; then
$rm conftest
- $LTCC $LTCFLAGS -o conftest conftest.c $i
- # Did it work?
- if test "$?" -eq 0 ; then
+ if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
ldd_output=`ldd conftest`
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
@@ -3594,7 +3623,7 @@
droppeddeps=yes
$echo
$echo "*** Warning! Library $i is needed by this library but I was not able to"
- $echo "*** make it link in! You will probably need to install it or some"
+ $echo "*** make it link in! You will probably need to install it or some"
$echo "*** library that it depends on before this library will be fully"
$echo "*** functional. Installing it before continuing would be even better."
fi
@@ -4239,12 +4268,14 @@
reload_conv_objs=
gentop=
# reload_cmds runs $LD directly, so let us get rid of
- # -Wl from whole_archive_flag_spec
+ # -Wl from whole_archive_flag_spec and hope we can get by with
+ # turning comma into space..
wl=
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
- eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+ reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
else
gentop="$output_objdir/${obj}x"
generated="$generated $gentop"
@@ -4692,16 +4723,16 @@
case $host in
*cygwin* | *mingw* )
if test -f "$output_objdir/${outputname}.def" ; then
- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
else
- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
fi
;;
* )
- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
;;
esac
;;
@@ -4716,13 +4747,13 @@
# really was required.
# Nullify the symbol file.
- compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
fi
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
# Replace the output file specification.
- compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
link_command="$compile_command$compile_rpath"
# We have no uninstalled library dependencies, so finalize right now.
@@ -4809,7 +4840,7 @@
if test "$fast_install" != no; then
link_command="$finalize_var$compile_command$finalize_rpath"
if test "$fast_install" = yes; then
- relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+ relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
else
# fast_install is set to needless
relink_command=
@@ -4846,7 +4877,7 @@
fi
done
relink_command="(cd `pwd`; $relink_command)"
- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
fi
# Quote $echo for shipping.
@@ -5253,6 +5284,18 @@
Xsed='${SED} -e 1s/^X//'
sed_quote_subst='$sed_quote_subst'
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+ # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '\${1+\"\$@\"}'='\"\$@\"'
+ setopt NO_GLOB_SUBST
+else
+ case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
+fi
+
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
@@ -5395,7 +5438,7 @@
;;
esac
$echo >> $output "\
- \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+ \$echo \"\$0: cannot exec \$program \$*\"
exit $EXIT_FAILURE
fi
else
@@ -5581,7 +5624,7 @@
done
# Quote the link command for shipping.
relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
if test "$hardcode_automatic" = yes ; then
relink_command=
fi
@@ -5926,9 +5969,9 @@
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
else
- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
fi
$echo "$modename: warning: relinking \`$file'" 1>&2
@@ -6137,7 +6180,7 @@
file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
outputname="$tmpdir/$file"
# Replace the output file specification.
- relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
$show "$relink_command"
if $run eval "$relink_command"; then :
@@ -6413,12 +6456,15 @@
fi
# Restore saved environment variables
- if test "${save_LC_ALL+set}" = set; then
- LC_ALL="$save_LC_ALL"; export LC_ALL
- fi
- if test "${save_LANG+set}" = set; then
- LANG="$save_LANG"; export LANG
- fi
+ for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+ do
+ eval "if test \"\${save_$lt_var+set}\" = set; then
+ $lt_var=\$save_$lt_var; export $lt_var
+ else
+ $lt_unset $lt_var
+ fi"
+ done
+
# Now prepare to actually exec the command.
exec_cmd="\$cmd$args"
@@ -6775,9 +6821,9 @@
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-export-symbols SYMFILE
- try to export only the symbols listed in SYMFILE
+ try to export only the symbols listed in SYMFILE
-export-symbols-regex REGEX
- try to export only the symbols matching REGEX
+ try to export only the symbols matching REGEX
-LLIBDIR search LIBDIR for required installed libraries
-lNAME OUTPUT-FILE requires the installed library libNAME
-module build a library that can dlopened
@@ -6791,9 +6837,11 @@
-release RELEASE specify package release information
-rpath LIBDIR the created library will eventually be installed in LIBDIR
-R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
- -static do not do any dynamic linking of libtool libraries
+ -static do not do any dynamic linking of uninstalled libtool libraries
+ -static-libtool-libs
+ do not do any dynamic linking of libtool libraries
-version-info CURRENT[:REVISION[:AGE]]
- specify library version info [each variable defaults to 0]
+ specify library version info [each variable defaults to 0]
All other options (arguments beginning with \`-') are ignored.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXevie-X11R7.1-1.0.1/man/Makefile.am new/libXevie-1.0.2/man/Makefile.am
--- old/libXevie-X11R7.1-1.0.1/man/Makefile.am 2006-02-12 19:19:21.000000000 +0100
+++ new/libXevie-1.0.2/man/Makefile.am 2006-10-12 00:30:50.000000000 +0200
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.5 2005/12/06 22:48:43 kem Exp $
+# $Id$
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXevie-X11R7.1-1.0.1/man/Makefile.in new/libXevie-1.0.2/man/Makefile.in
--- old/libXevie-X11R7.1-1.0.1/man/Makefile.in 2006-05-22 03:30:48.000000000 +0200
+++ new/libXevie-1.0.2/man/Makefile.in 2006-10-13 22:03:26.000000000 +0200
@@ -14,7 +14,7 @@
@SET_MAKE@
-# $Id: Makefile.am,v 1.5 2005/12/06 22:48:43 kem Exp $
+# $Id$
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
@@ -150,6 +150,7 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -211,7 +212,6 @@
BUILT_SOURCES = shadows.DONE
EXTRA_DIST = $(libman_PRE)
CLEANFILES = $(libman_DATA) $(BUILT_SOURCES)
-SED = sed
# Strings to replace in man pages
XORGRELSTRING = @PACKAGE_STRING@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXevie-X11R7.1-1.0.1/man/Xevie.man new/libXevie-1.0.2/man/Xevie.man
--- old/libXevie-X11R7.1-1.0.1/man/Xevie.man 2005-04-04 04:41:49.000000000 +0200
+++ new/libXevie-1.0.2/man/Xevie.man 2006-10-12 00:30:50.000000000 +0200
@@ -1,5 +1,5 @@
.\"
-.\" $XdotOrg: lib/Xevie/man/Xevie.man,v 1.2 2005/04/04 02:41:49 alanc Exp $
+.\" $XdotOrg: xc/lib/Xevie/Xevie.man,v $
.\"
.\"
.de TQ
@@ -24,8 +24,7 @@
Status XevieSelectInput \^(\^Display *\fIdpy\fP,
long \fIevent_mask\fP\^);
.sp
-Status XevieSendEvent \^(\^
- \^(\^Display *\fIdpy\fP,
+Status XevieSendEvent \^(\^Display *\fIdpy\fP,
XEvent *\fIevent\fP,
char *fIdataType\fP\^);
.sp
@@ -42,9 +41,6 @@
XEVIE_MODIFIED or XEVIE_UNMODIFIED - whether the Xevie client
has changed or synthesised this event.
-.SH DATATYPES
-
-
.SH DESCRIPTION
.B X Event Interception Extension (XEvIE)
is designed for users who need to intercept all the Keyboard and Mouse events.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXevie-X11R7.1-1.0.1/src/Makefile.in new/libXevie-1.0.2/src/Makefile.in
--- old/libXevie-X11R7.1-1.0.1/src/Makefile.in 2006-05-22 03:30:48.000000000 +0200
+++ new/libXevie-1.0.2/src/Makefile.in 2006-10-13 22:03:26.000000000 +0200
@@ -145,6 +145,7 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXevie-X11R7.1-1.0.1/src/Xevie.c new/libXevie-1.0.2/src/Xevie.c
--- old/libXevie-X11R7.1-1.0.1/src/Xevie.c 2005-07-03 09:00:56.000000000 +0200
+++ new/libXevie-1.0.2/src/Xevie.c 2006-10-12 00:30:50.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XdotOrg: lib/Xevie/src/Xevie.c,v 1.3 2005/07/03 07:00:56 daniels Exp $ */
+/* $XdotOrg: xc/lib/Xevie/Xevie.c,v 1.2 2005/05/22 01:20:14 alanc Exp $ */
/************************************************************
Copyright 2003 Sun Microsystems, Inc.
++++++ libXfont-1.2.2.tar.bz2 -> libXfont-1.2.3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXfont-1.2.2/ChangeLog new/libXfont-1.2.3/ChangeLog
--- old/libXfont-1.2.2/ChangeLog 2006-09-12 17:12:17.000000000 +0200
+++ new/libXfont-1.2.3/ChangeLog 2006-10-13 22:16:05.000000000 +0200
@@ -1,3 +1,16 @@
+commit 5dfff0eb0f532edb1f4a25daa5529e08dd832ecb
+Author: Alan Coopersmith
+Date: Thu Oct 5 18:12:50 2006 -0700
+
+ --disable-builtins should not force off all bitmap support
+
+commit 264df52d24f585915e0d9823d5f087cf23e3fc75
+Merge: 0fb55cb... d896c3e...
+Author: Alan Coopersmith
+Date: Fri Sep 22 11:36:43 2006 -0700
+
+ Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/lib/libXfont
+
commit d896c3eaeafdb8831ed0833af46250c36f82502f
Author: Adam Jackson
Date: Tue Sep 12 11:11:12 2006 -0400
@@ -17,6 +30,12 @@
Fixes for integer overflows in CID encoded fonts parsing reported by iDefense
CVE-ID 2006-3739, 2006-3740, bugzilla #8000, #8001.
+commit 0fb55cb86e2ec5dbfbf27a01ceafb77c72fe9f40
+Author: Alan Coopersmith
+Date: Wed Aug 30 15:53:14 2006 -0700
+
+ Fix typo in comment (alreadt -> already)
+
commit aa7f3107d5aad41cb3f7b1bb3a4723014314289c
Author: Alan Coopersmith
Date: Fri Aug 25 17:51:46 2006 -0700
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXfont-1.2.2/aclocal.m4 new/libXfont-1.2.3/aclocal.m4
--- old/libXfont-1.2.2/aclocal.m4 2006-09-12 16:59:28.000000000 +0200
+++ new/libXfont-1.2.3/aclocal.m4 2006-10-13 22:15:51.000000000 +0200
@@ -6548,7 +6548,8 @@
_PKG_TEXT
])],
- [$4])
+ [AC_MSG_RESULT([no])
+ $4])
elif test $pkg_failed = untried; then
ifelse([$4], , [AC_MSG_FAILURE(dnl
[The pkg-config script could not be found or is too old. Make sure it
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXfont-1.2.2/configure new/libXfont-1.2.3/configure
--- old/libXfont-1.2.2/configure 2006-09-12 16:59:33.000000000 +0200
+++ new/libXfont-1.2.3/configure 2006-10-13 22:15:53.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for libXfont 1.2.2.
+# Generated by GNU Autoconf 2.59 for libXfont 1.2.3.
#
# Report bugs to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg.
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='libXfont'
PACKAGE_TARNAME='libXfont'
-PACKAGE_VERSION='1.2.2'
-PACKAGE_STRING='libXfont 1.2.2'
+PACKAGE_VERSION='1.2.3'
+PACKAGE_STRING='libXfont 1.2.3'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
# Factoring default headers for most tests.
@@ -981,7 +981,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.2.2 to adapt to many kinds of systems.
+\`configure' configures libXfont 1.2.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1047,7 +1047,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libXfont 1.2.2:";;
+ short | recursive ) echo "Configuration of libXfont 1.2.3:";;
esac
cat <<\_ACEOF
@@ -1216,7 +1216,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-libXfont configure 1.2.2
+libXfont configure 1.2.3
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1230,7 +1230,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.2.2, which was
+It was created by libXfont $as_me 1.2.3, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1873,7 +1873,7 @@
# Define the identity of the package.
PACKAGE='libXfont'
- VERSION='1.2.2'
+ VERSION='1.2.3'
cat >>confdefs.h <<_ACEOF
@@ -19152,7 +19152,9 @@
# Put the nasty error message in config.log where it belongs
echo "$FREETYPE_PKG_ERRORS" >&5
- freetype_config=yes
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ freetype_config=yes
elif test $pkg_failed = untried; then
freetype_config=yes
else
@@ -19355,7 +19357,7 @@
#define XFONT_BUILTINS 1
_ACEOF
- XFONT_PCFFORMAT=yes
+ XFONT_BITMAP=yes
fi
# Check whether --enable-pcfformat or --disable-pcfformat was given.
@@ -19375,7 +19377,7 @@
XFONT_PCFFORMAT_FALSE=
fi
-if test "x$XFONT_BUILTINS" = xyes; then
+if test "x$XFONT_PCFFORMAT" = xyes; then
cat >>confdefs.h <<\_ACEOF
#define XFONT_PCFFORMAT 1
@@ -19401,7 +19403,7 @@
XFONT_BDFFORMAT_FALSE=
fi
-if test "x$XFONT_BUILTINS" = xyes; then
+if test "x$XFONT_BDFFORMAT" = xyes; then
cat >>confdefs.h <<\_ACEOF
#define XFONT_BDFFORMAT 1
@@ -19427,7 +19429,7 @@
XFONT_SNFFORMAT_FALSE=
fi
-if test "x$XFONT_BUILTINS" = xyes; then
+if test "x$XFONT_SNFFORMAT" = xyes; then
cat >>confdefs.h <<\_ACEOF
#define XFONT_SNFFORMAT 1
@@ -19436,21 +19438,6 @@
XFONT_BITMAP=yes
fi
-# Check whether --enable-bdfformat or --disable-bdfformat was given.
-if test "${enable_bdfformat+set}" = set; then
- enableval="$enable_bdfformat"
- XFONT_BDFFORMAT=$enableval
-else
- XFONT_BDFFORMAT=yes
-fi;
-# Check whether --enable-snfformat or --disable-snfformat was given.
-if test "${enable_snfformat+set}" = set; then
- enableval="$enable_snfformat"
- XFONT_SNFFORMAT=$enableval
-else
- XFONT_SNFFORMAT=yes
-fi;
-
if test "x$XFONT_BITMAP" = xyes ; then
@@ -19483,7 +19470,7 @@
if test "x$XFONT_FONTFILE" = xyes; then
cat >>confdefs.h <<\_ACEOF
-#define XFONT_FONTFILE
+#define XFONT_FONTFILE 1
_ACEOF
fi
@@ -21025,7 +21012,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by libXfont $as_me 1.2.2, which was
+This file was extended by libXfont $as_me 1.2.3, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21088,7 +21075,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-libXfont config.status 1.2.2
+libXfont config.status 1.2.3
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXfont-1.2.2/configure.ac new/libXfont-1.2.3/configure.ac
--- old/libXfont-1.2.2/configure.ac 2006-09-12 16:59:14.000000000 +0200
+++ new/libXfont-1.2.3/configure.ac 2006-10-13 20:58:46.000000000 +0200
@@ -26,7 +26,7 @@
AC_PREREQ([2.57])
AC_INIT([libXfont],
- 1.2.2,
+ 1.2.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
libXfont)
dnl
@@ -152,33 +152,30 @@
AM_CONDITIONAL(XFONT_BUILTINS, [test "x$XFONT_BUILTINS" = xyes ])
if test "x$XFONT_BUILTINS" = xyes; then
AC_DEFINE(XFONT_BUILTINS,1,[Support built-in fonts])
- XFONT_PCFFORMAT=yes
+ XFONT_BITMAP=yes
fi
AC_ARG_ENABLE(pcfformat, [ --disable-pcfformat ], [XFONT_PCFFORMAT=$enableval], [XFONT_PCFFORMAT=yes])
AM_CONDITIONAL(XFONT_PCFFORMAT, [test "x$XFONT_PCFFORMAT" = xyes])
-if test "x$XFONT_BUILTINS" = xyes; then
+if test "x$XFONT_PCFFORMAT" = xyes; then
AC_DEFINE(XFONT_PCFFORMAT,1,[Support pcf format bitmap font files])
XFONT_BITMAP=yes
fi
AC_ARG_ENABLE(bdfformat, [ --disable-bdfformat ], [XFONT_BDFFORMAT=$enableval], [XFONT_BDFFORMAT=yes])
AM_CONDITIONAL(XFONT_BDFFORMAT, [test "x$XFONT_BDFFORMAT" = xyes])
-if test "x$XFONT_BUILTINS" = xyes; then
+if test "x$XFONT_BDFFORMAT" = xyes; then
AC_DEFINE(XFONT_BDFFORMAT,1,[Support bdf format bitmap font files])
XFONT_BITMAP=yes
fi
AC_ARG_ENABLE(snfformat, [ --disable-snfformat ], [XFONT_SNFFORMAT=$enableval], [XFONT_SNFFORMAT=yes])
AM_CONDITIONAL(XFONT_SNFFORMAT, [test "x$XFONT_SNFFORMAT" = xyes])
-if test "x$XFONT_BUILTINS" = xyes; then
+if test "x$XFONT_SNFFORMAT" = xyes; then
AC_DEFINE(XFONT_SNFFORMAT,1,[Support snf format bitmap font files])
XFONT_BITMAP=yes
fi
-AC_ARG_ENABLE(bdfformat, [ --disable-bdfformat ], [XFONT_BDFFORMAT=$enableval], [XFONT_BDFFORMAT=yes])
-AC_ARG_ENABLE(snfformat, [ --disable-snfformat ], [XFONT_SNFFORMAT=$enableval], [XFONT_SNFFORMAT=yes])
-
AM_CONDITIONAL(XFONT_BITMAP, [test "x$XFONT_BITMAP" = xyes ])
if test "x$XFONT_BITMAP" = xyes; then
AC_DEFINE(XFONT_BITMAP,1,[Support bitmap font files])
@@ -187,7 +184,7 @@
AM_CONDITIONAL(XFONT_FONTFILE, [test "x$XFONT_FONTFILE" = xyes])
if test "x$XFONT_FONTFILE" = xyes; then
- AC_DEFINE(XFONT_FONTFILE,,[Support fonts in files])
+ AC_DEFINE(XFONT_FONTFILE,1,[Support fonts in files])
fi
#
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXfont-1.2.2/include/X11/fonts/fontconf.h new/libXfont-1.2.3/include/X11/fonts/fontconf.h
--- old/libXfont-1.2.2/include/X11/fonts/fontconf.h 2006-09-12 16:59:59.000000000 +0200
+++ new/libXfont-1.2.3/include/X11/fonts/fontconf.h 2006-10-13 00:56:10.000000000 +0200
@@ -51,7 +51,7 @@
#define XFONT_BITMAP 1
/* Define as 1 if you have fontfile support in Xfont */
-#define XFONT_FONTFILE
+#define XFONT_FONTFILE 1
/* Define as 1 if you have font cache support in Xfont */
/* #undef XFONT_FONTCACHE */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXfont-1.2.2/src/bitmap/pcfread.c new/libXfont-1.2.3/src/bitmap/pcfread.c
--- old/libXfont-1.2.2/src/bitmap/pcfread.c 2006-09-12 16:56:07.000000000 +0200
+++ new/libXfont-1.2.3/src/bitmap/pcfread.c 2006-10-12 00:31:18.000000000 +0200
@@ -468,7 +468,7 @@
nbitmaps = pcfGetINT32(file, format);
if (nbitmaps != nmetrics || IS_EOF(file))
goto Bail;
- /* nmetrics is alreadt ok, so nbitmap also is */
+ /* nmetrics is already ok, so nbitmap also is */
offsets = (CARD32 *) xalloc(nbitmaps * sizeof(CARD32));
if (!offsets) {
pcfError("pcfReadFont(): Couldn't allocate offsets (%d*%d)\n", nbitmaps, sizeof(CARD32));
++++++ libXfontcache-X11R7.1-1.0.2.tar.bz2 -> libXfontcache-1.0.3.tar.bz2 ++++++
++++ 1799 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/libXfontcache-X11R7.1-1.0.2/ChangeLog new/libXfontcache-1.0.3/ChangeLog
--- old/libXfontcache-X11R7.1-1.0.2/ChangeLog 2006-04-27 02:12:33.000000000 +0200
+++ new/libXfontcache-1.0.3/ChangeLog 2006-10-13 22:14:13.000000000 +0200
@@ -1,74 +1,221 @@
-2006-04-26 Adam Jackson
+commit 49c76e1a9ff5fceb8ee33b6a0334942da643e286
+Author: Adam Jackson
+Date: Thu Oct 12 18:51:35 2006 -0400
- * configure.ac:
- Bump to 1.0.2
+ Fix the ChangeLog hook to distcheck.
-2006-02-12 Alan Coopersmith
+commit 43d696f4404a7595e9bb84909df85675058bdca5
+Author: Matthieu Herrb
+Date: Sat Jul 29 20:31:08 2006 +0200
- * 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.
+ Remove ChangeLog. Add a Makefile rule to generate it using git-log
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 895c6e6f83201636d705f9d3c98701a528ab31b5
+Author: Federico G. Schwindt
+Date: Sat Jul 29 20:27:30 2006 +0200
- * configure.ac:
- Update package version for X11R7 release.
+ Correct header path.
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 37ffff200fe4b3bd973f5bade4a217768029146f
+Author: Alan Coopersmith
+Date: Thu Jul 13 14:58:57 2006 -0700
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ renamed: .cvsignore -> .gitignore
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit eb191bbc716620c067bf6286469f8e5d90224577
+Author: Adam Jackson
+Date: Thu Apr 27 00:12:33 2006 +0000
- * man/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ Bump to 1.0.2
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 4fd0f2d9d43fd84c2f27e28545708d08ac7d83e0
+Author: Alan Coopersmith
+Date: Sun Feb 12 18:19:21 2006 +0000
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Bug #5628 https://bugs.freedesktop.org/show_bug.cgi?id=5628 Shadow pages
+ not created correctly when MANDIR & MANSUFFIX don't match.
-2005-12-02 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit c1b89988246ab0a10076034a2e2a13fa48d852e6
+Author: Kevin E Martin
+Date: Wed Dec 21 02:30:05 2005 +0000
- * configure.ac:
- * src/Makefile.am:
- Add check and cflags for malloc(0) returning NULL.
+ Update package version for X11R7 release.
-2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 4a67e4901ce462b98214d276c96b3bece7cd4bcc
+Author: Adam Jackson
+Date: Mon Dec 19 16:28:27 2005 +0000
- * xfontcache.pc.in:
- Update pkgconfig files to separate library build-time dependencies
- from application build-time dependencies.
+ Stub COPYING files
-2005-11-12 Alan Coopersmith
+commit d683612fd75ae6ed905cc98fe0a94fe5c28c0613
+Author: Kevin E Martin
+Date: Thu Dec 15 00:24:29 2005 +0000
- * configure.ac:
- * man/Makefile.am:
- Use sed to substitute variables in man pages.
- Install shadow man pages for pages that document multiple functions.
-
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Update package version number for final X11R7 release candidate.
- * configure.ac:
- Update package version number for RC1 release.
+commit 86c4c88a09fa328af9fc06123986ece8448b17c7
+Author: Kevin E Martin
+Date: Tue Dec 6 22:48:43 2005 +0000
-2005-07-13 keith Packard
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
- * man/Makefile.am:
- Make EXTRA_DIST match defined man_MANS variable
+commit 556af948c779751d377762d262ac5e02795c20d3
+Author: Kevin E Martin
+Date: Sat Dec 3 05:49:44 2005 +0000
-2005-07-08 Keith Packard
+ Update package version number for X11R7 RC3 release.
- * .cvsignore:
- * man/.cvsignore:
- * src/.cvsignore:
- Add .cvsignore files
+commit 6e86b1afe88ad387f97abb937b9b792fb0ebc0c8
+Author: Kevin E Martin
+Date: Sat Dec 3 04:41:49 2005 +0000
-2005-06-21 Alexander Gottwald <ago at freedesktop dot org>
+ Add check and cflags for malloc(0) returning NULL.
- * configure.ac
- * src/Makefile.am
- Add missing xext.pc and xextproto.pc
- Add DEPS_CFLAGS to Makefile.am
+commit 3a802cf242352b033906f75ae07b0d4e7a34e3eb
+Author: Alan Coopersmith
+Date: Mon Nov 28 22:03:05 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 0f4fd60816fa79831174bdf81f46e5b53351a2dd
+Author: Eric Anholt
+Date: Sun Nov 20 23:17:40 2005 +0000
+
+ Add/improve libs .cvsignores.
+
+commit 6ce2df31e5c80a524c2190ffca12bada12db21d2
+Author: Kevin E Martin
+Date: Sat Nov 19 07:15:41 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 68d5758a4c265ed7fc87c8299af277fd7db7de87
+Author: Alan Coopersmith
+Date: Sun Nov 13 01:32:07 2005 +0000
+
+ Use sed to substitute variables in man pages. Install shadow man pages for
+ pages that document multiple functions.
+
+commit 2681f785ac11d4264d7b443f457effe4766a3d91
+Author: Kevin E Martin
+Date: Wed Oct 19 02:48:10 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 6422064781eaa59d0ccc73246ed3b6384ca83d5b
+Author: Adam Jackson
+Date: Wed Aug 3 03:28:01 2005 +0000
+
+ Do PKG_CHECK_MODULES on a unique token instead of on "DEP", so builds with
+ a global configure cache don't get confused.
+
+commit 1f7d7e3e9b7ef6cf24c156e799c25d846f8fdd29
+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 15325304bf7ae576bfe3f6236f7a983b68010f1c
+Author: Daniel Stone
+Date: Sat Jul 16 07:08:31 2005 +0000
+
+ Set soversion to 1.0.0 using -version-number.
+
+commit 16a2a64e9283d8f9f70d7f9b52db2c0018385342
+Author: Keith Packard
+Date: Wed Jul 13 07:26:39 2005 +0000
+
+ Make EXTRA_DIST match defined man_MANS variable
+
+commit 5c5b7c82715b5c20581dde01dffbf3ee351480ac
+Author: Keith Packard
+Date: Sat Jul 9 06:39:15 2005 +0000
+
+ Add .cvsignore files
+
+commit 65fbc3d7e8f8b22c23cfc6b54726f40d23bbea92
+Author: Alexander Gottwald
+Date: Tue Jun 21 15:41:36 2005 +0000
+
+ lib/XScrnSaver/configure.ac
+ lib/XScrnSaver/src/Makefile.am
+ lib/Xfontcache/configure.ac
+ lib/Xfontcache/src/Makefile.am
+ lib/Xinerama/configure.ac
+ lib/Xinerama/src/Makefile.am
+ lib/Xtst/configure.ac
+ lib/Xv/configure.ac
+ lib/XvMC/configure.ac
+ lib/dmx/configure.ac Add missing xext.pc and xextproto.pc Add DEP_CFLAGS to
+ src/Makefile.am
+
+commit afcd83ff1cecd94a6066f6f22f0d633062e831f9
+Author: Søren Sandmann Pedersen
+Date: Fri Jun 10 19:22:53 2005 +0000
+
+ Check in build system for Xfontcache
+
+commit ee99568cca84a7e1762c7aab09c9d5ddf381406c
+Author: Egbert Eich
+Date: Fri Apr 23 18:43:41 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 6f18e086dd998720a80e8d7d9807683dfd29fad0
+Author: Egbert Eich
+Date: Sun Mar 14 08:32:07 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 1f4360dcfb2a7804c0d40cfa6246a198da542063
+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 03c67189ab4356d55ab5278097979d7da0178efc
+Author: Egbert Eich
+Date: Thu Feb 26 13:35:33 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit c0876298fcadd7acdb0e0650e58733bf6783013d
+Author: Egbert Eich
+Date: Thu Feb 26 09:22:42 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 666771f69bc7d624cad1e975c8b742f7e427a869
+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 c3550c03194bfed8e67c941718e0afb007cf0c05
+Author: Kaleb Keithley
+Date: Tue Nov 25 19:28:09 2003 +0000
+
+ Initial revision
+
+commit 1336fc90eb351c19451b3e786e1bf124f1a857f5
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:48:48 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit cb47cbfacef1e9f2d515406ba267be874e0e8844
+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/libXfontcache-X11R7.1-1.0.2/Makefile.am new/libXfontcache-1.0.3/Makefile.am
--- old/libXfontcache-X11R7.1-1.0.2/Makefile.am 2005-06-10 21:22:49.000000000 +0200
+++ new/libXfontcache-1.0.3/Makefile.am 2006-10-13 00:51:07.000000000 +0200
@@ -24,5 +24,10 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xfontcache.pc
-EXTRA_DIST = xfontcache.pc.in autogen.sh
+EXTRA_DIST = xfontcache.pc.in autogen.sh ChangeLog
+CLEANFILES = ChangeLog
+
+ChangeLog: FORCE
+ git-log > ChangeLog
+FORCE:
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/libXfontcache-X11R7.1-1.0.2/configure.ac new/libXfontcache-1.0.3/configure.ac
--- old/libXfontcache-X11R7.1-1.0.2/configure.ac 2006-04-27 02:12:33.000000000 +0200
+++ new/libXfontcache-1.0.3/configure.ac 2006-10-13 20:58:41.000000000 +0200
@@ -23,7 +23,7 @@
AC_PREREQ([2.57])
-AC_INIT(libXfontcache, 1.0.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXfontcache)
+AC_INIT(libXfontcache, 1.0.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXfontcache)
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/libXfontcache-X11R7.1-1.0.2/man/Makefile.am new/libXfontcache-1.0.3/man/Makefile.am
--- old/libXfontcache-X11R7.1-1.0.2/man/Makefile.am 2006-02-12 19:19:21.000000000 +0100
+++ new/libXfontcache-1.0.3/man/Makefile.am 2006-10-12 00:31:20.000000000 +0200
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.5 2005/12/06 22:48:43 kem Exp $
+# $Id$
#
# 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/libXfontcache-X11R7.1-1.0.2/man/Xfontcache.man new/libXfontcache-1.0.3/man/Xfontcache.man
--- old/libXfontcache-X11R7.1-1.0.2/man/Xfontcache.man 2004-04-23 20:43:41.000000000 +0200
+++ new/libXfontcache-1.0.3/man/Xfontcache.man 2006-10-12 00:31:20.000000000 +0200
@@ -31,7 +31,7 @@
.SH NAME
Xfontcache \- X-TrueType font cache extension client library
.SH SYNOPSIS
-.B #include
+.B #include
.PP
.nf
.ta .5i 2i
++++++ libXft-2.1.10.tar.bz2 -> libXft-2.1.11.tar.bz2 ++++++
++++ 4167 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.10/COPYING new/libXft-2.1.11/COPYING
--- old/libXft-2.1.10/COPYING 2005-06-25 00:43:20.000000000 +0200
+++ new/libXft-2.1.11/COPYING 2006-10-12 00:31:23.000000000 +0200
@@ -1,4 +1,4 @@
-$Id: COPYING,v 1.3 2005/06/24 22:43:20 alanc Exp $
+$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.10/ChangeLog new/libXft-2.1.11/ChangeLog
--- old/libXft-2.1.10/ChangeLog 2006-06-06 18:36:33.000000000 +0200
+++ new/libXft-2.1.11/ChangeLog 2006-10-12 00:31:23.000000000 +0200
@@ -1,12 +1,3 @@
-2006-06-06 Daniel Stone
-
- * configure.ac:
- Bump to 2.1.10.
-
- * include/X11/Xft/Xft.h:
- * src/xftname.c:
- Add XftNameUnparse to the public API.
-
2006-06-03 Daniel Stone
* configure.ac:
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.10/Makefile.am new/libXft-2.1.11/Makefile.am
--- old/libXft-2.1.10/Makefile.am 2005-10-05 21:46:16.000000000 +0200
+++ new/libXft-2.1.11/Makefile.am 2006-10-12 00:31:23.000000000 +0200
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.am,v 1.2 2005/10/05 19:46:16 kem Exp $
+# $Id$
#
# Copyright © 2003 Keith Packard, Noah Levitt
#
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.10/configure.ac new/libXft-2.1.11/configure.ac
--- old/libXft-2.1.10/configure.ac 2006-06-06 18:36:17.000000000 +0200
+++ new/libXft-2.1.11/configure.ac 2006-10-13 23:08:05.000000000 +0200
@@ -1,5 +1,5 @@
dnl
-dnl $Id: configure.ac,v 1.6 2005/12/15 00:24:30 kem Exp $
+dnl $Id$
dnl
dnl Copyright © 2003 Keith Packard, Noah Levitt
dnl
@@ -32,7 +32,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.10, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXft)
+AC_INIT(libXft, 2.1.11, [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.10/include/X11/Xft/Xft.h new/libXft-2.1.11/include/X11/Xft/Xft.h
--- old/libXft-2.1.10/include/X11/Xft/Xft.h 2006-06-06 18:36:26.000000000 +0200
+++ new/libXft-2.1.11/include/X11/Xft/Xft.h 2006-10-12 00:31:23.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * $Id: Xft.h,v 1.6 2005/10/19 02:46:56 kem Exp $
+ * $Id$
*
* Copyright © 2000 Keith Packard
*
@@ -33,7 +33,7 @@
#define XFT_MAJOR 2
#define XFT_MINOR 1
-#define XFT_REVISION 10
+#define XFT_REVISION 9
#define XFT_VERSION ((XFT_MAJOR * 10000) + (XFT_MINOR * 100) + (XFT_REVISION))
#define XftVersion XFT_VERSION
@@ -447,9 +447,6 @@
FcPattern
*XftNameParse (_Xconst char *name);
-FcBool
-XftNameUnparse (FcPattern *pat, char *dest, int len);
-
/* xftrender.c */
void
XftGlyphRender (Display *dpy,
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.10/include/X11/Xft/XftCompat.h new/libXft-2.1.11/include/X11/Xft/XftCompat.h
--- old/libXft-2.1.10/include/X11/Xft/XftCompat.h 2005-07-03 09:00:57.000000000 +0200
+++ new/libXft-2.1.11/include/X11/Xft/XftCompat.h 2006-10-12 00:31:23.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * $Id: XftCompat.h,v 1.4 2005/07/03 07:00:57 daniels Exp $
+ * $Id$
*
* Copyright © 2001 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.10/man/Xft.3 new/libXft-2.1.11/man/Xft.3
--- old/libXft-2.1.10/man/Xft.3 2006-06-06 18:37:07.000000000 +0200
+++ new/libXft-2.1.11/man/Xft.3 2006-10-13 23:08:31.000000000 +0200
@@ -1,5 +1,5 @@
.\"
-.\" $Id: Xft.3.in,v 1.3 2005/06/24 22:43:20 alanc Exp $
+.\" $Id$
.\"
.\" Copyright © 2000 Keith Packard
.\"
@@ -21,7 +21,7 @@
.\" TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
.\" PERFORMANCE OF THIS SOFTWARE.
.\"
-.TH Xft 3 "Version 2.1.10" "Xft"
+.TH Xft 3 "Version 2.1.11" "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.10/man/Xft.3.in new/libXft-2.1.11/man/Xft.3.in
--- old/libXft-2.1.10/man/Xft.3.in 2005-06-25 00:43:20.000000000 +0200
+++ new/libXft-2.1.11/man/Xft.3.in 2006-10-12 00:31:23.000000000 +0200
@@ -1,5 +1,5 @@
.\"
-.\" $Id: Xft.3.in,v 1.3 2005/06/24 22:43:20 alanc Exp $
+.\" $Id$
.\"
.\" Copyright © 2000 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.10/man/xft-config.1 new/libXft-2.1.11/man/xft-config.1
--- old/libXft-2.1.10/man/xft-config.1 2006-06-06 18:37:07.000000000 +0200
+++ new/libXft-2.1.11/man/xft-config.1 2006-10-13 23:08:31.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.10" "Xft"
+.TH xft-config 1 "Version 2.1.11" "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.10/src/xftcolor.c new/libXft-2.1.11/src/xftcolor.c
--- old/libXft-2.1.10/src/xftcolor.c 2006-06-03 12:30:56.000000000 +0200
+++ new/libXft-2.1.11/src/xftcolor.c 2006-10-12 00:31:23.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * $Id: xftcolor.c,v 1.4 2005/07/03 07:00:57 daniels Exp $
+ * $Id$
*
* Copyright © 2000 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.10/src/xftcore.c new/libXft-2.1.11/src/xftcore.c
--- old/libXft-2.1.10/src/xftcore.c 2006-06-03 12:30:56.000000000 +0200
+++ new/libXft-2.1.11/src/xftcore.c 2006-10-12 00:31:23.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * $Id: xftcore.c,v 1.4 2005/07/03 07:00:57 daniels Exp $
+ * $Id$
*
* Copyright © 2000 Keith Packard
*
@@ -921,7 +921,7 @@
if (XftFontCheckGlyph (dpy, public, FcTrue, 0, missing, &nmissing))
glyphs_loaded = FcTrue;
if (nmissing)
- XftFontLoadGlyphs (dpy, public, FcTrue, missing, nmissing);
+ XftFontLoadGlyphs (dpy, public, glyphs_loaded, missing, nmissing);
return font->glyphs[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.10/src/xftdbg.c new/libXft-2.1.11/src/xftdbg.c
--- old/libXft-2.1.10/src/xftdbg.c 2006-06-03 12:30:56.000000000 +0200
+++ new/libXft-2.1.11/src/xftdbg.c 2006-10-12 00:31:23.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * $Id: xftdbg.c,v 1.4 2005/07/03 07:00:57 daniels Exp $
+ * $Id$
*
* Copyright © 2000 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.10/src/xftdpy.c new/libXft-2.1.11/src/xftdpy.c
--- old/libXft-2.1.10/src/xftdpy.c 2006-06-03 12:30:56.000000000 +0200
+++ new/libXft-2.1.11/src/xftdpy.c 2006-10-12 00:31:23.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * $Id: xftdpy.c,v 1.4 2005/07/03 07:00:57 daniels Exp $
+ * $Id$
*
* Copyright © 2000 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.10/src/xftdraw.c new/libXft-2.1.11/src/xftdraw.c
--- old/libXft-2.1.10/src/xftdraw.c 2006-06-03 12:30:56.000000000 +0200
+++ new/libXft-2.1.11/src/xftdraw.c 2006-10-12 00:31:23.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * $Id: xftdraw.c,v 1.4 2005/07/03 07:00:57 daniels Exp $
+ * $Id$
*
* Copyright © 2000 Keith Packard
*
@@ -210,7 +210,7 @@
{
XftDisplayInfo *info = _XftDisplayInfoGet (draw->dpy, True);
- if (!info->hasRender)
+ if (!info || !info->hasRender)
return 0;
if (draw->visual == 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.10/src/xftextent.c new/libXft-2.1.11/src/xftextent.c
--- old/libXft-2.1.10/src/xftextent.c 2006-06-03 12:30:56.000000000 +0200
+++ new/libXft-2.1.11/src/xftextent.c 2006-10-12 00:31:23.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * $Id: xftextent.c,v 1.4 2005/07/03 07:00:57 daniels Exp $
+ * $Id$
*
* Copyright © 2000 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.10/src/xftfont.c new/libXft-2.1.11/src/xftfont.c
--- old/libXft-2.1.10/src/xftfont.c 2006-06-03 12:30:56.000000000 +0200
+++ new/libXft-2.1.11/src/xftfont.c 2006-10-12 00:31:23.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * $Id: xftfont.c,v 1.4 2005/07/03 07:00:57 daniels Exp $
+ * $Id$
*
* Copyright © 2000 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.10/src/xftfreetype.c new/libXft-2.1.11/src/xftfreetype.c
--- old/libXft-2.1.10/src/xftfreetype.c 2006-06-03 12:30:56.000000000 +0200
+++ new/libXft-2.1.11/src/xftfreetype.c 2006-10-12 00:31:23.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * $Id: xftfreetype.c,v 1.5 2005/07/03 07:00:57 daniels Exp $
+ * $Id$
*
* Copyright © 2000 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.10/src/xftglyphs.c new/libXft-2.1.11/src/xftglyphs.c
--- old/libXft-2.1.10/src/xftglyphs.c 2006-06-03 12:30:56.000000000 +0200
+++ new/libXft-2.1.11/src/xftglyphs.c 2006-10-12 00:31:23.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * $Id: xftglyphs.c,v 1.4 2005/07/03 07:00:57 daniels Exp $
+ * $Id$
*
* Copyright © 2000 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.10/src/xftinit.c new/libXft-2.1.11/src/xftinit.c
--- old/libXft-2.1.10/src/xftinit.c 2006-06-03 12:30:56.000000000 +0200
+++ new/libXft-2.1.11/src/xftinit.c 2006-10-12 00:31:23.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * $Id: xftinit.c,v 1.4 2005/07/03 07:00:57 daniels Exp $
+ * $Id$
*
* Copyright © 2000 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.10/src/xftint.h new/libXft-2.1.11/src/xftint.h
--- old/libXft-2.1.10/src/xftint.h 2006-06-06 18:35:37.000000000 +0200
+++ new/libXft-2.1.11/src/xftint.h 2006-10-12 00:31:23.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * $Id: xftint.h,v 1.6 2005/07/03 07:00:57 daniels Exp $
+ * $Id$
*
* Copyright © 2000 Keith Packard
*
@@ -326,6 +326,7 @@
FcPattern *XftPatternDuplicate (FcPattern *orig);
FcPattern *XftPatternVaBuild (FcPattern *orig, va_list va);
FcPattern *XftPatternBuild (FcPattern *orig, ...);
+FcBool XftNameUnparse (FcPattern *pat, char *dest, int len);
FcBool XftGlyphExists (Display *dpy, XftFont *font, FcChar32 ucs4);
FcObjectSet *XftObjectSetCreate (void);
Bool XftObjectSetAdd (FcObjectSet *os, _Xconst char *object);
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.10/src/xftlist.c new/libXft-2.1.11/src/xftlist.c
--- old/libXft-2.1.10/src/xftlist.c 2006-06-03 12:30:56.000000000 +0200
+++ new/libXft-2.1.11/src/xftlist.c 2006-10-12 00:31:23.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * $Id: xftlist.c,v 1.4 2005/07/03 07:00:57 daniels Exp $
+ * $Id$
*
* Copyright © 2000 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.10/src/xftname.c new/libXft-2.1.11/src/xftname.c
--- old/libXft-2.1.10/src/xftname.c 2006-06-06 18:34:54.000000000 +0200
+++ new/libXft-2.1.11/src/xftname.c 2006-10-12 00:31:23.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * $Id: xftname.c,v 1.4 2005/07/03 07:00:57 daniels Exp $
+ * $Id$
*
* Copyright © 2000 Keith Packard
*
@@ -50,7 +50,7 @@
return FcNameParse ((FcChar8 *) name);
}
-_X_EXPORT FcBool
+_X_HIDDEN FcBool
XftNameUnparse (FcPattern *pat, char *dest, int len)
{
FcChar8 *name;
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.10/src/xftrender.c new/libXft-2.1.11/src/xftrender.c
--- old/libXft-2.1.10/src/xftrender.c 2006-06-03 12:30:56.000000000 +0200
+++ new/libXft-2.1.11/src/xftrender.c 2006-10-12 00:31:23.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * $Id: xftrender.c,v 1.4 2005/07/03 07:00:57 daniels Exp $
+ * $Id$
*
* Copyright © 2000 Keith Packard
*
@@ -518,7 +518,7 @@
break;
}
}
- if (i == nglyphs)
+ if (i == nglyphs || !firstFont)
goto bail2;
glyph = firstFont->glyphs[g];
format = firstFont->format;
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.10/src/xftstr.c new/libXft-2.1.11/src/xftstr.c
--- old/libXft-2.1.10/src/xftstr.c 2006-06-03 12:30:56.000000000 +0200
+++ new/libXft-2.1.11/src/xftstr.c 2006-10-12 00:31:23.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * $Id: xftstr.c,v 1.4 2005/07/03 07:00:57 daniels Exp $
+ * $Id$
*
* Copyright © 2000 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.10/src/xftswap.c new/libXft-2.1.11/src/xftswap.c
--- old/libXft-2.1.10/src/xftswap.c 2006-06-03 12:30:56.000000000 +0200
+++ new/libXft-2.1.11/src/xftswap.c 2006-10-12 00:31:23.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * $Id: xftswap.c,v 1.4 2005/07/03 07:00:57 daniels Exp $
+ * $Id$
*
* Copyright © 2002 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.10/src/xftxlfd.c new/libXft-2.1.11/src/xftxlfd.c
--- old/libXft-2.1.10/src/xftxlfd.c 2006-06-03 12:30:56.000000000 +0200
+++ new/libXft-2.1.11/src/xftxlfd.c 2006-10-12 00:31:23.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * $Id: xftxlfd.c,v 1.4 2005/07/03 07:00:57 daniels Exp $
+ * $Id$
*
* Copyright © 2000 Keith Packard
*
@@ -128,8 +128,10 @@
save = (char *) malloc (strlen (foundry) + 1);
- if (!save)
+ if (!save) {
+ FcPatternDestroy (pat);
return 0;
+ }
if (!FcPatternAddString (pat, XFT_XLFD, (FcChar8 *) xlfd_orig)) goto bail;
++++++ libXrandr-X11R7.1-1.1.1.tar.bz2 -> libXrandr-1.1.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXrandr-X11R7.1-1.1.1/ChangeLog new/libXrandr-1.1.2/ChangeLog
--- old/libXrandr-X11R7.1-1.1.1/ChangeLog 2006-04-27 02:20:39.000000000 +0200
+++ new/libXrandr-1.1.2/ChangeLog 2006-10-12 00:31:47.000000000 +0200
@@ -1,8 +1,3 @@
-2006-04-26 Adam Jackson
-
- * configure.ac:
- Bump to 1.1.1
-
2006-02-12 Alan Coopersmith
* man/Makefile.am:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXrandr-X11R7.1-1.1.1/Makefile.am new/libXrandr-1.1.2/Makefile.am
--- old/libXrandr-X11R7.1-1.1.1/Makefile.am 2005-07-23 07:27:00.000000000 +0200
+++ new/libXrandr-1.1.2/Makefile.am 2006-10-12 00:31:47.000000000 +0200
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.am,v 1.1 2005/06/08 17:48:03 sandmann Exp $
+# $Id$
#
# Copyright © 2003 Keith Packard, Noah Levitt
#
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXrandr-X11R7.1-1.1.1/Makefile.in new/libXrandr-1.1.2/Makefile.in
--- old/libXrandr-X11R7.1-1.1.1/Makefile.in 2006-05-22 03:42:35.000000000 +0200
+++ new/libXrandr-1.1.2/Makefile.in 2006-10-13 23:09:34.000000000 +0200
@@ -15,7 +15,7 @@
@SET_MAKE@
#
-# $Id: Makefile.am,v 1.1 2005/06/08 17:48:03 sandmann Exp $
+# $Id$
#
# Copyright © 2003 Keith Packard, Noah Levitt
#
@@ -174,6 +174,7 @@
RANDR_LIBS = @RANDR_LIBS@
RANDR_VERSION = @RANDR_VERSION@
RANLIB = @RANLIB@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXrandr-X11R7.1-1.1.1/aclocal.m4 new/libXrandr-1.1.2/aclocal.m4
--- old/libXrandr-X11R7.1-1.1.1/aclocal.m4 2006-05-22 03:42:26.000000000 +0200
+++ new/libXrandr-1.1.2/aclocal.m4 2006-10-13 23:09:31.000000000 +0200
@@ -1597,7 +1597,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
@@ -4305,6 +4305,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$_LT_AC_TAGVAR(GCC, $1)
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -4438,11 +4441,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
+predep_objects=\`echo $lt_[]_LT_AC_TAGVAR(predep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
+postdep_objects=\`echo $lt_[]_LT_AC_TAGVAR(postdep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -4454,7 +4457,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
+compiler_lib_search_path=\`echo $lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -4534,7 +4537,7 @@
link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -6370,6 +6373,7 @@
done
done
done
+IFS=$as_save_IFS
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -6402,6 +6406,7 @@
done
])
SED=$lt_cv_path_SED
+AC_SUBST([SED])
AC_MSG_RESULT([$SED])
])
@@ -6543,7 +6548,8 @@
_PKG_TEXT
])],
- [$4])
+ [AC_MSG_RESULT([no])
+ $4])
elif test $pkg_failed = untried; then
ifelse([$4], , [AC_MSG_FAILURE(dnl
[The pkg-config script could not be found or is too old. Make sure it
@@ -6562,35 +6568,69 @@
fi[]dnl
])# PKG_CHECK_MODULES
-dnl $Id: xorg-macros.m4,v 1.8 2005/12/09 15:28:41 kem Exp $
dnl
-dnl Copyright 2005 Sun Microsystems, Inc. All rights reserved.
-dnl
-dnl Permission to use, copy, modify, distribute, and sell this software and its
-dnl documentation for any purpose is hereby granted without fee, provided that
-dnl the above copyright notice appear in all copies and that both that
-dnl copyright notice and this permission notice appear in supporting
-dnl documentation.
-dnl
-dnl The above copyright notice and this permission notice shall be included
-dnl in all copies or substantial portions of the Software.
+dnl Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved.
dnl
+dnl Permission is hereby granted, free of charge, to any person obtaining a
+dnl copy of this software and associated documentation files (the
+dnl "Software"), to deal in the Software without restriction, including
+dnl without limitation the rights to use, copy, modify, merge, publish,
+dnl distribute, and/or sell copies of the Software, and to permit persons
+dnl to whom the Software is furnished to do so, provided that the above
+dnl copyright notice(s) and this permission notice appear in all copies of
+dnl the Software and that both the above copyright notice(s) and this
+dnl permission notice appear in supporting documentation.
+dnl
dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-dnl OTHER DEALINGS IN THE SOFTWARE.
-dnl
-dnl Except as contained in this notice, the name of the copyright holders shall
-dnl not be used in advertising or otherwise to promote the sale, use or
-dnl other dealings in this Software without prior written authorization
-dnl from the copyright holders.
-dnl
+dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+dnl OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+dnl HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+dnl INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+dnl FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+dnl NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+dnl WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+dnl
+dnl Except as contained in this notice, the name of a copyright holder
+dnl shall not be used in advertising or otherwise to promote the sale, use
+dnl or other dealings in this Software without prior written authorization
+dnl of the copyright holder.
+
+# XORG_MACROS_VERSION(required-version)
+# -------------------------------------
+# Minimum version: 1.1.0
+#
+# If you're using a macro added in Version 1.1 or newer, include this in
+# your configure.ac with the minimum required version, such as:
+# XORG_MACROS_VERSION(1.1)
+#
+# To force at least a version with this macro defined, also add:
+# m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
+#
+#
+# See the "minimum version" comment for each macro you use to see what
+# version you require.
+AC_DEFUN([XORG_MACROS_VERSION],[
+ [XORG_MACROS_needed_version=$1
+ XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
+ XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
+ AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
+ [XORG_MACROS_version=1.1.1
+ XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
+ XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
+ if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
+ AC_MSG_ERROR([configure built with incompatible version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.x])
+ fi
+ if test $XORG_MACROS_minor -lt $XORG_MACROS_needed_minor ; then
+ AC_MSG_ERROR([configure built with too old of a version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.${XORG_MACROS_minor}.0 or newer])
+ fi
+ AC_MSG_RESULT([yes, $XORG_MACROS_version])
+]) # XORG_MACROS_VERSION
# XORG_PROG_RAWCPP()
# ------------------
+# Minimum version: 1.0.0
+#
# Find cpp program and necessary flags for use in pre-processing text files
# such as man pages and config files
AC_DEFUN([XORG_PROG_RAWCPP],[
@@ -6633,6 +6673,8 @@
# XORG_MANPAGE_SECTIONS()
# -----------------------
+# Minimum version: 1.0.0
+#
# Determine which sections man pages go in for the different man page types
# on this OS - replaces *ManSuffix settings in old Imake *.cf per-os files.
# Not sure if there's any better way than just hardcoding by OS name.
@@ -6642,75 +6684,47 @@
AC_REQUIRE([AC_CANONICAL_HOST])
if test x$APP_MAN_SUFFIX = x ; then
- case $host_os in
- linux*) APP_MAN_SUFFIX=1x ;;
- *) APP_MAN_SUFFIX=1 ;;
- esac
+ APP_MAN_SUFFIX=1
fi
if test x$APP_MAN_DIR = x ; then
- case $host_os in
- linux*) APP_MAN_DIR='$(mandir)/man1' ;;
- *) APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' ;;
- esac
+ APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)'
fi
if test x$LIB_MAN_SUFFIX = x ; then
- case $host_os in
- linux*) LIB_MAN_SUFFIX=3x ;;
- *) LIB_MAN_SUFFIX=3 ;;
- esac
+ LIB_MAN_SUFFIX=3
fi
if test x$LIB_MAN_DIR = x ; then
- case $host_os in
- linux*) LIB_MAN_DIR='$(mandir)/man3' ;;
- *) LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' ;;
- esac
+ LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)'
fi
if test x$FILE_MAN_SUFFIX = x ; then
case $host_os in
- linux*) FILE_MAN_SUFFIX=5x ;;
solaris*) FILE_MAN_SUFFIX=4 ;;
*) FILE_MAN_SUFFIX=5 ;;
esac
fi
if test x$FILE_MAN_DIR = x ; then
- case $host_os in
- linux*) FILE_MAN_DIR='$(mandir)/man5' ;;
- *) FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' ;;
- esac
+ FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)'
fi
-# In Imake's linux.cf, the misc man suffix & dir was only changed for
-# LinuxDebian, not other Linuxes, so we leave it unchanged here
if test x$MISC_MAN_SUFFIX = x ; then
case $host_os in
-# linux*) MISC_MAN_SUFFIX=7x ;;
solaris*) MISC_MAN_SUFFIX=5 ;;
*) MISC_MAN_SUFFIX=7 ;;
esac
fi
if test x$MISC_MAN_DIR = x ; then
- case $host_os in
-# linux*) MISC_MAN_DIR='$(mandir)/man7' ;;
- *) MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)' ;;
- esac
+ MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)'
fi
-# In Imake's linux.cf, the driver man suffix & dir was only changed for
-# LinuxDebian, not other Linuxes, so we leave it unchanged here
if test x$DRIVER_MAN_SUFFIX = x ; then
case $host_os in
-# linux*) DRIVER_MAN_SUFFIX=4x ;;
solaris*) DRIVER_MAN_SUFFIX=7 ;;
*) DRIVER_MAN_SUFFIX=4 ;;
esac
fi
if test x$DRIVER_MAN_DIR = x ; then
- case $host_os in
-# linux*) DRIVER_MAN_DIR='$(mandir)/man4' ;;
- *) DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)' ;;
- esac
+ DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)'
fi
if test x$ADMIN_MAN_SUFFIX = x ; then
@@ -6740,6 +6754,8 @@
# XORG_CHECK_LINUXDOC
# -------------------
+# Minimum version: 1.0.0
+#
# Defines the variable MAKE_TEXT if the necessary tools and
# files are found. $(MAKE_TEXT) blah.sgml will then produce blah.txt.
# Whether or not the necessary tools and files are found can be checked
@@ -6791,6 +6807,8 @@
# XORG_CHECK_MALLOC_ZERO
# ----------------------
+# Minimum version: 1.0.0
+#
# Defines {MALLOC,XMALLOC,XTMALLOC}_ZERO_CFLAGS appropriately if
# malloc(0) returns NULL. Packages should add one of these cflags to
# their AM_CFLAGS (or other appropriate *_CFLAGS) to use them.
@@ -6835,6 +6853,78 @@
AC_SUBST([XTMALLOC_ZERO_CFLAGS])
]) # XORG_CHECK_MALLOC_ZERO
+# XORG_WITH_LINT()
+# ----------------
+# Minimum version: 1.1.0
+#
+# Sets up flags for source checkers such as lint and sparse if --with-lint
+# is specified. (Use --with-lint=sparse for sparse.)
+# Sets $LINT to name of source checker passed with --with-lint (default: lint)
+# Sets $LINT_FLAGS to flags to pass to source checker
+# Sets LINT automake conditional if enabled (default: disabled)
+#
+AC_DEFUN([XORG_WITH_LINT],[
+
+# Allow checking code with lint, sparse, etc.
+AC_ARG_WITH(lint, [AC_HELP_STRING([--with-lint],
+ [Use a lint-style source code checker (default: disabled)])],
+ [use_lint=$withval], [use_lint=no])
+if test "x$use_lint" = "xyes" ; then
+ LINT="lint"
+else
+ LINT="$use_lint"
+fi
+if test "x$LINT_FLAGS" = "x" -a "x$LINT" != "xno" ; then
+ case $LINT in
+ lint|*/lint)
+ case $host_os in
+ solaris*)
+ LINT_FLAGS="-u -b -h -erroff=E_INDISTING_FROM_TRUNC2"
+ ;;
+ esac
+ ;;
+ esac
+fi
+
+AC_SUBST(LINT)
+AC_SUBST(LINT_FLAGS)
+AM_CONDITIONAL(LINT, [test x$LINT != xno])
+
+]) # XORG_WITH_LINT
+
+# XORG_LINT_LIBRARY(LIBNAME)
+# --------------------------
+# Minimum version: 1.1.0
+#
+# Sets up flags for building lint libraries for checking programs that call
+# functions in the library.
+# Disabled by default, enable with --enable-lint-library
+# Sets:
+# @LINTLIB@ - name of lint library file to make
+# MAKE_LINT_LIB - automake conditional
+#
+
+AC_DEFUN([XORG_LINT_LIBRARY],[
+AC_REQUIRE([XORG_WITH_LINT])
+# Build lint "library" for more indepth checks of programs calling this library
+AC_ARG_ENABLE(lint-library, [AC_HELP_STRING([--enable-lint-library],
+ [Create lint library (default: disabled)])],
+ [make_lint_lib=$enableval], [make_lint_lib=no])
+if test "x$make_lint_lib" != "xno" ; then
+ if test "x$LINT" = "xno" ; then
+ AC_MSG_ERROR([Cannot make lint library without --with-lint])
+ fi
+ if test "x$make_lint_lib" = "xyes" ; then
+ LINTLIB=llib-l$1.ln
+ else
+ LINTLIB=$make_lint_lib
+ fi
+fi
+AC_SUBST(LINTLIB)
+AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno])
+
+]) # XORG_LINT_LIBRARY
+
dnl Copyright 2005 Red Hat, Inc
dnl
dnl Permission to use, copy, modify, distribute, and sell this software and its
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXrandr-X11R7.1-1.1.1/configure new/libXrandr-1.1.2/configure
--- old/libXrandr-X11R7.1-1.1.1/configure 2006-05-22 03:42:32.000000000 +0200
+++ new/libXrandr-1.1.2/configure 2006-10-13 23:09:33.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for libXrandr 1.1.1.
+# Generated by GNU Autoconf 2.59 for libXrandr 1.1.2.
#
# Report bugs to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg.
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='libXrandr'
PACKAGE_TARNAME='libXrandr'
-PACKAGE_VERSION='1.1.1'
-PACKAGE_STRING='libXrandr 1.1.1'
+PACKAGE_VERSION='1.1.2'
+PACKAGE_STRING='libXrandr 1.1.2'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
# Factoring default headers for most tests.
@@ -464,7 +464,7 @@
# include
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXX
CPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG ac_pt_PKG_CONFIG X_CFLAGS X_LIBS RANDR_VERSION RANDR_CFLAGS RANDR_LIBS MALLOC_ZERO_CFLAGS XMALLOC_ZERO_CFLAGS XTMALLOC_ZERO_CFLAGS APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX MISC_MAN_SUFFIX DRIVER_MAN_SUFFIX ADMIN_MAN_SUFFIX APP_MAN_DIR LIB_MAN_DIR FILE_MAN_DIR MISC_MAN_DIR DRIVER_MAN_DIR ADMIN_MAN_DIR LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE
CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG ac_pt_PKG_CONFIG X_CFLAGS X_LIBS RANDR_VERSION RANDR_CFLAGS RANDR_LIBS MALLOC_ZERO_CFLAGS XMALLOC_ZERO_CFLAGS XTMALLOC_ZERO_CFLAGS APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX MISC_MAN_SUFFIX DRIVER_MAN_SUFFIX ADMIN_MAN_SUFFIX APP_MAN_DIR LIB_MAN_DIR FILE_MAN_DIR MISC_MAN_DIR DRIVER_MAN_DIR ADMIN_MAN_DIR LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -973,7 +973,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 libXrandr 1.1.1 to adapt to many kinds of systems.
+\`configure' configures libXrandr 1.1.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1039,7 +1039,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libXrandr 1.1.1:";;
+ short | recursive ) echo "Configuration of libXrandr 1.1.2:";;
esac
cat <<\_ACEOF
@@ -1190,7 +1190,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-libXrandr configure 1.1.1
+libXrandr configure 1.1.2
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1204,7 +1204,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libXrandr $as_me 1.1.1, which was
+It was created by libXrandr $as_me 1.1.2, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1847,7 +1847,7 @@
# Define the identity of the package.
PACKAGE='libXrandr'
- VERSION='1.1.1'
+ VERSION='1.1.2'
cat >>confdefs.h <<_ACEOF
@@ -3256,6 +3256,7 @@
done
done
done
+IFS=$as_save_IFS
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -3290,6 +3291,7 @@
fi
SED=$lt_cv_path_SED
+
echo "$as_me:$LINENO: result: $SED" >&5
echo "${ECHO_T}$SED" >&6
@@ -3730,7 +3732,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 3733 "configure"' > conftest.$ac_ext
+ echo '#line 3735 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5329,7 +5331,7 @@
# Provide some information about the compiler.
-echo "$as_me:5332:" \
+echo "$as_me:5334:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5
@@ -6392,11 +6394,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6395: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6397: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6399: \$? = $ac_status" >&5
+ echo "$as_me:6401: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6660,11 +6662,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6663: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6665: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6667: \$? = $ac_status" >&5
+ echo "$as_me:6669: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6764,11 +6766,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6767: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6769: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:6771: \$? = $ac_status" >&5
+ echo "$as_me:6773: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8233,7 +8235,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 8236 "configure"' > conftest.$ac_ext
+ echo '#line 8238 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -8252,7 +8254,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
@@ -9130,7 +9132,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext < conftest.$ac_ext <&5)
+ (eval echo "\"\$as_me:11578: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11577: \$? = $ac_status" >&5
+ echo "$as_me:11582: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -11674,11 +11679,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11677: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11682: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11681: \$? = $ac_status" >&5
+ echo "$as_me:11686: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12210,7 +12215,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 12213 "configure"' > conftest.$ac_ext
+ echo '#line 12218 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -12229,7 +12234,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
@@ -12614,6 +12619,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_CXX
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -12747,11 +12755,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_predep_objects_CXX
+predep_objects=\`echo $lt_predep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_postdep_objects_CXX
+postdep_objects=\`echo $lt_postdep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -12763,7 +12771,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -12843,7 +12851,7 @@
link_all_deplibs=$link_all_deplibs_CXX
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -13265,11 +13273,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13268: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13276: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13272: \$? = $ac_status" >&5
+ echo "$as_me:13280: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13369,11 +13377,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13372: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13380: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13376: \$? = $ac_status" >&5
+ echo "$as_me:13384: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14818,7 +14826,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 14821 "configure"' > conftest.$ac_ext
+ echo '#line 14829 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -14837,7 +14845,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
@@ -15222,6 +15230,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_F77
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -15355,11 +15366,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_predep_objects_F77
+predep_objects=\`echo $lt_predep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_postdep_objects_F77
+postdep_objects=\`echo $lt_postdep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -15371,7 +15382,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_F77
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -15451,7 +15462,7 @@
link_all_deplibs=$link_all_deplibs_F77
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -15593,11 +15604,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15596: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15607: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15600: \$? = $ac_status" >&5
+ echo "$as_me:15611: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15861,11 +15872,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15864: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15875: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15868: \$? = $ac_status" >&5
+ echo "$as_me:15879: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15965,11 +15976,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15968: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15979: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15972: \$? = $ac_status" >&5
+ echo "$as_me:15983: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17434,7 +17445,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 17437 "configure"' > conftest.$ac_ext
+ echo '#line 17448 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -17453,7 +17464,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
@@ -17838,6 +17849,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_GCJ
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -17971,11 +17985,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_predep_objects_GCJ
+predep_objects=\`echo $lt_predep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_postdep_objects_GCJ
+postdep_objects=\`echo $lt_postdep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -17987,7 +18001,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -18067,7 +18081,7 @@
link_all_deplibs=$link_all_deplibs_GCJ
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -18319,6 +18333,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_RC
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -18452,11 +18469,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_predep_objects_RC
+predep_objects=\`echo $lt_predep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_postdep_objects_RC
+postdep_objects=\`echo $lt_postdep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -18468,7 +18485,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_RC
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -18548,7 +18565,7 @@
link_all_deplibs=$link_all_deplibs_RC
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -19070,75 +19087,47 @@
if test x$APP_MAN_SUFFIX = x ; then
- case $host_os in
- linux*) APP_MAN_SUFFIX=1x ;;
- *) APP_MAN_SUFFIX=1 ;;
- esac
+ APP_MAN_SUFFIX=1
fi
if test x$APP_MAN_DIR = x ; then
- case $host_os in
- linux*) APP_MAN_DIR='$(mandir)/man1' ;;
- *) APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' ;;
- esac
+ APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)'
fi
if test x$LIB_MAN_SUFFIX = x ; then
- case $host_os in
- linux*) LIB_MAN_SUFFIX=3x ;;
- *) LIB_MAN_SUFFIX=3 ;;
- esac
+ LIB_MAN_SUFFIX=3
fi
if test x$LIB_MAN_DIR = x ; then
- case $host_os in
- linux*) LIB_MAN_DIR='$(mandir)/man3' ;;
- *) LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' ;;
- esac
+ LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)'
fi
if test x$FILE_MAN_SUFFIX = x ; then
case $host_os in
- linux*) FILE_MAN_SUFFIX=5x ;;
solaris*) FILE_MAN_SUFFIX=4 ;;
*) FILE_MAN_SUFFIX=5 ;;
esac
fi
if test x$FILE_MAN_DIR = x ; then
- case $host_os in
- linux*) FILE_MAN_DIR='$(mandir)/man5' ;;
- *) FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' ;;
- esac
+ FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)'
fi
-# In Imake's linux.cf, the misc man suffix & dir was only changed for
-# LinuxDebian, not other Linuxes, so we leave it unchanged here
if test x$MISC_MAN_SUFFIX = x ; then
case $host_os in
-# linux*) MISC_MAN_SUFFIX=7x ;;
solaris*) MISC_MAN_SUFFIX=5 ;;
*) MISC_MAN_SUFFIX=7 ;;
esac
fi
if test x$MISC_MAN_DIR = x ; then
- case $host_os in
-# linux*) MISC_MAN_DIR='$(mandir)/man7' ;;
- *) MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)' ;;
- esac
+ MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)'
fi
-# In Imake's linux.cf, the driver man suffix & dir was only changed for
-# LinuxDebian, not other Linuxes, so we leave it unchanged here
if test x$DRIVER_MAN_SUFFIX = x ; then
case $host_os in
-# linux*) DRIVER_MAN_SUFFIX=4x ;;
solaris*) DRIVER_MAN_SUFFIX=7 ;;
*) DRIVER_MAN_SUFFIX=4 ;;
esac
fi
if test x$DRIVER_MAN_DIR = x ; then
- case $host_os in
-# linux*) DRIVER_MAN_DIR='$(mandir)/man4' ;;
- *) DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)' ;;
- esac
+ DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)'
fi
if test x$ADMIN_MAN_SUFFIX = x ; then
@@ -19573,7 +19562,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by libXrandr $as_me 1.1.1, which was
+This file was extended by libXrandr $as_me 1.1.2, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -19636,7 +19625,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-libXrandr config.status 1.1.1
+libXrandr config.status 1.1.2
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@@ -19886,6 +19875,7 @@
s,@host_cpu@,$host_cpu,;t t
s,@host_vendor@,$host_vendor,;t t
s,@host_os@,$host_os,;t t
+s,@SED@,$SED,;t t
s,@EGREP@,$EGREP,;t t
s,@LN_S@,$LN_S,;t t
s,@ECHO@,$ECHO,;t t
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXrandr-X11R7.1-1.1.1/configure.ac new/libXrandr-1.1.2/configure.ac
--- old/libXrandr-X11R7.1-1.1.1/configure.ac 2006-04-27 02:20:39.000000000 +0200
+++ new/libXrandr-1.1.2/configure.ac 2006-10-13 23:09:22.000000000 +0200
@@ -1,5 +1,5 @@
dnl
-dnl $Id: configure.ac,v 1.12 2005/12/03 05:49:45 kem Exp $
+dnl $Id$
dnl
dnl Copyright © 2003 Keith Packard, Noah Levitt
dnl
@@ -32,7 +32,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.1.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXrandr)
+AC_INIT(libXrandr, 1.1.2, [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 old/libXrandr-X11R7.1-1.1.1/ltmain.sh new/libXrandr-1.1.2/ltmain.sh
--- old/libXrandr-X11R7.1-1.1.1/ltmain.sh 2006-02-12 01:50:49.000000000 +0100
+++ new/libXrandr-1.1.2/ltmain.sh 2006-07-13 09:12:13.000000000 +0200
@@ -46,10 +46,16 @@
VERSION=1.5.22
TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes.
-if test -n "${ZSH_VERSION+set}" ; then
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
+else
+ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
fi
# Check that we have a working $echo.
@@ -105,12 +111,14 @@
# These must not be set unconditionally because not all systems understand
# e.g. LANG=C (notably SCO).
# We save the old values to restore during execute mode.
-if test "${LC_ALL+set}" = set; then
- save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
-fi
-if test "${LANG+set}" = set; then
- save_LANG="$LANG"; LANG=C; export LANG
-fi
+for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+ eval "if test \"\${$lt_var+set}\" = set; then
+ save_$lt_var=\$$lt_var
+ $lt_var=C
+ export $lt_var
+ fi"
+done
# Make sure IFS has a sensible default
lt_nl='
@@ -136,6 +144,8 @@
preserve_args=
lo2o="s/\\.lo\$/.${objext}/"
o2lo="s/\\.${objext}\$/.lo/"
+extracted_archives=
+extracted_serial=0
#####################################
# Shell function definitions:
@@ -327,7 +337,17 @@
*) my_xabs=`pwd`"/$my_xlib" ;;
esac
my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
- my_xdir="$my_gentop/$my_xlib"
+ my_xlib_u=$my_xlib
+ while :; do
+ case " $extracted_archives " in
+ *" $my_xlib_u "*)
+ extracted_serial=`expr $extracted_serial + 1`
+ my_xlib_u=lt$extracted_serial-$my_xlib ;;
+ *) break ;;
+ esac
+ done
+ extracted_archives="$extracted_archives $my_xlib_u"
+ my_xdir="$my_gentop/$my_xlib_u"
$show "${rm}r $my_xdir"
$run ${rm}r "$my_xdir"
@@ -758,6 +778,7 @@
*.f90) xform=f90 ;;
*.for) xform=for ;;
*.java) xform=java ;;
+ *.obj) xform=obj ;;
esac
libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
@@ -1138,8 +1159,9 @@
for arg
do
case $arg in
- -all-static | -static)
- if test "X$arg" = "X-all-static"; then
+ -all-static | -static | -static-libtool-libs)
+ case $arg in
+ -all-static)
if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
$echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
fi
@@ -1147,12 +1169,20 @@
dlopen_self=$dlopen_self_static
fi
prefer_static_libs=yes
- else
+ ;;
+ -static)
if test -z "$pic_flag" && test -n "$link_static_flag"; then
dlopen_self=$dlopen_self_static
fi
prefer_static_libs=built
- fi
+ ;;
+ -static-libtool-libs)
+ if test -z "$pic_flag" && test -n "$link_static_flag"; then
+ dlopen_self=$dlopen_self_static
+ fi
+ prefer_static_libs=yes
+ ;;
+ esac
build_libtool_libs=no
build_old_libs=yes
break
@@ -1712,7 +1742,7 @@
continue
;;
- -static)
+ -static | -static-libtool-libs)
# The effects of -static are defined in a previous loop.
# We used to do the same as -all-static on platforms that
# didn't have a PIC flag, but the assumption that the effects
@@ -2490,7 +2520,9 @@
if test "$linkmode,$pass" = "prog,link"; then
if test -n "$library_names" &&
- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+ { { test "$prefer_static_libs" = no ||
+ test "$prefer_static_libs,$installed" = "built,yes"; } ||
+ test -z "$old_library"; }; then
# We need to hardcode the library path
if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
# Make sure the rpath contains only unique directories.
@@ -3186,7 +3218,7 @@
# which has an extra 1 added just for fun
#
case $version_type in
- darwin|linux|osf|windows)
+ darwin|linux|osf|windows|none)
current=`expr $number_major + $number_minor`
age="$number_minor"
revision="$number_revision"
@@ -3410,11 +3442,11 @@
fi
# Eliminate all temporary directories.
- for path in $notinst_path; do
- lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
- deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
- dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
- done
+# for path in $notinst_path; do
+# lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
+# deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
+# dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
+# done
if test -n "$xrpath"; then
# If the user specified any rpath flags, then add them.
@@ -3515,13 +3547,12 @@
int main() { return 0; }
EOF
$rm conftest
- $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
- if test "$?" -eq 0 ; then
+ if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
ldd_output=`ldd conftest`
for i in $deplibs; do
name=`expr $i : '-l\(.*\)'`
# If $name is empty we are operating on a -L argument.
- if test "$name" != "" && test "$name" -ne "0"; then
+ if test "$name" != "" && test "$name" != "0"; then
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
@@ -3560,9 +3591,7 @@
# If $name is empty we are operating on a -L argument.
if test "$name" != "" && test "$name" != "0"; then
$rm conftest
- $LTCC $LTCFLAGS -o conftest conftest.c $i
- # Did it work?
- if test "$?" -eq 0 ; then
+ if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
ldd_output=`ldd conftest`
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
@@ -3594,7 +3623,7 @@
droppeddeps=yes
$echo
$echo "*** Warning! Library $i is needed by this library but I was not able to"
- $echo "*** make it link in! You will probably need to install it or some"
+ $echo "*** make it link in! You will probably need to install it or some"
$echo "*** library that it depends on before this library will be fully"
$echo "*** functional. Installing it before continuing would be even better."
fi
@@ -4239,12 +4268,14 @@
reload_conv_objs=
gentop=
# reload_cmds runs $LD directly, so let us get rid of
- # -Wl from whole_archive_flag_spec
+ # -Wl from whole_archive_flag_spec and hope we can get by with
+ # turning comma into space..
wl=
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
- eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+ reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
else
gentop="$output_objdir/${obj}x"
generated="$generated $gentop"
@@ -4692,16 +4723,16 @@
case $host in
*cygwin* | *mingw* )
if test -f "$output_objdir/${outputname}.def" ; then
- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
else
- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
fi
;;
* )
- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
;;
esac
;;
@@ -4716,13 +4747,13 @@
# really was required.
# Nullify the symbol file.
- compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
fi
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
# Replace the output file specification.
- compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
link_command="$compile_command$compile_rpath"
# We have no uninstalled library dependencies, so finalize right now.
@@ -4809,7 +4840,7 @@
if test "$fast_install" != no; then
link_command="$finalize_var$compile_command$finalize_rpath"
if test "$fast_install" = yes; then
- relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+ relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
else
# fast_install is set to needless
relink_command=
@@ -4846,7 +4877,7 @@
fi
done
relink_command="(cd `pwd`; $relink_command)"
- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
fi
# Quote $echo for shipping.
@@ -5253,6 +5284,18 @@
Xsed='${SED} -e 1s/^X//'
sed_quote_subst='$sed_quote_subst'
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+ # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '\${1+\"\$@\"}'='\"\$@\"'
+ setopt NO_GLOB_SUBST
+else
+ case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
+fi
+
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
@@ -5395,7 +5438,7 @@
;;
esac
$echo >> $output "\
- \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+ \$echo \"\$0: cannot exec \$program \$*\"
exit $EXIT_FAILURE
fi
else
@@ -5581,7 +5624,7 @@
done
# Quote the link command for shipping.
relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
if test "$hardcode_automatic" = yes ; then
relink_command=
fi
@@ -5926,9 +5969,9 @@
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
else
- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
fi
$echo "$modename: warning: relinking \`$file'" 1>&2
@@ -6137,7 +6180,7 @@
file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
outputname="$tmpdir/$file"
# Replace the output file specification.
- relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
$show "$relink_command"
if $run eval "$relink_command"; then :
@@ -6413,12 +6456,15 @@
fi
# Restore saved environment variables
- if test "${save_LC_ALL+set}" = set; then
- LC_ALL="$save_LC_ALL"; export LC_ALL
- fi
- if test "${save_LANG+set}" = set; then
- LANG="$save_LANG"; export LANG
- fi
+ for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+ do
+ eval "if test \"\${save_$lt_var+set}\" = set; then
+ $lt_var=\$save_$lt_var; export $lt_var
+ else
+ $lt_unset $lt_var
+ fi"
+ done
+
# Now prepare to actually exec the command.
exec_cmd="\$cmd$args"
@@ -6775,9 +6821,9 @@
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-export-symbols SYMFILE
- try to export only the symbols listed in SYMFILE
+ try to export only the symbols listed in SYMFILE
-export-symbols-regex REGEX
- try to export only the symbols matching REGEX
+ try to export only the symbols matching REGEX
-LLIBDIR search LIBDIR for required installed libraries
-lNAME OUTPUT-FILE requires the installed library libNAME
-module build a library that can dlopened
@@ -6791,9 +6837,11 @@
-release RELEASE specify package release information
-rpath LIBDIR the created library will eventually be installed in LIBDIR
-R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
- -static do not do any dynamic linking of libtool libraries
+ -static do not do any dynamic linking of uninstalled libtool libraries
+ -static-libtool-libs
+ do not do any dynamic linking of libtool libraries
-version-info CURRENT[:REVISION[:AGE]]
- specify library version info [each variable defaults to 0]
+ specify library version info [each variable defaults to 0]
All other options (arguments beginning with \`-') are ignored.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXrandr-X11R7.1-1.1.1/man/Makefile.am new/libXrandr-1.1.2/man/Makefile.am
--- old/libXrandr-X11R7.1-1.1.1/man/Makefile.am 2006-02-12 19:19:22.000000000 +0100
+++ new/libXrandr-1.1.2/man/Makefile.am 2006-10-12 00:31:47.000000000 +0200
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.7 2005/12/06 22:48:44 kem Exp $
+# $Id$
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXrandr-X11R7.1-1.1.1/man/Makefile.in new/libXrandr-1.1.2/man/Makefile.in
--- old/libXrandr-X11R7.1-1.1.1/man/Makefile.in 2006-05-22 03:42:35.000000000 +0200
+++ new/libXrandr-1.1.2/man/Makefile.in 2006-10-13 23:09:34.000000000 +0200
@@ -14,7 +14,7 @@
@SET_MAKE@
-# $Id: Makefile.am,v 1.7 2005/12/06 22:48:44 kem Exp $
+# $Id$
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
@@ -153,6 +153,7 @@
RANDR_LIBS = @RANDR_LIBS@
RANDR_VERSION = @RANDR_VERSION@
RANLIB = @RANLIB@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -214,7 +215,6 @@
BUILT_SOURCES = shadows.DONE
EXTRA_DIST = $(libman_PRE)
CLEANFILES = $(libman_DATA) $(BUILT_SOURCES)
-SED = sed
# Strings to replace in man pages
XORGRELSTRING = @PACKAGE_STRING@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXrandr-X11R7.1-1.1.1/man/Xrandr.man new/libXrandr-1.1.2/man/Xrandr.man
--- old/libXrandr-X11R7.1-1.1.1/man/Xrandr.man 2005-10-13 04:56:42.000000000 +0200
+++ new/libXrandr-1.1.2/man/Xrandr.man 2006-10-12 00:31:47.000000000 +0200
@@ -1,6 +1,6 @@
.\"
.\" $XFree86: xc/lib/Xrandr/Xrandr.man,v 1.7 2003/08/04 10:32:21 eich Exp $
-.\" $XdotOrg: lib/Xrandr/man/Xrandr.man,v 1.4 2005/10/13 02:56:42 alanc Exp $
+.\" $XdotOrg: xc/lib/Xrandr/Xrandr.man,v 1.2 2004/04/23 18:43:47 eich Exp $
.\"
.\" Copyright 2002 Hewlett-Packard Company.\"
.\" Permission to use, copy, modify, distribute, and sell this software and its
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXrandr-X11R7.1-1.1.1/src/Makefile.in new/libXrandr-1.1.2/src/Makefile.in
--- old/libXrandr-X11R7.1-1.1.1/src/Makefile.in 2006-05-22 03:42:35.000000000 +0200
+++ new/libXrandr-1.1.2/src/Makefile.in 2006-10-13 23:09:34.000000000 +0200
@@ -147,6 +147,7 @@
RANDR_LIBS = @RANDR_LIBS@
RANDR_VERSION = @RANDR_VERSION@
RANLIB = @RANLIB@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXrandr-X11R7.1-1.1.1/src/Xrandr.c new/libXrandr-1.1.2/src/Xrandr.c
--- old/libXrandr-X11R7.1-1.1.1/src/Xrandr.c 2005-09-30 06:25:14.000000000 +0200
+++ new/libXrandr-1.1.2/src/Xrandr.c 2006-10-13 20:48:13.000000000 +0200
@@ -390,11 +390,11 @@
xrri->major_version = rep.majorVersion;
xrri->minor_version = rep.minorVersion;
xrri->has_rates = _XRRHasRates (xrri->major_version, xrri->minor_version);
+ UnlockDisplay (dpy);
+ SyncHandle ();
}
*major_versionp = xrri->major_version;
*minor_versionp = xrri->minor_version;
- UnlockDisplay (dpy);
- SyncHandle ();
return 1;
}
++++++ libXres-X11R7.1-1.0.1.tar.bz2 -> libXres-1.0.2.tar.bz2 ++++++
++++ 1893 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/libXres-X11R7.1-1.0.1/ChangeLog new/libXres-1.0.2/ChangeLog
--- old/libXres-X11R7.1-1.0.1/ChangeLog 2006-04-27 02:22:20.000000000 +0200
+++ new/libXres-1.0.2/ChangeLog 2006-10-13 22:28:15.000000000 +0200
@@ -1,118 +1,243 @@
-2006-04-26 Adam Jackson
+commit a5608546e433a829a0d17e2b60ac196e044dde94
+Author: Adam Jackson
+Date: Thu Oct 12 20:14:37 2006 -0400
- * configure.ac:
- Bump to 1.0.1
+ Fix the ChangeLog hook to distcheck.
-2006-04-03 Adam Jackson
+commit ed20661748b0070771116861972f5d1f00b45ed1
+Author: Matthieu Herrb
+Date: Sat Jul 29 20:23:07 2006 +0200
- * src/Makefile.am:
- Bug #6407: Cygwin build fix. (Yaakov Selkowitz)
+ Remove ChangeLog, add a rule to generate it with git-log.
-2006-02-12 Alan Coopersmith
+commit 5faf9733ca4b632ec9a3640b00186b48052b3c03
+Author: Federico G. Schwindt
+Date: Sat Jul 29 20:12:01 2006 +0200
- * 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.
+ Typo in path to XRes.h
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit cf9bc567fbbafc57348abb7e398729d40f566e3d
+Author: Alan Coopersmith
+Date: Thu Jul 13 14:58:46 2006 -0700
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ renamed: .cvsignore -> .gitignore
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 405d6e8e7e9918a86a40e78a2baf7a1f20b86d6d
+Author: Adam Jackson
+Date: Thu Apr 27 00:22:20 2006 +0000
- * man/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ Bump to 1.0.1
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit f49ba1035cf9e8f7cc8a9c44162e5a95d692d446
+Author: Adam Jackson
+Date: Mon Apr 3 19:26:13 2006 +0000
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Bug #6407: Cygwin build fix. (Yaakov Selkowitz)
-2005-12-02 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit d7d53b5a5b6efc54b405006103fce1721853aa02
+Author: Alan Coopersmith
+Date: Sun Feb 12 18:19:20 2006 +0000
- * configure.ac:
- * src/Makefile.am:
- Add check and cflags for malloc(0) returning NULL.
+ Bug #5628 https://bugs.freedesktop.org/show_bug.cgi?id=5628 Shadow pages
+ not created correctly when MANDIR & MANSUFFIX don't match.
-2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 4cfcdcae80e4e54c40cafcde1f7d341c0a9eccf5
+Author: Kevin E Martin
+Date: Thu Dec 15 00:24:28 2005 +0000
- * xres.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.
+ Update package version number for final X11R7 release candidate.
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit d65c058cb0e8cc6f1bc657a5afbf728b446c0c77
+Author: Kevin E Martin
+Date: Tue Dec 6 22:48:42 2005 +0000
- * configure.ac:
- Update package version number for X11R7 RC2 release.
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
-2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 9e37dcb3199b4c0013dcf1acc95bf9f194622e83
+Author: Kevin E Martin
+Date: Sat Dec 3 05:49:42 2005 +0000
- * configure.ac:
- * src/Makefile.am:
- Update pkgcheck dependencies to work with separate build roots.
+ Update package version number for X11R7 RC3 release.
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit f84239e6f526a4b52158c4670da8d1bd02d527f2
+Author: Kevin E Martin
+Date: Sat Dec 3 04:41:48 2005 +0000
- * configure.ac:
- Update package version number for RC1 release.
+ Add check and cflags for malloc(0) returning NULL.
-2005-10-12 Alan Coopersmith
+commit f125e444a022300ae4aa69db2d209cc3c2fbbe0b
+Author: Alan Coopersmith
+Date: Mon Nov 28 22:03:04 2005 +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.
+ 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)
-2005-07-08 Keith Packard
+commit 110fc9c3da409c53f2d6f638d0a137c29559cd32
+Author: Kevin E Martin
+Date: Sat Nov 19 07:15:40 2005 +0000
- * .cvsignore:
- * man/.cvsignore:
- * src/.cvsignore:
- * src/Makefile.am:
- Add .cvsignore files
- Switch _la_CFLAGS for AM_CFLAGS to clean up directory
+ Update pkgconfig files to separate library build-time dependencies from
+ application build-time dependencies, and update package deps to work
+ with separate build roots.
-2005-06-22 Theo van Klaveren
+commit c6674701dade763eb2d3380755b4c23f47fa6cdb
+Author: Kevin E Martin
+Date: Wed Nov 9 21:19:12 2005 +0000
- Fix make distcheck.
+ Update package version number for X11R7 RC2 release.
- * configure.ac: Also subst RESOURCEEXT_LIBS and XRES_LIBS.
- * src/Makefile.am: Add missing CFLAGS substitution.
+commit 3e53ff688524152ea26436b9a5797d9a10647844
+Author: Kevin E Martin
+Date: Tue Nov 1 15:11:50 2005 +0000
-2004-05-10 Eric Anholt
+ Update pkgcheck dependencies to work with separate build roots.
- * Makefile.am:
- * configure.ac:
- * xres.pc.in:
- Properly include LIBS/CFLAGS in .pc and linking.
- Don't include warning CFLAGS in .pc file.
- Bump to version 1.0.2.
+commit c9df69c6197623623d5c7d444181cfaddb9b23bb
+Author: Kevin E Martin
+Date: Wed Oct 19 02:48:08 2005 +0000
-2004-02-03 Jim Gettys
+ Update package version number for RC1 release.
- * AUTHORS: Get an author file in place.
+commit b9bf386000f448f3ba559ea435840648a6b202f0
+Author: Alan Coopersmith
+Date: Tue Oct 18 00:00:08 2005 +0000
-2004-01-15 Daniel Stone
- * Tag release 1.0.1 for first freedesktop.org clientside lib release.
+ Use @LIB_MAN_SUFFIX@ instead of $(LIB_MAN_SUFFIX) in macro substitutions to
+ work better with BSD make
-2003-11-09 Eric Anholt
+commit f6248446b56651ad08ef9ae036f3d266d5a1d108
+Author: Alan Coopersmith
+Date: Mon Oct 17 21:13:15 2005 +0000
- * configure.ac:
- Make bzip2 distribution.
+ Rename .shadows.DONE to shadows.DONE to avoid some make's thinking it's a
+ suffix rule (reported by Matthieu Herrb)
-2003-10-28 Keith Packard
+commit 67f04ddabfdda0d8c69c8f251eab631e4b6585e4
+Author: Alan Coopersmith
+Date: Thu Oct 13 04:25:46 2005 +0000
- * Makefile.am:
- * configure.ac:
- Add GCC warnings.
- Gratuitously change X_CFLAGS to XRES_CFLAGS to make things look more
- like other packages
+ Add generated man pages to .cvsignores
-2003-10-28 Keith Packard
+commit 1192ba3d6749837a501db95014c71f1d801b3bae
+Author: Alan Coopersmith
+Date: Thu Oct 13 01:44:46 2005 +0000
- * XRes.c:
- Use "XRes.h" instead of to build before
- install
+ Use sed to fill in variables in man page Add shadow man pages for man pages
+ that document multiple functions.
+
+commit 8eb24cbd838af67ffe96b074dc66cfff3f12ada4
+Author: Kevin E Martin
+Date: Fri Jul 29 21:22:50 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 4b937bf0b80d1e7520beda11e5958858c1d8be63
+Author: Daniel Stone
+Date: Sat Jul 16 06:28:05 2005 +0000
+
+ Set soversion to 1.0.0 using -version-number.
+
+commit 4e618f40eedcb5f8b3e2e1e32cb055a65af52961
+Author: Daniel Stone
+Date: Tue Jul 12 06:07:58 2005 +0000
+
+ Bump soversion to 1.0.0.
+
+commit c38c5edc353971b2ca6b3d2b55288b88cd46de5b
+Author: Keith Packard
+Date: Sat Jul 9 06:03:13 2005 +0000
+
+ Add .cvsignore files Switch _la_CFLAGS for AM_CFLAGS to clean up directory
+
+commit c1ed34d39740625d52eca7f2c5bf5c6797f28097
+Author: Søren Sandmann Pedersen
+Date: Wed Jun 22 22:46:38 2005 +0000
+
+ Apply these patches from Theo van Klaveren:
+ lib-dmx.patch lib-FS.patch lib-X11.patch lib-XRes.patch
+ lib-XScrnSaver.patch lib-xtrans.patch
+ to make the libraries distcheck.
+
+commit 2dbb8e41c6accaf9d86f3fdadfed5aea330da1fd
+Author: Søren Sandmann Pedersen
+Date: Tue Jun 14 17:31:59 2005 +0000
+
+ XRes/src/Makefile.am: Add $(top_srcdir)/include to INCLUDES
+
+commit a30727351e6cdeb7ff2ffa0bddad8c3a1be9eda0
+Author: Søren Sandmann Pedersen
+Date: Tue Jun 7 18:51:23 2005 +0000
+
+ - symlink.sh: Move XRes.h from proto/Resource to
+ lib/XRes/include/X11/extensions
+ - symlink.sh: Add XRes linking
+ - xc/lib/XRes/*.c: conditionally include config.h
+ - lib/XRes: add directories and build system.
+
+commit e47da1b068cd9b8a772a99e30b2c1d5271d4295e
+Author: Egbert Eich
+Date: Fri Apr 23 18:43:36 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 5597850916b8c24c6d430fcac50c88b2d97a6f01
+Author: Egbert Eich
+Date: Sun Mar 14 08:32:00 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 247bcd0cd4b6f288ebe950933aee57c8c429268d
+Author: Egbert Eich
+Date: Wed Mar 3 12:11:19 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 16b6e9a93ba18983468ce7e4e58eea4a1e46adf1
+Author: Egbert Eich
+Date: Thu Feb 26 13:35:30 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 559e2ccbe7259e3cff4614c97a8b730bd9dafac2
+Author: Egbert Eich
+Date: Thu Feb 26 09:22:39 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit c783cd6e35b7a7770b16518060b5cc970c9b3d0d
+Author: Kaleb Keithley
+Date: Fri Dec 19 20:54:31 2003 +0000
+
+ XFree86 4.3.99.902 (RC 2)
+
+commit 2dc3bb158d8859d529dce8c88066a7570351319d
+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 345fbee57dc02964c90e8e232cb9274860276d27
+Author: Kaleb Keithley
+Date: Tue Nov 25 19:28:09 2003 +0000
+
+ Initial revision
+
+commit 8379290050be8b8fcbdcc74e11cebbc637ff96ba
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:48:47 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 0ee742ac9989d710dafc982a212768d8311f80ff
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:48:47 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/libXres-X11R7.1-1.0.1/Makefile.am new/libXres-1.0.2/Makefile.am
--- old/libXres-X11R7.1-1.0.1/Makefile.am 2005-06-07 20:51:22.000000000 +0200
+++ new/libXres-1.0.2/Makefile.am 2006-10-13 02:14:25.000000000 +0200
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.am,v 1.5 2005/04/18 02:02:51 ajax Exp $
+# $Id$
#
# Copyright © 2003 Keith Packard, Noah Levitt
#
@@ -30,4 +30,10 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xres.pc
-EXTRA_DIST = xres.pc.in autogen.sh
+EXTRA_DIST = xres.pc.in autogen.sh ChangeLog
+
+CLEANFILES = ChangeLog
+
+ChangeLog: FORCE
+ git-log > ChangeLog
+FORCE: 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/libXres-X11R7.1-1.0.1/configure.ac new/libXres-1.0.2/configure.ac
--- old/libXres-X11R7.1-1.0.1/configure.ac 2006-04-27 02:22:20.000000000 +0200
+++ new/libXres-1.0.2/configure.ac 2006-10-13 20:59:52.000000000 +0200
@@ -1,5 +1,5 @@
dnl
-dnl $Id: configure.ac,v 1.10 2005/12/03 05:49:42 kem Exp $
+dnl $Id$
dnl
dnl Copyright © 2003 Keith Packard, Noah Levitt
dnl
@@ -32,7 +32,7 @@
dnl digit in the version number to track changes which don't affect the
dnl protocol, so XRes version l.n.m corresponds to protocol version l.n
dnl
-AC_INIT(libXres, 1.0.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXres)
+AC_INIT(libXres, 1.0.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXres)
AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_CONFIG_HEADER(config.h)
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/libXres-X11R7.1-1.0.1/include/X11/extensions/XRes.h new/libXres-1.0.2/include/X11/extensions/XRes.h
--- old/libXres-X11R7.1-1.0.1/include/X11/extensions/XRes.h 2004-04-23 20:43:06.000000000 +0200
+++ new/libXres-1.0.2/include/X11/extensions/XRes.h 2006-10-12 00:30:21.000000000 +0200
@@ -1,7 +1,7 @@
/*
Copyright (c) 2002 XFree86 Inc
*/
-/* $XdotOrg: lib/XRes/include/X11/extensions/XRes.h,v 1.2 2004/04/23 18:43:06 eich Exp $ */
+/* $XdotOrg: xc/include/extensions/XRes.h,v 1.4 2003/12/18 05:48:06 dawes Exp $ */
/* $XFree86: xc/include/extensions/XRes.h,v 1.3 2002/03/10 22:05:51 mvojkovi Exp $ */
#ifndef _XRES_H
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/libXres-X11R7.1-1.0.1/man/Makefile.am new/libXres-1.0.2/man/Makefile.am
--- old/libXres-X11R7.1-1.0.1/man/Makefile.am 2006-02-12 19:19:20.000000000 +0100
+++ new/libXres-1.0.2/man/Makefile.am 2006-10-12 00:30:21.000000000 +0200
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.6 2005/12/06 22:48:42 kem Exp $
+# $Id$
#
# 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/libXres-X11R7.1-1.0.1/man/XRes.man new/libXres-1.0.2/man/XRes.man
--- old/libXres-X11R7.1-1.0.1/man/XRes.man 2004-04-23 20:43:36.000000000 +0200
+++ new/libXres-1.0.2/man/XRes.man 2006-10-12 00:30:21.000000000 +0200
@@ -1,5 +1,5 @@
.\"
-.\" $XdotOrg: lib/XRes/man/XRes.man,v 1.2 2004/04/23 18:43:36 eich Exp $
+.\" $XdotOrg$
.\" $XFree86: xc/lib/XRes/XRes.man,v 1.2 2003/10/13 21:22:54 herrb Exp $
.\"
.\" Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved.
@@ -32,7 +32,7 @@
.SH NAME
XRes \- X-Resource extension client library
.SH SYNOPSIS
-.B #include
+.B #include
.PP
.nf
.ta .5i 2i
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org