[Info-xnee] patch for xnee-1.07.92

[Mike Castle]

I need to apply the following patch to build xnee on my machine.  It's
ugly.  It's only what to get the thing to compile; it's not the most
compact patch.  But hopefully it will point things in the right direction.

Note that the Makefile.in patches should be applied to Makefile.am instead.

patch -p1 << \EOF
diff -ru xnee-1.07.92.orig/libxnee/include/libxnee/xnee.h 
xnee-1.07.92/libxnee/include/libxnee/xnee.h
--- xnee-1.07.92.orig/libxnee/include/libxnee/xnee.h    2003-08-29 
15:44:08.000000000 -0700
+++ xnee-1.07.92/libxnee/include/libxnee/xnee.h 2003-10-02 18:19:33.000000000 
-0700
@@ -40,7 +40,6 @@
 
 #include <sys/utsname.h>
 
-#include <X11/Xlibint.h>
 #include <X11/Xproto.h>
 #include <X11/Xlib.h>
 
diff -ru xnee-1.07.92.orig/libxnee/include/libxnee/xnee_resource.h 
xnee-1.07.92/libxnee/include/libxnee/xnee_resource.h
--- xnee-1.07.92.orig/libxnee/include/libxnee/xnee_resource.h   2003-08-03 
15:54:40.000000000 -0700
+++ xnee-1.07.92/libxnee/include/libxnee/xnee_resource.h        2003-10-02 
18:29:25.000000000 -0700
@@ -22,7 +22,6 @@
  * MA  02111-1307, USA.                                              
  ****/
 
-#include <X11/Xlibint.h>
 #include <X11/Xproto.h>
 #include <X11/Xlib.h>
 
diff -ru xnee-1.07.92.orig/libxnee/src/Makefile.in 
xnee-1.07.92/libxnee/src/Makefile.in
--- xnee-1.07.92.orig/libxnee/src/Makefile.in   2003-08-29 15:53:25.000000000 
-0700
+++ xnee-1.07.92/libxnee/src/Makefile.in        2003-10-02 18:19:33.000000000 
-0700
@@ -80,7 +80,7 @@
 @address@hidden = -DUSE_BUF_VERBOSE
 @address@hidden = -DNO_BUF_VERBOSE
 
-CFLAGS = -I../include ${X_CFLAGS}  -g ${VERBOSE_FLAG} ${GCOV_FLAG} 
${GPROF_FLAG} ${BUF_VERBOSE_FLAG} 
+CFLAGS = -I$(srcdir)/../include ${X_CFLAGS}  -g ${VERBOSE_FLAG} ${GCOV_FLAG} 
${GPROF_FLAG} ${BUF_VERBOSE_FLAG} 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = 
 LIBRARIES =  $(lib_LIBRARIES)
diff -ru xnee-1.07.92.orig/libxnee/src/print.c xnee-1.07.92/libxnee/src/print.c
--- xnee-1.07.92.orig/libxnee/src/print.c       2003-08-13 14:42:25.000000000 
-0700
+++ xnee-1.07.92/libxnee/src/print.c    2003-10-02 18:35:04.000000000 -0700
@@ -26,6 +26,7 @@
 #include "libxnee/xnee_replay.h"
 #include "libxnee/xnee_resource.h"
 
+#include <time.h>
 
 
 /**************************************************************
diff -ru xnee-1.07.92.orig/libxnee/src/xnee.c xnee-1.07.92/libxnee/src/xnee.c
--- xnee-1.07.92.orig/libxnee/src/xnee.c        2003-08-29 15:44:11.000000000 
-0700
+++ xnee-1.07.92/libxnee/src/xnee.c     2003-10-02 18:19:33.000000000 -0700
@@ -34,7 +34,6 @@
 
 #include <sys/utsname.h>
 
-#include <X11/Xlibint.h>
 #include <X11/Xproto.h>
 #include <X11/Xlib.h>
 
diff -ru xnee-1.07.92.orig/libxnee/src/xnee_km.c 
xnee-1.07.92/libxnee/src/xnee_km.c
--- xnee-1.07.92.orig/libxnee/src/xnee_km.c     2003-08-29 15:44:11.000000000 
-0700
+++ xnee-1.07.92/libxnee/src/xnee_km.c  2003-10-02 18:43:41.000000000 -0700
@@ -31,6 +31,7 @@
 #include "libxnee/xnee_km.h"
 #include "libxnee/xnee_setget.h"
 
+#include <time.h>
 
 /* internal prototypes */
 int
diff -ru xnee-1.07.92.orig/libxnee/src/xnee_resource.c 
xnee-1.07.92/libxnee/src/xnee_resource.c
--- xnee-1.07.92.orig/libxnee/src/xnee_resource.c       2003-08-06 
17:30:31.000000000 -0700
+++ xnee-1.07.92/libxnee/src/xnee_resource.c    2003-10-02 18:51:16.000000000 
-0700
@@ -34,7 +34,6 @@
 
 #include <sys/utsname.h>
 
-#include <X11/Xlibint.h>
 #include <X11/Xproto.h>
 #include <X11/Xlib.h>
 
diff -ru xnee-1.07.92.orig/xnee/src/Makefile.in 
xnee-1.07.92/xnee/src/Makefile.in
--- xnee-1.07.92.orig/xnee/src/Makefile.in      2003-08-29 15:53:25.000000000 
-0700
+++ xnee-1.07.92/xnee/src/Makefile.in   2003-10-02 18:19:33.000000000 -0700
@@ -75,7 +75,7 @@
 @address@hidden = -DUSE_BUF_VERBOSE
 @address@hidden = -DNO_BUF_VERBOSE
 
-CFLAGS = -I../../libxnee/include ${X_CFLAGS}  -g ${VERBOSE_FLAG} ${GCOV_FLAG} 
${GPROF_FLAG} ${BUF_VERBOSE_FLAG}
+CFLAGS = -I$(srcdir)/../../libxnee/include ${X_CFLAGS}  -g ${VERBOSE_FLAG} 
${GCOV_FLAG} ${GPROF_FLAG} ${BUF_VERBOSE_FLAG}
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = 
 PROGRAMS =  $(bin_PROGRAMS)
EOF

mrc
-- 
     Mike Castle      address@hidden      www.netcom.com/~dalgoda/
    We are all of us living in the shadow of Manhattan.  -- Watchmen
fatal ("You are in a maze of twisty compiler features, all different"); -- gcc