Fix build with gcc-3.4.2

PR:		ports/69923
Submitted by:	Ports Fury

2 files changed, 25 insertions, 9 deletions

diff --git a/print/ghostscript-gpl/files/patch-eplaser:gdevescv.c b/print/ghostscript-gpl/files/patch-eplaser:gdevescv.c
index e52c4569c06a..e9f51746ab22 100644
--- a/print/ghostscript-gpl/files/patch-eplaser:gdevescv.c
+++ b/print/ghostscript-gpl/files/patch-eplaser:gdevescv.c
@@ -1,5 +1,5 @@
---- eplaser/gdevescv.c.orig	Thu Oct 30 21:41:16 2003
-+++ eplaser/gdevescv.c	Wed Dec 17 00:51:21 2003
+--- eplaser/gdevescv.c.orig	Mon May 17 14:25:19 2004
++++ eplaser/gdevescv.c	Mon Aug  2 14:04:30 2004
 @@ -37,10 +37,6 @@
  
   */
@@ -22,7 +22,7 @@
  /* ---------------- Device definition ---------------- */
  
  /* Device procedures */
-@@ -335,6 +335,16 @@
+@@ -342,6 +342,16 @@
  };
  
  /* Vector device implementation */
@@ -39,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));
-@@ -343,10 +353,25 @@
+@@ -350,10 +360,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));
@@ -65,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));
-@@ -359,6 +384,7 @@
+@@ -366,6 +391,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));
@@ -73,7 +73,7 @@
  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 @@
+@@ -1578,7 +1604,7 @@
              pdev->MaskState = 1;
          }
  	color_set_pure(&color, one);
@@ -82,7 +82,14 @@
  
  	/* ここを通過したら以下の色設定は無意味？ */
      }
-@@ -1669,7 +1695,7 @@
+@@ -1671,13 +1697,13 @@
+ 		 gs_logical_operation_t lop, const gx_clip_path * pcpath)
+ {
+     gx_device_vector const	*vdev = (gx_device_vector *) dev;
+-    gx_device_escv const	*pdev = (gx_device_escv *) dev;
++    gx_device_escv		*pdev = (gx_device_escv *) dev;
+     stream			*s = gdev_vector_stream(vdev);
+ 
      if (w <= 0 || h <= 0) return 0;
      
      if (depth > 1 ||
diff --git a/print/ghostscript-gpl/files/patch-eplaser:gdevesmv.c b/print/ghostscript-gpl/files/patch-eplaser:gdevesmv.c
index 2bcb1b8e273d..0d56322a5eb8 100644
--- a/print/ghostscript-gpl/files/patch-eplaser:gdevesmv.c
+++ b/print/ghostscript-gpl/files/patch-eplaser:gdevesmv.c
@@ -1,5 +1,5 @@
---- eplaser/gdevesmv.c.orig	Tue Oct 28 19:40:09 2003
-+++ eplaser/gdevesmv.c	Wed Dec 17 00:50:58 2003
+--- eplaser/gdevesmv.c.orig	Mon May 17 14:25:19 2004
++++ eplaser/gdevesmv.c	Mon Aug  2 14:05:21 2004
 @@ -34,10 +34,6 @@
  
   */
@@ -82,6 +82,15 @@
  
  	/* ここを通過したら以下の色設定は無意味？ */
      }
+@@ -1771,7 +1797,7 @@
+ 		 gs_logical_operation_t lop, const gx_clip_path * pcpath)
+ {
+     gx_device_vector const	*vdev = (gx_device_vector *) dev;
+-    gx_device_esmv const	*pdev = (gx_device_esmv *) dev;
++    gx_device_esmv		*pdev = (gx_device_esmv *) dev;
+     stream			*s = gdev_vector_stream(vdev);
+     gx_color_index		color = gx_dc_pure_color(pdcolor);
+     char			obuf[64];
 @@ -1779,7 +1805,7 @@
      if (w <= 0 || h <= 0) return 0;