Hello community,
here is the log from the commit of package xorg-x11-libs
checked in at Thu Apr 12 18:21:32 CEST 2007.
--------
--- xorg-x11-libs/xorg-x11-libs.changes 2007-03-17 11:13:43.000000000 +0100
+++ /mounts/work_src_done/STABLE/xorg-x11-libs/xorg-x11-libs.changes 2007-04-11 22:16:46.000000000 +0200
@@ -1,0 +2,34 @@
+Wed Apr 11 22:12:01 CEST 2007 - sndirsch@suse.de
+
+- updated libXi to release 1.0.4
+ * Don't call XInput_find_display in _XiGetExtensionVersion, while
+ the Display lock is held.
+- obsoletes libXi-20061015090357.diff
+
+-------------------------------------------------------------------
+Wed Apr 11 03:52:26 CEST 2007 - sndirsch@suse.de
+
+- updated libXi to release 1.0.3
+ * X.Org Bug #8663: _XiCheckExtInit must drop the Display lock in
+ all error cases
+- obsoletes libXi-20061119100426.diff
+
+-------------------------------------------------------------------
+Fri Apr 6 11:45:46 CEST 2007 - sndirsch@suse.de
+
+- updated libXfont to release 1.2.8:
+ * Actually use loadable font modules
+ * Add #pragma weak for Sun cc where needed
+ * added -flat_namespace to CFLAGS for Darwin
+ * Integer overflow vulnerabilities
+- obsoletes bug-247730-247732_libXfont.diff
+
+-------------------------------------------------------------------
+Mon Mar 26 12:57:55 CEST 2007 - sndirsch@suse.de
+
+- bug-247730-247732_libXfont.diff:
+ * X Window System Server fonts.dir File Parsing Integer Overflow
+ Vulnerability / X Window System Server BDF Font Parsing Integer
+ Overflow Vulnerability (Bugs #247730, #247732)
+
+-------------------------------------------------------------------
Old:
----
libXfont-1.2.7.tar.bz2
libXi-1.0.2.tar.bz2
libXi-20061015090357.diff
libXi-20061119100426.diff
New:
----
libXfont-1.2.8.tar.bz2
libXi-1.0.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-libs.spec ++++++
--- /var/tmp/diff_new_pack.F14342/_old 2007-04-12 18:21:01.000000000 +0200
+++ /var/tmp/diff_new_pack.F14342/_new 2007-04-12 18:21:01.000000000 +0200
@@ -19,7 +19,7 @@
%endif
URL: http://xorg.freedesktop.org/
Version: 7.2
-Release: 48
+Release: 53
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/Libraries
@@ -34,10 +34,10 @@
Source7: libXcursor-1.1.8.tar.bz2
Source8: libXdamage-1.1.1.tar.bz2
Source9: libXevie-1.0.2.tar.bz2
-Source10: libXfont-1.2.7.tar.bz2
+Source10: libXfont-1.2.8.tar.bz2
Source11: libXfontcache-1.0.4.tar.bz2
Source12: libXft-2.1.12.tar.bz2
-Source13: libXi-1.0.2.tar.bz2
+Source13: libXi-1.0.4.tar.bz2
Source14: libXinerama-1.0.2.tar.bz2
Source15: libXprintAppUtil-X11R7.0-1.0.1.tar.bz2
Source16: libXrandr-1.2.1.tar.bz2
@@ -61,8 +61,6 @@
Patch3: p_xft_cjk.diff
Patch4: p_xft_register.diff
Patch5: libxkbui.diff
-Patch6: libXi-20061015090357.diff
-Patch7: libXi-20061119100426.diff
Patch8: bug233919-libXaw.diff
Patch10: libXxf86misc-xcb.diff
@@ -145,10 +143,6 @@
pushd libxkbui-*
%patch5
popd
-pushd libXi-*
-%patch6 -p1
-%patch7 -p1
-popd
pushd libXaw-*
%patch8 -p0
popd
@@ -221,6 +215,28 @@
%{_mandir}/man3/*
%changelog
+* Wed Apr 11 2007 - sndirsch@suse.de
+- updated libXi to release 1.0.4
+ * Don't call XInput_find_display in _XiGetExtensionVersion, while
+ the Display lock is held.
+- obsoletes libXi-20061015090357.diff
+* Wed Apr 11 2007 - sndirsch@suse.de
+- updated libXi to release 1.0.3
+ * X.Org Bug #8663: _XiCheckExtInit must drop the Display lock in
+ all error cases
+- obsoletes libXi-20061119100426.diff
+* Fri Apr 06 2007 - sndirsch@suse.de
+- updated libXfont to release 1.2.8:
+ * Actually use loadable font modules
+ * Add #pragma weak for Sun cc where needed
+ * added -flat_namespace to CFLAGS for Darwin
+ * Integer overflow vulnerabilities
+- obsoletes bug-247730-247732_libXfont.diff
+* Mon Mar 26 2007 - sndirsch@suse.de
+- bug-247730-247732_libXfont.diff:
+ * X Window System Server fonts.dir File Parsing Integer Overflow
+ Vulnerability / X Window System Server BDF Font Parsing Integer
+ Overflow Vulnerability (Bugs #247730, #247732)
* Sat Mar 17 2007 - sndirsch@suse.de
- updated libXinerama to release 1.0.2
* Add support for source code checkers such as sparse & lint
++++++ libXfont-1.2.7.tar.bz2 -> libXfont-1.2.8.tar.bz2 ++++++
++++ 30552 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/libXfont-1.2.7/ChangeLog new/libXfont-1.2.8/ChangeLog
--- old/libXfont-1.2.7/ChangeLog 2007-01-23 00:29:10.000000000 +0100
+++ new/libXfont-1.2.8/ChangeLog 2007-04-05 02:56:35.000000000 +0200
@@ -1,3 +1,47 @@
+commit 87db45f5eb7880395735f7bf3a8ee2d89b7e0122
+Author: Alan Coopersmith
+Date: Wed Apr 4 17:05:13 2007 -0700
+
+ Version bump: 1.2.8
+
+commit 224fb6403a328e70b370540cc5cefd74421fafac
+Merge: e7a59cf... 0fbb37c...
+Author: Matthieu Herrb
+Date: Tue Apr 3 16:05:48 2007 +0200
+
+ Merge branch 'master' of git+ssh://herrb@git.freedesktop.org/git/xorg/lib/libXfont
+
+commit e7a59cfb5d442d2965cfcffeff405a4b05591190
+Author: Matthieu Herrb
+Date: Tue Apr 3 15:45:21 2007 +0200
+
+ Integer overflow vulnerabilities
+
+ CVE-2007-1351: BDFFont Parsing Integer Overflow
+ CVE-2007-1352: fonts.dir File Parsing Integer Overflow
+
+commit 0fbb37ccc630ced42d6a973c81d947870cca7637
+Author: Alan Coopersmith
+Date: Mon Apr 2 17:40:19 2007 -0700
+
+ Add #pragma weak for Sun cc where needed
+
+commit cc824e4f2c9a53a00b36a6f83bf065c363027087
+Author: Alan Coopersmith
+Date: Fri Mar 23 15:57:29 2007 -0700
+
+ Actually use loadable font modules
+
+ Loadable font modules were not being initialized, and all font renderers
+ known at build time were always being initialized, regardless of Xorg
+ module configuration.
+
+commit fc6e22f238d34918156ded34148730075b7b9cc2
+Author: Ben Byer
+Date: Tue Feb 20 00:20:23 2007 -0800
+
+ added -flat_namespace to CFLAGS for Darwin
+
commit 9509d5c7ee5d5e78c6eef54e8faceede5ca5f24e
Author: Kristian Høgsberg
Date: Mon Jan 22 18:24:19 2007 -0500
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/libXfont-1.2.7/config.h.in new/libXfont-1.2.8/config.h.in
--- old/libXfont-1.2.7/config.h.in 2007-01-23 00:29:10.000000000 +0100
+++ new/libXfont-1.2.8/config.h.in 2007-04-05 02:55:39.000000000 +0200
@@ -51,6 +51,12 @@
/* Support IPv6 for TCP connections */
#undef IPv6
+/* Support dynamically loaded font modules */
+#undef LOADABLEFONTS
+
+/* Support os-specific local connections */
+#undef LOCALCONN
+
/* Name of package */
#undef PACKAGE
@@ -69,6 +75,15 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
/* Define as the return type of signal handlers (`int' or `void'). */
#undef RETSIGTYPE
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/libXfont-1.2.7/configure.ac new/libXfont-1.2.8/configure.ac
--- old/libXfont-1.2.7/configure.ac 2007-01-23 00:20:09.000000000 +0100
+++ new/libXfont-1.2.8/configure.ac 2007-04-04 05:13:21.000000000 +0200
@@ -26,7 +26,7 @@
AC_PREREQ([2.57])
AC_INIT([libXfont],
- 1.2.7,
+ 1.2.8,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
libXfont)
dnl
@@ -171,6 +171,14 @@
AC_DEFINE(XFONT_FONTFILE,1,[Support fonts in files])
fi
+AC_ARG_ENABLE(loadable-font-modules,
+ AC_HELP_STRING([--disable-loadable-font-modules],
+ [support dynamically loaded font modules (default is enabled)]),
+ [LOADABLE_FONTS=$enableval], [LOADABLE_FONTS=yes])
+if test "x$LOADABLE_FONTS" = xyes; then
+ AC_DEFINE(LOADABLEFONTS,1,[Support dynamically loaded font modules])
+fi
+
#
# Font cache extension support?
#
@@ -218,6 +226,9 @@
linux*)
OS_CFLAGS="-D_XOPEN_SOURCE"
;;
+ darwin*)
+ OS_CFLAGS="-Wl,-flat_namespace"
+ ;;
*)
OS_CFLAGS=
;;
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/libXfont-1.2.7/src/bitmap/bdfread.c new/libXfont-1.2.8/src/bitmap/bdfread.c
--- old/libXfont-1.2.7/src/bitmap/bdfread.c 2006-07-04 20:55:31.000000000 +0200
+++ new/libXfont-1.2.8/src/bitmap/bdfread.c 2007-04-04 01:31:09.000000000 +0200
@@ -65,6 +65,12 @@
#include
#include
+#if HAVE_STDINT_H
+#include
+#elif !defined(INT32_MAX)
+#define INT32_MAX 0x7fffffff
+#endif
+
#define INDICES 256
#define MAXENCODING 0xFFFF
#define BDFLINELEN 1024
@@ -288,6 +294,11 @@
bdfError("invalid number of CHARS in BDF file\n");
return (FALSE);
}
+ if (nchars > INT32_MAX / sizeof(CharInfoRec)) {
+ bdfError("Couldn't allocate pCI (%d*%d)\n", nchars,
+ sizeof(CharInfoRec));
+ goto BAILOUT;
+ }
ci = (CharInfoPtr) xalloc(nchars * sizeof(CharInfoRec));
if (!ci) {
bdfError("Couldn't allocate pCI (%d*%d)\n", nchars,
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/libXfont-1.2.7/src/fontfile/ffcheck.c new/libXfont-1.2.8/src/fontfile/ffcheck.c
--- old/libXfont-1.2.7/src/fontfile/ffcheck.c 2007-01-17 22:49:10.000000000 +0100
+++ new/libXfont-1.2.8/src/fontfile/ffcheck.c 2007-03-23 23:31:00.000000000 +0100
@@ -37,9 +37,7 @@
#endif
#include
#include
-#ifdef LOADABLEFONTS
#include
-#endif
/*
* Map FPE functions to renderer functions
@@ -118,37 +116,59 @@
return BadFontName;
}
-void
-FontFileCheckRegisterFpeFunctions (void)
-{
-#ifndef LOADABLEFONTS
- BitmapRegisterFontFileFunctions ();
-
-
+/* Font renderers to initialize when not linked into something like
+ Xorg that provides its own module configuration options */
+static const FontModule builtinFontModuleList[] = {
#ifdef XFONT_SPEEDO
- SpeedoRegisterFontFileFunctions ();
+ {
+ SpeedoRegisterFontFileFunctions,
+ "speedo",
+ NULL
+ },
#endif
#ifdef XFONT_TYPE1
- Type1RegisterFontFileFunctions();
-#endif
-#ifdef XFONT_FREETYPE
- FreeTypeRegisterFontFileFunctions();
+ {
+ Type1RegisterFontFileFunctions,
+ "type1",
+ NULL
+ },
#endif
+#ifdef XFONT_FREETYPE
+ {
+ FreeTypeRegisterFontFileFunctions,
+ "freetype",
+ NULL
+ },
+#endif
+ /* List terminator - must be last entry */
+ { NULL, NULL, NULL }
+};
+void
+FontFileCheckRegisterFpeFunctions (void)
+{
+ FontModule *fmlist = builtinFontModuleList;
+
+#ifdef XFONT_BITMAP
+ /* bitmap is always builtin to libXfont now */
+ BitmapRegisterFontFileFunctions ();
+#endif
-#else
+#ifdef LOADABLEFONTS
+ if (FontModuleList) {
+ fmlist = FontModuleList;
+ }
+#endif
- {
+ if (fmlist) {
int i;
- if (FontModuleList) {
- for (i = 0; FontModuleList[i].name; i++) {
- if (FontModuleList[i].initFunc)
- FontModuleList[i].initFunc();
+ for (i = 0; fmlist[i].name; i++) {
+ if (fmlist[i].initFunc) {
+ fmlist[i].initFunc();
}
}
}
-#endif
RegisterFPEFunctions(FontFileNameCheck,
FontFileInitFPE,
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/libXfont-1.2.7/src/fontfile/fontdir.c new/libXfont-1.2.8/src/fontfile/fontdir.c
--- old/libXfont-1.2.7/src/fontfile/fontdir.c 2006-07-04 20:55:31.000000000 +0200
+++ new/libXfont-1.2.8/src/fontfile/fontdir.c 2007-04-04 01:31:09.000000000 +0200
@@ -38,9 +38,17 @@
#include
#include
+#if HAVE_STDINT_H
+#include
+#elif !defined(INT32_MAX)
+#define INT32_MAX 0x7fffffff
+#endif
+
Bool
FontFileInitTable (FontTablePtr table, int size)
{
+ if (size < 0 || (size > INT32_MAX/sizeof(FontEntryRec)))
+ return FALSE;
if (size)
{
table->entries = (FontEntryPtr) xalloc(sizeof(FontEntryRec) * size);
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/libXfont-1.2.7/src/fontfile/register.c new/libXfont-1.2.8/src/fontfile/register.c
--- old/libXfont-1.2.7/src/fontfile/register.c 2007-01-17 22:49:10.000000000 +0100
+++ new/libXfont-1.2.8/src/fontfile/register.c 2007-03-23 23:31:07.000000000 +0100
@@ -42,10 +42,7 @@
#include
#include
#include
-
-#ifdef LOADABLEFONTS
#include
-#endif
/*
* Translate monolithic build symbols to modular build symbols.
@@ -67,36 +64,59 @@
# define XFONT_FREETYPE 1
#endif
+/* Font renderers to initialize when not linked into something like
+ Xorg that provides its own module configuration options */
+static const FontModule builtinFontModuleList[] = {
+#ifdef XFONT_SPEEDO
+ {
+ SpeedoRegisterFontFileFunctions,
+ "speedo",
+ NULL
+ },
+#endif
+#ifdef XFONT_TYPE1
+ {
+ Type1RegisterFontFileFunctions,
+ "type1",
+ NULL
+ },
+#endif
+#ifdef XFONT_FREETYPE
+ {
+ FreeTypeRegisterFontFileFunctions,
+ "freetype",
+ NULL
+ },
+#endif
+ /* List terminator - must be last entry */
+ { NULL, NULL, NULL }
+};
+
void
FontFileRegisterFpeFunctions(void)
{
-#ifndef LOADABLEFONTS
+ FontModule *fmlist = builtinFontModuleList;
#ifdef XFONT_BITMAP
+ /* bitmap is always builtin to libXfont now */
BitmapRegisterFontFileFunctions ();
#endif
-#ifdef XFONT_SPEEDO
- SpeedoRegisterFontFileFunctions ();
-#endif
-#ifdef XFONT_TYPE1
- Type1RegisterFontFileFunctions();
-#endif
-#ifdef XFONT_FREETYPE
- FreeTypeRegisterFontFileFunctions();
-#endif
-#else
- {
+#ifdef LOADABLEFONTS
+ if (FontModuleList) {
+ fmlist = FontModuleList;
+ }
+#endif
+
+ if (fmlist) {
int i;
- if (FontModuleList) {
- for (i = 0; FontModuleList[i].name; i++) {
- if (FontModuleList[i].initFunc)
- FontModuleList[i].initFunc();
+ for (i = 0; fmlist[i].name; i++) {
+ if (fmlist[i].initFunc) {
+ fmlist[i].initFunc();
}
}
}
-#endif
FontFileRegisterLocalFpeFunctions ();
}
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/libXfont-1.2.7/src/stubs/cauthgen.c new/libXfont-1.2.8/src/stubs/cauthgen.c
--- old/libXfont-1.2.7/src/stubs/cauthgen.c 2006-07-04 20:55:31.000000000 +0200
+++ new/libXfont-1.2.8/src/stubs/cauthgen.c 2007-04-03 00:29:58.000000000 +0200
@@ -3,6 +3,10 @@
#endif
#include "stubs.h"
+#ifdef __SUNPRO_C
+#pragma weak client_auth_generation
+#endif
+
weak int
client_auth_generation(ClientPtr client)
{
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/libXfont-1.2.7/src/stubs/csignal.c new/libXfont-1.2.8/src/stubs/csignal.c
--- old/libXfont-1.2.7/src/stubs/csignal.c 2006-07-04 20:55:31.000000000 +0200
+++ new/libXfont-1.2.8/src/stubs/csignal.c 2007-04-03 00:30:09.000000000 +0200
@@ -3,6 +3,10 @@
#endif
#include "stubs.h"
+#ifdef __SUNPRO_C
+#pragma weak ClientSignal
+#endif
+
weak Bool
ClientSignal(ClientPtr client)
{
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/libXfont-1.2.7/src/stubs/delfntcid.c new/libXfont-1.2.8/src/stubs/delfntcid.c
--- old/libXfont-1.2.7/src/stubs/delfntcid.c 2006-07-04 20:55:31.000000000 +0200
+++ new/libXfont-1.2.8/src/stubs/delfntcid.c 2007-04-03 00:30:24.000000000 +0200
@@ -3,6 +3,10 @@
#endif
#include "stubs.h"
+#ifdef __SUNPRO_C
+#pragma weak DeleteFontClientID
+#endif
+
weak void
DeleteFontClientID(Font id)
{
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/libXfont-1.2.7/src/stubs/errorf.c new/libXfont-1.2.8/src/stubs/errorf.c
--- old/libXfont-1.2.7/src/stubs/errorf.c 2006-07-04 20:55:31.000000000 +0200
+++ new/libXfont-1.2.8/src/stubs/errorf.c 2007-04-03 00:30:40.000000000 +0200
@@ -3,6 +3,10 @@
#endif
#include "stubs.h"
+#ifdef __SUNPRO_C
+#pragma weak ErrorF
+#endif
+
weak void
ErrorF(const char *f, ...)
{
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/libXfont-1.2.7/src/stubs/fatalerror.c new/libXfont-1.2.8/src/stubs/fatalerror.c
--- old/libXfont-1.2.7/src/stubs/fatalerror.c 2006-07-04 20:55:31.000000000 +0200
+++ new/libXfont-1.2.8/src/stubs/fatalerror.c 2007-04-03 00:30:55.000000000 +0200
@@ -3,6 +3,10 @@
#endif
#include "stubs.h"
+#ifdef __SUNPRO_C
+#pragma weak FatalError
+#endif
+
weak void
FatalError(const char *f, ...)
{
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/libXfont-1.2.7/src/stubs/findoldfnt.c new/libXfont-1.2.8/src/stubs/findoldfnt.c
--- old/libXfont-1.2.7/src/stubs/findoldfnt.c 2006-07-04 20:55:31.000000000 +0200
+++ new/libXfont-1.2.8/src/stubs/findoldfnt.c 2007-04-03 00:31:08.000000000 +0200
@@ -3,6 +3,10 @@
#endif
#include "stubs.h"
+#ifdef __SUNPRO_C
+#pragma weak find_old_font
+#endif
+
weak FontPtr
find_old_font(FSID id)
{
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/libXfont-1.2.7/src/stubs/fontmod.c new/libXfont-1.2.8/src/stubs/fontmod.c
--- old/libXfont-1.2.7/src/stubs/fontmod.c 1970-01-01 01:00:00.000000000 +0100
+++ new/libXfont-1.2.8/src/stubs/fontmod.c 2007-04-03 00:29:29.000000000 +0200
@@ -0,0 +1,14 @@
+#ifdef HAVE_CONFIG_H
+#include
+#endif
+
+#ifdef LOADABLEFONTS
+#include "stubs.h"
+#include
+
+#ifdef __SUNPRO_C
+#pragma weak FontModuleList
+#endif
+
+weak FontModule *FontModuleList;
+#endif /* LOADABLEFONTS */
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/libXfont-1.2.7/src/stubs/getcres.c new/libXfont-1.2.8/src/stubs/getcres.c
--- old/libXfont-1.2.7/src/stubs/getcres.c 2006-07-04 20:55:31.000000000 +0200
+++ new/libXfont-1.2.8/src/stubs/getcres.c 2007-04-03 00:31:26.000000000 +0200
@@ -3,6 +3,10 @@
#endif
#include "stubs.h"
+#ifdef __SUNPRO_C
+#pragma weak GetClientResolutions
+#endif
+
weak FontResolutionPtr
GetClientResolutions(int *num)
{
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/libXfont-1.2.7/src/stubs/getdefptsize.c new/libXfont-1.2.8/src/stubs/getdefptsize.c
--- old/libXfont-1.2.7/src/stubs/getdefptsize.c 2006-07-04 20:55:31.000000000 +0200
+++ new/libXfont-1.2.8/src/stubs/getdefptsize.c 2007-04-03 00:31:42.000000000 +0200
@@ -3,6 +3,10 @@
#endif
#include "stubs.h"
+#ifdef __SUNPRO_C
+#pragma weak GetDefaultPointSize
+#endif
+
weak int
GetDefaultPointSize(void)
{
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/libXfont-1.2.7/src/stubs/getnewfntcid.c new/libXfont-1.2.8/src/stubs/getnewfntcid.c
--- old/libXfont-1.2.7/src/stubs/getnewfntcid.c 2006-07-04 20:55:31.000000000 +0200
+++ new/libXfont-1.2.8/src/stubs/getnewfntcid.c 2007-04-03 00:31:57.000000000 +0200
@@ -3,6 +3,10 @@
#endif
#include "stubs.h"
+#ifdef __SUNPRO_C
+#pragma weak GetNewFontClientID
+#endif
+
weak Font
GetNewFontClientID(void)
{
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/libXfont-1.2.7/src/stubs/gettime.c new/libXfont-1.2.8/src/stubs/gettime.c
--- old/libXfont-1.2.7/src/stubs/gettime.c 2006-07-04 20:55:31.000000000 +0200
+++ new/libXfont-1.2.8/src/stubs/gettime.c 2007-04-03 00:32:26.000000000 +0200
@@ -3,6 +3,10 @@
#endif
#include "stubs.h"
+#ifdef __SUNPRO_C
+#pragma weak GetTimeInMillis
+#endif
+
weak unsigned long
GetTimeInMillis (void)
{
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/libXfont-1.2.7/src/stubs/initfshdl.c new/libXfont-1.2.8/src/stubs/initfshdl.c
--- old/libXfont-1.2.7/src/stubs/initfshdl.c 2006-07-04 20:55:31.000000000 +0200
+++ new/libXfont-1.2.8/src/stubs/initfshdl.c 2007-04-03 00:32:43.000000000 +0200
@@ -3,6 +3,10 @@
#endif
#include "stubs.h"
+#ifdef __SUNPRO_C
+#pragma weak init_fs_handlers
+#endif
+
weak int
init_fs_handlers(FontPathElementPtr fpe,
BlockHandlerProcPtr block_handler)
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/libXfont-1.2.7/src/stubs/Makefile.am new/libXfont-1.2.8/src/stubs/Makefile.am
--- old/libXfont-1.2.7/src/stubs/Makefile.am 2006-07-04 20:55:31.000000000 +0200
+++ new/libXfont-1.2.8/src/stubs/Makefile.am 2007-03-14 05:00:09.000000000 +0100
@@ -10,6 +10,7 @@
errorf.c \
fatalerror.c \
findoldfnt.c \
+ fontmod.c \
getcres.c \
getdefptsize.c \
getnewfntcid.c \
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/libXfont-1.2.7/src/stubs/regfpefunc.c new/libXfont-1.2.8/src/stubs/regfpefunc.c
--- old/libXfont-1.2.7/src/stubs/regfpefunc.c 2006-07-04 20:55:31.000000000 +0200
+++ new/libXfont-1.2.8/src/stubs/regfpefunc.c 2007-04-03 00:33:01.000000000 +0200
@@ -3,6 +3,10 @@
#endif
#include "stubs.h"
+#ifdef __SUNPRO_C
+#pragma weak RegisterFPEFunctions
+#endif
+
weak int
RegisterFPEFunctions(NameCheckFunc name_func,
InitFpeFunc init_func,
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/libXfont-1.2.7/src/stubs/rmfshdl.c new/libXfont-1.2.8/src/stubs/rmfshdl.c
--- old/libXfont-1.2.7/src/stubs/rmfshdl.c 2006-07-04 20:55:31.000000000 +0200
+++ new/libXfont-1.2.8/src/stubs/rmfshdl.c 2007-04-03 00:33:19.000000000 +0200
@@ -3,6 +3,10 @@
#endif
#include "stubs.h"
+#ifdef __SUNPRO_C
+#pragma weak remove_fs_handlers
+#endif
+
weak void
remove_fs_handlers(FontPathElementPtr fpe,
BlockHandlerProcPtr blockHandler,
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/libXfont-1.2.7/src/stubs/servclient.c new/libXfont-1.2.8/src/stubs/servclient.c
--- old/libXfont-1.2.7/src/stubs/servclient.c 2006-07-04 20:55:31.000000000 +0200
+++ new/libXfont-1.2.8/src/stubs/servclient.c 2007-04-03 00:33:30.000000000 +0200
@@ -3,4 +3,8 @@
#endif
#include "stubs.h"
+#ifdef __SUNPRO_C
+#pragma weak serverClient
+#endif
+
weak void *serverClient = 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/libXfont-1.2.7/src/stubs/setfntauth.c new/libXfont-1.2.8/src/stubs/setfntauth.c
--- old/libXfont-1.2.7/src/stubs/setfntauth.c 2006-07-04 20:55:31.000000000 +0200
+++ new/libXfont-1.2.8/src/stubs/setfntauth.c 2007-04-03 00:33:46.000000000 +0200
@@ -3,6 +3,10 @@
#endif
#include "stubs.h"
+#ifdef __SUNPRO_C
+#pragma weak set_font_authorizations
+#endif
+
weak int
set_font_authorizations(char **authorizations, int *authlen, ClientPtr client)
{
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/libXfont-1.2.7/src/stubs/stfntcfnt.c new/libXfont-1.2.8/src/stubs/stfntcfnt.c
--- old/libXfont-1.2.7/src/stubs/stfntcfnt.c 2006-07-04 20:55:31.000000000 +0200
+++ new/libXfont-1.2.8/src/stubs/stfntcfnt.c 2007-04-03 00:34:02.000000000 +0200
@@ -3,6 +3,10 @@
#endif
#include "stubs.h"
+#ifdef __SUNPRO_C
+#pragma weak StoreFontClientFont
+#endif
+
weak int
StoreFontClientFont(FontPtr pfont, Font id)
{
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/libXfont-1.2.7/src/stubs/xpstubs.c new/libXfont-1.2.8/src/stubs/xpstubs.c
--- old/libXfont-1.2.7/src/stubs/xpstubs.c 2006-07-04 20:55:31.000000000 +0200
+++ new/libXfont-1.2.8/src/stubs/xpstubs.c 2007-04-03 00:34:21.000000000 +0200
@@ -3,6 +3,11 @@
#endif
#include "stubs.h"
+#ifdef __SUNPRO_C
+#pragma weak XpClientIsBitmapClient
+#pragma weak XpClientIsPrintClient
+#endif
+
weak Bool
XpClientIsBitmapClient(ClientPtr client)
{
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/libXfont-1.2.7/src/util/atom.c new/libXfont-1.2.8/src/util/atom.c
--- old/libXfont-1.2.7/src/util/atom.c 2006-07-04 20:55:31.000000000 +0200
+++ new/libXfont-1.2.8/src/util/atom.c 2007-04-03 00:10:27.000000000 +0200
@@ -146,6 +146,10 @@
return TRUE;
}
+#ifdef __SUNPRO_C
+#pragma weak MakeAtom
+#endif
+
weak Atom
MakeAtom(char *string, unsigned len, int makeit)
{
@@ -219,12 +223,20 @@
return a->atom;
}
+#ifdef __SUNPRO_C
+#pragma weak ValidAtom
+#endif
+
weak int
ValidAtom(Atom atom)
{
return (atom != None) && (atom <= lastAtom);
}
+#ifdef __SUNPRO_C
+#pragma weak NameForAtom
+#endif
+
weak char *
NameForAtom(Atom atom)
{
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/libXfont-1.2.7/src/util/miscutil.c new/libXfont-1.2.8/src/util/miscutil.c
--- old/libXfont-1.2.7/src/util/miscutil.c 2006-07-04 20:55:31.000000000 +0200
+++ new/libXfont-1.2.8/src/util/miscutil.c 2007-04-03 00:37:34.000000000 +0200
@@ -40,8 +40,18 @@
#define XK_LATIN1
#include
-/* make sure everything initializes themselves at least once */
+#ifdef __SUNPRO_C
+#pragma weak serverGeneration
+#pragma weak Xalloc
+#pragma weak Xrealloc
+#pragma weak Xfree
+#pragma weak Xcalloc
+#pragma weak CopyISOLatin1Lowered
+#pragma weak register_fpe_functions
+#endif
+
+/* make sure everything initializes themselves at least once */
weak long serverGeneration = 1;
weak void *
++++++ libXi-1.0.2.tar.bz2 -> libXi-1.0.4.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXi-1.0.2/aclocal.m4 new/libXi-1.0.4/aclocal.m4
--- old/libXi-1.0.2/aclocal.m4 2006-11-08 15:21:07.000000000 +0100
+++ new/libXi-1.0.4/aclocal.m4 2007-04-11 17:45:30.000000000 +0200
@@ -6537,35 +6537,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.5
+ 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],[
@@ -6608,6 +6642,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.
@@ -6617,75 +6653,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
@@ -6715,23 +6723,24 @@
# 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
# with the AM_CONDITIONAL "BUILD_LINUXDOC"
AC_DEFUN([XORG_CHECK_LINUXDOC],[
-AC_CHECK_FILE(
- [$prefix/share/X11/sgml/defs.ent],
- [DEFS_ENT_PATH=$prefix/share/X11/sgml],
- [DEFS_ENT_PATH=]
-)
+XORG_SGML_PATH=$prefix/share/sgml
+HAVE_DEFS_ENT=
+
+AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
AC_PATH_PROG(LINUXDOC, linuxdoc)
AC_PATH_PROG(PS2PDF, ps2pdf)
AC_MSG_CHECKING([Whether to build documentation])
-if test x$DEFS_ENT_PATH != x && test x$LINUXDOC != x ; then
+if test x$HAVE_DEFS_ENT != x && test x$LINUXDOC != x ; then
BUILDDOC=yes
else
BUILDDOC=no
@@ -6743,7 +6752,7 @@
AC_MSG_CHECKING([Whether to build pdf documentation])
-if test x$PS2PDF != x ; then
+if test x$PS2PDF != x && test x$BUILD_PDFDOC != xno; then
BUILDPDFDOC=yes
else
BUILDPDFDOC=no
@@ -6753,10 +6762,10 @@
AC_MSG_RESULT([$BUILDPDFDOC])
-MAKE_TEXT="SGML_SEARCH_PATH=$DEFS_ENT_PATH GROFF_NO_SGR=y $LINUXDOC -B txt"
-MAKE_PS="SGML_SEARCH_PATH=$DEFS_ENT_PATH $LINUXDOC -B latex --papersize=letter --output=ps"
+MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH GROFF_NO_SGR=y $LINUXDOC -B txt"
+MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B latex --papersize=letter --output=ps"
MAKE_PDF="$PS2PDF"
-MAKE_HTML="SGML_SEARCH_PATH=$DEFS_ENT_PATH $LINUXDOC -B html --split=0"
+MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B html --split=0"
AC_SUBST(MAKE_TEXT)
AC_SUBST(MAKE_PS)
@@ -6764,8 +6773,76 @@
AC_SUBST(MAKE_HTML)
]) # XORG_CHECK_LINUXDOC
+# XORG_CHECK_DOCBOOK
+# -------------------
+# Minimum version: 1.0.0
+#
+# Checks for the ability to build output formats from SGML DocBook source.
+# For XXX in {TXT, PDF, PS, HTML}, the AM_CONDITIONAL "BUILD_XXXDOC"
+# indicates whether the necessary tools and files are found and, if set,
+# $(MAKE_XXX) blah.sgml will produce blah.xxx.
+AC_DEFUN([XORG_CHECK_DOCBOOK],[
+XORG_SGML_PATH=$prefix/share/sgml
+HAVE_DEFS_ENT=
+BUILDTXTDOC=no
+BUILDPDFDOC=no
+BUILDPSDOC=no
+BUILDHTMLDOC=no
+
+AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+
+AC_PATH_PROG(DOCBOOKPS, docbook2ps)
+AC_PATH_PROG(DOCBOOKPDF, docbook2pdf)
+AC_PATH_PROG(DOCBOOKHTML, docbook2html)
+AC_PATH_PROG(DOCBOOKTXT, docbook2txt)
+
+AC_MSG_CHECKING([Whether to build text documentation])
+if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKTXT != x &&
+ test x$BUILD_TXTDOC != xno; then
+ BUILDTXTDOC=yes
+fi
+AM_CONDITIONAL(BUILD_TXTDOC, [test x$BUILDTXTDOC = xyes])
+AC_MSG_RESULT([$BUILDTXTDOC])
+
+AC_MSG_CHECKING([Whether to build PDF documentation])
+if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKPDF != x &&
+ test x$BUILD_PDFDOC != xno; then
+ BUILDPDFDOC=yes
+fi
+AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes])
+AC_MSG_RESULT([$BUILDPDFDOC])
+
+AC_MSG_CHECKING([Whether to build PostScript documentation])
+if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKPS != x &&
+ test x$BUILD_PSDOC != xno; then
+ BUILDPSDOC=yes
+fi
+AM_CONDITIONAL(BUILD_PSDOC, [test x$BUILDPSDOC = xyes])
+AC_MSG_RESULT([$BUILDPSDOC])
+
+AC_MSG_CHECKING([Whether to build HTML documentation])
+if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKHTML != x &&
+ test x$BUILD_HTMLDOC != xno; then
+ BUILDHTMLDOC=yes
+fi
+AM_CONDITIONAL(BUILD_HTMLDOC, [test x$BUILDHTMLDOC = xyes])
+AC_MSG_RESULT([$BUILDHTMLDOC])
+
+MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKTXT"
+MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKPS"
+MAKE_PDF="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKPDF"
+MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKHTML"
+
+AC_SUBST(MAKE_TEXT)
+AC_SUBST(MAKE_PS)
+AC_SUBST(MAKE_PDF)
+AC_SUBST(MAKE_HTML)
+]) # XORG_CHECK_DOCBOOK
+
# 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.
@@ -6810,6 +6887,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
@@ -6839,7 +6988,8 @@
# --------------------
# Adds --with/without-release-string and changes the PACKAGE and
# PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION". If
-# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged.
+# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. Also
+# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use.
AC_DEFUN([XORG_RELEASE_VERSION],[
AC_ARG_WITH(release-version,
@@ -6852,6 +7002,23 @@
PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION"
AC_MSG_NOTICE([Building with package name set to $PACKAGE])
fi
+ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
+ [`echo $PACKAGE_VERSION | cut -d . -f 1`],
+ [Major version of this package])
+ PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+ if test "x$PVM" = "x"; then
+ PVM="0"
+ fi
+ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
+ [$PVM],
+ [Minor version of this package])
+ PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+ if test "x$PVP" = "x"; then
+ PVP="0"
+ fi
+ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_PATCHLEVEL],
+ [$PVP],
+ [Patch version of this package])
])
# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
@@ -7578,10 +7745,10 @@
AMDEPSHOWCMDSAT=''
AMPRETTYECHO=true
AMCMDECHO=echo
-if test "x$enable_pretty_cmds" == xyes;
+if test "x$enable_pretty_cmds" = xyes;
then
AMSHOWCMDSAT='@'
- _AM_IF_OPTION([no-dependencies],,test x$enable_dependency_tracking == xno &&) AMDEPSHOWCMDSAT='@'
+ _AM_IF_OPTION([no-dependencies],,test "x$enable_dependency_tracking" = xno &&) AMDEPSHOWCMDSAT='@'
AMPRETTYECHO=echo
AMCMDECHO=true
LT_QUIET='--quiet'
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXi-1.0.2/ChangeLog new/libXi-1.0.4/ChangeLog
--- old/libXi-1.0.2/ChangeLog 2006-11-08 15:21:21.000000000 +0100
+++ new/libXi-1.0.4/ChangeLog 2007-04-11 17:46:50.000000000 +0200
@@ -1,3 +1,44 @@
+commit cb8e2a83411561fc564a656ffa1c1027acbf90cd
+Author: Daniel Stone
+Date: Wed Apr 11 18:45:13 2007 +0300
+
+ Bump to 1.0.4
+
+commit 0ae08175472acc203c55eaf886fa754901072108
+Author: Jamey Sharp
+Date: Sun Oct 15 00:03:57 2006 -0700
+
+ Don't call XInput_find_display in _XiGetExtensionVersion, while the Display lock is held.
+
+ _XiGetExtensionVersion has two callers. One had already called
+ XInput_find_display, and the other could easily do so outside the
+ Display lock. So I change the _XiGetExtensionVersion interface to
+ accept a previously-computed XExtDisplayInfo from the caller.
+ Besides being more correct, this should be slightly faster. :-)
+
+ Thanks to Magnus Kessler for identifying
+ the bug and proposing a workaround.
+
+commit a768f06e3c795279dfed289ea6544e2b4c302ae6
+Author: Daniel Stone
+Date: Tue Apr 10 23:28:42 2007 +0300
+
+ bump to 1.0.3
+
+commit 45615d9a16a219da47aac95bafc914e454e84977
+Author: Daniel Stone
+Date: Wed Dec 6 18:56:56 2006 +0200
+
+ Makefile.am: make ChangeLog hook safer
+
+ Make ChangeLog hook as safe as possible.
+
+commit 8ee33d7f4f7f428e3995f767deed22a4c46f2eca
+Author: Jamey Sharp
+Date: Sun Nov 19 01:04:26 2006 -0800
+
+ Bug #8663: _XiCheckExtInit must drop the Display lock in all error cases.
+
commit 540b4cc6f5657c870079b4bf883c9297ab434d71
Author: Daniel Stone
Date: Wed Nov 8 16:20:34 2006 +0200
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXi-1.0.2/configure new/libXi-1.0.4/configure
--- old/libXi-1.0.2/configure 2006-11-08 15:21:12.000000000 +0100
+++ new/libXi-1.0.4/configure 2007-04-11 17:45:35.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for libXi 1.0.2.
+# Generated by GNU Autoconf 2.60 for libXi 1.0.4.
#
# Report bugs to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg.
#
@@ -713,8 +713,8 @@
# Identity of this package.
PACKAGE_NAME='libXi'
PACKAGE_TARNAME='libXi'
-PACKAGE_VERSION='1.0.2'
-PACKAGE_STRING='libXi 1.0.2'
+PACKAGE_VERSION='1.0.4'
+PACKAGE_STRING='libXi 1.0.4'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
# Factoring default headers for most tests.
@@ -1401,7 +1401,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 libXi 1.0.2 to adapt to many kinds of systems.
+\`configure' configures libXi 1.0.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1471,7 +1471,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libXi 1.0.2:";;
+ short | recursive ) echo "Configuration of libXi 1.0.4:";;
esac
cat <<\_ACEOF
@@ -1583,7 +1583,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libXi configure 1.0.2
+libXi configure 1.0.4
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1597,7 +1597,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libXi $as_me 1.0.2, which was
+It was created by libXi $as_me 1.0.4, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2256,10 +2256,10 @@
AMDEPSHOWCMDSAT=''
AMPRETTYECHO=true
AMCMDECHO=echo
-if test "x$enable_pretty_cmds" == xyes;
+if test "x$enable_pretty_cmds" = xyes;
then
AMSHOWCMDSAT='@'
- test x$enable_dependency_tracking == xno && AMDEPSHOWCMDSAT='@'
+ test "x$enable_dependency_tracking" = xno && AMDEPSHOWCMDSAT='@'
AMPRETTYECHO=echo
AMCMDECHO=true
LT_QUIET='--quiet'
@@ -2290,7 +2290,7 @@
# Define the identity of the package.
PACKAGE='libXi'
- VERSION='1.0.2'
+ VERSION='1.0.4'
cat >>confdefs.h <<_ACEOF
@@ -20048,75 +20048,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
@@ -20159,6 +20131,29 @@
echo "$as_me: Building with package name set to $PACKAGE" >&6;}
fi
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
+_ACEOF
+
+ PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+ if test "x$PVM" = "x"; then
+ PVM="0"
+ fi
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION_MINOR $PVM
+_ACEOF
+
+ PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+ if test "x$PVP" = "x"; then
+ PVP="0"
+ fi
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION_PATCHLEVEL $PVP
+_ACEOF
+
+
ac_config_files="$ac_config_files Makefile src/Makefile man/Makefile xi.pc"
@@ -20573,7 +20568,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libXi $as_me 1.0.2, which was
+This file was extended by libXi $as_me 1.0.4, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20626,7 +20621,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-libXi config.status 1.0.2
+libXi config.status 1.0.4
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXi-1.0.2/configure.ac new/libXi-1.0.4/configure.ac
--- old/libXi-1.0.2/configure.ac 2006-11-08 15:20:14.000000000 +0100
+++ new/libXi-1.0.4/configure.ac 2007-04-11 17:45:07.000000000 +0200
@@ -4,7 +4,7 @@
AC_PREREQ([2.57])
-AC_INIT(libXi, 1.0.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXi)
+AC_INIT(libXi, 1.0.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXi)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXi-1.0.2/Makefile.am new/libXi-1.0.4/Makefile.am
--- old/libXi-1.0.2/Makefile.am 2006-09-24 18:58:10.000000000 +0200
+++ new/libXi-1.0.4/Makefile.am 2007-04-10 22:28:31.000000000 +0200
@@ -14,6 +14,6 @@
.PHONY: ChangeLog
ChangeLog:
- GIT_DIR=${srcdir}/.git git-log > ChangeLog
+ (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
dist-hook: ChangeLog
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXi-1.0.2/Makefile.in new/libXi-1.0.4/Makefile.in
--- old/libXi-1.0.2/Makefile.in 2006-11-08 15:21:14.000000000 +0100
+++ new/libXi-1.0.4/Makefile.in 2007-04-11 17:45:34.000000000 +0200
@@ -704,7 +704,7 @@
.PHONY: ChangeLog
ChangeLog:
- GIT_DIR=${srcdir}/.git git-log > ChangeLog
+ (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
dist-hook: ChangeLog
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXi-1.0.2/src/config.h.in new/libXi-1.0.4/src/config.h.in
--- old/libXi-1.0.2/src/config.h.in 2006-11-08 15:21:22.000000000 +0100
+++ new/libXi-1.0.4/src/config.h.in 2007-04-11 17:45:52.000000000 +0200
@@ -48,6 +48,15 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXi-1.0.2/src/XExtInt.c new/libXi-1.0.4/src/XExtInt.c
--- old/libXi-1.0.2/src/XExtInt.c 2006-11-08 15:20:05.000000000 +0100
+++ new/libXi-1.0.4/src/XExtInt.c 2007-04-11 17:44:31.000000000 +0200
@@ -80,9 +80,6 @@
XExtensionVersion *vers;
} XInputData;
-#define XInputCheckExtension(dpy,i,val) \
- XextCheckExtension (dpy, i, xinput_extension_name, val)
-
static /* const */ XExtensionHooks xinput_extension_hooks = {
NULL, /* create_gc */
NULL, /* copy_gc */
@@ -181,6 +178,12 @@
*error = info->codes->first_error + XI_DeviceBusy;
}
+static int XInputCheckExtension(Display *dpy, XExtDisplayInfo *info)
+{
+ XextCheckExtension (dpy, info, xinput_extension_name, 0);
+ return 1;
+}
+
/***********************************************************************
*
* Check to see if the input extension is installed in the server.
@@ -196,7 +199,10 @@
{
XExtensionVersion *ext;
- XInputCheckExtension(dpy, info, -1);
+ if (!XInputCheckExtension(dpy, info)) {
+ UnlockDisplay(dpy);
+ return (-1);
+ }
if (info->data == NULL) {
info->data = (XPointer) Xmalloc(sizeof(XInputData));
@@ -205,7 +211,7 @@
return (-1);
}
((XInputData *) info->data)->vers =
- _XiGetExtensionVersion(dpy, "XInputExtension");
+ _XiGetExtensionVersion(dpy, "XInputExtension", info);
}
if (versions[version_index].major_version > Dont_Check) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXi-1.0.2/src/XGetVers.c new/libXi-1.0.4/src/XGetVers.c
--- old/libXi-1.0.2/src/XGetVers.c 2006-11-08 15:20:05.000000000 +0100
+++ new/libXi-1.0.4/src/XGetVers.c 2007-04-11 17:44:32.000000000 +0200
@@ -64,9 +64,10 @@
XGetExtensionVersion(register Display * dpy, _Xconst char *name)
{
XExtensionVersion *ext;
+ XExtDisplayInfo *info = XInput_find_display(dpy);
LockDisplay(dpy);
- ext = _XiGetExtensionVersion(dpy, name);
+ ext = _XiGetExtensionVersion(dpy, name, info);
if (ext != (XExtensionVersion *) NoSuchExtension) {
UnlockDisplay(dpy);
SyncHandle();
@@ -75,12 +76,11 @@
}
XExtensionVersion *
-_XiGetExtensionVersion(register Display * dpy, _Xconst char *name)
+_XiGetExtensionVersion(register Display * dpy, _Xconst char *name, XExtDisplayInfo *info)
{
xGetExtensionVersionReq *req;
xGetExtensionVersionReply rep;
XExtensionVersion *ext;
- XExtDisplayInfo *info = XInput_find_display(dpy);
if (_XiCheckExtInit(dpy, Dont_Check, info) == -1)
return ((XExtensionVersion *) NoSuchExtension);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libXi-1.0.2/src/XIint.h new/libXi-1.0.4/src/XIint.h
--- old/libXi-1.0.2/src/XIint.h 2006-11-08 15:20:05.000000000 +0100
+++ new/libXi-1.0.4/src/XIint.h 2007-04-11 17:44:32.000000000 +0200
@@ -12,6 +12,6 @@
extern int _XiCheckExtInit(Display *, int, XExtDisplayInfo *);
-extern XExtensionVersion *_XiGetExtensionVersion(Display *, _Xconst char *);
+extern XExtensionVersion *_XiGetExtensionVersion(Display *, _Xconst char *, XExtDisplayInfo *);
#endif
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org