Attachment #10996 for bug #21836

Lines 1-2 Link Here

(-)xmhtml/files/md5 (-2 / +2 lines)
1	MD5 (XmHTML-1.1.0.tar.gz) = 4a29ce778089a3312ba5c5ce700101f6	1	MD5 (XmHTML-1.1.7.tar.gz) = 6d079435fb954bb7878f4dd0d3f7b8d8
2	MD5 (patch-102697.gz) = 5af647414fe4087935cc8ec9652fb938	2




*** Makefile.orig	Thu Feb  4 01:43:27 1999
--- Makefile	Sat Aug  5 15:29:56 2000
***************
*** 40,46 ****
  # remove the examples directory from this line.
  # If you want to build the XmHTML tutorial examples, add the book directory.

! SUBDIRS= lib http examples tools

  # some common definitions
  #
--- 40,46 ----
  # remove the examples directory from this line.
  # If you want to build the XmHTML tutorial examples, add the book directory.

! SUBDIRS= lib http examples tools book contrib

  # some common definitions
  #
***************
*** 64,72 ****
  # Compiler Settings #
  #                   #
  #####################
! CC       = gcc
! CFLAGS   = -g -funroll-loops -Wall -pipe -ansi
! LDFLAGS  =

  # The following flags are *very* usefull if you are getting unresolved
  # references to functions in libraries that you *know* to exist.
--- 64,72 ----
  # Compiler Settings #
  #                   #
  #####################
! CC       = libtool gcc
! CFLAGS   = -O2 -funroll-loops -pipe -ansi
! #LDFLAGS  =

  # The following flags are *very* usefull if you are getting unresolved
  # references to functions in libraries that you *know* to exist.
***************
*** 115,121 ****
  # HAVE_LIBZ => zlib.h

  ZLIBINC       =
! IMAGEINCLUDES = $(ZLIBINC)

  # Image libraries
  # No need to add -lXpm if you need to include it with LIBS below
--- 115,121 ----
  # HAVE_LIBZ => zlib.h

  ZLIBINC       =
! IMAGEINCLUDES = -I${LOCALBASE}/include $(ZLIBINC)

  # Image libraries
  # No need to add -lXpm if you need to include it with LIBS below
***************
*** 126,132 ****
  # HAVE_LIBZ => libz (and possibly libm)

  ZLIBLIB   = -lz -lm
! IMAGELIBS = -ljpeg -lpng $(ZLIBLIB)

  # 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
--- 126,132 ----
  # HAVE_LIBZ => libz (and possibly libm)

  ZLIBLIB   = -lz -lm
! IMAGELIBS = -L${LOCALBASE}/lib -ljpeg -lpng $(ZLIBLIB)

  # 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
***************
*** 166,182 ****
  # 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)

  # Various include directories
  LIBINC=-I. -I../include -I../include/common -I../../include -I../../include/common

  # Platform specific includes
  ifeq ($(PLATFORM),Motif)
! PLATFORMINC=-I../../include/XmHTML -I/usr/X11R6/include
  else
  ifeq ($(PLATFORM),gtk)
! PLATFORMINC=-I../../include/gtk-xmhtml -I/usr/local/include
  endif
  endif

--- 166,182 ----
  # Add -DDEBUG to enable selective debug output (see the file DEBUGGING for more
  # info).
  #
! CPPFLAGS = -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)
! PLATFORMINC=-I../../include/XmHTML -I${X11BASE}/include
  else
  ifeq ($(PLATFORM),gtk)
! PLATFORMINC=-I../../include/gtk-xmhtml -I${LOCALBASE}/include
  endif
  endif

***************
*** 192,208 ****
  # Motif version (default)
  ifeq ($(PLATFORM),Motif)

! LIBDIR = -L/usr/X11R6/lib
  # This is what is required under Linux (Motif 2.0.1).
  # Your mileage may vary.
! LIBS   = -lXm -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE

  else

  # gtk version (only supported port for now)
  ifeq($(PLATFORM),gtk)

! LIBDIR = -L/usr/local/lib
  LIBS   = -lgdk -lgtk -lX11

  # endif gtk
--- 192,208 ----
  # Motif version (default)
  ifeq ($(PLATFORM),Motif)

! LIBDIR = -L${X11BASE}/lib
  # This is what is required under Linux (Motif 2.0.1).
  # Your mileage may vary.
! LIBS   = ${MOTIFLIB} -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE

  else

  # gtk version (only supported port for now)
  ifeq($(PLATFORM),gtk)

! LIBDIR = -L${X11BASE}/lib
  LIBS   = -lgdk -lgtk -lX11

  # endif gtk
***************
*** 308,311 ****
  	tools/scansrc.sh ./lib/common > docs/sources.desc
  	tools/scansrc.sh ./lib/Motif >> docs/sources.desc
  	tools/scansrc.sh ./lib/gtk >> docs/sources.desc
-
--- 308,310 ----

Lines 1-18 Link Here

(-)xmhtml/patches/patch-ab (-3 / +4 lines)
1	--- src/Imakefile.orig Sat Feb 20 14:31:44 1999	1	--- examples/Makefile.orig Wed Feb 3 19:43:27 1999
2	+++ src/Imakefile Sun Feb 21 12:52:40 1999	2	+++ examples/Makefile Tue Nov 2 01:39:14 1999
3	@@ -61,11 +61,15 @@	3	@@ -11,10 +11,10 @@
		4	EXAMPLES=example_1 example_2 example_4

Return to bug 21836

Lines 1-60 Link Here

(-)xmhtml/patches/patch-aa (-60 / +155 lines)
1	--- XmHTML.cf.orig Sat Feb 20 13:38:17 1999	1	*** Makefile.orig Thu Feb 4 01:43:27 1999
2	+++ XmHTML.cf Sat Feb 20 14:08:18 1999	2	--- Makefile Sat Aug 5 15:29:56 2000
3	@@ -22,10 +22,10 @@	3	***************
4	XCOMM	4	* 40,46 **
5		5	# remove the examples directory from this line.
6	XCOMM This specifies where the XmHTML library will be installed	6	# If you want to build the XmHTML tutorial examples, add the book directory.
7	-#define XmHTMLLibDir $(USRLIBDIR)	7
8	+#define XmHTMLLibDir /usr/X11R6/lib	8	! SUBDIRS= lib http examples tools
9		9
10	XCOMM This specifies where the XmHTML header files will be installed	10	# some common definitions
11	-#define XmHTMLIncDir $(INCROOT)/XmHTML	11	#
12	+#define XmHTMLIncDir /usr/X11R6/include/XmHTML	12	--- 40,46 ----
13		13	# remove the examples directory from this line.
14	XCOMM You may need to modify the following DEFINES as follows:	14	# If you want to build the XmHTML tutorial examples, add the book directory.
15	XCOMM if your system doesn't provide str[n]casecmp, add -DNEED_STRCASECMP	15
16	@@ -51,6 +51,11 @@	16	! SUBDIRS= lib http examples tools book contrib
17	DEFINES = -DNEED_STRCASECMP	17
18	#endif	18	# some common definitions
19		19	#
20	+BUILDINCTOP= ..	20	***************
21	+BUILDBINTOP= ..	21	* 64,72 **
22	+BUILDLIBTOP= ..	22	# Compiler Settings #
23	+INSTINCFLAGS = -c -m 0444	23	# #
24	+	24	#####################
25	XCOMM Image support configuration	25	! CC = gcc
26		26	! CFLAGS = -g -funroll-loops -Wall -pipe -ansi
27	XCOMM XPM support.	27	! LDFLAGS =
28	@@ -59,8 +64,8 @@	28
29	XCOMM Uncomment and fill in the proper paths to xpm.h and libXpm	29	# The following flags are very usefull if you are getting unresolved
30	XCOMM The defaults are /usr/X11R6/include (or wherever your X includes live)	30	# references to functions in libraries that you know to exist.
31	XCOMM and /usr/X11R6/lib (or wherever your X libraries live)	31	--- 64,72 ----
32	-XCOMM XPMINCLUDES = -I$(INCROOT)/X11	32	# Compiler Settings #
33	-XCOMM XPMLIBRARIES = -L$(LIBDIR) -lXpm	33	# #
34	+XPMINCLUDES = -I$(INCROOT)/X11	34	#####################
35	+XPMLIBRARIES = -L$(LIBDIR) -lXpm	35	! CC = libtool gcc
36		36	! CFLAGS = -O2 -funroll-loops -pipe -ansi
37	XCOMM	37	! #LDFLAGS =
38	XCOMM JPEG Support. Enabled by default.	38
39	@@ -74,8 +79,8 @@	39	# The following flags are very usefull if you are getting unresolved
40	XCOMM Required include files: jpeglib.h, jconfig.h, jmorecfg.h	40	# references to functions in libraries that you know to exist.
41	XCOMM	41	***************
42	#if (IHaveJPEG)	42	* 115,121 **
43	-JPEGINC =	43	# HAVE_LIBZ => zlib.h
44	-JPEGLIB = -ljpeg	44
45	+JPEGINC = -I/usr/local/include	45	ZLIBINC =
46	+JPEGLIB = -ljpeg -L/usr/local/lib	46	! IMAGEINCLUDES = $(ZLIBINC)
47	#else	47
48	XCOMM JPEG support not selected	48	# Image libraries
49	#endif	49	# No need to add -lXpm if you need to include it with LIBS below
50	@@ -93,8 +98,8 @@	50	--- 115,121 ----
51	XCOMM Required include files: png.h, pngconf.h	51	# HAVE_LIBZ => zlib.h
52	XCOMM	52
53	#if (IHavePNG)	53	ZLIBINC =
54	-PNGINC =	54	! IMAGEINCLUDES = -I${LOCALBASE}/include $(ZLIBINC)
55	-PNGLIB = -lpng	55
56	+PNGINC = -I/usr/local/include	56	# Image libraries
57	+PNGLIB = -lpng -L/usr/local/lib	57	# No need to add -lXpm if you need to include it with LIBS below
58	#else	58	***************
59	XCOMM PNG support not selected	59	* 126,132 **
60	#endif	60	# HAVE_LIBZ => libz (and possibly libm)
		61
		62	ZLIBLIB = -lz -lm
		63	! IMAGELIBS = -ljpeg -lpng $(ZLIBLIB)
		64
		65	# It might be troublesome to know what the correct defines are for your
		66	# system. A possible set of defines for some OS's is given below. Pick
		67	--- 126,132 ----
		68	# HAVE_LIBZ => libz (and possibly libm)
		69
		70	ZLIBLIB = -lz -lm
		71	! IMAGELIBS = -L${LOCALBASE}/lib -ljpeg -lpng $(ZLIBLIB)
		72
		73	# It might be troublesome to know what the correct defines are for your
		74	# system. A possible set of defines for some OS's is given below. Pick
		75	***************
		76	* 166,182 **
		77	# Add -DDEBUG to enable selective debug output (see the file DEBUGGING for more
		78	# info).
		79	#
		80	! CPPFLAGS = -DDEBUG -D_GNU_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE -DHAVE_REGEX_H $(IMAGEDEFINES)
		81
		82	# Various include directories
		83	LIBINC=-I. -I../include -I../include/common -I../../include -I../../include/common
		84
		85	# Platform specific includes
		86	ifeq ($(PLATFORM),Motif)
		87	! PLATFORMINC=-I../../include/XmHTML -I/usr/X11R6/include
		88	else
		89	ifeq ($(PLATFORM),gtk)
		90	! PLATFORMINC=-I../../include/gtk-xmhtml -I/usr/local/include
		91	endif
		92	endif
		93
		94	--- 166,182 ----
		95	# Add -DDEBUG to enable selective debug output (see the file DEBUGGING for more
		96	# info).
		97	#
		98	! CPPFLAGS = -DHAVE_REGEX_H $(IMAGEDEFINES)
		99
		100	# Various include directories
		101	LIBINC=-I. -I../include -I../include/common -I../../include -I../../include/common
		102
		103	# Platform specific includes
		104	ifeq ($(PLATFORM),Motif)
		105	! PLATFORMINC=-I../../include/XmHTML -I${X11BASE}/include
		106	else
		107	ifeq ($(PLATFORM),gtk)
		108	! PLATFORMINC=-I../../include/gtk-xmhtml -I${LOCALBASE}/include
		109	endif
		110	endif
		111
		112	***************
		113	* 192,208 **
		114	# Motif version (default)
		115	ifeq ($(PLATFORM),Motif)
		116
		117	! LIBDIR = -L/usr/X11R6/lib
		118	# This is what is required under Linux (Motif 2.0.1).
		119	# Your mileage may vary.
		120	! LIBS = -lXm -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE
		121
		122	else
		123
		124	# gtk version (only supported port for now)
125	ifeq($(PLATFORM),gtk)
126
127	! LIBDIR = -L/usr/local/lib
128	LIBS = -lgdk -lgtk -lX11
129
130	# endif gtk
131	--- 192,208 ----
132	# Motif version (default)
133	ifeq ($(PLATFORM),Motif)
134
135	! LIBDIR = -L${X11BASE}/lib
136	# This is what is required under Linux (Motif 2.0.1).
137	# Your mileage may vary.
138	! LIBS = ${MOTIFLIB} -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE
139
140	else
141
142	# gtk version (only supported port for now)
143	ifeq($(PLATFORM),gtk)
144
145	! LIBDIR = -L${X11BASE}/lib
146	LIBS = -lgdk -lgtk -lX11
147
148	# endif gtk
149	***************
150	* 308,311 **
151	tools/scansrc.sh ./lib/common > docs/sources.desc
152	tools/scansrc.sh ./lib/Motif >> docs/sources.desc
153	tools/scansrc.sh ./lib/gtk >> docs/sources.desc
154	-
155	--- 308,310 ----