diff options
author | Chris Larson <kergoth@openedhand.com> | 2006-08-15 11:58:37 +0000 |
---|---|---|
committer | Chris Larson <kergoth@openedhand.com> | 2006-08-15 11:58:37 +0000 |
commit | ca10363baac7de9581ec90ab47957f973e1dbdc4 (patch) | |
tree | 2000b53f806c79510671d8fd1a6a36125f8b25b3 /meta/packages/xorg-app/xmodmap | |
parent | c210d01a7ca8c00ddc45d292878b89086b137129 (diff) | |
download | poky-ca10363baac7de9581ec90ab47957f973e1dbdc4.tar.gz |
Numerous new xorg package versions from upstream OE. Pester me if any local changes got inadvertantly lost, or if any packages need upgrading.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@607 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/xorg-app/xmodmap')
-rw-r--r-- | meta/packages/xorg-app/xmodmap/autofoo.patch | 109 |
1 files changed, 109 insertions, 0 deletions
diff --git a/meta/packages/xorg-app/xmodmap/autofoo.patch b/meta/packages/xorg-app/xmodmap/autofoo.patch new file mode 100644 index 0000000000..f309add086 --- /dev/null +++ b/meta/packages/xorg-app/xmodmap/autofoo.patch | |||
@@ -0,0 +1,109 @@ | |||
1 | diff -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) | ||
58 | diff -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 "$@" | ||
65 | diff -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]) | ||