Hello community, here is the log from the commit of package libXTrap for openSUSE:Factory checked in at 2013-01-07 17:24:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libXTrap (Old) and /work/SRC/openSUSE:Factory/.libXTrap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libXTrap", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libXTrap/libXTrap.changes 2012-09-25 16:14:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libXTrap.new/libXTrap.changes 2013-01-07 17:24:25.000000000 +0100 @@ -1,0 +2,15 @@ +Mon Jan 7 00:01:14 UTC 2013 - [email protected] + +- Update to version 1.0.1: + + Add README with pointers to mailing list, bugzilla & git repos + + Add note about XTrap history & deprecation to README + + Replace static ChangeLog with dist-hook to generate from git log + + SyncHandle must not be called with the Display lock held. + + configure.ac: Use AC_CONFIG_HEADERS instead of AM_CONFIG_HEADER for automake 1.13 + + configure.ac: foreign and use XORG_COMPILER_FLAGS + + nuke RCS Ids + + Janitor: ansification, make distcheck, compiler warnings. + + Fix memset usage. + + Remove unnecessary memset return value casts to void. + +------------------------------------------------------------------- Old: ---- libXTrap-X11R7.0-1.0.0.tar.bz2 New: ---- libXTrap-1.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libXTrap.spec ++++++ --- /var/tmp/diff_new_pack.qbnEyx/_old 2013-01-07 17:24:26.000000000 +0100 +++ /var/tmp/diff_new_pack.qbnEyx/_new 2013-01-07 17:24:26.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libXTrap # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ Name: libXTrap %define lname libXTrap6 -Version: 1.0.0 +Version: 1.0.1 Release: 0 Summary: X event Trap extension License: MIT @@ -27,7 +27,7 @@ #Git-Clone: git://anongit.freedesktop.org/xorg/lib/libXTrap #Git-Web: http://cgit.freedesktop.org/xorg/lib/libXTrap/ -Source: %name-X11R7.0-%version.tar.bz2 +Source: %name-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build #git#BuildRequires: autoconf >= 2.57, automake, libtool BuildRequires: pkgconfig @@ -62,7 +62,7 @@ in %lname. %prep -%setup -qn %name-X11R7.0-%version +%setup -qn %name-%version %build %configure --disable-static ++++++ libXTrap-X11R7.0-1.0.0.tar.bz2 -> libXTrap-1.0.1.tar.bz2 ++++++ ++++ 75284 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/libXTrap-X11R7.0-1.0.0/COPYING new/libXTrap-1.0.1/COPYING --- old/libXTrap-X11R7.0-1.0.0/COPYING 2005-06-29 23:36:44.000000000 +0200 +++ new/libXTrap-1.0.1/COPYING 2013-01-03 18:20:43.000000000 +0100 @@ -1,4 +1,3 @@ -$Id: COPYING,v 1.1 2005/06/29 21:36:44 sandmann Exp $ 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/libXTrap-X11R7.0-1.0.0/ChangeLog new/libXTrap-1.0.1/ChangeLog --- old/libXTrap-X11R7.0-1.0.0/ChangeLog 2005-12-15 01:24:28.000000000 +0100 +++ new/libXTrap-1.0.1/ChangeLog 2013-01-03 18:39:43.000000000 +0100 @@ -1,38 +1,239 @@ -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit e6b833f5cb053af936e3a60015ac0cca1ac1f13e +Author: Jeremy Huddleston Sequoia <[email protected]> +Date: Thu Jan 3 09:38:31 2013 -0800 - * configure.ac: - Update package version number for final X11R7 release candidate. + configure.ac: 1.0.1 + + Signed-off-by: Jeremy Huddleston Sequoia <[email protected]> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 8f2e33f4c40fb3baa3d0b2b153ff029112bb6071 +Author: Jeremy Huddleston Sequoia <[email protected]> +Date: Thu Jan 3 09:34:05 2013 -0800 - * configure.ac: - Update package version number for X11R7 RC3 release. + configure.ac: foreign and use XORG_COMPILER_FLAGS + + Signed-off-by: Jeremy Huddleston Sequoia <[email protected]> -2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 6ef02c79f1713e45475c56e3ca84df619a55c0f6 +Author: Jeremy Huddleston Sequoia <[email protected]> +Date: Thu Jan 3 09:21:18 2013 -0800 - * xtrap.pc.in: - Update pkgconfig files to separate library build-time dependencies - from application build-time dependencies. + configure.ac: Use AC_CONFIG_HEADERS instead of AM_CONFIG_HEADER for automake 1.13 + + Signed-off-by: Jeremy Huddleston Sequoia <[email protected]> -2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit b9d8ee673b4296d0962bfdc63e5b1b82590cfdf6 +Author: Thomas Klausner <[email protected]> +Date: Fri Jul 20 23:41:19 2012 +0200 - * configure.ac: - Update package version number for RC1 release. + Remove unnecessary memset return value casts to void. + + Signed-off-by: Thomas Klausner <[email protected]> + Reviewed-by: Rémi Cardona <[email protected]> + Signed-off-by: Alan Coopersmith <[email protected]> -2005-07-08 Keith Packard <[email protected]> +commit 45a8bd9a1ebf4f829d0f837beba2bb2b846fc834 +Author: Thomas Klausner <[email protected]> +Date: Fri Jul 20 23:41:18 2012 +0200 - * .cvsignore: - * src/.cvsignore: - * src/Makefile.am: - Add .cvsignore files - Switch _la_CFLAGS for AM_CFLAGS to clean up directory + Fix memset usage. + + From Joerg Sonnenberger <[email protected]> + + Signed-off-by: Thomas Klausner <[email protected]> + Reviewed-by: Rémi Cardona <[email protected]> + Signed-off-by: Alan Coopersmith <[email protected]> -2005-05-17 <[email protected]> +commit 74a751e9821bcd313ed9b8fb71d30ac9b5598b23 +Author: Alan Coopersmith <[email protected]> +Date: Tue Jun 8 19:36:06 2010 -0700 - * configure.ac: Remove rest of half-removed if statement + Add note about XTrap history & deprecation to README + + Summarized from the description in the xtrap(1) man page. + + Signed-off-by: Alan Coopersmith <[email protected]> - * ChangeLog: remove irrelevant entries +commit cb487b4242b653f75772bef6f7c1da0ddc9a03c0 +Author: Jamey Sharp <[email protected]> +Date: Fri Apr 9 17:28:29 2010 -0700 -2005-04-16 Josh Triplett <[email protected]> + SyncHandle must not be called with the Display lock held. + + The correct pattern is to call UnlockDisplay, *then* SyncHandle. - * Makefile.am: Tell automake about the manpage. +commit d324480514d0c915cbb30e504eccf2fae087e402 +Author: Alan Coopersmith <[email protected]> +Date: Mon Feb 2 20:34:31 2009 -0800 + + Add README with pointers to mailing list, bugzilla & git repos + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 9ef7d1fc012b2ef15738f8b499f7d5fcd9af415c +Author: Paulo Cesar Pereira de Andrade <[email protected]> +Date: Fri Jan 30 19:29:48 2009 -0200 + + Janitor: ansification, make distcheck, compiler warnings. + +commit 170b0b6941967b7f7a11f32d1c826ddfeb8c23ce +Author: Matthieu Herrb <[email protected]> +Date: Sun Mar 9 00:22:40 2008 +0100 + + nuke RCS Ids + +commit 168b120a6f3d3fef2a0e9c66493c00c3e89cdae9 +Author: James Cloos <[email protected]> +Date: Thu Dec 6 16:38:23 2007 -0500 + + Replace static ChangeLog with dist-hook to generate from git log + +commit 4ff5c996213a08c204f4285d6df1013587ecf5e7 +Author: James Cloos <[email protected]> +Date: Mon Sep 3 05:53:35 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit 59f6d41359428e2616c22e317d75733cab474d4b +Author: Alan Coopersmith <[email protected]> +Date: Thu Jul 13 14:58:48 2006 -0700 + + renamed: .cvsignore -> .gitignore + +commit fecbb3c852e3ee2af26c1fcbc9153f3bb76f565b +Author: Kevin E Martin <[email protected]> +Date: Thu Dec 15 00:24:28 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 0004b2300c346a2a0d3d793e953e4a3326384d6d +Author: Kevin E Martin <[email protected]> +Date: Sat Dec 3 05:49:42 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit 57e90bc7b9bafa3f7425a0b05297bf23c851289f +Author: Kevin E Martin <[email protected]> +Date: Sat Nov 19 07:15:40 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 8d3dec4df464d1090f39b69c9e9b2c4b9fadc651 +Author: Kevin E Martin <[email protected]> +Date: Wed Oct 19 02:48:09 2005 +0000 + + Update package version number for RC1 release. + +commit 8699c1dff957252e54466f41ed9fe3fe1d1bea16 +Author: Adam Jackson <[email protected]> +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 4690351c2e2a53c7f5a5d6729ee401c140825f70 +Author: Kevin E Martin <[email protected]> +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 25302594022079635901ad99d70aff5a28945e47 +Author: Daniel Stone <[email protected]> +Date: Wed Jul 20 11:02:25 2005 +0000 + + Change soversion to 6.4.0 with -version-number. + +commit 5d9aaf8db932d543dfcbab71b241d35e656cfd43 +Author: Keith Packard <[email protected]> +Date: Sat Jul 9 06:06:07 2005 +0000 + + Add .cvsignore files Switch _la_CFLAGS for AM_CFLAGS to clean up directory + +commit d04f712ea8d7e34e2c7bdae255c9956d68d98657 +Author: Søren Sandmann Pedersen <[email protected]> +Date: Fri Jul 1 20:09:11 2005 +0000 + + xtrap.pc.in: s/Xfixes/XTrap/ xi.pc.in: s/Xt/Xi/ Xv/src/Makefile.am: remove + whitespace after backslash modularizeapp.sh: s/destkop/desktop/ + modular/symlink.sh: Add bitmaps for xeyes, system.xsm for xsm, and + Xvidtune.cpp for xvidtune. Also comment out non-existing mga_bios.h + Check in buildsystems for xsetroot, xsm, xstdcmap, xtrap, and xvinfo + +commit 4c53f5f702a735b2ee20f86a5b898f999296cb5c +Author: Alexander Gottwald <[email protected]> +Date: Thu Jun 30 12:19:09 2005 +0000 + + add missing check for xext.pc + +commit d3dcbf6f834d50ea5ba2e530e9b37dd6b29473aa +Author: Søren Sandmann Pedersen <[email protected]> +Date: Wed Jun 29 21:36:44 2005 +0000 + + Check in build system for XTrap + +commit 6446598fd5e19390dd2bb6240a15b4133ed5b74b +Author: Søren Sandmann Pedersen <[email protected]> +Date: Mon Jun 20 21:47:31 2005 +0000 + + - Make Xt install its internal files in /usr/include/X11, both in the + modular and the monolithic tree. + - Update XTrap to use #include <X11/internal-xt-headerI.h> + - Add XvMC to symlink.sh + +commit b3fce83504c051e4f241a91b4a04e2b877778686 +Author: Adam Jackson <[email protected]> +Date: Mon May 30 18:36:19 2005 +0000 + + Bug #3407: Clean out ancient #ifdef X11R5 conditionals. + +commit 2b2a1e1519939bd71bc2141499e051f6e19c4de6 +Author: Egbert Eich <[email protected]> +Date: Fri Apr 23 18:43:36 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit 3bc6a06a2e61a42711fc24d1b688efd5749bc895 +Author: Egbert Eich <[email protected]> +Date: Sun Mar 14 08:32:01 2004 +0000 + + Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 + +commit ab01d1452b5c1a5e4639450bf5da3d4515b22bef +Author: Egbert Eich <[email protected]> +Date: Wed Mar 3 12:11:20 2004 +0000 + + Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 + +commit f407232870f8924670a3b1510d6c884d634b50a7 +Author: Egbert Eich <[email protected]> +Date: Thu Feb 26 13:35:30 2004 +0000 + + readding XFree86's cvs IDs + +commit 65e5285b0fb9b7e45bffe6cc6fe7e7d21df3f0af +Author: Egbert Eich <[email protected]> +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 a13dac472005af380593f889872fabfa8cfb0c63 +Author: Kaleb Keithley <[email protected]> +Date: Fri Nov 14 16:48:47 2003 +0000 + + XFree86 4.3.0.1 + +commit d0f9768bb0ef1daac029865fbccb96316444e9e9 +Author: Kaleb Keithley <[email protected]> +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/libXTrap-X11R7.0-1.0.0/Makefile.am new/libXTrap-1.0.1/Makefile.am --- old/libXTrap-X11R7.0-1.0.0/Makefile.am 2005-08-03 05:28:00.000000000 +0200 +++ new/libXTrap-1.0.1/Makefile.am 2013-01-03 18:20:43.000000000 +0100 @@ -1,6 +1,4 @@ # -# $Id: Makefile.am,v 1.2 2005/08/03 03:28:00 ajax Exp $ -# # Copyright © 2003 Keith Packard, Noah Levitt # # Permission to use, copy, modify, distribute, and sell this software and its @@ -21,11 +19,17 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -AM_CFLAGS = $(XTRAP_CFLAGS) - SUBDIRS = src pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xtrap.pc -EXTRA_DIST = xtrap.pc.in autogen.sh +EXTRA_DIST = xtrap.pc.in ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXTrap-X11R7.0-1.0.0/README new/libXTrap-1.0.1/README --- old/libXTrap-X11R7.0-1.0.0/README 2005-06-29 23:36:44.000000000 +0200 +++ new/libXTrap-1.0.1/README 2013-01-03 18:20:43.000000000 +0100 @@ -1,10 +1,34 @@ - Xfixes - XFIXES Extension - Version 2.0.1 - 2002-10-4 +libXTrap is the Xlib-based client API for the DEC-XTRAP extension. -This package contains header files and documentation for the XFIXES -extension. Library and server implementations are separate. +XTrap was a proposed standard extension for X11R5 which facilitated the +capturing of server protocol and synthesizing core input events. + +Digital participated in the X Consortium's xtest working group which chose +to evolve XTrap functionality into the XTEST & RECORD extensions for X11R6. + +As X11R6 was released in 1994, XTrap has now been deprecated for over +15 years, and uses of it should be quite rare. + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/lib/libXTrap + + http://cgit.freedesktop.org/xorg/lib/libXTrap + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage -Keith Packard [email protected] 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/libXTrap-X11R7.0-1.0.0/autogen.sh new/libXTrap-1.0.1/autogen.sh --- old/libXTrap-X11R7.0-1.0.0/autogen.sh 2005-06-29 23:36:44.000000000 +0200 +++ new/libXTrap-1.0.1/autogen.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -#! /bin/sh - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd $srcdir - -autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? - -$srcdir/configure --enable-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/libXTrap-X11R7.0-1.0.0/config.h.in new/libXTrap-1.0.1/config.h.in --- old/libXTrap-X11R7.0-1.0.0/config.h.in 2005-12-21 08:16:57.000000000 +0100 +++ new/libXTrap-1.0.1/config.h.in 2013-01-03 18:38:56.000000000 +0100 @@ -30,6 +30,10 @@ /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#undef LT_OBJDIR + /* Name of package */ #undef PACKAGE @@ -45,9 +49,21 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION +/* Major version of this package */ +#undef PACKAGE_VERSION_MAJOR + +/* Minor version of this package */ +#undef PACKAGE_VERSION_MINOR + +/* Patch version of this package */ +#undef PACKAGE_VERSION_PATCHLEVEL + /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXTrap-X11R7.0-1.0.0/configure.ac new/libXTrap-1.0.1/configure.ac --- old/libXTrap-X11R7.0-1.0.0/configure.ac 2005-12-15 01:24:28.000000000 +0100 +++ new/libXTrap-1.0.1/configure.ac 2013-01-03 18:38:29.000000000 +0100 @@ -1,6 +1,4 @@ dnl -dnl $Id: configure.ac,v 1.7 2005/12/15 00:24:28 kem Exp $ -dnl dnl Copyright © 2003 Keith Packard, Noah Levitt dnl dnl Permission to use, copy, modify, distribute, and sell this software and its @@ -25,22 +23,28 @@ AC_PREREQ([2.57]) -AC_INIT(libXTrap, 1.0.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXTrap) -AM_INIT_AUTOMAKE([dist-bzip2]) +AC_INIT(libXTrap, 1.0.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXTrap) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -AM_CONFIG_HEADER(config.h) +# Require xorg-macros: XORG_COMPILER_FLAGS, XORG_CHANGELOG +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.17 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.17) +AC_CONFIG_HEADERS([config.h]) # Check for progs AC_PROG_CC AC_PROG_LIBTOOL +XORG_COMPILER_FLAGS # Check for dependencies PKG_CHECK_MODULES(XTRAP, x11 xt trapproto xext xextproto) +XTRAP_CFLAGS="$BASE_CFLAGS $XTRAP_CFLAGS" AC_SUBST(XTRAP_CFLAGS) AC_SUBST(XTRAP_LIBS) XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile src/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/libXTrap-X11R7.0-1.0.0/missing new/libXTrap-1.0.1/missing --- old/libXTrap-X11R7.0-1.0.0/missing 2005-12-21 08:17:01.000000000 +0100 +++ new/libXTrap-1.0.1/missing 2013-01-03 18:38:57.000000000 +0100 @@ -1,7 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard <[email protected]>, 1996. +# Common wrapper for a few potentially missing GNU programs. + +scriptversion=2012-06-26.16; # UTC + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -14,9 +17,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -24,313 +25,191 @@ # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi -run=: - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -case "$1" in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - ;; -esac + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch]" + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man + +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. + +Send bug reports to <[email protected]>." + exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.4 - GNU automake" + echo "missing $scriptversion (GNU Automake)" + exit $? ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; - aclocal*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case "$f" in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - - echo 1>&2 "\ -WARNING: \`$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison|yacc) - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then - eval LASTARG="\${$#}" - case "$LASTARG" in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if [ ! -f y.tab.h ]; then - echo >y.tab.h - fi - if [ ! -f y.tab.c ]; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex|flex) - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if [ $# -ne 1 ]; then - eval LASTARG="\${$#}" - case "$LASTARG" in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if [ ! -f lex.yy.c ]; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` - fi - if [ -f "$file" ]; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit 1 - fi - ;; +esac - makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file` - fi - touch $file - ;; +# Run the given program, remember its exit status. +"$@"; st=$? - tar) - shift - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - fi - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case "$firstarg" in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case "$firstarg" in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; +# If it succeeded, we are done. +test $st -eq 0 && exit 0 - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi -exit 0 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'automa4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXTrap-X11R7.0-1.0.0/src/XEConTxt.c new/libXTrap-1.0.1/src/XEConTxt.c --- old/libXTrap-X11R7.0-1.0.0/src/XEConTxt.c 2004-04-23 20:43:36.000000000 +0200 +++ new/libXTrap-1.0.1/src/XEConTxt.c 2013-01-03 18:20:43.000000000 +0100 @@ -49,8 +49,6 @@ # define FALSE 0L #endif -extern char *extensionData; - static XETC TC; /* @@ -71,7 +69,7 @@ { firsttime = False; /* The first Trap Context is the Template (default) TC */ - (void)memset(tc,0L,sizeof(tc)); + memset(tc,0L,sizeof(*tc)); tc->eventBase = 0x7FFFFFFFL; tc->errorBase = 0x7FFFFFFFL; tc->values.v.max_pkt_size = 0x7FFFL; @@ -325,10 +323,6 @@ } XtFree((XtPointer)tc); - if (extensionData) - { - XtFree(extensionData); - } } return; } @@ -342,7 +336,7 @@ XETCValues tcv; int status = True; - (void)memset((char *)&tcv,0L,sizeof(tcv)); + memset((char *)&tcv,0L,sizeof(tcv)); XETrapSetCfgFlagMaxPacket(&tcv, valid, True); XETrapSetCfgFlagMaxPacket(&tcv, data, set_flag); XETrapSetCfgMaxPktSize(&tcv, size); @@ -355,7 +349,7 @@ int status = True; KeyCode cmd_keycode; - (void)memset((char *)&tcv,0L,sizeof(tcv)); + memset((char *)&tcv,0L,sizeof(tcv)); XETrapSetCfgFlagCmd(&tcv, valid, True); XETrapSetCfgFlagCmd(&tcv, data, set_flag); if (set_flag == True) @@ -389,7 +383,7 @@ XETCValues tcv; int status = True; - (void)memset((char *)&tcv,0L,sizeof(tcv)); + memset((char *)&tcv,0L,sizeof(tcv)); XETrapSetCfgFlagTimestamp(&tcv, valid, True); XETrapSetCfgFlagTimestamp(&tcv, data, set_flag); XETrapSetValFlagDeltaTimes(&tcv, delta_flag); @@ -402,7 +396,7 @@ XETCValues tcv; int status = True; - (void)memset((char *)&tcv,0L,sizeof(tcv)); + memset((char *)&tcv,0L,sizeof(tcv)); XETrapSetCfgFlagWinXY(&tcv, valid, True); XETrapSetCfgFlagWinXY(&tcv, data, set_flag); status = XEChangeTC(tc, TCWinXY, &tcv); @@ -414,7 +408,7 @@ XETCValues tcv; int status = True; - (void)memset((char *)&tcv,0L,sizeof(tcv)); + memset((char *)&tcv,0L,sizeof(tcv)); XETrapSetCfgFlagCursor(&tcv, valid, True); XETrapSetCfgFlagCursor(&tcv, data, set_flag); status = XEChangeTC(tc, TCCursor, &tcv); @@ -426,7 +420,7 @@ XETCValues tcv; int status = True; - (void)memset((char *)&tcv,0L,sizeof(tcv)); + memset((char *)&tcv,0L,sizeof(tcv)); XETrapSetCfgFlagXInput(&tcv, valid, True); XETrapSetCfgFlagXInput(&tcv, data, set_flag); status = XEChangeTC(tc, TCXInput, &tcv); @@ -438,7 +432,7 @@ XETCValues tcv; int status = True; - (void)memset((char *)&tcv,0L,sizeof(tcv)); + memset((char *)&tcv,0L,sizeof(tcv)); XETrapSetCfgFlagColorReplies(&tcv, valid, True); XETrapSetCfgFlagColorReplies(&tcv, data, set_flag); status = XEChangeTC(tc, TCColorReplies, &tcv); @@ -450,7 +444,7 @@ XETCValues tcv; int status = True; - (void)memset((char *)&tcv,0L,sizeof(tcv)); + memset((char *)&tcv,0L,sizeof(tcv)); XETrapSetCfgFlagGrabServer(&tcv, valid, True); XETrapSetCfgFlagGrabServer(&tcv, data, set_flag); status = XEChangeTC(tc, TCGrabServer, &tcv); @@ -462,7 +456,7 @@ XETCValues tcv; int status = True; - (void)memset((char *)&tcv,0L,sizeof(tcv)); + memset((char *)&tcv,0L,sizeof(tcv)); XETrapSetCfgFlagStatistics(&tcv, valid, True); XETrapSetCfgFlagStatistics(&tcv, data, set_flag); status = XEChangeTC(tc, TCStatistics, &tcv); @@ -475,7 +469,7 @@ int status = True; int i; - (void)memset((char *)&tcv,0L,sizeof(tcv)); + memset((char *)&tcv,0L,sizeof(tcv)); XETrapSetCfgFlagRequest(&tcv, valid, True); XETrapSetCfgFlagRequest(&tcv, data, set_flag); for (i=0; i<256L; i++) @@ -492,7 +486,7 @@ int status = True; int i; - (void)memset((char *)&tcv,0L,sizeof(tcv)); + memset((char *)&tcv,0L,sizeof(tcv)); XETrapSetCfgFlagEvent(&tcv, valid, True); XETrapSetCfgFlagEvent(&tcv, data, set_flag); for (i=KeyPress; i<=MotionNotify; i++) 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/libXTrap-X11R7.0-1.0.0/src/XERqsts.c new/libXTrap-1.0.1/src/XERqsts.c --- old/libXTrap-X11R7.0-1.0.0/src/XERqsts.c 2004-04-23 20:43:36.000000000 +0200 +++ new/libXTrap-1.0.1/src/XERqsts.c 2013-01-03 18:20:43.000000000 +0100 @@ -153,8 +153,8 @@ reqptr->minor_opcode = XETrap_GetVersion; reqptr->protocol = XETrapProtocol; status = _XReply(dpy,(xReply *)&rep,numlongs,xTrue); - SyncHandle(); UnlockDisplay(dpy); + SyncHandle(); memcpy((char *)ret,&(rep.data),sizeof(XETrapGetVersRep)); return(status); } @@ -173,8 +173,8 @@ reqptr->minor_opcode = XETrap_GetAvailable; reqptr->protocol = XETrapProtocol; status = _XReply(dpy,(xReply *)&rep,numlongs,xTrue); - SyncHandle(); UnlockDisplay(dpy); + SyncHandle(); memcpy((char *)ret,&(rep.data),sizeof(XETrapGetAvailRep)); return(status); } @@ -249,8 +249,8 @@ GetReq(XTrap,reqptr); reqptr->minor_opcode = XETrap_GetLastInpTime; status = _XReply(dpy,(xReply *)&rep,numlongs,xTrue); - SyncHandle(); UnlockDisplay(dpy); + SyncHandle(); ret->last_time=rep.data_last_time; @@ -347,8 +347,8 @@ { status = _XReply(dpy,(xReply *)&rep,numlongs,xTrue); } - SyncHandle(); UnlockDisplay(dpy); + SyncHandle(); memcpy((char *)ret->state_flags,rep.data_state_flags,2); memcpy((char *)ret->config.flags.valid,rep.data_config_flags_valid,4); @@ -404,8 +404,8 @@ status = _XRead(dpy, (char *)&rep.data, numbytes); } } - SyncHandle(); UnlockDisplay(dpy); + SyncHandle(); memcpy(ret,&(rep.data),sizeof(XETrapGetStatsRep)); } return(status); 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/libXTrap-X11R7.0-1.0.0/src/XEStrMap.c new/libXTrap-1.0.1/src/XEStrMap.c --- old/libXTrap-X11R7.0-1.0.0/src/XEStrMap.c 2004-04-23 20:43:36.000000000 +0200 +++ new/libXTrap-1.0.1/src/XEStrMap.c 2013-01-03 18:20:43.000000000 +0100 @@ -114,8 +114,8 @@ char *extName; int extEvent; } _extensionData; -_extensionData *extensionData; -int numExtension = -1; +static _extensionData *extensionData; +static int numExtension = -1; static struct _pf_tbl {CARD32 id; char *str;} pf_tbl[] = { 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/libXTrap-X11R7.0-1.0.0/src/XEWrappers.c new/libXTrap-1.0.1/src/XEWrappers.c --- old/libXTrap-X11R7.0-1.0.0/src/XEWrappers.c 2005-06-20 23:47:31.000000000 +0200 +++ new/libXTrap-1.0.1/src/XEWrappers.c 2013-01-03 18:20:43.000000000 +0100 @@ -268,7 +268,7 @@ #ifdef XTHREADS , FALSE #endif /* XTHREADS */ - , 0L)); + , NULL)); #else /* vms */ #define IS_AFTER(t1,t2) (((t2).high > (t1).high) \ ||(((t2).high == (t1).high)&& ((t2).low > (t1).low))) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
