Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv8537
Modified Files:
xmhtml.patch
Log Message:
Make it compile on 10.5
Index: xmhtml.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/xmhtml.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xmhtml.patch 23 May 2006 02:19:32 -0000 1.2
+++ xmhtml.patch 1 Dec 2007 11:02:43 -0000 1.3
@@ -1,5 +1,6 @@
---- XmHTML-1.1.7/Makefile Thu Feb 4 00:43:27 1999
-+++ XmHTML-1.1.7-patched/Makefile Thu Feb 21 10:23:43 2002
+diff -ur XmHTML-1.1.7/Makefile XmHTML-1.1.7.corr/Makefile
+--- XmHTML-1.1.7/Makefile 1999-02-04 01:43:27.000000000 +0100
++++ XmHTML-1.1.7.corr/Makefile 2007-12-01 11:15:42.000000000 +0100
@@ -40,7 +40,7 @@
# remove the examples directory from this line.
# If you want to build the XmHTML tutorial examples, add the book directory.
@@ -40,7 +41,15 @@
# It might be troublesome to know what the correct defines are for your
# system. A possible set of defines for some OS's is given below. Pick
-@@ -173,7 +173,7 @@
+@@ -166,14 +166,14 @@
+ # Add -DDEBUG to enable selective debug output (see the file DEBUGGING for
more
+ # info).
+ #
+-CPPFLAGS = -DDEBUG -D_GNU_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE -DHAVE_REGEX_H
$(IMAGEDEFINES)
++CPPFLAGS = -DHAVE_STRINGS_H -DDEBUG -D_GNU_SOURCE -D_BSD_SOURCE
-D_POSIX_SOURCE -DHAVE_REGEX_H $(IMAGEDEFINES)
+
+ # Various include directories
+ LIBINC=-I. -I../include -I../include/common -I../../include
-I../../include/common
# Platform specific includes
ifeq ($(PLATFORM),Motif)
@@ -58,3 +67,15 @@
# This is what is required under Linux (Motif 2.0.1).
# Your mileage may vary.
LIBS = -lXm -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE
+diff -ur XmHTML-1.1.7/lib/common/debug.c XmHTML-1.1.7.corr/lib/common/debug.c
+--- XmHTML-1.1.7/lib/common/debug.c 1998-10-06 21:58:00.000000000 +0200
++++ XmHTML-1.1.7.corr/lib/common/debug.c 2007-12-01 11:24:23.000000000
+0100
+@@ -110,7 +110,7 @@
+ /*** Private Function Prototype Declarations ****/
+
+ /*** Private Variable Declarations ***/
+-static FILE *__rsd_debug_file = stdout;
++static FILE *__rsd_debug_file; /**= stdout;**/
+
+ /*****
+ * When debug output is send to a file, we register an exit func to close
-------------------------------------------------------------------------
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell. From the desktop to the data center, Linux is going
mainstream. Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
