From 135e2e73bbe7155901a651c38b772e7b4547f39c Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 2 Nov 2010 07:32:01 +0000 Subject: libX11 libXdmcp xkbcomp pixman git update 2/11/2010 --- libX11/configure.ac | 10 +++---- libXdmcp/configure.ac | 3 +- pixman/COPYING | 81 ++++++++++++++++++++++++++------------------------- pixman/configure.ac | 3 +- xkbcomp/configure.ac | 9 ++++-- 5 files changed, 55 insertions(+), 51 deletions(-) diff --git a/libX11/configure.ac b/libX11/configure.ac index f174f31e1..80e38a931 100644 --- a/libX11/configure.ac +++ b/libX11/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ(2.60) AC_INIT([libX11], - 1.3.99.902, + [1.3.99.903], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libX11) AC_CONFIG_SRCDIR([Makefile.am]) @@ -21,14 +21,14 @@ AC_CONFIG_HEADER([include/X11/XlibConf.h]) # to avoid autoconf errors. AC_USE_SYSTEM_EXTENSIONS -# Require xorg-macros minimum of 1.10 for DocBook XML documentation +# Require xorg-macros minimum of 1.11 for disabling fop by default m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.10) + [m4_fatal([must install xorg-macros 1.11 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.11) XORG_DEFAULT_OPTIONS XORG_ENABLE_SPECS XORG_WITH_XMLTO(0.0.20) -XORG_WITH_FOP +XORG_WITH_FOP([no]) XORG_CHECK_SGML_DOCTOOLS(1.5) XORG_PROG_RAWCPP diff --git a/libXdmcp/configure.ac b/libXdmcp/configure.ac index bacd8c877..3de7feee0 100644 --- a/libXdmcp/configure.ac +++ b/libXdmcp/configure.ac @@ -22,7 +22,8 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ([2.60]) -AC_INIT(libXdmcp, 1.0.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],libXdmcp) +AC_INIT([libXdmcp], [1.1.0], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXdmcp]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE diff --git a/pixman/COPYING b/pixman/COPYING index b0571e6a6..48ea58bdd 100644 --- a/pixman/COPYING +++ b/pixman/COPYING @@ -1,40 +1,41 @@ -The following is the 'standard copyright' agreed upon by most contributors, -and is currently the canonical license, though a modification is currently -under discussion. Copyright holders of new code should use this license -statement where possible, and append their name to this list. - -Copyright 1987, 1988, 1989, 1998 The Open Group -Copyright 1987, 1988, 1989 Digital Equipment Corporation -Copyright 1999, 2004, 2008 Keith Packard -Copyright 2000 SuSE, Inc. -Copyright 2000 Keith Packard, member of The XFree86 Project, Inc. -Copyright 2004, 2005, 2007, 2008 Red Hat, Inc. -Copyright 2004 Nicholas Miell -Copyright 2005 Lars Knoll & Zack Rusin, Trolltech -Copyright 2005 Trolltech AS -Copyright 2007 Luca Barbato -Copyright 2008 Aaron Plattner, NVIDIA Corporation -Copyright 2008 Rodrigo Kumpera -Copyright 2008 André Tupinambá -Copyright 2008 Mozilla Corporation -Copyright 2008 Frederic Plourde -Copyright 2009 Sun Microsystems, Inc. - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation -the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice (including the next -paragraph) shall be included in all copies or substantial portions of the -Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. +The following is the MIT license, agreed upon by most contributors. +Copyright holders of new code should use this license statement where +possible. They may also add themselves to the list below. + +/* + * Copyright 1987, 1988, 1989, 1998 The Open Group + * Copyright 1987, 1988, 1989 Digital Equipment Corporation + * Copyright 1999, 2004, 2008 Keith Packard + * Copyright 2000 SuSE, Inc. + * Copyright 2000 Keith Packard, member of The XFree86 Project, Inc. + * Copyright 2004, 2005, 2007, 2008, 2009, 2010 Red Hat, Inc. + * Copyright 2004 Nicholas Miell + * Copyright 2005 Lars Knoll & Zack Rusin, Trolltech + * Copyright 2005 Trolltech AS + * Copyright 2007 Luca Barbato + * Copyright 2008 Aaron Plattner, NVIDIA Corporation + * Copyright 2008 Rodrigo Kumpera + * Copyright 2008 André Tupinambá + * Copyright 2008 Mozilla Corporation + * Copyright 2008 Frederic Plourde + * Copyright 2009 Sun Microsystems, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ diff --git a/pixman/configure.ac b/pixman/configure.ac index 2c32f00d8..ad975f494 100644 --- a/pixman/configure.ac +++ b/pixman/configure.ac @@ -652,10 +652,9 @@ support_for__thread=no AC_MSG_CHECKING(for __thread) AC_LINK_IFELSE([ -#ifdef defined __MINGW32__ && !(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)) +#if defined(__MINGW32__) && !(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)) #error This MinGW version has broken __thread support #endif -#endif #ifdef __OpenBSD__ #error OpenBSD has broken __thread support #endif diff --git a/xkbcomp/configure.ac b/xkbcomp/configure.ac index 15f268738..07822fe58 100644 --- a/xkbcomp/configure.ac +++ b/xkbcomp/configure.ac @@ -34,11 +34,14 @@ XORG_DEFAULT_OPTIONS AM_CONFIG_HEADER(config.h) +# If both the C file and YACC are missing, the package cannot be build. AC_PROG_YACC AC_PATH_PROG([YACC_INST], $YACC) -AC_CHECK_FILE([$srcdir/xkbparse.c], [], - [test -z "$YACC_INST" && AC_MSG_ERROR([yacc not found - unable to compile xkbparse.y])]) - +if test ! -f "$srcdir/xkbparse.c"; then + if test -z "$YACC_INST"; then + AC_MSG_ERROR([yacc not found - unable to compile xkbparse.y]) + fi +fi AC_CHECK_FUNCS([strdup strcasecmp]) -- cgit v1.2.3