summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2008-06-24 10:53:28 +0000
committerRoss Burton <ross@openedhand.com>2008-06-24 10:53:28 +0000
commit9b63c68b0fdcc266d1c16aa40e2b2daadb48ccdd (patch)
tree7e9857e7af3848af0710ebf785978c495da96a04
parentf6e7776727d883ea62bc3725b395ab628d5f4534 (diff)
downloadpoky-9b63c68b0fdcc266d1c16aa40e2b2daadb48ccdd.tar.gz
xorg-app: remove unused patch files
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4722 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/xorg-app/xauth/autofoo.patch148
-rw-r--r--meta/packages/xorg-app/xhost/autofoo.patch165
-rw-r--r--meta/packages/xorg-app/xmodmap/autofoo.patch109
-rw-r--r--meta/packages/xorg-app/xrdb/autofoo.patch132
-rw-r--r--meta/packages/xorg-app/xset/autofoo.patch109
5 files changed, 0 insertions, 663 deletions
diff --git a/meta/packages/xorg-app/xauth/autofoo.patch b/meta/packages/xorg-app/xauth/autofoo.patch
deleted file mode 100644
index d279a6f4fc..0000000000
--- a/meta/packages/xorg-app/xauth/autofoo.patch
+++ /dev/null
@@ -1,148 +0,0 @@
1diff -urN xauth.orig/Imakefile xauth/Imakefile
2--- xauth.orig/Imakefile 2004-04-23 21:54:38.000000000 +0200
3+++ xauth/Imakefile 1970-01-01 01:00:00.000000000 +0100
4@@ -1,19 +0,0 @@
5-XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:11 cpqbld Exp $
6-
7-
8-
9-
10-XCOMM $XFree86: xc/programs/xauth/Imakefile,v 3.5tsi Exp $
11-
12- DEPLIBS = $(DEPXAUTHLIB) $(DEPXMUULIB) $(DEPXLIB)
13-LOCAL_LIBRARIES = $(XAUTHLIB) $(XMUULIB) $(XLIB)
14- SRCS = xauth.c gethost.c process.c parsedpy.c
15- OBJS = xauth.o gethost.o process.o parsedpy.o
16- CONN_DEFINES = $(CONNECTION_FLAGS)
17- DEPEND_DEFINES = $(CONN_DEFINES) $(SIGNAL_DEFINES)
18-
19-ComplexProgramTarget(xauth)
20-
21-SpecialCObjectRule(gethost,$(ICONFIGFILES),$(CONN_DEFINES) $(SIGNAL_DEFINES))
22-SpecialCObjectRule(process,$(ICONFIGFILES),$(CONN_DEFINES) $(SIGNAL_DEFINES))
23-SpecialCObjectRule(parsedpy,$(ICONFIGFILES),$(CONN_DEFINES))
24diff -urN xauth.orig/Makefile.am xauth/Makefile.am
25--- xauth.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
26+++ xauth/Makefile.am 2004-08-14 13:20:37.000000000 +0200
27@@ -0,0 +1,53 @@
28+#
29+# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $
30+#
31+# Copyright © 2003 Keith Packard
32+#
33+# Permission to use, copy, modify, distribute, and sell this software and its
34+# documentation for any purpose is hereby granted without fee, provided that
35+# the above copyright notice appear in all copies and that both that
36+# copyright notice and this permission notice appear in supporting
37+# documentation, and that the name of Keith Packard not be used in
38+# advertising or publicity pertaining to distribution of the software without
39+# specific, written prior permission. Keith Packard makes no
40+# representations about the suitability of this software for any purpose. It
41+# is provided "as is" without express or implied warranty.
42+#
43+# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
44+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
45+# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
46+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
47+# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
48+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
49+# PERFORMANCE OF THIS SOFTWARE.
50+#
51+
52+AUTOMAKE_OPTIONS = 1.7 foreign
53+
54+AM_CFLAGS = @XAUTH_CFLAGS@
55+
56+bin_PROGRAMS = xauth
57+
58+xauth_SOURCES = gethost.c parsedpy.c process.c xauth.c xauth.h
59+
60+xauth_LDADD = @XAUTH_LIBS@
61+
62+man5_MANS=xauth.man
63+
64+EXTRA_DIST= $(man5_MANS)
65+
66+MAINTAINERCLEANFILES = configure \
67+config.guess \
68+config.sub \
69+install-sh \
70+ltmain.sh \
71+missing \
72+mkinstalldirs \
73+aclocal.m4 \
74+Makefile.in \
75+depcomp \
76+autoscan.log \
77+configure.scan \
78+config.h \
79+config.h.in \
80+$(man5_MANS)
81diff -urN xauth.orig/autogen.sh xauth/autogen.sh
82--- xauth.orig/autogen.sh 1970-01-01 01:00:00.000000000 +0100
83+++ xauth/autogen.sh 2004-08-14 13:15:46.000000000 +0200
84@@ -0,0 +1,3 @@
85+#! /bin/sh
86+autoreconf -v --install || exit 1
87+./configure --enable-maintainer-mode "$@"
88diff -urN xauth.orig/configure.ac xauth/configure.ac
89--- xauth.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
90+++ xauth/configure.ac 2004-08-14 23:43:54.000000000 +0200
91@@ -0,0 +1,57 @@
92+dnl
93+dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $
94+dnl
95+dnl Copyright © 2003 Keith Packard
96+dnl
97+dnl Permission to use, copy, modify, distribute, and sell this software and its
98+dnl documentation for any purpose is hereby granted without fee, provided that
99+dnl the above copyright notice appear in all copies and that both that
100+dnl copyright notice and this permission notice appear in supporting
101+dnl documentation, and that the name of Keith Packard not be used in
102+dnl advertising or publicity pertaining to distribution of the software without
103+dnl specific, written prior permission. Keith Packard makes no
104+dnl representations about the suitability of this software for any purpose. It
105+dnl is provided "as is" without express or implied warranty.
106+dnl
107+dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
108+dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
109+dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
110+dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
111+dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
112+dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
113+dnl PERFORMANCE OF THIS SOFTWARE.
114+dnl
115+
116+AC_PREREQ(2.57)
117+AC_INIT([xauth],4.4.0,[],xauth)
118+AC_CONFIG_SRCDIR([Makefile.am])
119+AM_INIT_AUTOMAKE([dist-bzip2])
120+AM_MAINTAINER_MODE
121+AM_CONFIG_HEADER(config.h)
122+
123+AC_PROG_CC
124+AC_PROG_INSTALL
125+AC_PROG_LN_S
126+AC_LIBTOOL_WIN32_DLL
127+AM_PROG_LIBTOOL
128+AC_PROG_MAKE_SET
129+
130+PKG_CHECK_MODULES(XAUTH, xau xext xmuu x11)
131+
132+AC_TYPE_SIGNAL
133+
134+# Transport selection
135+AC_ARG_ENABLE(unix-transport,[ --disable-unix-transport ], [UNIXCONN=$enableval], [UNIXCONN=yes])
136+AC_ARG_ENABLE(tcp-transport, [ --disable-tcp-transport ], [TCPCONN=$enableval], [TCPCONN=yes])
137+AC_ARG_ENABLE(ipv6, [ --disable-ipv6 ], [IPV6CONN=$enableval], [IPV6CONN=yes])
138+if test "$UNIXCONN" = "yes"; then
139+ AC_DEFINE(UNIXCONN,1,[Support UNIX socket connections])
140+fi
141+if test "$TCPCONN" = "yes"; then
142+ AC_DEFINE(TCPCONN,1,[Support TCP socket connections])
143+fi
144+if test "$IPV6CONN" = "yes"; then
145+ AC_DEFINE(IPv6,1,[Support IPv6 for TCP connections])
146+fi
147+
148+AC_OUTPUT([Makefile])
diff --git a/meta/packages/xorg-app/xhost/autofoo.patch b/meta/packages/xorg-app/xhost/autofoo.patch
deleted file mode 100644
index b29f017abc..0000000000
--- a/meta/packages/xorg-app/xhost/autofoo.patch
+++ /dev/null
@@ -1,165 +0,0 @@
1diff -urN xhost.orig/Imakefile xhost/Imakefile
2--- xhost.orig/Imakefile 2003-11-14 16:54:53.000000000 +0100
3+++ xhost/Imakefile 1970-01-01 01:00:00.000000000 +0100
4@@ -1,16 +0,0 @@
5-XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:24 cpqbld Exp $
6-#if HasSecureRPC
7-RPC_DEFINES = -DSECURE_RPC
8-#else
9-RPC_DEFINES =
10-#endif
11-KRB5_DEFINES = Krb5Defines
12-KRB5_INCLUDE = Krb5Includes
13- INCLUDES = $(KRB5_INCLUDE)
14- DEPLIBS = $(DEPXMULIB) $(DEPXLIB)
15-LOCAL_LIBRARIES = $(XMULIB) $(XLIB)
16- SRCS = xhost.c
17- OBJS = xhost.o
18- DEFINES = ConnectionFlags $(SIGNAL_DEFINES) $(RPC_DEFINES) $(KRB5_DEFINES)
19-
20-ComplexProgramTarget(xhost)
21diff -urN xhost.orig/Makefile.am xhost/Makefile.am
22--- xhost.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
23+++ xhost/Makefile.am 2004-08-15 17:43:47.000000000 +0200
24@@ -0,0 +1,53 @@
25+#
26+# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $
27+#
28+# Copyright © 2003 Keith Packard
29+#
30+# Permission to use, copy, modify, distribute, and sell this software and its
31+# documentation for any purpose is hereby granted without fee, provided that
32+# the above copyright notice appear in all copies and that both that
33+# copyright notice and this permission notice appear in supporting
34+# documentation, and that the name of Keith Packard not be used in
35+# advertising or publicity pertaining to distribution of the software without
36+# specific, written prior permission. Keith Packard makes no
37+# representations about the suitability of this software for any purpose. It
38+# is provided "as is" without express or implied warranty.
39+#
40+# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
41+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
42+# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
43+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
44+# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
45+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
46+# PERFORMANCE OF THIS SOFTWARE.
47+#
48+
49+AUTOMAKE_OPTIONS = 1.7 foreign
50+
51+AM_CFLAGS = @XHOST_CFLAGS@
52+
53+bin_PROGRAMS = xhost
54+
55+xhost_SOURCES = xhost.c
56+
57+xhost_LDADD = @XHOST_LIBS@
58+
59+man5_MANS=xhost.man
60+
61+EXTRA_DIST= $(man5_MANS)
62+
63+MAINTAINERCLEANFILES = configure \
64+config.guess \
65+config.sub \
66+install-sh \
67+ltmain.sh \
68+missing \
69+mkinstalldirs \
70+aclocal.m4 \
71+Makefile.in \
72+depcomp \
73+autoscan.log \
74+configure.scan \
75+config.h \
76+config.h.in \
77+$(man5_MANS)
78diff -urN xhost.orig/configure.ac xhost/configure.ac
79--- xhost.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
80+++ xhost/configure.ac 2004-08-15 17:43:42.000000000 +0200
81@@ -0,0 +1,57 @@
82+dnl
83+dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $
84+dnl
85+dnl Copyright © 2003 Keith Packard
86+dnl
87+dnl Permission to use, copy, modify, distribute, and sell this software and its
88+dnl documentation for any purpose is hereby granted without fee, provided that
89+dnl the above copyright notice appear in all copies and that both that
90+dnl copyright notice and this permission notice appear in supporting
91+dnl documentation, and that the name of Keith Packard not be used in
92+dnl advertising or publicity pertaining to distribution of the software without
93+dnl specific, written prior permission. Keith Packard makes no
94+dnl representations about the suitability of this software for any purpose. It
95+dnl is provided "as is" without express or implied warranty.
96+dnl
97+dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
98+dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
99+dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
100+dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
101+dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
102+dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
103+dnl PERFORMANCE OF THIS SOFTWARE.
104+dnl
105+
106+AC_PREREQ(2.57)
107+AC_INIT([xhost],4.4.0,[],xhost)
108+AC_CONFIG_SRCDIR([Makefile.am])
109+AM_INIT_AUTOMAKE([dist-bzip2])
110+AM_MAINTAINER_MODE
111+AM_CONFIG_HEADER(config.h)
112+
113+AC_PROG_CC
114+AC_PROG_INSTALL
115+AC_PROG_LN_S
116+AC_LIBTOOL_WIN32_DLL
117+AM_PROG_LIBTOOL
118+AC_PROG_MAKE_SET
119+
120+PKG_CHECK_MODULES(XHOST, xext xmuu x11)
121+
122+AC_TYPE_SIGNAL
123+
124+# Transport selection
125+AC_ARG_ENABLE(unix-transport,[ --disable-unix-transport ], [UNIXCONN=$enableval], [UNIXCONN=yes])
126+AC_ARG_ENABLE(tcp-transport, [ --disable-tcp-transport ], [TCPCONN=$enableval], [TCPCONN=yes])
127+AC_ARG_ENABLE(ipv6, [ --disable-ipv6 ], [IPV6CONN=$enableval], [IPV6CONN=yes])
128+if test "$UNIXCONN" = "yes"; then
129+ AC_DEFINE(UNIXCONN,1,[Support UNIX socket connections])
130+fi
131+if test "$TCPCONN" = "yes"; then
132+ AC_DEFINE(TCPCONN,1,[Support TCP socket connections])
133+fi
134+if test "$IPV6CONN" = "yes"; then
135+ AC_DEFINE(IPv6,1,[Support IPv6 for TCP connections])
136+fi
137+
138+AC_OUTPUT([Makefile])
139diff -urN xhost.orig/xhost.c xhost/xhost.c
140--- xhost.orig/xhost.c 2003-11-14 16:54:53.000000000 +0100
141+++ xhost/xhost.c 2004-08-15 17:53:07.000000000 +0200
142@@ -27,6 +27,10 @@
143
144 */
145
146+#ifdef HAVE_CONFIG_H
147+#include "config.h"
148+#endif
149+
150 #if defined(TCPCONN) || defined(STREAMSCONN)
151 #define NEEDSOCKETS
152 #endif
153@@ -102,11 +106,7 @@
154 static int local_xerror();
155 static char *get_hostname();
156
157-#ifdef SIGNALRETURNSINT
158-#define signal_t int
159-#else
160-#define signal_t void
161-#endif
162+#define signal_t RETSIGTYPE
163 static signal_t nameserver_lost();
164
165 #define NAMESERVER_TIMEOUT 5 /* time to wait for nameserver */
diff --git a/meta/packages/xorg-app/xmodmap/autofoo.patch b/meta/packages/xorg-app/xmodmap/autofoo.patch
deleted file mode 100644
index f309add086..0000000000
--- a/meta/packages/xorg-app/xmodmap/autofoo.patch
+++ /dev/null
@@ -1,109 +0,0 @@
1diff -urN xmodmap.orig/Makefile.am xmodmap/Makefile.am
2--- xmodmap.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
3+++ xmodmap/Makefile.am 2004-08-31 19:49:33.000000000 +0200
4@@ -0,0 +1,53 @@
5+#
6+# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $
7+#
8+# Copyright © 2003 Keith Packard
9+#
10+# Permission to use, copy, modify, distribute, and sell this software and its
11+# documentation for any purpose is hereby granted without fee, provided that
12+# the above copyright notice appear in all copies and that both that
13+# copyright notice and this permission notice appear in supporting
14+# documentation, and that the name of Keith Packard not be used in
15+# advertising or publicity pertaining to distribution of the software without
16+# specific, written prior permission. Keith Packard makes no
17+# representations about the suitability of this software for any purpose. It
18+# is provided "as is" without express or implied warranty.
19+#
20+# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
21+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
22+# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
23+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
24+# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
25+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
26+# PERFORMANCE OF THIS SOFTWARE.
27+#
28+
29+AUTOMAKE_OPTIONS = 1.7 foreign
30+
31+AM_CFLAGS = @XMODMAP_CFLAGS@
32+
33+bin_PROGRAMS = xmodmap
34+
35+xmodmap_SOURCES = exec.c handle.c pf.c wq.h xmodmap.c xmodmap.h
36+
37+xmodmap_LDADD = @XMODMAP_LIBS@
38+
39+man5_MANS=xmodmap.man
40+
41+EXTRA_DIST= $(man5_MANS)
42+
43+MAINTAINERCLEANFILES = configure \
44+config.guess \
45+config.sub \
46+install-sh \
47+ltmain.sh \
48+missing \
49+mkinstalldirs \
50+aclocal.m4 \
51+Makefile.in \
52+depcomp \
53+autoscan.log \
54+configure.scan \
55+config.h \
56+config.h.in \
57+$(man5_MANS)
58diff -urN xmodmap.orig/autogen.sh xmodmap/autogen.sh
59--- xmodmap.orig/autogen.sh 1970-01-01 01:00:00.000000000 +0100
60+++ xmodmap/autogen.sh 2004-08-31 19:46:14.000000000 +0200
61@@ -0,0 +1,3 @@
62+#! /bin/sh
63+autoreconf -v --install || exit 1
64+./configure --enable-maintainer-mode "$@"
65diff -urN xmodmap.orig/configure.ac xmodmap/configure.ac
66--- xmodmap.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
67+++ xmodmap/configure.ac 2004-08-31 20:27:03.000000000 +0200
68@@ -0,0 +1,41 @@
69+dnl
70+dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $
71+dnl
72+dnl Copyright © 2003 Keith Packard
73+dnl
74+dnl Permission to use, copy, modify, distribute, and sell this software and its
75+dnl documentation for any purpose is hereby granted without fee, provided that
76+dnl the above copyright notice appear in all copies and that both that
77+dnl copyright notice and this permission notice appear in supporting
78+dnl documentation, and that the name of Keith Packard not be used in
79+dnl advertising or publicity pertaining to distribution of the software without
80+dnl specific, written prior permission. Keith Packard makes no
81+dnl representations about the suitability of this software for any purpose. It
82+dnl is provided "as is" without express or implied warranty.
83+dnl
84+dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
85+dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
86+dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
87+dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
88+dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
89+dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
90+dnl PERFORMANCE OF THIS SOFTWARE.
91+dnl
92+
93+AC_PREREQ(2.57)
94+AC_INIT([xmodmap],4.4.0,[],xmodmap)
95+AC_CONFIG_SRCDIR([Makefile.am])
96+AM_INIT_AUTOMAKE([dist-bzip2])
97+AM_MAINTAINER_MODE
98+AM_CONFIG_HEADER(config.h)
99+
100+AC_PROG_CC
101+AC_PROG_INSTALL
102+AC_PROG_LN_S
103+AC_LIBTOOL_WIN32_DLL
104+AM_PROG_LIBTOOL
105+AC_PROG_MAKE_SET
106+
107+PKG_CHECK_MODULES(XMODMAP, x11)
108+
109+AC_OUTPUT([Makefile])
diff --git a/meta/packages/xorg-app/xrdb/autofoo.patch b/meta/packages/xorg-app/xrdb/autofoo.patch
deleted file mode 100644
index b30a46bc36..0000000000
--- a/meta/packages/xorg-app/xrdb/autofoo.patch
+++ /dev/null
@@ -1,132 +0,0 @@
1diff -urN xrdb.orig/Imakefile xrdb/Imakefile
2--- xrdb.orig/Imakefile 2004-04-23 21:55:03.000000000 +0200
3+++ xrdb/Imakefile 1970-01-01 01:00:00.000000000 +0100
4@@ -1,19 +0,0 @@
5-XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:56 cpqbld Exp $
6-
7-
8-
9-
10-XCOMM $XFree86: xc/programs/xrdb/Imakefile,v 3.6tsi Exp $
11-
12-#ifdef PatheticCpp
13- CPPDEFS = -DPATHETICCPP
14-#endif
15-#if HasMkstemp
16- CPPDEFS = -DHAS_MKSTEMP
17-#endif
18-XCOMM Due to ill make parsing the cpp is passed directly in source file
19- DEFINES = -DCPP="\"$(CPP)\"" $(CPPDEFS)
20- DEPLIBS = $(DEPXMUULIB) $(DEPXONLYLIB)
21-LOCAL_LIBRARIES = $(XMUULIB) $(XONLYLIB)
22-
23-SimpleProgramTarget(xrdb)
24diff -urN xrdb.orig/Makefile.am xrdb/Makefile.am
25--- xrdb.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
26+++ xrdb/Makefile.am 2004-08-14 16:05:01.000000000 +0200
27@@ -0,0 +1,53 @@
28+#
29+# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $
30+#
31+# Copyright © 2003 Keith Packard
32+#
33+# Permission to use, copy, modify, distribute, and sell this software and its
34+# documentation for any purpose is hereby granted without fee, provided that
35+# the above copyright notice appear in all copies and that both that
36+# copyright notice and this permission notice appear in supporting
37+# documentation, and that the name of Keith Packard not be used in
38+# advertising or publicity pertaining to distribution of the software without
39+# specific, written prior permission. Keith Packard makes no
40+# representations about the suitability of this software for any purpose. It
41+# is provided "as is" without express or implied warranty.
42+#
43+# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
44+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
45+# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
46+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
47+# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
48+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
49+# PERFORMANCE OF THIS SOFTWARE.
50+#
51+
52+AUTOMAKE_OPTIONS = 1.7 foreign
53+
54+AM_CFLAGS = @XRDB_CFLAGS@
55+
56+bin_PROGRAMS = xrdb
57+
58+xrdb_SOURCES = xrdb.c
59+
60+xrdb_LDADD = @XRDB_LIBS@
61+
62+man5_MANS=xrdb.man
63+
64+EXTRA_DIST= $(man5_MANS)
65+
66+MAINTAINERCLEANFILES = configure \
67+config.guess \
68+config.sub \
69+install-sh \
70+ltmain.sh \
71+missing \
72+mkinstalldirs \
73+aclocal.m4 \
74+Makefile.in \
75+depcomp \
76+autoscan.log \
77+configure.scan \
78+config.h \
79+config.h.in \
80+$(man5_MANS)
81diff -urN xrdb.orig/autogen.sh xrdb/autogen.sh
82--- xrdb.orig/autogen.sh 1970-01-01 01:00:00.000000000 +0100
83+++ xrdb/autogen.sh 2004-08-14 15:57:35.000000000 +0200
84@@ -0,0 +1,3 @@
85+#! /bin/sh
86+autoreconf -v --install || exit 1
87+./configure --enable-maintainer-mode "$@"
88diff -urN xrdb.orig/configure.ac xrdb/configure.ac
89--- xrdb.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
90+++ xrdb/configure.ac 2004-08-14 16:03:31.000000000 +0200
91@@ -0,0 +1,41 @@
92+dnl
93+dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $
94+dnl
95+dnl Copyright © 2003 Keith Packard
96+dnl
97+dnl Permission to use, copy, modify, distribute, and sell this software and its
98+dnl documentation for any purpose is hereby granted without fee, provided that
99+dnl the above copyright notice appear in all copies and that both that
100+dnl copyright notice and this permission notice appear in supporting
101+dnl documentation, and that the name of Keith Packard not be used in
102+dnl advertising or publicity pertaining to distribution of the software without
103+dnl specific, written prior permission. Keith Packard makes no
104+dnl representations about the suitability of this software for any purpose. It
105+dnl is provided "as is" without express or implied warranty.
106+dnl
107+dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
108+dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
109+dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
110+dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
111+dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
112+dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
113+dnl PERFORMANCE OF THIS SOFTWARE.
114+dnl
115+
116+AC_PREREQ(2.57)
117+AC_INIT([xrdb],4.4.0,[],xrdb)
118+AC_CONFIG_SRCDIR([Makefile.am])
119+AM_INIT_AUTOMAKE([dist-bzip2])
120+AM_MAINTAINER_MODE
121+AM_CONFIG_HEADER(config.h)
122+
123+AC_PROG_CC
124+AC_PROG_INSTALL
125+AC_PROG_LN_S
126+AC_LIBTOOL_WIN32_DLL
127+AM_PROG_LIBTOOL
128+AC_PROG_MAKE_SET
129+
130+PKG_CHECK_MODULES(XRDB, xext xmuu x11)
131+
132+AC_OUTPUT([Makefile])
diff --git a/meta/packages/xorg-app/xset/autofoo.patch b/meta/packages/xorg-app/xset/autofoo.patch
deleted file mode 100644
index 039d1319e3..0000000000
--- a/meta/packages/xorg-app/xset/autofoo.patch
+++ /dev/null
@@ -1,109 +0,0 @@
1diff -urN xset.orig/Makefile.am xset/Makefile.am
2--- xset.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
3+++ xset/Makefile.am 2004-08-14 16:32:10.000000000 +0200
4@@ -0,0 +1,53 @@
5+#
6+# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $
7+#
8+# Copyright © 2003 Keith Packard
9+#
10+# Permission to use, copy, modify, distribute, and sell this software and its
11+# documentation for any purpose is hereby granted without fee, provided that
12+# the above copyright notice appear in all copies and that both that
13+# copyright notice and this permission notice appear in supporting
14+# documentation, and that the name of Keith Packard not be used in
15+# advertising or publicity pertaining to distribution of the software without
16+# specific, written prior permission. Keith Packard makes no
17+# representations about the suitability of this software for any purpose. It
18+# is provided "as is" without express or implied warranty.
19+#
20+# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
21+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
22+# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
23+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
24+# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
25+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
26+# PERFORMANCE OF THIS SOFTWARE.
27+#
28+
29+AUTOMAKE_OPTIONS = 1.7 foreign
30+
31+AM_CFLAGS = @XSET_CFLAGS@
32+
33+bin_PROGRAMS = xset
34+
35+xset_SOURCES = xset.c
36+
37+xset_LDADD = @XSET_LIBS@
38+
39+man5_MANS=xset.man
40+
41+EXTRA_DIST= $(man5_MANS)
42+
43+MAINTAINERCLEANFILES = configure \
44+config.guess \
45+config.sub \
46+install-sh \
47+ltmain.sh \
48+missing \
49+mkinstalldirs \
50+aclocal.m4 \
51+Makefile.in \
52+depcomp \
53+autoscan.log \
54+configure.scan \
55+config.h \
56+config.h.in \
57+$(man5_MANS)
58diff -urN xset.orig/autogen.sh xset/autogen.sh
59--- xset.orig/autogen.sh 1970-01-01 01:00:00.000000000 +0100
60+++ xset/autogen.sh 2004-08-14 16:27:56.000000000 +0200
61@@ -0,0 +1,3 @@
62+#! /bin/sh
63+autoreconf -v --install || exit 1
64+./configure --enable-maintainer-mode "$@"
65diff -urN xset.orig/configure.ac xset/configure.ac
66--- xset.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
67+++ xset/configure.ac 2004-08-17 14:21:25.000000000 +0200
68@@ -0,0 +1,41 @@
69+dnl
70+dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $
71+dnl
72+dnl Copyright © 2003 Keith Packard
73+dnl
74+dnl Permission to use, copy, modify, distribute, and sell this software and its
75+dnl documentation for any purpose is hereby granted without fee, provided that
76+dnl the above copyright notice appear in all copies and that both that
77+dnl copyright notice and this permission notice appear in supporting
78+dnl documentation, and that the name of Keith Packard not be used in
79+dnl advertising or publicity pertaining to distribution of the software without
80+dnl specific, written prior permission. Keith Packard makes no
81+dnl representations about the suitability of this software for any purpose. It
82+dnl is provided "as is" without express or implied warranty.
83+dnl
84+dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
85+dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
86+dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
87+dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
88+dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
89+dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
90+dnl PERFORMANCE OF THIS SOFTWARE.
91+dnl
92+
93+AC_PREREQ(2.57)
94+AC_INIT([xset],4.4.0,[],xset)
95+AC_CONFIG_SRCDIR([Makefile.am])
96+AM_INIT_AUTOMAKE([dist-bzip2])
97+AM_MAINTAINER_MODE
98+AM_CONFIG_HEADER(config.h)
99+
100+AC_PROG_CC
101+AC_PROG_INSTALL
102+AC_PROG_LN_S
103+AC_LIBTOOL_WIN32_DLL
104+AM_PROG_LIBTOOL
105+AC_PROG_MAKE_SET
106+
107+PKG_CHECK_MODULES(XSET, xext xextensions xmuu x11)
108+
109+AC_OUTPUT([Makefile])