1 diff -urN xprop.orig/Makefile.am xprop/Makefile.am
2 --- xprop.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
3 +++ xprop/Makefile.am 2004-08-15 18:49:43.000000000 +0200
6 +# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $
8 +# Copyright © 2003 Keith Packard
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.
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.
29 +AUTOMAKE_OPTIONS = 1.7 foreign
31 +AM_CFLAGS = @XPROP_CFLAGS@
35 +xprop_SOURCES = dsimple.c dsimple.h xprop.c
37 +xprop_LDADD = @XPROP_LIBS@
41 +EXTRA_DIST= $(man5_MANS)
43 +MAINTAINERCLEANFILES = configure \
58 diff -urN xprop.orig/configure.ac xprop/configure.ac
59 --- xprop.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
60 +++ xprop/configure.ac 2004-08-15 19:00:43.000000000 +0200
63 +dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $
65 +dnl Copyright © 2003 Keith Packard
67 +dnl Permission to use, copy, modify, distribute, and sell this software and its
68 +dnl documentation for any purpose is hereby granted without fee, provided that
69 +dnl the above copyright notice appear in all copies and that both that
70 +dnl copyright notice and this permission notice appear in supporting
71 +dnl documentation, and that the name of Keith Packard not be used in
72 +dnl advertising or publicity pertaining to distribution of the software without
73 +dnl specific, written prior permission. Keith Packard makes no
74 +dnl representations about the suitability of this software for any purpose. It
75 +dnl is provided "as is" without express or implied warranty.
77 +dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
78 +dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
79 +dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
80 +dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
81 +dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
82 +dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
83 +dnl PERFORMANCE OF THIS SOFTWARE.
87 +AC_INIT([xprop],4.4.0,[],xprop)
88 +AC_CONFIG_SRCDIR([Makefile.am])
89 +AM_INIT_AUTOMAKE([dist-bzip2])
91 +AM_CONFIG_HEADER(config.h)
100 +PKG_CHECK_MODULES(XPROP, xext xmuu x11)
102 +AC_CHECK_HEADERS([wchar.h])
103 +AC_CHECK_HEADERS([wctype.h])
105 +AC_OUTPUT([Makefile])
106 diff -urN xprop.orig/dsimple.c xprop/dsimple.c
107 --- xprop.orig/dsimple.c 2003-11-14 16:54:54.000000000 +0100
108 +++ xprop/dsimple.c 2004-08-15 19:19:32.000000000 +0200
113 +#ifdef HAVE_CONFIG_H
118 #include <X11/Xlib.h>
119 #include <X11/Xutil.h>
120 #include <X11/cursorfont.h>
124 * Other_stuff.h: Definitions of routines in other_stuff.
130 - char *data, *malloc();
133 if (!(data = malloc(size)))
134 Fatal_Error("Out of memory!");
139 - char *new_ptr, *realloc();
143 return(Malloc(size));
144 diff -urN xprop.orig/xprop.c xprop/xprop.c
145 --- xprop.orig/xprop.c 2004-04-23 21:55:03.000000000 +0200
146 +++ xprop/xprop.c 2004-08-15 19:23:13.000000000 +0200
148 /* $XFree86: xc/programs/xprop/xprop.c,v 1.15 2003/09/24 02:43:38 dawes Exp $ */
151 +#ifdef HAVE_CONFIG_H
155 #include <X11/Xlib.h>
157 #include <X11/Xfuncs.h>