- Update to version 8.13

PR:		61077
Submitted by:	Ports Fury

9 files changed, 161 insertions, 63 deletions

diff --git a/print/ghostscript-afpl/files/chp2200.contrib.mak b/print/ghostscript-afpl/files/cdj850.contrib.mak
index c71ea8ac3512..8faefec5fe4e 100644
--- a/print/ghostscript-afpl/files/chp2200.contrib.mak
+++ b/print/ghostscript-afpl/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/ghostscript-afpl/files/patch-eplaser:gdevescv.c b/print/ghostscript-afpl/files/patch-eplaser:gdevescv.c
index 3578352b1b7e..e52c4569c06a 100644
--- a/print/ghostscript-afpl/files/patch-eplaser:gdevescv.c
+++ b/print/ghostscript-afpl/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	Wed Dec 17 00:51:21 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));
@@ -60,3 +73,21 @@
  private int escv_setlinewidth(gx_device_vector * vdev, floatp width);
  private int escv_setlinecap(gx_device_vector * vdev, gs_line_cap cap);
  private int escv_setlinejoin(gx_device_vector * vdev, gs_line_join join);
+@@ -1570,7 +1596,7 @@
+             pdev->MaskState = 1;
+         }
+ 	color_set_pure(&color, one);
+-	code = gdev_vector_update_fill_color((gx_device_vector *) pdev, &color);
++	code = gdev_vector_update_fill_color((gx_device_vector *) pdev, NULL, &color);
+ 
+ 	/* ここを通過したら以下の色設定は無意味？ */
+     }
+@@ -1669,7 +1695,7 @@
+     if (w <= 0 || h <= 0) return 0;
+     
+     if (depth > 1 ||
+-	gdev_vector_update_fill_color(vdev, pdcolor) < 0 ||
++	gdev_vector_update_fill_color(vdev, NULL, pdcolor) < 0 ||
+ 	gdev_vector_update_clip_path(vdev, pcpath) < 0 ||
+ 	gdev_vector_update_log_op(vdev, lop) < 0
+ 	) 
diff --git a/print/ghostscript-afpl/files/patch-eplaser:gdevesmv.c b/print/ghostscript-afpl/files/patch-eplaser:gdevesmv.c
index b18c7503f5f5..2bcb1b8e273d 100644
--- a/print/ghostscript-afpl/files/patch-eplaser:gdevesmv.c
+++ b/print/ghostscript-afpl/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	Wed Dec 17 00:50:58 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));
@@ -60,3 +73,21 @@
  private int esmv_setlinewidth(gx_device_vector * vdev, floatp width);
  private int esmv_setlinecap(gx_device_vector * vdev, gs_line_cap cap);
  private int esmv_setlinejoin(gx_device_vector * vdev, gs_line_join join);
+@@ -1688,7 +1714,7 @@
+             pdev->MaskState = 1;
+         }
+ 	color_set_pure(&color, one);
+-	code = gdev_vector_update_fill_color((gx_device_vector *) pdev, &color);
++	code = gdev_vector_update_fill_color((gx_device_vector *) pdev, NULL, &color);
+ 
+ 	/* ここを通過したら以下の色設定は無意味？ */
+     }
+@@ -1779,7 +1805,7 @@
+     if (w <= 0 || h <= 0) return 0;
+     
+     if (depth > 1 ||
+-	gdev_vector_update_fill_color(vdev, pdcolor) < 0 ||
++	gdev_vector_update_fill_color(vdev, NULL, pdcolor) < 0 ||
+ 	gdev_vector_update_clip_path(vdev, pcpath) < 0 ||
+ 	gdev_vector_update_log_op(vdev, lop) < 0
+ 	) 
diff --git a/print/ghostscript-afpl/files/patch-lib:pdf_font.ps b/print/ghostscript-afpl/files/patch-lib:pdf_font.ps
new file mode 100644
index 000000000000..28e098c7acd9
--- /dev/null
+++ b/print/ghostscript-afpl/files/patch-lib:pdf_font.ps
@@ -0,0 +1,15 @@
+--- lib/pdf_font.ps.orig	Fri Oct 24 02:45:33 2003
++++ lib/pdf_font.ps	Thu Dec 18 23:11:07 2003
+@@ -1113,10 +1113,12 @@
+ 
+ /buildCIDType0 {	% <CIDFontType0-font-resource> buildCIDType0 <font>
+   dup /BaseFont get exch 1 index findCIDFont
++  addCIDmetrics /CIDFont defineresource
+ } bdef
+ 
+ /buildCIDType2 {	% <CIDFontType2-font-resource> buildCIDType2 <font>
+   dup /BaseFont get exch 1 index findCIDFont
++  addCIDmetrics /CIDFont defineresource
+ } bdef
+ 
+ /processCIDToGIDMap { % <fontres> <cidfont> processCIDToGIDMap <fontres> <cidfont>
diff --git a/print/ghostscript-afpl/files/patch-lips:gdevl4v.c b/print/ghostscript-afpl/files/patch-lips:gdevl4v.c
index 91da63b0b63e..15f8af27eda0 100644
--- a/print/ghostscript-afpl/files/patch-lips:gdevl4v.c
+++ b/print/ghostscript-afpl/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
@@ -120,3 +120,21 @@
  	lputs(s, paper);
      }
      pdev->prev_paper_size = paper_size;
+@@ -1881,7 +1906,7 @@
+ 	}
+ 	color_set_pure(&color, one);
+ 	code = gdev_vector_update_fill_color((gx_device_vector *) pdev,
+-					     &color);
++					     NULL, &color);
+     }
+     if (code < 0)
+ 	return 0;
+@@ -2026,7 +2051,7 @@
+     if (w <= 0 || h <= 0)
+ 	return 0;
+     if (depth > 1 ||
+-	gdev_vector_update_fill_color(vdev, pdcolor) < 0 ||
++	gdev_vector_update_fill_color(vdev, NULL, pdcolor) < 0 ||
+ 	gdev_vector_update_clip_path(vdev, pcpath) < 0 ||
+ 	gdev_vector_update_log_op(vdev, lop) < 0)
+ 	return gx_default_fill_mask(dev, data, data_x, raster, id,
diff --git a/print/ghostscript-afpl/files/patch-src:cpca_gdevl4v.c b/print/ghostscript-afpl/files/patch-src:cpca_gdevl4v.c
index 005f7cdf39dc..8e7c323a351d 100644
--- a/print/ghostscript-afpl/files/patch-src:cpca_gdevl4v.c
+++ b/print/ghostscript-afpl/files/patch-src:cpca_gdevl4v.c
@@ -1,5 +1,5 @@
 --- src/cpca_gdevl4v.c.orig	Tue May  7 00:30:00 2002
-+++ src/cpca_gdevl4v.c	Fri Dec  6 04:59:34 2002
++++ src/cpca_gdevl4v.c	Wed Dec 10 19:54:46 2003
 @@ -316,41 +316,35 @@
  };
  
@@ -31,14 +31,13 @@
  
 -lips4v_beginpath(P2(gx_device_vector * vdev, gx_path_type_t type));
 +lips4v_beginpath(gx_device_vector * vdev, gx_path_type_t type);
-+private int
-+lips4v_moveto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
-+	       floatp y, gx_path_type_t type);
  private int
 -lips4v_moveto(P6
 -	      (gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
 -	       floatp y, gx_path_type_t type));
--private int
++lips4v_moveto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
++	       floatp y, gx_path_type_t type);
+ private int
 -lips4v_lineto(P6
 -	      (gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
 -	       floatp y, gx_path_type_t type));
@@ -63,3 +62,21 @@
  private int lips4v_setlinewidth(gx_device_vector * vdev, floatp width);
  private int lips4v_setlinecap(gx_device_vector * vdev, gs_line_cap cap);
  private int lips4v_setlinejoin(gx_device_vector * vdev, gs_line_join join);
+@@ -2296,7 +2290,7 @@
+ 	}
+ 	color_set_pure(&color, one);
+ 	code = gdev_vector_update_fill_color((gx_device_vector *) pdev,
+-					     &color);
++					     NULL, &color);
+     }
+     if (code < 0)
+ 	return 0;
+@@ -2438,7 +2432,7 @@
+     if (w <= 0 || h <= 0)
+ 	return 0;
+     if (depth > 1 ||
+-	gdev_vector_update_fill_color(vdev, pdcolor) < 0 ||
++	gdev_vector_update_fill_color(vdev, NULL, pdcolor) < 0 ||
+ 	gdev_vector_update_clip_path(vdev, pcpath) < 0 ||
+ 	gdev_vector_update_log_op(vdev, lop) < 0)
+ 	return gx_default_fill_mask(dev, data, data_x, raster, id,
diff --git a/print/ghostscript-afpl/files/patch-hp2200:gdevcd8.c b/print/ghostscript-afpl/files/patch-src:gdevcd8.c
index 497acc7d3b65..f92af5b292f4 100644
--- a/print/ghostscript-afpl/files/patch-hp2200:gdevcd8.c
+++ b/print/ghostscript-afpl/files/patch-src:gdevcd8.c
@@ -1,6 +1,6 @@
---- hp2200/gdevcd8.c.orig	Wed Jun 21 20:39:33 2000
-+++ hp2200/gdevcd8.c	Sat Nov 23 03:03:58 2002
-@@ -409,19 +409,19 @@
+--- src/gdevcd8.c.orig	Mon Feb 28 16:01:59 2000
++++ src/gdevcd8.c	Wed Dec 10 21:32:53 2003
+@@ -406,19 +406,19 @@
  };
  
  private int
@@ -29,7 +29,7 @@
      {
  	rescale_byte_wise1x1, rescale_byte_wise1x2
      },
-@@ -574,16 +574,16 @@
+@@ -571,16 +571,16 @@
  };
  
      /* function pointer typedefs for device driver struct */
@@ -51,7 +51,7 @@
  
  typedef struct gx_device_cdj850_s {
      gx_device_common;
-@@ -729,60 +729,60 @@
+@@ -699,52 +699,52 @@
   *  functions.
   */
  private void
@@ -117,21 +117,10 @@
 -     cdj1600_terminate_page(P2(gx_device_printer * pdev, FILE * prn_stream));
 +     cdj1600_terminate_page(gx_device_printer * pdev, FILE * prn_stream);
  
- /*  Functions for the HP2200C */
- private void
--     chp2200_start_raster_mode(P3(gx_device_printer * pdev,
--				 int papersize, FILE * prn_stream));
-+     chp2200_start_raster_mode(gx_device_printer * pdev,
-+				 int papersize, FILE * prn_stream);
- 
- private void
--     chp2200_terminate_page(P2(gx_device_printer * pdev, FILE * prn_stream));
-+     chp2200_terminate_page(gx_device_printer * pdev, FILE * prn_stream);
  
  
- private const gx_device_procs cdj670_procs =
-@@ -855,12 +855,12 @@
- 	       chp2200_terminate_page);
+@@ -804,12 +804,12 @@
+ 		cdj1600_terminate_page);
  
  /* Forward references */
 -private int cdj_put_param_int(P6(gs_param_list *, gs_param_name,
@@ -149,7 +138,7 @@
  
  
  /*  hp_colour_open()
-@@ -1102,73 +1102,73 @@
+@@ -1028,73 +1028,73 @@
  
  /* internal functions */
  private void
@@ -247,7 +236,7 @@
  
  
  private void
-@@ -3393,13 +3393,14 @@
+@@ -2744,13 +2744,14 @@
      (y) = gx_bits_to_color_value((v) & ((1 << (b)) - 1), (b))
  
  private gx_color_index
@@ -266,7 +255,7 @@
  
      switch (pdev->color_info.depth) {
  	case 1:
-@@ -3432,9 +3433,11 @@
+@@ -2783,9 +2784,11 @@
  /* Mapping of RGB colors to gray values. */
  
  private gx_color_index
@@ -280,7 +269,7 @@
      if (gx_color_value_to_byte(r & g & b) == 0xff) {
  	return (gx_color_index) 0;	/* White */
      } else {
-@@ -3522,9 +3525,11 @@
+@@ -2873,9 +2876,11 @@
  }
  
  private gx_color_index
diff --git a/print/ghostscript-afpl/files/patch-src:unix-dll.mak b/print/ghostscript-afpl/files/patch-src:unix-dll.mak
index 2ee0a5c3a0d1..dbecfe241c4d 100644
--- a/print/ghostscript-afpl/files/patch-src:unix-dll.mak
+++ b/print/ghostscript-afpl/files/patch-src:unix-dll.mak
@@ -1,6 +1,6 @@
---- src/unix-dll.mak.orig	Wed Oct 17 19:11:23 2001
-+++ src/unix-dll.mak	Sat Feb  9 04:53:18 2002
-@@ -48,11 +48,9 @@
+--- src/unix-dll.mak.orig	Wed Sep 24 22:41:20 2003
++++ src/unix-dll.mak	Wed Dec 10 19:25:49 2003
+@@ -46,11 +46,9 @@
  
  # shared library
  GS_SONAME=lib$(GS).so
@@ -14,7 +14,7 @@
  
  # Shared object is built by redefining GS_XE in a recursive make.
  
-@@ -60,24 +58,20 @@
+@@ -58,24 +56,20 @@
  
  $(GS_SO): $(GS_SO_MAJOR)
  	$(RM_) $(GS_SO)
@@ -29,7 +29,7 @@
  
  $(GSSOX_XE): $(GS_SO) $(GLSRC)dxmain.c
 -	$(GLCC) -g `gtk-config --cflags` -o $(GSSOX_XE) $(GLSRC)dxmain.c -L$(BINDIR) -l$(GS) `gtk-config --libs`
-+	$(GLCC) `$(GTK_CONFIG) --cflags` -o $(GSSOX_XE) $(GLSRC)dxmain.c -L$(BINDIR) -l$(GS) `$(GTK_CONFIG) --libs`
++	$(GLCC) `pkg-config --cflags gtk+` -o $(GSSOX_XE) $(GLSRC)dxmain.c -L$(BINDIR) -l$(GS) `pkg-config --libs gtk+`
  
  $(GSSOC_XE): $(GS_SO) $(GLSRC)dxmainc.c
 -	$(GLCC) -g -o $(GSSOC_XE) $(GLSRC)dxmainc.c -L$(BINDIR) -l$(GS)
@@ -37,14 +37,15 @@
  
  # ------------------------- Recursive make targets ------------------------- #
  
- SODEFS=LDFLAGS='$(LDFLAGS) $(CFLAGS_SO) -shared -Wl,-soname,$(GS_SONAME_MAJOR)'\
+-SODEFS=LDFLAGS='$(LDFLAGS) $(CFLAGS_SO) -shared -Wl,-soname=$(GS_SONAME_MAJOR)'\
 - GS_XE=$(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR)\
++SODEFS=LDFLAGS='$(LDFLAGS) $(CFLAGS_SO) -shared -Wl,-soname,$(GS_SONAME_MAJOR)'\
 + GS_XE=$(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR)\
   STDIO_IMPLEMENTATION=c\
   DISPLAY_DEV=$(DD)$(SOOBJRELDIR)/display.dev\
   BINDIR=$(BINDIR)/$(SOBINRELDIR)\
-@@ -106,11 +100,9 @@
- 	-mkdir $(libdir)
+@@ -104,11 +98,9 @@
+ 	-mkdir -p $(libdir)
  	$(INSTALL_PROGRAM) $(GSSOC) $(bindir)/$(GSSOC_XENAME)
  	$(INSTALL_PROGRAM) $(GSSOX) $(bindir)/$(GSSOX_XENAME)
 -	$(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME_MAJOR_MINOR)
diff --git a/print/ghostscript-afpl/files/patch-src:unix-gcc.mak b/print/ghostscript-afpl/files/patch-src:unix-gcc.mak
index 0ef8d446ab00..ab8ae52b389b 100644
--- a/print/ghostscript-afpl/files/patch-src:unix-gcc.mak
+++ b/print/ghostscript-afpl/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${LOCALBASE}/include
++XCFLAGS+=-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include
  
  CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)