rpms/ghostscript
5
0
Fork 0
Code Issues Pull Requests Releases Activity

9.05.

Browse Source
This commit is contained in:
Tim Waugh 2012-02-09 12:38:44 +00:00
parent e7cddeec9c
commit 133be3feed
10 changed files with 25 additions and 473 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -30,3 +30,4 @@ ghostscript-8.71.tar.xz
/ghostscript-9.01.tar.bz2 /ghostscript-9.01.tar.bz2
/ghostscript-9.02.tar.bz2 /ghostscript-9.02.tar.bz2
/ghostscript-9.04.tar.bz2 /ghostscript-9.04.tar.bz2
/ghostscript-9.05.tar.bz2

17
ghostscript-SEAC.patch
View File

@ -1,17 +0,0 @@
diff -up ghostscript-9.04/base/gxtype1.c.SEAC ghostscript-9.04/base/gxtype1.c
--- ghostscript-9.04/base/gxtype1.c.SEAC 2011-08-05 12:12:20.000000000 +0100
+++ ghostscript-9.04/base/gxtype1.c 2011-11-08 09:30:19.000262809 +0000
@@ -409,7 +409,12 @@ gs_type1_piece_codes(/*const*/ gs_font_t
cnext;
goto out;
case c2_shortint:
- cip += 2;
+ {
+ short sint = *cip++;
+ sint = (sint << 8) + *cip++;
+ CS_CHECK_PUSH(csp, cstack);
+ *++csp = int2fixed(sint);
+ }
break;
case c2_hstemhm:
hhints += ((csp - cstack) + 1) / 2;

19
ghostscript-cups-filters.patch
View File

@ -1,16 +1,15 @@
diff -up ghostscript-9.02/cups/cups.mak.cups-filters ghostscript-9.02/cups/cups.mak diff -up ghostscript-9.05/cups/cups.mak.cups-filters ghostscript-9.05/cups/cups.mak
--- ghostscript-9.02/cups/cups.mak.cups-filters 2011-02-28 22:31:28.000000000 +0000 --- ghostscript-9.05/cups/cups.mak.cups-filters 2012-02-08 08:48:50.000000000 +0000
+++ ghostscript-9.02/cups/cups.mak 2011-04-04 12:39:23.691844891 +0100 +++ ghostscript-9.05/cups/cups.mak 2012-02-09 11:42:22.211731587 +0000
@@ -56,10 +56,8 @@ install-cups: cups @@ -56,9 +56,9 @@ install-cups: cups
$(INSTALL_PROGRAM) $(GSTORASTER_XE) $(DESTDIR)$(CUPSSERVERBIN)/filter; \ $(INSTALL_PROGRAM) $(GSTORASTER_XE) $(DESTDIR)$(CUPSSERVERBIN)/filter; \
fi fi
$(INSTALL_PROGRAM) cups/pstopxl $(DESTDIR)$(CUPSSERVERBIN)/filter $(INSTALL_PROGRAM) cups/gstopxl $(DESTDIR)$(CUPSSERVERBIN)/filter
- -mkdir -p $(DESTDIR)$(CUPSSERVERROOT) - -mkdir -p $(DESTDIR)$(CUPSSERVERROOT)
- if [ "$(CUPSPDFTORASTER)" = "1" ]; then \
- $(INSTALL_DATA) cups/gstoraster.convs $(DESTDIR)$(CUPSSERVERROOT); \
- fi
+ -mkdir -p $(DESTDIR)$(CUPSDATA)/mime + -mkdir -p $(DESTDIR)$(CUPSDATA)/mime
+ $(INSTALL_DATA) cups/gstoraster.convs $(DESTDIR)$(CUPSDATA)/mime if [ "$(CUPSPDFTORASTER)" = "1" ]; then \
- $(INSTALL_DATA) cups/gstoraster.convs $(DESTDIR)$(CUPSSERVERROOT); \
+ $(INSTALL_DATA) cups/gstoraster.convs $(DESTDIR)$(CUPSDATA)/mime; \
fi
-mkdir -p $(DESTDIR)$(CUPSDATA)/model -mkdir -p $(DESTDIR)$(CUPSDATA)/model
$(INSTALL_DATA) cups/pxlcolor.ppd $(DESTDIR)$(CUPSDATA)/model $(INSTALL_DATA) cups/pxlcolor.ppd $(DESTDIR)$(CUPSDATA)/model
$(INSTALL_DATA) cups/pxlmono.ppd $(DESTDIR)$(CUPSDATA)/model

263
ghostscript-cups-rgbw.patch
View File

@ -1,263 +0,0 @@
diff -up ghostscript-9.04/cups/gdevcups.c.cups-rgbw ghostscript-9.04/cups/gdevcups.c
--- ghostscript-9.04/cups/gdevcups.c.cups-rgbw 2011-08-05 12:12:21.000000000 +0100
+++ ghostscript-9.04/cups/gdevcups.c 2011-08-22 10:54:24.614010581 +0100
@@ -225,6 +225,7 @@ typedef struct gx_device_cups_s
unsigned short EncodeLUT[gx_max_color_value + 1];/* RGB value to output color LUT */
int Density[CUPS_MAX_VALUE + 1];/* Density LUT */
int Matrix[3][3][CUPS_MAX_VALUE + 1];/* Color transform matrix LUT */
+ int user_icc;
int cupsRasterVersion;
/* Used by cups_put_params(): */
@@ -426,6 +427,7 @@ gx_device_cups gs_cups_device =
{0x00}, /* EncodeLUT */
{0x00}, /* Density */
{0x00}, /* Matrix */
+ 0,
3 /* cupsRasterVersion */
};
@@ -1182,15 +1184,18 @@ cups_map_cmyk(gx_device *pdev, /* I - D
case CUPS_CSPACE_RGB :
case CUPS_CSPACE_RGBW :
+ c0 = c + k;
+ c1 = m + k;
+ c2 = y + k;
if (cups->header.cupsColorSpace == CUPS_CSPACE_RGBW) {
- c0 = c;
- c1 = m;
- c2 = y;
- c3 = k;
- } else {
- c0 = c + k;
- c1 = m + k;
- c2 = y + k;
+ if ((k >= frac_1 - 1) ||
+ ((c0 >= frac_1) && (c1 >= frac_1) && (c2 >= frac_1))) {
+ c0 = frac_1;
+ c1 = frac_1;
+ c2 = frac_1;
+ c3 = frac_1;
+ } else
+ c3 = 0;
}
if (c0 < 0)
@@ -1212,11 +1217,12 @@ cups_map_cmyk(gx_device *pdev, /* I - D
out[2] = frac_1 - (frac)cups->Density[c2];
if (cups->header.cupsColorSpace == CUPS_CSPACE_RGBW) {
- if (c3 < 0)
- c3 = 0;
- else if (c3 > frac_1)
- c3 = frac_1;
- out[3] = frac_1 - (frac)cups->Density[c3];
+ if (c3 == 0)
+ out[3] = frac_1;
+ else if (c3 == frac_1)
+ out[3] = 0;
+ else
+ out[3] = frac_1;
}
break;
@@ -2034,10 +2040,15 @@ cups_map_color_rgb(gx_device *pdev,
* cups->DecodeLUT actually maps to RGBW, not CMYK...
*/
- k = cups->DecodeLUT[c3];
- c = cups->DecodeLUT[c0] + k - gx_max_color_value;
- m = cups->DecodeLUT[c1] + k - gx_max_color_value;
- y = cups->DecodeLUT[c2] + k - gx_max_color_value;
+ if (c3 == 0) {
+ c = 0;
+ m = 0;
+ y = 0;
+ } else {
+ c = cups->DecodeLUT[c0];
+ m = cups->DecodeLUT[c1];
+ y = cups->DecodeLUT[c2];
+ }
if (c > gx_max_color_value)
prgb[0] = gx_max_color_value;
@@ -2282,20 +2293,20 @@ cups_map_rgb_color(gx_device *pdev,
switch (cups->header.cupsBitsPerColor)
{
default :
- i = 0x0e;
+ i = 0x00;
break;
case 2 :
- i = 0xfc;
+ i = 0x00;
break;
case 4 :
- i = 0xfff0;
+ i = 0x0000;
break;
case 8 :
- i = 0xffffff00;
+ i = 0x00000000;
break;
#ifdef GX_COLOR_INDEX_TYPE
case 16 :
- i = 0xffffffffffff0000;
+ i = 0x0000000000000000;
break;
#endif /* GX_COLOR_INDEX_TYPE */
}
@@ -2929,7 +2940,10 @@ cups_put_params(gx_device *pdev, /*
int xflip = 0,
yflip = 0;
int found = 0;
-
+ gs_param_string icc_pro_dummy;
+ int old_cmps = cups->color_info.num_components;
+ int old_depth = cups->color_info.depth;
+
#ifdef DEBUG
dprintf2("DEBUG2: cups_put_params(%p, %p)\n", pdev, plist);
#endif /* DEBUG */
@@ -3024,6 +3038,11 @@ cups_put_params(gx_device *pdev, /*
margins_set = param_read_float_array(plist, "Margins", &arrayval) == 0;
color_set = param_read_int(plist, "cupsColorSpace", &intval) == 0 ||
param_read_int(plist, "cupsBitsPerColor", &intval) == 0;
+
+ if (!cups->user_icc) {
+ cups->user_icc = param_read_string(plist, "OutputICCProfile", &icc_pro_dummy) == 0;
+ }
+
/* We set the old dimensions to 1 if we have a color depth change, so
that memory reallocation gets forced. This is perhaps not the correct
approach to prevent crashes like in bug 690435. We keep it for the
@@ -3134,12 +3153,20 @@ cups_put_params(gx_device *pdev, /*
if ((code = gdev_prn_put_params(pdev, plist)) < 0)
return (code);
+ /* If cups_set_color_info() changed the color model of the device we want to
+ * force the raster memory to be recreated/reinitialized
+ */
+ if (cups->color_info.num_components != old_cmps || cups->color_info.depth != old_depth) {
+ width_old = 0;
+ height_old = 0;
+ }
+ else {
/* pdev->width/height may have been changed by the call to
* gdev_prn_put_params()
*/
- width_old = pdev->width;
- height_old = pdev->height;
-
+ width_old = pdev->width;
+ height_old = pdev->height;
+ }
/*
* Update margins/sizes as needed...
*/
@@ -4044,22 +4071,88 @@ cups_set_color_info(gx_device *pdev) /*
for (k = 0; k <= CUPS_MAX_VALUE; k ++)
cups->Density[k] = k;
}
- /* Set up the ICC profile for ghostscript to use based upon the color space.
- This is different than the PPD profile above which appears to be some sort
- of matrix based TRC profile */
- switch (cups->header.cupsColorSpace) {
- /* Use RGB profile for this */
- case CUPS_CSPACE_RGBW:
- if (pdev->icc_struct == NULL) {
- pdev->icc_struct = gsicc_new_device_profile_array(pdev->memory);
- }
- if (pdev->icc_struct->device_profile[gsDEFAULTPROFILE] == NULL) {
- code = gsicc_set_device_profile(pdev, pdev->memory,
- DEFAULT_RGB_ICC, gsDEFAULTPROFILE);
- }
- break;
- default:
- break;
+ if (!cups->user_icc) {
+ /* Set up the ICC profile for ghostscript to use based upon the color space.
+ This is different than the PPD profile above which appears to be some sort
+ of matrix based TRC profile */
+ switch (cups->header.cupsColorSpace)
+ {
+ default :
+ case CUPS_CSPACE_RGBW :
+ case CUPS_CSPACE_RGB :
+ case CUPS_CSPACE_RGBA :
+ case CUPS_CSPACE_CMY :
+ case CUPS_CSPACE_YMC :
+# ifdef CUPS_RASTER_HAVE_COLORIMETRIC
+ case CUPS_CSPACE_CIELab :
+ case CUPS_CSPACE_ICC1 :
+ case CUPS_CSPACE_ICC2 :
+ case CUPS_CSPACE_ICC3 :
+ case CUPS_CSPACE_ICC4 :
+ case CUPS_CSPACE_ICC5 :
+ case CUPS_CSPACE_ICC6 :
+ case CUPS_CSPACE_ICC7 :
+ case CUPS_CSPACE_ICC8 :
+ case CUPS_CSPACE_ICC9 :
+ case CUPS_CSPACE_ICCA :
+ case CUPS_CSPACE_ICCB :
+ case CUPS_CSPACE_ICCC :
+ case CUPS_CSPACE_ICCD :
+ case CUPS_CSPACE_ICCE :
+ case CUPS_CSPACE_ICCF :
+# endif /* CUPS_RASTER_HAVE_COLORIMETRIC */
+ if (!pdev->icc_struct || (pdev->icc_struct &&
+ pdev->icc_struct->device_profile[gsDEFAULTPROFILE]->data_cs != gsRGB)) {
+
+ if (pdev->icc_struct) {
+ rc_decrement(pdev->icc_struct, "cups_set_color_info");
+ }
+ pdev->icc_struct = gsicc_new_device_profile_array(pdev->memory);
+
+ code = gsicc_set_device_profile(pdev, pdev->memory,
+ (char *)DEFAULT_RGB_ICC, gsDEFAULTPROFILE);
+ }
+ break;
+
+ case CUPS_CSPACE_W :
+ case CUPS_CSPACE_WHITE :
+ case CUPS_CSPACE_K :
+ case CUPS_CSPACE_GOLD :
+ case CUPS_CSPACE_SILVER :
+ if (!pdev->icc_struct || (pdev->icc_struct &&
+ pdev->icc_struct->device_profile[gsDEFAULTPROFILE]->data_cs != gsGRAY)) {
+
+ if (pdev->icc_struct) {
+ rc_decrement(pdev->icc_struct, "cups_set_color_info");
+ }
+ pdev->icc_struct = gsicc_new_device_profile_array(pdev->memory);
+
+ code = gsicc_set_device_profile(pdev, pdev->memory->non_gc_memory,
+ (char *)DEFAULT_GRAY_ICC, gsDEFAULTPROFILE);
+ }
+ break;
+ case CUPS_CSPACE_KCMYcm :
+# ifdef CUPS_RASTER_HAVE_COLORIMETRIC
+ case CUPS_CSPACE_CIEXYZ :
+#endif
+ case CUPS_CSPACE_CMYK :
+ case CUPS_CSPACE_YMCK :
+ case CUPS_CSPACE_KCMY :
+ case CUPS_CSPACE_GMCK :
+ case CUPS_CSPACE_GMCS :
+ if (!pdev->icc_struct || (pdev->icc_struct &&
+ pdev->icc_struct->device_profile[gsDEFAULTPROFILE]->data_cs != gsCMYK)) {
+
+ if (pdev->icc_struct) {
+ rc_decrement(pdev->icc_struct, "cups_set_color_info");
+ }
+ pdev->icc_struct = gsicc_new_device_profile_array(pdev->memory);
+
+ code = gsicc_set_device_profile(pdev, pdev->memory,
+ (char *)DEFAULT_CMYK_ICC, gsDEFAULTPROFILE);
+ }
+ break;
+ }
}
}

61
ghostscript-glyph-crash.patch
View File

@ -1,61 +0,0 @@
diff -up ghostscript-9.04/psi/zfapi.c.glyph-crash ghostscript-9.04/psi/zfapi.c
--- ghostscript-9.04/psi/zfapi.c.glyph-crash 2011-08-05 12:12:20.000000000 +0100
+++ ghostscript-9.04/psi/zfapi.c 2011-11-01 13:24:54.334696191 +0000
@@ -1885,34 +1885,35 @@ static int fapi_finish_render_aux(i_ctx_
/* The server provides an outline instead the raster. */
gs_imager_state *pis = (gs_imager_state *)pgs->show_gstate;
gs_point pt;
+ if (!I->skip_glyph) {
+ if ((code = gs_currentpoint(pgs, &pt)) < 0)
+ return code;
+ if ((code = outline_char(i_ctx_p, I, import_shift_v, penum_s, pgs->path, !pbfont->PaintType)) < 0)
+ return code;
+ if ((code = gs_imager_setflat((gs_imager_state *)pgs, gs_char_flatness(pis, 1.0))) < 0)
+ return code;
+ if (pbfont->PaintType) {
+ float lw = gs_currentlinewidth(pgs);
- if ((code = gs_currentpoint(pgs, &pt)) < 0)
- return code;
- if ((code = outline_char(i_ctx_p, I, import_shift_v, penum_s, pgs->path, !pbfont->PaintType)) < 0)
- return code;
- if ((code = gs_imager_setflat((gs_imager_state *)pgs, gs_char_flatness(pis, 1.0))) < 0)
- return code;
- if (pbfont->PaintType) {
- float lw = gs_currentlinewidth(pgs);
+ gs_setlinewidth(pgs, pbfont->StrokeWidth);
+ code = gs_stroke(pgs);
+ gs_setlinewidth(pgs, lw);
+ if (code < 0)
+ return code;
+ } else {
+ gs_in_cache_device_t in_cachedevice = pgs->in_cachedevice;
+ pgs->in_cachedevice = CACHE_DEVICE_NOT_CACHING;
- gs_setlinewidth(pgs, pbfont->StrokeWidth);
- code = gs_stroke(pgs);
- gs_setlinewidth(pgs, lw);
- if (code < 0)
- return code;
- } else {
- gs_in_cache_device_t in_cachedevice = pgs->in_cachedevice;
- pgs->in_cachedevice = CACHE_DEVICE_NOT_CACHING;
+ pgs->fill_adjust.x = pgs->fill_adjust.y = 0;
- pgs->fill_adjust.x = pgs->fill_adjust.y = 0;
+ if ((code = gs_fill(pgs)) < 0)
+ return code;
- if ((code = gs_fill(pgs)) < 0)
+ pgs->in_cachedevice = in_cachedevice;
+ }
+ if ((code = gs_moveto(pgs, pt.x, pt.y)) < 0)
return code;
-
- pgs->in_cachedevice = in_cachedevice;
}
- if ((code = gs_moveto(pgs, pt.x, pt.y)) < 0)
- return code;
} else {
int rast_orig_x = rast.orig_x;
int rast_orig_y = - rast.orig_y;

44
ghostscript-jbig2dec-nullderef.patch
View File

@ -1,44 +0,0 @@
diff -up ghostscript-8.71/jbig2dec/jbig2_symbol_dict.c.jbig2dec-nullderef ghostscript-8.71/jbig2dec/jbig2_symbol_dict.c
--- ghostscript-8.71/jbig2dec/jbig2_symbol_dict.c.jbig2dec-nullderef 2009-05-29 07:48:44.000000000 +0100
+++ ghostscript-8.71/jbig2dec/jbig2_symbol_dict.c 2010-02-17 12:06:42.040614797 +0000
@@ -367,6 +367,11 @@ jbig2_decode_symbol_dict(Jbig2Ctx *ctx,
memcpy(region_params.gbat, params->sdat, sdat_bytes);
image = jbig2_image_new(ctx, SYMWIDTH, HCHEIGHT);
+ if (image == NULL) {
+ jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number,
+ "failed to allocate image storage");
+ return NULL;
+ }
code = jbig2_decode_generic_region(ctx, segment, &region_params,
as, image, GB_stats);
@@ -517,6 +522,11 @@ jbig2_decode_symbol_dict(Jbig2Ctx *ctx,
ID, RDX, RDY);
image = jbig2_image_new(ctx, SYMWIDTH, HCHEIGHT);
+ if (image == NULL) {
+ jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number,
+ "failed to allocate image storage");
+ return NULL;
+ }
/* Table 18 */
rparams.GRTEMPLATE = params->SDRTEMPLATE;
@@ -635,6 +645,16 @@ jbig2_decode_symbol_dict(Jbig2Ctx *ctx,
for (j = HCFIRSTSYM; j < NSYMSDECODED; j++) {
Jbig2Image *glyph;
glyph = jbig2_image_new(ctx, SDNEWSYMWIDTHS[j], HCHEIGHT);
+ if (glyph == NULL) {
+ jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number,
+ "error allocating image storage for glyph");
+ while (--j >= HCFIRSTSYM) {
+ jbig2_image_release(ctx, SDNEWSYMS->glyphs[j]);
+ SDNEWSYMS->glyphs[j] = NULL;
+ }
+ jbig2_image_release(ctx, image);
+ return NULL;
+ }
jbig2_image_compose(ctx, glyph, image,
-x, 0, JBIG2_COMPOSE_REPLACE);
x += SDNEWSYMWIDTHS[j];

45
ghostscript-pxl-landscape.patch
View File

@ -1,45 +0,0 @@
diff -up ghostscript-9.04rc1/base/gdevpxut.c.pxl-landscape ghostscript-9.04rc1/base/gdevpxut.c
--- ghostscript-9.04rc1/base/gdevpxut.c.pxl-landscape 2011-07-29 10:42:51.000000000 +0100
+++ ghostscript-9.04rc1/base/gdevpxut.c 2011-08-01 12:34:54.201815802 +0100
@@ -115,11 +115,7 @@ px_write_file_header(stream *s, const gx
int
px_write_page_header(stream *s, const gx_device *dev)
{
- static const byte page_header_1[] = {
- DUB(ePortraitOrientation), DA(pxaOrientation)
- };
-
- PX_PUT_LIT(s, page_header_1);
+ /* Orientation is deferred until px_write_select_media... */
return 0;
}
@@ -145,6 +141,7 @@ px_write_select_media(stream *s, const g
int i;
pxeMediaSize_t size = eDefaultPaperSize;
byte tray = eAutoSelect;
+ byte orientation = ePortraitOrientation;
bool match_found = false;
/* The default is eDefaultPaperSize (=96), but we'll emit CustomMediaSize */
@@ -156,11 +153,19 @@ px_write_select_media(stream *s, const g
match_found = true;
size = media_sizes[i].ms;
break;
- }
+ } else if (fabs(media_sizes[i].height - w) < 0.05 &&
+ fabs(media_sizes[i].width - h) < 0.05
+ ) {
+ match_found = true;
+ size = media_sizes[i].ms;
+ orientation = eLandscapeOrientation;
+ break;
+ }
/*
* According to the PCL XL documentation, MediaSize/CustomMediaSize must always
* be specified, but MediaSource is optional.
*/
+ px_put_uba(s, orientation, pxaOrientation);
if (match_found) {
/* standard media */
px_put_uba(s, (byte)size, pxaMediaSize);

16
ghostscript-runlibfileifexists.patch
View File

@ -1,6 +1,6 @@
diff -up ghostscript-9.04/Resource/Init/gs_fonts.ps.runlibfileifexists ghostscript-9.04/Resource/Init/gs_fonts.ps diff -up ghostscript-9.05/Resource/Init/gs_fonts.ps.runlibfileifexists ghostscript-9.05/Resource/Init/gs_fonts.ps
--- ghostscript-9.04/Resource/Init/gs_fonts.ps.runlibfileifexists 2011-08-09 17:05:39.736485415 +0100 --- ghostscript-9.05/Resource/Init/gs_fonts.ps.runlibfileifexists 2012-02-08 08:48:49.000000000 +0000
+++ ghostscript-9.04/Resource/Init/gs_fonts.ps 2011-08-09 17:06:08.615943187 +0100 +++ ghostscript-9.05/Resource/Init/gs_fonts.ps 2012-02-09 12:15:50.651367207 +0000
@@ -96,10 +96,19 @@ userdict /Fontmap .FontDirectory maxleng @@ -96,10 +96,19 @@ userdict /Fontmap .FontDirectory maxleng
% stack: dict file fontname filename|aliasname % stack: dict file fontname filename|aliasname
1 index type /stringtype eq 1 index type /stringtype eq
@ -24,10 +24,10 @@ diff -up ghostscript-9.04/Resource/Init/gs_fonts.ps.runlibfileifexists ghostscri
} { } {
% This is a real entry. % This is a real entry.
% Read and pop tokens until a semicolon. % Read and pop tokens until a semicolon.
diff -up ghostscript-9.04/Resource/Init/gs_init.ps.runlibfileifexists ghostscript-9.04/Resource/Init/gs_init.ps diff -up ghostscript-9.05/Resource/Init/gs_init.ps.runlibfileifexists ghostscript-9.05/Resource/Init/gs_init.ps
--- ghostscript-9.04/Resource/Init/gs_init.ps.runlibfileifexists 2011-08-09 17:05:44.395397937 +0100 --- ghostscript-9.05/Resource/Init/gs_init.ps.runlibfileifexists 2012-02-08 08:48:49.000000000 +0000
+++ ghostscript-9.04/Resource/Init/gs_init.ps 2011-08-09 17:06:15.238818843 +0100 +++ ghostscript-9.05/Resource/Init/gs_init.ps 2012-02-09 12:15:50.652367207 +0000
@@ -674,6 +674,14 @@ systemdict /internaldict dup .makeintern @@ -679,6 +679,14 @@ systemdict /internaldict dup .makeintern
{ /undefinedfilename signalerror } { /undefinedfilename signalerror }
ifelse ifelse
} bind def } bind def
@ -42,7 +42,7 @@ diff -up ghostscript-9.04/Resource/Init/gs_init.ps.runlibfileifexists ghostscrip
/selectdevice /selectdevice
{ finddevice setdevice .setdefaultscreen } bind def { finddevice setdevice .setdefaultscreen } bind def
/signalerror % <object> <errorname> signalerror - /signalerror % <object> <errorname> signalerror -
@@ -842,6 +850,7 @@ userdict /.currentresourcefile //null pu @@ -847,6 +855,7 @@ userdict /.currentresourcefile //null pu
} bind def } bind def
% Temporarily substitute it for the real runlibfile. % Temporarily substitute it for the real runlibfile.
/.runlibfile /runlibfile load def /.runlibfile /runlibfile load def

30
ghostscript.spec
View File

@ -1,11 +1,11 @@
%define gs_ver 9.04 %define gs_ver 9.05
%define gs_dot_ver 9.04 %define gs_dot_ver 9.05
%{expand: %%define build_with_freetype %{?_with_freetype:1}%{!?_with_freetype:0}} %{expand: %%define build_with_freetype %{?_with_freetype:1}%{!?_with_freetype:0}}
Summary: A PostScript interpreter and renderer Summary: A PostScript interpreter and renderer
Name: ghostscript Name: ghostscript
Version: %{gs_ver} Version: %{gs_ver}
Release: 9%{?dist} Release: 1%{?dist}
# Included CMap data is Redistributable, no modification permitted, # Included CMap data is Redistributable, no modification permitted,
# see http://bugzilla.redhat.com/487510 # see http://bugzilla.redhat.com/487510
@ -21,15 +21,10 @@ Patch2: ghostscript-scripts.patch
Patch3: ghostscript-noopt.patch Patch3: ghostscript-noopt.patch
Patch4: ghostscript-ijs-automake-ver.patch Patch4: ghostscript-ijs-automake-ver.patch
Patch5: ghostscript-runlibfileifexists.patch Patch5: ghostscript-runlibfileifexists.patch
Patch6: ghostscript-cups-rgbw.patch
Patch7: ghostscript-glyph-crash.patch
Patch8: ghostscript-jbig2dec-nullderef.patch
Patch9: ghostscript-SEAC.patch
Patch10: ghostscript-cups-filters.patch Patch10: ghostscript-cups-filters.patch
Patch27: ghostscript-Fontmap.local.patch Patch27: ghostscript-Fontmap.local.patch
Patch28: ghostscript-iccprofiles-initdir.patch Patch28: ghostscript-iccprofiles-initdir.patch
Patch29: ghostscript-gdevcups-debug-uninit.patch Patch29: ghostscript-gdevcups-debug-uninit.patch
Patch30: ghostscript-pxl-landscape.patch
Requires: urw-fonts >= 1.1, ghostscript-fonts Requires: urw-fonts >= 1.1, ghostscript-fonts
Requires: poppler-data Requires: poppler-data
@ -123,19 +118,6 @@ rm -rf libpng zlib jpeg jasper expat
# Define .runlibfileifexists. # Define .runlibfileifexists.
%patch5 -p1 %patch5 -p1
# Applied upstream fix for gdevcups handling of RGBW (Ghostscript
# bug #691922).
%patch6 -p1 -b .cups-rgbw
# Applied upstream fix for skipping "cached" outline glyphs (bug #742349).
%patch7 -p1 -b .glyph-crash
# Applied patch to fix NULL dereference in JBIG2 decoder (bug #501710).
%patch8 -p1 -b .jbig2dec-nullderef
# Applied fix for type 1 font copying code SEAC scanner (bug #728710).
%patch9 -p1 -b .SEAC
# Install CUPS filter convs files in the correct place. # Install CUPS filter convs files in the correct place.
%patch10 -p1 -b .cups-filters %patch10 -p1 -b .cups-filters
@ -151,9 +133,6 @@ rm -rf libpng zlib jpeg jasper expat
# gdevcups: don't use uninitialized variables in debugging output. # gdevcups: don't use uninitialized variables in debugging output.
%patch29 -p1 -b .gdevcups-debug-uninit %patch29 -p1 -b .gdevcups-debug-uninit
# pxl: match landscape page sizes (bug #692165).
%patch30 -p1 -b .pxl-landscape
# Convert manual pages to UTF-8 # Convert manual pages to UTF-8
from8859_1() { from8859_1() {
iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_" iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@ -341,6 +320,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libgs.so %{_libdir}/libgs.so
%changelog %changelog
* Thu Feb 9 2012 Tim Waugh <twaugh@redhat.com> 9.05-1
- 9.05.
* Fri Jan 6 2012 Tim Waugh <twaugh@redhat.com> 9.04-9 * Fri Jan 6 2012 Tim Waugh <twaugh@redhat.com> 9.04-9
- Use %%_cups_serverbin macro. - Use %%_cups_serverbin macro.

2
sources
View File

@ -1,3 +1,3 @@
2fbae60417d42779f6488ab897dcaaf6 acro5-cmaps-2001.tar.gz 2fbae60417d42779f6488ab897dcaaf6 acro5-cmaps-2001.tar.gz
dfc93dd2aaaf2b86d2fd55f654c13261 adobe-cmaps-200406.tar.gz dfc93dd2aaaf2b86d2fd55f654c13261 adobe-cmaps-200406.tar.gz
9f6899e821ab6d78ab2c856f10fa3023 ghostscript-9.04.tar.bz2 8bcef1f33ddf8a4d12b2cf8da385c191 ghostscript-9.05.tar.bz2