Complete new patch files for update to version 1.1.7.

3 files changed, 107 insertions, 0 deletions

diff --git a/x11-toolkits/xmhtml/files/patch-af b/x11-toolkits/xmhtml/files/patch-af
new file mode 100644
index 000000000000..c0c6932e90b0
--- /dev/null
+++ b/x11-toolkits/xmhtml/files/patch-af
@@ -0,0 +1,69 @@
+The patch fixes:
+1) <HR> placement
+2) formatting inside <PRE></PRE> (not really nice HTML, but any browser
+   supports it)
+3) "Can't convert XmHTML_DEFAULT_GAMMA" runtime warning
+
+--- XmHTML-1.1.7/lib/common/layout.c.orig	Thu Jan 28 02:10:17 1999
++++ XmHTML-1.1.7/lib/common/layout.c	Mon Jun 12 21:55:01 2000
+@@ -2377,14 +2377,16 @@
+ 	* Linefeeds in rules are divided accross the rule: half above and
+ 	* half below.
+ 	*****/
+-	if(data->linefeed)
++	if(data->linefeed) {
++		box->y += data->linefeed;
+ 		y_offset = data->linefeed/2;
+-	else
++	} else {
+ 		y_offset = data->font->height/2; 
++	}
+ 
+ 	data->y = box->y + y_offset;
+-
+-	/* take height of rule into account as well */
++	
++        /* take height of rule into account as well */
+ 	y_offset += data->height/2;
+ 
+ 	/* full height of the box */
+--- XmHTML-1.1.7/lib/common/parse.c.orig	Wed Jan 20 07:13:08 1999
++++ XmHTML-1.1.7/lib/common/parse.c	Mon Jun 12 01:40:19 2000
+@@ -1258,6 +1258,24 @@
+ 				current == HT_U || current == HT_VAR ||
+ 				current == HT_FONT || current == HT_ZTEXT)
+ 				return(True);
++			
++            /* allow most container elements as well if we can relax */
++			if(!parser->strict_checking &&
++				(current == HT_TABLE || current == HT_TR || current == HT_TH ||
++					current == HT_TD || current == HT_OL || current == HT_UL ||
++					current == HT_DL || current == HT_P || current == HT_DIV ||
++					current == HT_BLOCKQUOTE || current == HT_CENTER ||
++					current == HT_FORM || current == HT_CAPTION ||
++					current == HT_H1 || current == HT_H2 || current == HT_H3 ||
++					current == HT_H4 || current == HT_H5 || current == HT_H6))
++			{
++#ifdef MINIPARSE
++				tag_is_wrong_but_allowed = True;
++#endif
++				/* but always issue a warning */
++				parserCallback(parser, current, state, HTML_VIOLATION);
++				return(True);
++			}
+ 			break;
+ 
+ 		case HT_ZTEXT:
+--- XmHTML-1.1.7/include/XmHTML/resources.h.orig	Sun Dec 13 14:48:46 1998
++++ XmHTML-1.1.7/include/XmHTML/resources.h	Tue Jun 13 02:29:30 2000
+@@ -102,7 +102,9 @@
+ #define _resources_h_
+ 
+ #define Offset(field) XtOffsetOf(XmHTMLRec, html.field)
+-#define Stringify(VAL)	#VAL
++/* Must use cpp prescan for two levels of macros */
++#define Stringify(VAL)  _Stringify(VAL)
++#define _Stringify(VAL) #VAL
+ 
+ static XtResource resources [] =
+ {
diff --git a/x11-toolkits/xmhtml/files/patch-ag b/x11-toolkits/xmhtml/files/patch-ag
new file mode 100644
index 000000000000..214052ee4d24
--- /dev/null
+++ b/x11-toolkits/xmhtml/files/patch-ag
@@ -0,0 +1,19 @@
+*** XmHTML.cf~	Thu Oct  8 23:50:32 1998
+--- XmHTML.cf	Sat Aug  5 14:32:52 2000
+***************
+*** 61,67 ****
+  
+  #define IHaveJPEG YES
+  JPEGINC =
+! JPEGLIB = -ljpeg
+  
+  XCOMM PNG Support. Enabled by default.
+  XCOMM You require libpng, version 0.96 or above. If you don't have this lib
+--- 61,67 ----
+  
+  #define IHaveJPEG YES
+  JPEGINC =
+! JPEGLIB = -L${LOCALBASE}/lib -ljpeg
+  
+  XCOMM PNG Support. Enabled by default.
+  XCOMM You require libpng, version 0.96 or above. If you don't have this lib
diff --git a/x11-toolkits/xmhtml/files/patch-ah b/x11-toolkits/xmhtml/files/patch-ah
new file mode 100644
index 000000000000..b70efb80f5c8
--- /dev/null
+++ b/x11-toolkits/xmhtml/files/patch-ah
@@ -0,0 +1,19 @@
+*** book/Makefile.org	Wed Dec 23 04:58:46 1998
+--- book/Makefile	Sat Aug  5 18:08:51 2000
+***************
+*** 12,18 ****
+  
+  # The library
+  XMHTMLINC= -I../lib
+! XMHTMLLIB= -L../lib -lXmHTML
+  LINKLIBS = $(XMHTMLLIB) $(LOADLIBES) $(DMALLOCLIB)
+  
+  # rule to create .o files from .c files 
+--- 12,18 ----
+  
+  # The library
+  XMHTMLINC= -I../lib
+! XMHTMLLIB= ../lib/libXmHTML.la
+  LINKLIBS = $(XMHTMLLIB) $(LOADLIBES) $(DMALLOCLIB)
+  
+  # rule to create .o files from .c files