7 files changed, 174 insertions, 69 deletions

diff --git a/print/ghostscript7/files/chp2200.contrib.mak b/print/ghostscript7/files/cdj850.contrib.mak
index c71ea8ac3512..8faefec5fe4e 100644
--- a/print/ghostscript7/files/chp2200.contrib.mak
+++ b/print/ghostscript7/files/cdj850.contrib.mak
@@ -1,5 +1,4 @@
-### --------------- The H-P Buisiness Inkjet 2200 devices --------------- ###
-
+###- cdj850 - HP 850 Driver under development -------- ###
 cdeskjet8_=$(GLOBJ)gdevcd8.$(OBJ) $(HPPCL)
 
 $(DD)cdj670.dev : $(cdeskjet8_) $(DD)page.dev
@@ -17,9 +16,6 @@ $(DD)cdj890.dev : $(cdeskjet8_) $(DD)page.dev
 $(DD)cdj1600.dev : $(cdeskjet8_) $(DD)page.dev
 	$(SETPDEV2) $(DD)cdj1600 $(cdeskjet8_)
 
-$(DD)chp2200.dev : $(cdeskjet8_) $(DD)page.dev
-	$(SETPDEV2) $(DD)chp2200 $(cdeskjet8_)
-
 $(GLOBJ)gdevcd8.$(OBJ) : $(GLSRC)gdevcd8.c $(PDEVH) $(math__h)\
  $(gsparam_h) $(gxlum_h) $(gdevpcl_h)
 	$(GLCC) $(GLO_)gdevcd8.$(OBJ) $(C_) $(GLSRC)gdevcd8.c
diff --git a/print/ghostscript7/files/patch-eplaser:gdevescv.c b/print/ghostscript7/files/patch-eplaser:gdevescv.c
index 3578352b1b7e..4ed38872e8b4 100644
--- a/print/ghostscript7/files/patch-eplaser:gdevescv.c
+++ b/print/ghostscript7/files/patch-eplaser:gdevescv.c
@@ -1,15 +1,28 @@
---- eplaser/gdevescv.c.orig	Fri Jul 25 20:59:58 2003
-+++ eplaser/gdevescv.c	Tue Sep  9 22:03:50 2003
-@@ -37,8 +37,6 @@
+--- eplaser/gdevescv.c.orig	Thu Oct 30 21:41:16 2003
++++ eplaser/gdevescv.c	Thu Dec 18 17:51:49 2003
+@@ -37,10 +37,6 @@
  
   */
  
 -#include <stdlib.h>
 -#include <unistd.h>
- #include <string.h>
- 
+-#include <string.h>
+-
  #include "math_.h"
-@@ -321,6 +319,16 @@
+ #include "gx.h"
+ #include "gserrors.h"
+@@ -62,6 +58,10 @@
+ #include "gspath.h"
+ #include "gzpath.h"
+ 
++#include <stdlib.h>
++#include <unistd.h>
++#include <string.h>
++
+ /* ---------------- Device definition ---------------- */
+ 
+ /* Device procedures */
+@@ -335,6 +335,16 @@
  };
  
  /* Vector device implementation */
@@ -26,7 +39,7 @@
  private int escv_beginpage(P1(gx_device_vector * vdev));
  private int escv_setfillcolor(P2(gx_device_vector * vdev, const gx_drawing_color * pdc));
  private int escv_setstrokecolor(P2(gx_device_vector * vdev, const gx_drawing_color * pdc));
-@@ -329,10 +337,25 @@
+@@ -343,10 +353,25 @@
  private int escv_setflat(P2(gx_device_vector * vdev, floatp flatness));
  private int escv_setlogop(P3(gx_device_vector * vdev, gs_logical_operation_t lop, 
  			       gs_logical_operation_t diff));
@@ -52,7 +65,7 @@
  private int escv_beginpath(P2(gx_device_vector * vdev, gx_path_type_t type));
  private int escv_moveto(P6(gx_device_vector * vdev, floatp x0, floatp y0,
  			   floatp x, floatp y, gx_path_type_t type));
-@@ -345,6 +368,7 @@
+@@ -359,6 +384,7 @@
  				floatp x_start, floatp y_start, gx_path_type_t type));
  
  private int escv_endpath(P2(gx_device_vector * vdev, gx_path_type_t type));
diff --git a/print/ghostscript7/files/patch-eplaser:gdevesmv.c b/print/ghostscript7/files/patch-eplaser:gdevesmv.c
index b18c7503f5f5..d13f9da40e51 100644
--- a/print/ghostscript7/files/patch-eplaser:gdevesmv.c
+++ b/print/ghostscript7/files/patch-eplaser:gdevesmv.c
@@ -1,15 +1,28 @@
---- eplaser/gdevesmv.c.orig	Tue Aug 26 19:45:23 2003
-+++ eplaser/gdevesmv.c	Tue Sep  9 22:08:25 2003
-@@ -34,8 +34,6 @@
+--- eplaser/gdevesmv.c.orig	Tue Oct 28 19:40:09 2003
++++ eplaser/gdevesmv.c	Thu Dec 18 17:52:35 2003
+@@ -34,10 +34,6 @@
  
   */
  
 -#include <stdlib.h>
 -#include <unistd.h>
- #include <string.h>
- 
+-#include <string.h>
+-
  #include "math_.h"
-@@ -407,6 +405,16 @@
+ #include "gx.h"
+ #include "gserrors.h"
+@@ -59,6 +55,10 @@
+ #include "gspath.h"
+ #include "gzpath.h"
+ 
++#include <stdlib.h>
++#include <unistd.h>
++#include <string.h>
++
+ /* ---------------- Device definition ---------------- */
+ 
+ /* Device procedures */
+@@ -428,6 +428,16 @@
  
  
  /* Vector device implementation */
@@ -26,7 +39,7 @@
  private int esmv_beginpage(P1(gx_device_vector * vdev));
  private int esmv_setfillcolor(P2(gx_device_vector * vdev, const gx_drawing_color * pdc));
  private int esmv_setstrokecolor(P2(gx_device_vector * vdev, const gx_drawing_color * pdc));
-@@ -415,10 +423,25 @@
+@@ -436,10 +446,25 @@
  private int esmv_setflat(P2(gx_device_vector * vdev, floatp flatness));
  private int esmv_setlogop(P3(gx_device_vector * vdev, gs_logical_operation_t lop, 
  			       gs_logical_operation_t diff));
@@ -52,7 +65,7 @@
  private int esmv_beginpath(P2(gx_device_vector * vdev, gx_path_type_t type));
  private int esmv_moveto(P6(gx_device_vector * vdev, floatp x0, floatp y0,
  			   floatp x, floatp y, gx_path_type_t type));
-@@ -431,6 +454,7 @@
+@@ -452,6 +477,7 @@
  				floatp x_start, floatp y_start, gx_path_type_t type));
  
  private int esmv_endpath(P2(gx_device_vector * vdev, gx_path_type_t type));
diff --git a/print/ghostscript7/files/patch-lib:gs_ttf.ps b/print/ghostscript7/files/patch-lib:gs_ttf.ps
index 70f8e1fda27f..669b71760672 100644
--- a/print/ghostscript7/files/patch-lib:gs_ttf.ps
+++ b/print/ghostscript7/files/patch-lib:gs_ttf.ps
@@ -1,5 +1,5 @@
 --- lib/gs_ttf.ps.orig	Sat Apr 12 23:02:38 2003
-+++ lib/gs_ttf.ps	Fri Jul 25 13:25:33 2003
++++ lib/gs_ttf.ps	Sat Jan 10 00:51:05 2004
 @@ -575,7 +575,7 @@
    (maxp) 1 index
    (name) 1 index
@@ -31,13 +31,56 @@
    } if
    counttomark 0 ne { .dicttomark } { pop pop } ifelse
    /XUID [orgXUID 42 curxuid]
-@@ -1119,41 +1126,52 @@
+@@ -1097,9 +1104,26 @@
+ % 4	2	Offset	Coverage(--)
+ % 6	2	uint16	GlyphCount
+ % 8	2	GlyphID	Substitute(vertically oriented glyphs)
+-% --	2	uint16	SubstFormat
+-% +2	2	uint16	GlyphCount(same as above GlyphCount)
+-% +4	2	GlyphID	GlyphArray(horizontally oriented glyphs)
++%
++% [Coverage Format 1, Individual glyph indices]
++% Index Size    Type    Name of Entry
++% -----------------------------------
++% 0     2       uint16  CoverageFormat (Format identifier-format = 1)
++% 2     2       uint16  GlyphCount (same as above GlyphCount)
++% 4     2       GlyphID GlyphArray (horizontally oriented glyphs)
++%
++% [Coverage Format 2, Range of glyphs
++% Index Size    Type    Name of Entry
++% -----------------------------------
++% 0     2       uint16  CoverageFormat (Format identifier-format = 2)
++% 2     2       uint16  RangeCount
++% 4     2       struct  RangeRecord[RangeCount]
++% [RangeRecord]
++% Index Size    Type    Name of Entry
++% -----------------------------------
++% 0     2       GlyphID First GlyphID in the range
++% 2     2       GlyphID Last GlyphID in the range
++% 4     2       uint16  Coverage Index of first GlpyhID in range
+ % -----------------------------------
+ % References
+ % 1. http://www.microsoft.com/typography/OTSPEC/gsub.htm
+@@ -1110,50 +1134,101 @@
+   /gsubh2v null def
+   tabdict /GSUB .knownget { % if
+     dup /gsubver exch 0 getu32 def
+-    %dup /gsubosl exch 4 getu16 12 add def
+-    %dup /gsubofl exch 6 getu16 12 add def
+-    dup /gsuboll exch 8 getu16 12 add def
++    %dup /gsubosl exch 4 getu16 def
++    %dup /gsubofl exch 6 getu16 def
++    dup /gsuboll exch 8 getu16 def
+     DEBUG {
+       (gsubver: ) print gsubver =
+       %(gsubosl: ) print gsubosl =
        %(gsubofl: ) print gsubofl =
        (gsuboll: ) print gsuboll =
      } if
 -    dup /gsubfmt exch gsuboll 0 add getu16 def
 +    % /gsuboll should be pointed out the LookupList table, but not Lookup table.
-+    % so this is wrong: dup /gsubfmt exch gsuboll 0 add getu16 def
++    % so this is wrong:
++    % dup /gsubfmt exch gsuboll 0 add getu16 def
 +    dup /gsublc exch gsuboll 0 add getu16 def
      DEBUG {
 -      (gsubfmt: ) print gsubfmt =
@@ -55,7 +98,9 @@
 +    gsublc 0 ne {
 +      0 1 gsublc 1 sub {
 +	2 mul /gsubolt exch 2 index exch gsuboll 2 add add getu16 gsuboll add def
-+	dup /gsubfmt exch gsubolt 0 add getu16 def
++	dup /gsubltype exch gsubolt 0 add getu16 def
++	dup /gsublflag exch gsubolt 2 add getu16 def
++	dup /gsubsubc exch gsubolt 4 add getu16 def
  	DEBUG {
 -	  (gsubocv: ) print gsubocv =
 -	  (gsubglc: ) print gsubglc =
@@ -66,8 +111,75 @@
 -	    gsubhog exch getu16 =only
 -	    (->) =only
 -	    gsubvog exch getu16 =
--	  } for
-+	  (gsubfmt: ) print gsubfmt =
++	  (gsubolt: ) print gsubolt =
++	  (gsubltype: ) print gsubltype =
++	  (gsublflag: ) print gsublflag =
++	  (gsubsubc: ) print gsubsubc =
++	} if
++	gsubsubc 0 ne {
++	  0 1 gsubsubc 1 sub {
++	    2 mul /gsubost exch 2 index exch gsubolt 6 add add getu16 gsubolt add def
++	    dup /substfmt exch gsubost 0 add getu16 def
++	    DEBUG {
++	      (gsubost: ) print gsubost =
++	      (substfmt: ) print substfmt =
++	    } if
++%	    gsubver 16#00010000 eq { % ifelse
++	    gsubltype 1 eq substfmt 2 eq and { % ifelse
++	      dup /gsubocv exch gsubost 2 add getu16 def
++	      dup /gsubglc exch gsubost 4 add getu16 def
++	      % hacked by suzuki toshiya at 2001/3/6
++	      %dup /gsubvog exch gsubost 6 add gsubglc getinterval def
++	      %dup /gsubhog exch gsubost gsubocv add 4 add gsubglc getinterval def
++	      dup /gsubvog exch gsubost 6 add gsubglc 2 mul getinterval def
++	      dup /cvfmt exch gsubost gsubocv add 0 add getu16 def
++	      dup /cvglc exch gsubost gsubocv add 2 add getu16 def
++	      dup /gsubhog exch gsubost gsubocv add 4 add cvglc 2 mul getinterval def
++	      DEBUG {
++		(gsubocv: ) print gsubocv =
++		(gsubglc: ) print gsubglc =
++		(cvfmt: ) print cvfmt =
++
++		(gsubhog->gsubvog ) =
++		0 2 gsubhog length 2 sub { % for
++		  dup
++		  gsubhog exch getu16 =only
++		  (->) =only
++		  gsubvog exch getu16 =
++		} for
++	      } if
++	      cvfmt 1 eq {
++		/gsubh2v << 0 2 gsubhog length 2 sub {
++		  dup gsubhog exch getu16
++		  exch gsubvog exch getu16
++		} for >> def
++	      } {
++		cvfmt 2 eq {
++		  /gsubh2v << 0 6 gsubhog length 6 sub {
++		    dup 0 add /fgid exch gsubhog exch getu16 def
++		    dup 2 add /lgid exch gsubhog exch getu16 def
++		    4 add /cvidx exch gsubhog exch getu16 def
++		    DEBUG {
++		      (fgid: ) print fgid =
++		      (lgid: ) print lgid =
++		      (cvidx: ) print cvidx =
++		    } if
++		    fgid 1 lgid {
++		      dup cvidx add fgid sub
++		      exch gsubvog exch getu16
++		    } for
++		  } for >> def
++		} {
++		  %(UNKNWON COVERAGE FORMAT.) = flush
++		} ifelse
++	      } ifelse
++	    } {
++	      %(UNKNOWN GSUB FORMAT.) = flush
++	    } ifelse
++%	    } {
++%	      (ILLEGAL GSUB VERSION.) = flush
++%	    } ifelse
+ 	  } for
  	} if
 -	/gsubh2v << 0 2 gsubhog length 2 sub {
 -	  dup gsubhog exch getu16
@@ -79,37 +191,6 @@
 -%    } {
 -%      (ILLEGAL GSUB VERSION.) = flush
 -%    } ifelse
-+%	gsubver 16#00010000 eq { % ifelse
-+	gsubfmt 2 eq { % ifelse
-+	  dup /gsubocv exch gsubolt 2 add getu16 def
-+	  dup /gsubglc exch gsubolt 4 add getu16 def
-+	  % hacked by suzuki toshiya at 2001/3/6
-+	  %dup /gsubvog exch gsubolt 6 add gsubglc getinterval def
-+	  %dup /gsubhog exch gsubolt gsubocv add 4 add gsubglc getinterval def
-+	  dup /gsubvog exch gsubolt 6 add gsubglc 2 mul getinterval def
-+	  dup /gsubhog exch gsubolt gsubocv add 4 add gsubglc 2 mul getinterval def
-+	  DEBUG {
-+	    (gsubocv: ) print gsubocv =
-+	    (gsubglc: ) print gsubglc =
-+
-+	    (gsubhog->gsubvog ) =
-+	    0 2 gsubhog length 2 sub { % for
-+	      dup
-+	      gsubhog exch getu16 =only
-+	      (->) =only
-+	      gsubvog exch getu16 =
-+	    } for
-+	  } if
-+	  /gsubh2v << 0 2 gsubhog length 2 sub {
-+	    dup gsubhog exch getu16
-+	    exch gsubvog exch getu16
-+	  } for >> def
-+        } {
-+	  %(UNKNOWN GSUB FORMAT.) = flush
-+        } ifelse
-+%       } {
-+%         (ILLEGAL GSUB VERSION.) = flush
-+%       } ifelse
 +      } for
 +    } if
      pop
diff --git a/print/ghostscript7/files/patch-lips:gdevl4v.c b/print/ghostscript7/files/patch-lips:gdevl4v.c
index 91da63b0b63e..93e0be613626 100644
--- a/print/ghostscript7/files/patch-lips:gdevl4v.c
+++ b/print/ghostscript7/files/patch-lips:gdevl4v.c
@@ -1,5 +1,5 @@
 --- lips/gdevl4v.c.orig	Thu Nov  2 12:09:18 2000
-+++ lips/gdevl4v.c	Fri Sep 12 10:11:25 2003
++++ lips/gdevl4v.c	Wed Dec 10 19:42:42 2003
 @@ -230,41 +230,66 @@
  };
  
@@ -33,7 +33,7 @@
 +private int
 +lips4v_moveto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
 +	       floatp y, gx_path_type_t type);
-+private int
+ private int
 +lips4v_lineto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
 +	       floatp y, gx_path_type_t type);
 +private int
@@ -42,7 +42,8 @@
 +		gx_path_type_t type);
 +lips4v_closepath(gx_device_vector * vdev, floatp x, floatp y, floatp x_start,
 +		  floatp y_start, gx_path_type_t type);
-+
+ 
+-lips4v_beginpath(P2(gx_device_vector * vdev, gx_path_type_t type));
 +private int lips4v_endpath(gx_device_vector * vdev, gx_path_type_t type);
 +#else
 +private int lips4v_beginpage(P1(gx_device_vector * vdev));
@@ -56,9 +57,8 @@
 +private int
 +lips4v_setlogop(gx_device_vector * vdev, gs_logical_operation_t lop,
 +		 gs_logical_operation_t diff);
- private int
- 
--lips4v_beginpath(P2(gx_device_vector * vdev, gx_path_type_t type));
++private int
++
 +lips4v_beginpath(gx_device_vector * vdev, gx_path_type_t type);
  private int
 -lips4v_moveto(P6
diff --git a/print/ghostscript7/files/patch-lips:gdevlips.mak b/print/ghostscript7/files/patch-lips:gdevlips.mak
index ec0e03e7064d..a434f739a5fa 100644
--- a/print/ghostscript7/files/patch-lips:gdevlips.mak
+++ b/print/ghostscript7/files/patch-lips:gdevlips.mak
@@ -1,6 +1,6 @@
 --- lips/gdevlips.mak.orig	Thu Nov  2 12:12:13 2000
-+++ lips/gdevlips.mak	Fri Sep 12 09:34:24 2003
-@@ -1,6 +1,8 @@
++++ lips/gdevlips.mak	Sat Sep 27 22:16:20 2003
+@@ -1,17 +1,19 @@
  # ---------------- Laser Printer devices ---------------- #
  # $Id: gdevlips.mak $
  
@@ -8,8 +8,10 @@
 +
  $(GLOBJ)gdevlprn.$(OBJ): $(GLSRC)gdevlprn.c $(GLSRC)gdevlprn.h\
   $(gdevprn_h) $(PDEVH)
- 	$(GLCC) $(GLO_)gdevlprn.$(OBJ) $(C_) $(GLSRC)gdevlprn.c
-@@ -9,9 +11,9 @@
+-	$(GLCC) $(GLO_)gdevlprn.$(OBJ) $(C_) $(GLSRC)gdevlprn.c
++	$(GLCC) $(GLO_)gdevlprn.$(OBJ) $(C_) $(lips_opts) $(GLSRC)gdevlprn.c
+ 
+ ### --- The Canon LIPS II+/III/IVc/IV printer device --- ###
  
  lipsr_=$(GLOBJ)gdevl4r.$(OBJ) $(GLOBJ)gdevlips.$(OBJ) $(GLOBJ)gdevlprn.$(OBJ)
  $(GLOBJ)gdevl4r.$(OBJ): $(GLSRC)gdevl4r.c $(GLSRC)gdevlips.h $(PDEVH)
diff --git a/print/ghostscript7/files/patch-src:unix-gcc.mak b/print/ghostscript7/files/patch-src:unix-gcc.mak
index 22920fb1f675..e09585bae9f3 100644
--- a/print/ghostscript7/files/patch-src:unix-gcc.mak
+++ b/print/ghostscript7/files/patch-src:unix-gcc.mak
@@ -93,7 +93,7 @@
  #   specific stuff that <math.h> typically needs; nevertheless, we expect
  #   gcc to accept ANSI-style function prototypes and function definitions.
 -XCFLAGS=
-+XCFLAGS+=-I${.CURDIR}/gimp-print -I${LOCALBASE}/include
++XCFLAGS+=-I${.CURDIR}/gimp-print -I${LOCALBASE}/include/libpng -I${LOCALBASE}/include
  
  CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)