[SM-Commit] GIT changes to master grimoire by George Sherwood (309116d79ba06bd1f5563e24ce6fe839d354ea26)

George Sherwood scm at sourcemage.org
Sat May 8 10:18:14 EDT 2010


GIT changes to master grimoire by George Sherwood <gsherwood at sourcemage.org>:

 printer/ghostscript/DETAILS           |    1 
 printer/ghostscript/HISTORY           |    5 ++
 printer/ghostscript/PRE_BUILD         |    3 +
 printer/ghostscript/ghostscript.patch |   78 ++++++++++++++++++++++++++++++++++
 4 files changed, 87 insertions(+)

New commits:
commit 309116d79ba06bd1f5563e24ce6fe839d354ea26
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    ghostscript: Added upstream patch to fix Bug #15706

diff --git a/printer/ghostscript/DETAILS b/printer/ghostscript/DETAILS
index c10ecc5..ba0845e 100755
--- a/printer/ghostscript/DETAILS
+++ b/printer/ghostscript/DETAILS
@@ -6,6 +6,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://ghostscript.com/releases/$SOURCE
         WEB_SITE=http://www.ghostscript.com/awki
       LICENSE[0]=GPL
+      PATCHLEVEL=1
          ENTERED=20010922
         KEYWORDS="interpreter postscript printer"
            SHORT="interpreter for the PostScript language"
diff --git a/printer/ghostscript/HISTORY b/printer/ghostscript/HISTORY
index 57b8084..0f9bb05 100644
--- a/printer/ghostscript/HISTORY
+++ b/printer/ghostscript/HISTORY
@@ -1,3 +1,8 @@
+2010-05-08 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: PATCHLEVEL++
+	* PRE_BUILD: Added to patch
+	* ghostscript.patch: Added upstream patch.  Bug #15706
+
 2010-02-11 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 8.71
 
diff --git a/printer/ghostscript/PRE_BUILD b/printer/ghostscript/PRE_BUILD
new file mode 100755
index 0000000..b22a0de
--- /dev/null
+++ b/printer/ghostscript/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/ghostscript.patch
diff --git a/printer/ghostscript/ghostscript.patch b/printer/ghostscript/ghostscript.patch
new file mode 100644
index 0000000..826c029
--- /dev/null
+++ b/printer/ghostscript/ghostscript.patch
@@ -0,0 +1,78 @@
+diff --git a/cups/gdevcups.c b/cups/gdevcups.c
+index 551b806..4000abf 100644
+--- a/cups/gdevcups.c
++++ b/cups/gdevcups.c
+@@ -975,7 +975,8 @@ cups_map_cmyk(gx_device *pdev,		/* I - Device info */
+ 	      frac      k,		/* I - Black value */
+ 	      frac      *out)		/* O - Device colors */
+ {
+-  int	c0, c1, c2, c3;			/* Temporary color values */
++  int	c0 = 0, c1 = 0,
++        c2 = 0, c3 = 0;			/* Temporary color values */
+   float	rr, rg, rb,			/* Real RGB colors */
+ 	ciex, ciey, ciez,		/* CIE XYZ colors */
+ 	ciey_yn,			/* Normalized luminance */
+@@ -2703,9 +2704,13 @@ cups_put_params(gx_device     *pdev,	/* I - Device info */
+   int			color_set;	/* Were the color attrs set? */
+   gdev_prn_space_params	sp;		/* Space parameter data */
+   int			width,		/* New width of page */
+-                        height;		/* New height of page */
++                        height,		/* New height of page */
++                        colorspace,     /* New color space */
++                        bitspercolor;   /* New bits per color */
+   static int            width_old = 0,  /* Previous width */
+-                        height_old = 0; /* Previous height */
++                        height_old = 0, /* Previous height */
++                        colorspace_old = 0,/* Previous color space */
++                        bitspercolor_old = 0;/* Previous bits per color */
+   ppd_attr_t            *backside = NULL,
+                         *backsiderequiresflippedmargins = NULL;
+   float                 swap;
+@@ -2800,9 +2805,10 @@ cups_put_params(gx_device     *pdev,	/* I - Device info */
+   else if (code == 0) \
+   { \
+     dprintf1("DEBUG: Setting %s to", sname); \
+-    for (i = 0; i < count; i ++) \
+-      dprintf1(" %d", (unsigned)(arrayval.data[i]));	 \
+-      cups->header.name[i] = (unsigned)arrayval.data[i]; \
++    for (i = 0; i < count; i ++) { \
++      dprintf1(" %d", (unsigned)(arrayval.data[i])); \
++      cups->header.name[i] = (unsigned)(arrayval.data[i]); \
++    } \
+     dprintf("...\n"); \
+   }
+ 
+@@ -3243,23 +3249,31 @@ cups_put_params(gx_device     *pdev,	/* I - Device info */
+     }
+ #endif /* CUPS_RASTER_SYNCv1 */
+ 
++    colorspace = cups->header.cupsColorSpace;
++    bitspercolor = cups->header.cupsBitsPerColor;
++
+    /*
+     * Don't reallocate memory unless the device has been opened...
+     * Also reallocate only if the size has actually changed...
+     */
+ 
+-    if (pdev->is_open && (width != width_old || height != height_old))
++    if (pdev->is_open &&
++	(width != width_old || height != height_old ||
++	 colorspace != colorspace_old || bitspercolor != bitspercolor_old))
+     {
+ 
+       width_old = width;
+       height_old = height;
++      colorspace_old = colorspace;
++      bitspercolor_old = bitspercolor;
+ 
+      /*
+       * Device is open and size has changed, so reallocate...
+       */
+ 
+-      dprintf4("DEBUG2: Reallocating memory, [%.0f %.0f] = %dx%d pixels...\n",
+-	       pdev->MediaSize[0], pdev->MediaSize[1], width, height);
++      dprintf6("DEBUG2: Reallocating memory, [%.0f %.0f] = %dx%d pixels, color space: %d, bits per color: %d...\n",
++	       pdev->MediaSize[0], pdev->MediaSize[1], width, height,
++	       colorspace, bitspercolor);
+ 
+       sp = ((gx_device_printer *)pdev)->space_params;



More information about the SM-Commit mailing list