diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2010-08-16 14:33:59 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-08-16 17:03:43 +0200 |
commit | 637002603d949f26ea7fcd42843dc4070b9465f9 (patch) | |
tree | f0aec2fdabe55fb18ef82d812017c965a4fed353 /recipes/obsolete | |
parent | 8dd59bdb181eaa9b2325d1e75f657e1b78c181fc (diff) |
xorg: add latest packages for 2010-08-16
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes/obsolete')
-rw-r--r-- | recipes/obsolete/xorg/xorg-app/xauth/autofoo.patch | 148 | ||||
-rw-r--r-- | recipes/obsolete/xorg/xorg-app/xdpyinfo/disable-xkb.patch | 18 | ||||
-rw-r--r-- | recipes/obsolete/xorg/xorg-app/xev/diet-x11.patch | 80 | ||||
-rw-r--r-- | recipes/obsolete/xorg/xorg-app/xhost/autofoo.patch | 165 |
4 files changed, 411 insertions, 0 deletions
diff --git a/recipes/obsolete/xorg/xorg-app/xauth/autofoo.patch b/recipes/obsolete/xorg/xorg-app/xauth/autofoo.patch new file mode 100644 index 0000000000..d279a6f4fc --- /dev/null +++ b/recipes/obsolete/xorg/xorg-app/xauth/autofoo.patch @@ -0,0 +1,148 @@ +diff -urN xauth.orig/Imakefile xauth/Imakefile +--- xauth.orig/Imakefile 2004-04-23 21:54:38.000000000 +0200 ++++ xauth/Imakefile 1970-01-01 01:00:00.000000000 +0100 +@@ -1,19 +0,0 @@ +-XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:11 cpqbld Exp $ +- +- +- +- +-XCOMM $XFree86: xc/programs/xauth/Imakefile,v 3.5tsi Exp $ +- +- DEPLIBS = $(DEPXAUTHLIB) $(DEPXMUULIB) $(DEPXLIB) +-LOCAL_LIBRARIES = $(XAUTHLIB) $(XMUULIB) $(XLIB) +- SRCS = xauth.c gethost.c process.c parsedpy.c +- OBJS = xauth.o gethost.o process.o parsedpy.o +- CONN_DEFINES = $(CONNECTION_FLAGS) +- DEPEND_DEFINES = $(CONN_DEFINES) $(SIGNAL_DEFINES) +- +-ComplexProgramTarget(xauth) +- +-SpecialCObjectRule(gethost,$(ICONFIGFILES),$(CONN_DEFINES) $(SIGNAL_DEFINES)) +-SpecialCObjectRule(process,$(ICONFIGFILES),$(CONN_DEFINES) $(SIGNAL_DEFINES)) +-SpecialCObjectRule(parsedpy,$(ICONFIGFILES),$(CONN_DEFINES)) +diff -urN xauth.orig/Makefile.am xauth/Makefile.am +--- xauth.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100 ++++ xauth/Makefile.am 2004-08-14 13:20:37.000000000 +0200 +@@ -0,0 +1,53 @@ ++# ++# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $ ++# ++# Copyright © 2003 Keith Packard ++# ++# Permission to use, copy, modify, distribute, and sell this software and its ++# documentation for any purpose is hereby granted without fee, provided that ++# the above copyright notice appear in all copies and that both that ++# copyright notice and this permission notice appear in supporting ++# documentation, and that the name of Keith Packard not be used in ++# advertising or publicity pertaining to distribution of the software without ++# specific, written prior permission. Keith Packard makes no ++# representations about the suitability of this software for any purpose. It ++# is provided "as is" without express or implied warranty. ++# ++# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++# PERFORMANCE OF THIS SOFTWARE. ++# ++ ++AUTOMAKE_OPTIONS = 1.7 foreign ++ ++AM_CFLAGS = @XAUTH_CFLAGS@ ++ ++bin_PROGRAMS = xauth ++ ++xauth_SOURCES = gethost.c parsedpy.c process.c xauth.c xauth.h ++ ++xauth_LDADD = @XAUTH_LIBS@ ++ ++man5_MANS=xauth.man ++ ++EXTRA_DIST= $(man5_MANS) ++ ++MAINTAINERCLEANFILES = configure \ ++config.guess \ ++config.sub \ ++install-sh \ ++ltmain.sh \ ++missing \ ++mkinstalldirs \ ++aclocal.m4 \ ++Makefile.in \ ++depcomp \ ++autoscan.log \ ++configure.scan \ ++config.h \ ++config.h.in \ ++$(man5_MANS) +diff -urN xauth.orig/autogen.sh xauth/autogen.sh +--- xauth.orig/autogen.sh 1970-01-01 01:00:00.000000000 +0100 ++++ xauth/autogen.sh 2004-08-14 13:15:46.000000000 +0200 +@@ -0,0 +1,3 @@ ++#! /bin/sh ++autoreconf -v --install || exit 1 ++./configure --enable-maintainer-mode "$@" +diff -urN xauth.orig/configure.ac xauth/configure.ac +--- xauth.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100 ++++ xauth/configure.ac 2004-08-14 23:43:54.000000000 +0200 +@@ -0,0 +1,57 @@ ++dnl ++dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $ ++dnl ++dnl Copyright © 2003 Keith Packard ++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, and that the name of Keith Packard not be used in ++dnl advertising or publicity pertaining to distribution of the software without ++dnl specific, written prior permission. Keith Packard makes no ++dnl representations about the suitability of this software for any purpose. It ++dnl is provided "as is" without express or implied warranty. ++dnl ++dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++dnl PERFORMANCE OF THIS SOFTWARE. ++dnl ++ ++AC_PREREQ(2.57) ++AC_INIT([xauth],4.4.0,[],xauth) ++AC_CONFIG_SRCDIR([Makefile.am]) ++AM_INIT_AUTOMAKE([dist-bzip2]) ++AM_MAINTAINER_MODE ++AM_CONFIG_HEADER(config.h) ++ ++AC_PROG_CC ++AC_PROG_INSTALL ++AC_PROG_LN_S ++AC_LIBTOOL_WIN32_DLL ++AM_PROG_LIBTOOL ++AC_PROG_MAKE_SET ++ ++PKG_CHECK_MODULES(XAUTH, xau xext xmuu x11) ++ ++AC_TYPE_SIGNAL ++ ++# Transport selection ++AC_ARG_ENABLE(unix-transport,[ --disable-unix-transport ], [UNIXCONN=$enableval], [UNIXCONN=yes]) ++AC_ARG_ENABLE(tcp-transport, [ --disable-tcp-transport ], [TCPCONN=$enableval], [TCPCONN=yes]) ++AC_ARG_ENABLE(ipv6, [ --disable-ipv6 ], [IPV6CONN=$enableval], [IPV6CONN=yes]) ++if test "$UNIXCONN" = "yes"; then ++ AC_DEFINE(UNIXCONN,1,[Support UNIX socket connections]) ++fi ++if test "$TCPCONN" = "yes"; then ++ AC_DEFINE(TCPCONN,1,[Support TCP socket connections]) ++fi ++if test "$IPV6CONN" = "yes"; then ++ AC_DEFINE(IPv6,1,[Support IPv6 for TCP connections]) ++fi ++ ++AC_OUTPUT([Makefile]) diff --git a/recipes/obsolete/xorg/xorg-app/xdpyinfo/disable-xkb.patch b/recipes/obsolete/xorg/xorg-app/xdpyinfo/disable-xkb.patch new file mode 100644 index 0000000000..24af21f4fc --- /dev/null +++ b/recipes/obsolete/xorg/xorg-app/xdpyinfo/disable-xkb.patch @@ -0,0 +1,18 @@ +--- xdpyinfo-1.0.1/configure.ac.orig 2006-03-08 16:33:05.000000000 +0100 ++++ xdpyinfo-1.0.1/configure.ac 2006-03-08 16:41:59.000000000 +0100 +@@ -45,11 +45,15 @@ + AC_CHECK_HEADERS([X11/extensions/multibuf.h X11/extensions/XShm.h],,,[#include <X11/Xlib.h>]) + CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) + ++AC_ARG_ENABLE(xkb, AC_HELP_STRING([--disable-xkb], [Disable XKB support]), ++ XKB="$enableval", XKB="yes") ++if test "x$XKB" = "xyes" ; then + PKG_CHECK_MODULES(DPY_XKB, x11, + [SAVE_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $DPY_XKB_CFLAGS $DPY_X11_CFLAGS" + AC_CHECK_HEADERS([X11/extensions/XKB.h X11/XKBlib.h],,,[#include <X11/Xlib.h>]) + CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) ++fi + + PKG_CHECK_MODULES(DPY_XF86VIDMODE, xxf86vm, + [SAVE_CPPFLAGS="$CPPFLAGS" diff --git a/recipes/obsolete/xorg/xorg-app/xev/diet-x11.patch b/recipes/obsolete/xorg/xorg-app/xev/diet-x11.patch new file mode 100644 index 0000000000..9f515e8c73 --- /dev/null +++ b/recipes/obsolete/xorg/xorg-app/xev/diet-x11.patch @@ -0,0 +1,80 @@ +--- + xev.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +Index: xev-1.0.2/xev.c +=================================================================== +--- xev-1.0.2.orig/xev.c 2006-06-02 00:25:44.000000000 +0100 ++++ xev-1.0.2/xev.c 2007-05-10 15:22:07.000000000 +0100 +@@ -109,7 +109,7 @@ do_KeyPress (XEvent *eventp) + nbytes = XLookupString (e, str, 256, &ks, NULL); + + /* not supposed to call XmbLookupString on a key release event */ +- if (e->type == KeyPress && xic) { ++ /*if (e->type == KeyPress && xic) { + do { + nmbbytes = XmbLookupString (xic, e, buf, bsize - 1, &ks, &status); + buf[nmbbytes] = '\0'; +@@ -119,7 +119,7 @@ do_KeyPress (XEvent *eventp) + buf = realloc (buf, bsize); + } + } while (status == XBufferOverflow); +- } ++ }*/ + + if (ks == NoSymbol) + ksname = "NoSymbol"; +@@ -149,7 +149,7 @@ do_KeyPress (XEvent *eventp) + } + + /* not supposed to call XmbLookupString on a key release event */ +- if (e->type == KeyPress && xic) { ++ /*if (e->type == KeyPress && xic) { + printf (" XmbLookupString gives %d bytes: ", nmbbytes); + if (nmbbytes > 0) { + dump (buf, nmbbytes); +@@ -157,7 +157,7 @@ do_KeyPress (XEvent *eventp) + } else { + printf ("\n"); + } +- } ++ } */ + + printf (" XFilterEvent returns: %s\n", + XFilterEvent (eventp, e->window) ? "True" : "False"); +@@ -804,7 +804,7 @@ main (int argc, char **argv) + fprintf (stderr, "%s: XSetLocaleModifiers failed\n", ProgramName); + } + +- xim = XOpenIM (dpy, NULL, NULL, NULL); ++ /*xim = XOpenIM (dpy, NULL, NULL, NULL); + if (xim == NULL) { + fprintf (stderr, "%s: XOpenIM failed\n", ProgramName); + } +@@ -831,7 +831,7 @@ main (int argc, char **argv) + } + XFree (xim_styles); + } +- } ++ }*/ + + screen = DefaultScreen (dpy); + +@@ -891,7 +891,7 @@ main (int argc, char **argv) + printf ("Outer window is 0x%lx, inner window is 0x%lx\n", w, subw); + } + +- if (xim && xim_style) { ++ /*if (xim && xim_style) { + xic = XCreateIC (xim, + XNInputStyle, xim_style, + XNClientWindow, w, +@@ -901,7 +901,7 @@ main (int argc, char **argv) + if (xic == NULL) { + fprintf (stderr, "XCreateIC failed\n"); + } +- } ++ }*/ + + for (done = 0; !done; ) { + XEvent event; diff --git a/recipes/obsolete/xorg/xorg-app/xhost/autofoo.patch b/recipes/obsolete/xorg/xorg-app/xhost/autofoo.patch new file mode 100644 index 0000000000..b29f017abc --- /dev/null +++ b/recipes/obsolete/xorg/xorg-app/xhost/autofoo.patch @@ -0,0 +1,165 @@ +diff -urN xhost.orig/Imakefile xhost/Imakefile +--- xhost.orig/Imakefile 2003-11-14 16:54:53.000000000 +0100 ++++ xhost/Imakefile 1970-01-01 01:00:00.000000000 +0100 +@@ -1,16 +0,0 @@ +-XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:24 cpqbld Exp $ +-#if HasSecureRPC +-RPC_DEFINES = -DSECURE_RPC +-#else +-RPC_DEFINES = +-#endif +-KRB5_DEFINES = Krb5Defines +-KRB5_INCLUDE = Krb5Includes +- INCLUDES = $(KRB5_INCLUDE) +- DEPLIBS = $(DEPXMULIB) $(DEPXLIB) +-LOCAL_LIBRARIES = $(XMULIB) $(XLIB) +- SRCS = xhost.c +- OBJS = xhost.o +- DEFINES = ConnectionFlags $(SIGNAL_DEFINES) $(RPC_DEFINES) $(KRB5_DEFINES) +- +-ComplexProgramTarget(xhost) +diff -urN xhost.orig/Makefile.am xhost/Makefile.am +--- xhost.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100 ++++ xhost/Makefile.am 2004-08-15 17:43:47.000000000 +0200 +@@ -0,0 +1,53 @@ ++# ++# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $ ++# ++# Copyright © 2003 Keith Packard ++# ++# Permission to use, copy, modify, distribute, and sell this software and its ++# documentation for any purpose is hereby granted without fee, provided that ++# the above copyright notice appear in all copies and that both that ++# copyright notice and this permission notice appear in supporting ++# documentation, and that the name of Keith Packard not be used in ++# advertising or publicity pertaining to distribution of the software without ++# specific, written prior permission. Keith Packard makes no ++# representations about the suitability of this software for any purpose. It ++# is provided "as is" without express or implied warranty. ++# ++# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++# PERFORMANCE OF THIS SOFTWARE. ++# ++ ++AUTOMAKE_OPTIONS = 1.7 foreign ++ ++AM_CFLAGS = @XHOST_CFLAGS@ ++ ++bin_PROGRAMS = xhost ++ ++xhost_SOURCES = xhost.c ++ ++xhost_LDADD = @XHOST_LIBS@ ++ ++man5_MANS=xhost.man ++ ++EXTRA_DIST= $(man5_MANS) ++ ++MAINTAINERCLEANFILES = configure \ ++config.guess \ ++config.sub \ ++install-sh \ ++ltmain.sh \ ++missing \ ++mkinstalldirs \ ++aclocal.m4 \ ++Makefile.in \ ++depcomp \ ++autoscan.log \ ++configure.scan \ ++config.h \ ++config.h.in \ ++$(man5_MANS) +diff -urN xhost.orig/configure.ac xhost/configure.ac +--- xhost.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100 ++++ xhost/configure.ac 2004-08-15 17:43:42.000000000 +0200 +@@ -0,0 +1,57 @@ ++dnl ++dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $ ++dnl ++dnl Copyright © 2003 Keith Packard ++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, and that the name of Keith Packard not be used in ++dnl advertising or publicity pertaining to distribution of the software without ++dnl specific, written prior permission. Keith Packard makes no ++dnl representations about the suitability of this software for any purpose. It ++dnl is provided "as is" without express or implied warranty. ++dnl ++dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++dnl PERFORMANCE OF THIS SOFTWARE. ++dnl ++ ++AC_PREREQ(2.57) ++AC_INIT([xhost],4.4.0,[],xhost) ++AC_CONFIG_SRCDIR([Makefile.am]) ++AM_INIT_AUTOMAKE([dist-bzip2]) ++AM_MAINTAINER_MODE ++AM_CONFIG_HEADER(config.h) ++ ++AC_PROG_CC ++AC_PROG_INSTALL ++AC_PROG_LN_S ++AC_LIBTOOL_WIN32_DLL ++AM_PROG_LIBTOOL ++AC_PROG_MAKE_SET ++ ++PKG_CHECK_MODULES(XHOST, xext xmuu x11) ++ ++AC_TYPE_SIGNAL ++ ++# Transport selection ++AC_ARG_ENABLE(unix-transport,[ --disable-unix-transport ], [UNIXCONN=$enableval], [UNIXCONN=yes]) ++AC_ARG_ENABLE(tcp-transport, [ --disable-tcp-transport ], [TCPCONN=$enableval], [TCPCONN=yes]) ++AC_ARG_ENABLE(ipv6, [ --disable-ipv6 ], [IPV6CONN=$enableval], [IPV6CONN=yes]) ++if test "$UNIXCONN" = "yes"; then ++ AC_DEFINE(UNIXCONN,1,[Support UNIX socket connections]) ++fi ++if test "$TCPCONN" = "yes"; then ++ AC_DEFINE(TCPCONN,1,[Support TCP socket connections]) ++fi ++if test "$IPV6CONN" = "yes"; then ++ AC_DEFINE(IPv6,1,[Support IPv6 for TCP connections]) ++fi ++ ++AC_OUTPUT([Makefile]) +diff -urN xhost.orig/xhost.c xhost/xhost.c +--- xhost.orig/xhost.c 2003-11-14 16:54:53.000000000 +0100 ++++ xhost/xhost.c 2004-08-15 17:53:07.000000000 +0200 +@@ -27,6 +27,10 @@ + + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #if defined(TCPCONN) || defined(STREAMSCONN) + #define NEEDSOCKETS + #endif +@@ -102,11 +106,7 @@ + static int local_xerror(); + static char *get_hostname(); + +-#ifdef SIGNALRETURNSINT +-#define signal_t int +-#else +-#define signal_t void +-#endif ++#define signal_t RETSIGTYPE + static signal_t nameserver_lost(); + + #define NAMESERVER_TIMEOUT 5 /* time to wait for nameserver */ |