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

9.01.

Browse Source
This commit is contained in:
Tim Waugh 2011-02-10 10:32:12 +00:00
parent a8e0cd1845
commit 1a1240ee01
10 changed files with 25 additions and 8954 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -27,3 +27,4 @@ ghostscript-8.64.tar.bz2
ghostscript-8.70.tar.xz ghostscript-8.70.tar.xz
ghostscript-8.71.tar.xz ghostscript-8.71.tar.xz
/ghostscript-9.00.tar.xz /ghostscript-9.00.tar.xz
/ghostscript-9.01.tar.bz2

106
ghostscript-gdevcups-691733.patch
View File

@ -1,106 +0,0 @@
diff -up ghostscript-9.00/cups/gdevcups.c.gdevcups-691733 ghostscript-9.00/cups/gdevcups.c
--- ghostscript-9.00/cups/gdevcups.c.gdevcups-691733 2011-01-10 16:48:57.381703112 +0000
+++ ghostscript-9.00/cups/gdevcups.c 2011-01-10 16:52:02.021813786 +0000
@@ -2898,11 +2898,12 @@ cups_put_params(gx_device *pdev, /*
int margins_set; /* Were the margins set? */
int size_set; /* Was the size set? */
int color_set; /* Were the color attrs set? */
- gdev_prn_space_params sp; /* Space parameter data */
+ gdev_prn_space_params sp_old; /* Space parameter data */
int width, /* New width of page */
height, /* New height of page */
width_old = 0, /* Previous width of page */
height_old = 0; /* Previous height of page */
+ bool transp_old = 0; /* Previous transparency usage state */
ppd_attr_t *backside = NULL,
*backsiderequiresflippedmargins = NULL;
float swap;
@@ -2996,11 +2997,23 @@ cups_put_params(gx_device *pdev, /*
} \
}
+ sp_old = ((gx_device_printer *)pdev)->space_params;
+ width_old = pdev->width;
+ height_old = pdev->height;
+ transp_old = cups->page_uses_transparency;
size_set = param_read_float_array(plist, ".MediaSize", &arrayval) == 0 ||
param_read_float_array(plist, "PageSize", &arrayval) == 0;
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;
+ /* 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
+ time being until we decide finally */
+ if (color_set) {
+ width_old = 1;
+ height_old = 1;
+ }
/* We also recompute page size and margins if we simply get onto a new
page without necessarily having a page size change in the PostScript
code, as for some printers margins have to be flipped on the back sides of
@@ -3081,9 +3094,9 @@ cups_put_params(gx_device *pdev, /*
stringoption(cupsPageSizeName, "cupsPageSizeName");
#endif /* CUPS_RASTER_SYNCv1 */
- if ((code = param_read_string(plist, "cups->Profile", &stringval)) < 0)
+ if ((code = param_read_string(plist, "cupsProfile", &stringval)) < 0)
{
- param_signal_error(plist, "cups->Profile", code);
+ param_signal_error(plist, "cupsProfile", code);
return (code);
}
else if (code == 0)
@@ -3096,7 +3109,7 @@ cups_put_params(gx_device *pdev, /*
cups_set_color_info(pdev);
- /*
+ /*
* Then process standard page device options...
*/
@@ -3404,17 +3417,6 @@ cups_put_params(gx_device *pdev, /*
* does not keep track of the margins in the bitmap size...
*/
- /* 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 preven crashes like in bug 690435. We keep it for the
- time being until we decide finally */
- if (color_set) {
- width_old = -1;
- height_old = -1;
- } else {
- width_old = pdev->width;
- height_old = pdev->height;
- }
if (cups->landscape)
{
width = (pdev->MediaSize[1] - pdev->HWMargins[1] - pdev->HWMargins[3]) *
@@ -3457,11 +3459,10 @@ cups_put_params(gx_device *pdev, /*
pdev->MediaSize[0], pdev->MediaSize[1], width, height);
#endif /* DEBUG */
- sp = ((gx_device_printer *)pdev)->space_params;
-
- if ((code = gdev_prn_maybe_realloc_memory((gx_device_printer *)pdev, &sp,
+ if ((code = gdev_prn_maybe_realloc_memory((gx_device_printer *)pdev,
+ &sp_old,
width_old, height_old,
- cups->page_uses_transparency))
+ transp_old))
< 0)
return (code);
#ifdef DEBUG
@@ -3642,6 +3643,10 @@ cups_set_color_info(gx_device *pdev) /*
cups->header.cupsBitsPerPixel = cups->header.cupsBitsPerColor;
cups->color_info.depth = cups->header.cupsBitsPerPixel;
cups->color_info.num_components = 1;
+ cups->color_info.dither_grays = 1L << cups->header.cupsBitsPerColor;
+ cups->color_info.dither_colors = 1L << cups->header.cupsBitsPerColor;
+ cups->color_info.max_gray = cups->color_info.dither_grays - 1;
+ cups->color_info.max_color = cups->color_info.dither_grays - 1;
break;
case CUPS_CSPACE_CMY :

51
ghostscript-glyph-stretch-691920.patch
View File

@ -1,51 +0,0 @@
diff -up ghostscript-9.00/psi/fapi_ft.c.glyph-stretch-691920 ghostscript-9.00/psi/fapi_ft.c
--- ghostscript-9.00/psi/fapi_ft.c.glyph-stretch-691920 2010-09-14 15:56:26.000000000 +0100
+++ ghostscript-9.00/psi/fapi_ft.c 2011-02-02 13:20:51.736932787 +0000
@@ -652,12 +652,43 @@ transform_decompose(FT_Matrix *a_transfo
{
double scalex, scaley, fact = 1.0;
FT_Matrix ftscale_mat;
- FT_UInt xres = *xresp;
- FT_UInt yres = *yresp;
+ FT_UInt xres;
+ FT_UInt yres;
+ FT_Vector vectx, vecty;
- scalex = hypot ((double)a_transform->xx, (double)a_transform->xy) / 65536.0;
- scaley = hypot ((double)a_transform->yx, (double)a_transform->yy) / 65536.0;
+ scalex = hypot ((double)a_transform->xx, (double)a_transform->xy);
+ scaley = hypot ((double)a_transform->yx, (double)a_transform->yy);
+ if (*xresp != *yresp) {
+ /* We need to give the resolution in "glyph space", taking account of rotation and
+ * shearing, so that makes life a little complicated when non-square resolutions
+ * are used.
+ */
+ ftscale_mat.xx = scalex;
+ ftscale_mat.xy = ftscale_mat.yx = 0;
+ ftscale_mat.yy = scaley;
+
+ FT_Matrix_Invert(&ftscale_mat);
+
+ FT_Matrix_Multiply (a_transform, &ftscale_mat);
+
+ vectx.x = *xresp << 16;
+ vecty.y = *yresp << 16;
+ vectx.y = vecty.x = 0;
+
+ FT_Vector_Transform (&vectx, &ftscale_mat);
+ FT_Vector_Transform (&vecty, &ftscale_mat);
+ xres = (FT_UInt)((hypot ((double)vectx.x, (double)vecty.x) / 65536.0) + 0.5);
+ yres = (FT_UInt)((hypot ((double)vectx.y, (double)vecty.y) / 65536.0) + 0.5);
+ }
+ else {
+ /* Life is considerably easier when square resolutions are in use! */
+ xres = *xresp;
+ yres = *yresp;
+ }
+
+ scalex /= 65536.0;
+ scaley /= 65536.0;
/* FT clamps the width and height to a lower limit of 1.0 units
* (note: as FT stores it in 64ths of a unit, that is 64)
* So if either the width or the height are <1.0 here, we scale

199
ghostscript-icc-fix.patch
View File

@ -1,199 +0,0 @@
diff -up ghostscript-9.00/base/gdevnfwd.c.icc-fix ghostscript-9.00/base/gdevnfwd.c
--- ghostscript-9.00/base/gdevnfwd.c.icc-fix 2010-08-10 17:20:19.000000000 +0100
+++ ghostscript-9.00/base/gdevnfwd.c 2011-01-07 12:11:25.625149646 +0000
@@ -1117,3 +1117,29 @@ null_strip_copy_rop(gx_device * dev, con
{
return 0;
}
+
+bool
+fwd_uses_fwd_cmap_procs(gx_device * dev)
+{
+ const gx_cm_color_map_procs *pprocs;
+
+ pprocs = dev_proc(dev, get_color_mapping_procs)(dev);
+ if (pprocs == &FwdDevice_cm_map_procs) {
+ return true;
+ }
+ return false;
+}
+
+const gx_cm_color_map_procs*
+fwd_get_target_cmap_procs(gx_device * dev)
+{
+ const gx_cm_color_map_procs *pprocs;
+ gx_device_forward * const fdev = (gx_device_forward *)dev;
+ gx_device * const tdev = fdev->target;
+
+ pprocs = dev_proc(tdev, get_color_mapping_procs(tdev));
+ while (pprocs == &FwdDevice_cm_map_procs) {
+ pprocs = fwd_get_target_cmap_procs(tdev);
+ }
+ return pprocs;
+}
\ No newline at end of file
diff -up ghostscript-9.00/base/gdevp14.c.icc-fix ghostscript-9.00/base/gdevp14.c
--- ghostscript-9.00/base/gdevp14.c.icc-fix 2010-09-09 00:20:36.000000000 +0100
+++ ghostscript-9.00/base/gdevp14.c 2011-01-07 12:11:25.629149217 +0000
@@ -878,7 +878,11 @@ pdf14_pop_transparency_group(gs_imager_s
nos->parent_color_info_procs->num_components, 1,
false, false, true, tos->planestride,
tos->rowstride, num_rows, num_cols);
- /* Transform the data */
+ /* Transform the data. Since the pdf14 device should be
+ using RGB, CMYK or Gray buffers, this transform
+ does not need to worry about the cmap procs of
+ the target device. Those are handled when we do
+ the pdf14 put image operation */
gscms_transform_color_buffer(icc_link, &input_buff_desc,
&output_buff_desc, tos->data,
new_data_buf);
diff -up ghostscript-9.00/base/gxcmap.c.icc-fix ghostscript-9.00/base/gxcmap.c
--- ghostscript-9.00/base/gxcmap.c.icc-fix 2010-08-10 17:20:19.000000000 +0100
+++ ghostscript-9.00/base/gxcmap.c 2011-01-07 12:11:25.637148361 +0000
@@ -31,6 +31,7 @@
#include "gsicc_manage.h"
#include "gdevdevn.h"
#include "gsicc_cache.h"
+#include "gscms.h"
/* Structure descriptor */
public_st_device_color();
@@ -1744,3 +1745,37 @@ cmap_transfer_halftone(gx_color_value *p
}
}
+
+bool
+gx_device_uses_std_cmap_procs(gx_device * dev)
+{
+ const gx_cm_color_map_procs *pprocs;
+
+ if (dev->device_icc_profile != NULL) {
+ pprocs = dev_proc(dev, get_color_mapping_procs)(dev);
+ /* Check if they are forwarding procs */
+ if (fwd_uses_fwd_cmap_procs(dev)) {
+ pprocs = fwd_get_target_cmap_procs(dev);
+ }
+ switch(dev->device_icc_profile->data_cs) {
+ case gsGRAY:
+ if (pprocs == &DeviceGray_procs) {
+ return true;
+ }
+ break;
+ case gsRGB:
+ if (pprocs == &DeviceRGB_procs) {
+ return true;
+ }
+ break;
+ case gsCMYK:
+ if (pprocs == &DeviceCMYK_procs) {
+ return true;
+ }
+ break;
+ default:
+ break;
+ }
+ }
+ return false;
+}
diff -up ghostscript-9.00/base/gxcmap.h.icc-fix ghostscript-9.00/base/gxcmap.h
--- ghostscript-9.00/base/gxcmap.h.icc-fix 2007-12-03 21:31:16.000000000 +0000
+++ ghostscript-9.00/base/gxcmap.h 2011-01-07 12:11:25.639148147 +0000
@@ -284,5 +284,11 @@ dev_proc_decode_color(gx_default_decode_
* [0,1]
*/
frac gx_unit_frac(float fvalue);
+/* Determine if the device is using the standard color mapping procs. In
+ such a case, we can make use of the faster icc color conversions for
+ images */
+bool gx_device_uses_std_cmap_procs(gx_device * dev);
+bool fwd_uses_fwd_cmap_procs(gx_device * dev);
+const gx_cm_color_map_procs* fwd_get_target_cmap_procs(gx_device * dev);
#endif /* gxcmap_INCLUDED */
diff -up ghostscript-9.00/base/gxi12bit.c.icc-fix ghostscript-9.00/base/gxi12bit.c
--- ghostscript-9.00/base/gxi12bit.c.icc-fix 2010-08-10 17:20:19.000000000 +0100
+++ ghostscript-9.00/base/gxi12bit.c 2011-01-07 12:11:25.640148040 +0000
@@ -113,6 +113,8 @@ static irender_proc(image_render_icc16);
irender_proc_t
gs_image_class_2_fracs(gx_image_enum * penum)
{
+ bool std_cmap_procs;
+
if (penum->bps > 8) {
if (penum->use_mask_color) {
/* Convert color mask values to fracs. */
@@ -122,9 +124,14 @@ gs_image_class_2_fracs(gx_image_enum * p
penum->mask_color.values[i] =
bits2frac(penum->mask_color.values[i], 12);
}
+ /* If the device has some unique color mapping procs due to its color space,
+ then we will need to use those and go through pixel by pixel instead
+ of blasting through buffers. This is true for example with many of
+ the color spaces for CUPs */
+ std_cmap_procs = gx_device_uses_std_cmap_procs(penum->dev);
if ( (gs_color_space_get_index(penum->pcs) == gs_color_space_index_DeviceN &&
penum->pcs->cmm_icc_profile_data == NULL) || penum->use_mask_color ||
- penum->bps != 16 ||
+ penum->bps != 16 || !std_cmap_procs ||
gs_color_space_get_index(penum->pcs) == gs_color_space_index_DevicePixel) {
/* DevicePixel color space used in mask from 3x type. Basically
a simple color space that just is scaled to the device bit
diff -up ghostscript-9.00/base/gxicolor.c.icc-fix ghostscript-9.00/base/gxicolor.c
--- ghostscript-9.00/base/gxicolor.c.icc-fix 2010-08-10 17:20:19.000000000 +0100
+++ ghostscript-9.00/base/gxicolor.c 2011-01-07 12:11:25.642147826 +0000
@@ -97,6 +97,8 @@ get_cie_range( const gs_color_space * pc
irender_proc_t
gs_image_class_4_color(gx_image_enum * penum)
{
+ bool std_cmap_procs;
+
if (penum->use_mask_color) {
/*
* Scale the mask colors to match the scaling of each sample to
@@ -128,8 +130,14 @@ gs_image_class_4_color(gx_image_enum * p
penum->mask_color.mask = 0;
penum->mask_color.test = ~0;
}
+ /* If the device has some unique color mapping procs due to its color space,
+ then we will need to use those and go through pixel by pixel instead
+ of blasting through buffers. This is true for example with many of
+ the color spaces for CUPs */
+ std_cmap_procs = gx_device_uses_std_cmap_procs(penum->dev);
if ( (gs_color_space_get_index(penum->pcs) == gs_color_space_index_DeviceN &&
- penum->pcs->cmm_icc_profile_data == NULL) || penum->use_mask_color ) {
+ penum->pcs->cmm_icc_profile_data == NULL) || penum->use_mask_color ||
+ !std_cmap_procs) {
return &image_render_color_DeviceN;
} else {
/* Set up the link now */
diff -up ghostscript-9.00/base/gxiscale.c.icc-fix ghostscript-9.00/base/gxiscale.c
--- ghostscript-9.00/base/gxiscale.c.icc-fix 2010-08-10 17:20:19.000000000 +0100
+++ ghostscript-9.00/base/gxiscale.c 2011-01-07 12:11:25.644147611 +0000
@@ -104,6 +104,13 @@ gs_image_class_0_interpolate(gx_image_en
!= penum->dev->color_info.num_components) {
use_icc = false;
}
+ /* If the device has some unique color mapping procs due to its color space,
+ then we will need to use those and go through pixel by pixel instead
+ of blasting through buffers. This is true for example with many of
+ the color spaces for CUPs */
+ if(!gx_device_uses_std_cmap_procs(penum->dev)) {
+ use_icc = false;
+ }
/*
* USE_CONSERVATIVE_INTERPOLATION_RULES is normally NOT defined since
* the MITCHELL digital filter seems OK as long as we are going out to
diff -up ghostscript-9.00/base/lib.mak.icc-fix ghostscript-9.00/base/lib.mak
--- ghostscript-9.00/base/lib.mak.icc-fix 2010-09-09 00:20:36.000000000 +0100
+++ ghostscript-9.00/base/lib.mak 2011-01-07 12:11:25.648147183 +0000
@@ -602,7 +602,7 @@ $(GLOBJ)gxcmap.$(OBJ) : $(GLSRC)gxcmap.c
$(gxalpha_h) $(gxcspace_h) $(gxfarith_h) $(gxfrac_h)\
$(gxdcconv_h) $(gxdevice_h) $(gxcmap_h) $(gsnamecl_h) $(gxlum_h)\
$(gzstate_h) $(gxdither_h) $(gxcdevn_h) $(string__h)\
- $(gsicc_manage_h) $(gdevdevn_h) $(gsicc_cache_h)
+ $(gsicc_manage_h) $(gdevdevn_h) $(gsicc_cache_h) $(gscms_h)
$(GLCC) $(GLO_)gxcmap.$(OBJ) $(C_) $(GLSRC)gxcmap.c
$(GLOBJ)gxcpath.$(OBJ) : $(GLSRC)gxcpath.c $(GXERR)\

18
ghostscript-iccprofiles-initdir.patch
View File

@ -1,8 +1,8 @@
diff -up ghostscript-9.00/psi/zusparam.c.iccprofiles-initdir ghostscript-9.00/psi/zusparam.c diff -up ghostscript-9.01/psi/zusparam.c.iccprofiles-initdir ghostscript-9.01/psi/zusparam.c
--- ghostscript-9.00/psi/zusparam.c.iccprofiles-initdir 2010-09-23 14:15:24.628921593 +0100 --- ghostscript-9.01/psi/zusparam.c.iccprofiles-initdir 2010-11-16 14:48:31.000000000 +0000
+++ ghostscript-9.00/psi/zusparam.c 2010-09-23 14:29:21.189796748 +0100 +++ ghostscript-9.01/psi/zusparam.c 2011-02-10 09:51:59.107972983 +0000
@@ -593,14 +593,31 @@ set_default_gray_icc(i_ctx_t *i_ctx_p, g @@ -607,12 +607,31 @@ set_default_gray_icc(i_ctx_t *i_ctx_p, g
return(code); return code;
} }
+extern_gx_io_device_table(); +extern_gx_io_device_table();
@ -10,7 +10,7 @@ diff -up ghostscript-9.00/psi/zusparam.c.iccprofiles-initdir ghostscript-9.00/ps
static void static void
current_icc_directory(i_ctx_t *i_ctx_p, gs_param_string * pval) current_icc_directory(i_ctx_t *i_ctx_p, gs_param_string * pval)
{ {
static const char *const rfs = "%rom%iccprofiles/"; /* as good as any other */ static const char *const rfs = DEFAULT_DIR_ICC; /* as good as any other */
const gs_imager_state * pis = (gs_imager_state *) igs; const gs_imager_state * pis = (gs_imager_state *) igs;
+ int have_rom_device = 0; + int have_rom_device = 0;
+ +
@ -28,10 +28,8 @@ diff -up ghostscript-9.00/psi/zusparam.c.iccprofiles-initdir ghostscript-9.00/ps
+ } + }
+ } + }
- pval->data = (const byte *)( (pis->icc_manager->profiledir == NULL) ?
- rfs : pis->icc_manager->profiledir);
+ pval->data = (const byte *) (have_rom_device ? rfs : ""); + pval->data = (const byte *) (have_rom_device ? rfs : "");
+ } + }
pval->data = (const byte *)( (pis->icc_manager->profiledir == NULL) ?
rfs : pis->icc_manager->profiledir);
pval->size = strlen((const char *)pval->data); pval->size = strlen((const char *)pval->data);
pval->persistent = true;
}

8519
ghostscript-scan_token.patch
View File

File diff suppressed because it is too large Load Diff

26
ghostscript-system-jasper.patch
View File

@ -1,26 +0,0 @@
diff -up ghostscript-9.00/base/sjpx.c.system-jasper ghostscript-9.00/base/sjpx.c
--- ghostscript-9.00/base/sjpx.c.system-jasper 2010-08-17 15:31:58.000000000 +0100
+++ ghostscript-9.00/base/sjpx.c 2010-09-23 09:59:46.747467642 +0100
@@ -33,14 +33,6 @@ static void s_jpxd_set_defaults(stream_s
private_st_jpxd_state(); /* creates a gc object for our state,
defined in sjpx.h */
-/* error reporting callback for the jpx library */
-static void
-s_jpx_jas_error_cb(jas_error_t err, char *msg)
-{
- dprintf2("jasper (code %d) %s", (int)err, msg);
-}
-
-
/* initialize the steam.
this involves allocating the stream and image structures, and
initializing the decoder.
@@ -56,7 +48,6 @@ s_jpxd_init(stream_state * ss)
}
status = jas_init();
- jas_set_error_cb(s_jpx_jas_error_cb);
#ifdef JPX_DEBUG
/* raise the error reporting threshold from the default (0) */
jas_setdbglevel(1);

25
ghostscript-vsnprintf.patch
View File

@ -1,18 +1,7 @@
diff -up ghostscript-9.00/base/gsmisc.c.vsnprintf ghostscript-9.00/base/gsmisc.c diff -up ghostscript-9.01/base/gsmisc.c.vsnprintf ghostscript-9.01/base/gsmisc.c
--- ghostscript-9.00/base/gsmisc.c.vsnprintf 2010-05-06 17:04:27.000000000 +0100 diff -up ghostscript-9.01/base/gxttfb.c.vsnprintf ghostscript-9.01/base/gxttfb.c
+++ ghostscript-9.00/base/gsmisc.c 2010-09-23 10:01:48.152921502 +0100 --- ghostscript-9.01/base/gxttfb.c.vsnprintf 2011-01-14 18:58:46.000000000 +0000
@@ -260,7 +260,7 @@ int gs_throw_imp(const char *func, const +++ ghostscript-9.01/base/gxttfb.c 2011-02-10 09:48:01.334990056 +0000
va_list ap;
va_start(ap, fmt);
- vsprintf(msg, fmt, ap);
+ vsnprintf(msg, sizeof (msg), fmt, ap);
msg[sizeof(msg) - 1] = 0;
va_end(ap);
diff -up ghostscript-9.00/base/gxttfb.c.vsnprintf ghostscript-9.00/base/gxttfb.c
--- ghostscript-9.00/base/gxttfb.c.vsnprintf 2010-05-05 19:14:21.000000000 +0100
+++ ghostscript-9.00/base/gxttfb.c 2010-09-23 10:51:31.575797285 +0100
@@ -246,7 +246,7 @@ static int DebugPrint(ttfFont *ttf, cons @@ -246,7 +246,7 @@ static int DebugPrint(ttfFont *ttf, cons
if (gs_debug_c('Y')) { if (gs_debug_c('Y')) {
@ -22,9 +11,9 @@ diff -up ghostscript-9.00/base/gxttfb.c.vsnprintf ghostscript-9.00/base/gxttfb.c
/* NB: moved debug output from stdout to stderr /* NB: moved debug output from stdout to stderr
*/ */
errwrite(ttf->DebugMem, buf, count); errwrite(ttf->DebugMem, buf, count);
diff -up ghostscript-9.00/base/rinkj/rinkj-byte-stream.c.vsnprintf ghostscript-9.00/base/rinkj/rinkj-byte-stream.c diff -up ghostscript-9.01/base/rinkj/rinkj-byte-stream.c.vsnprintf ghostscript-9.01/base/rinkj/rinkj-byte-stream.c
--- ghostscript-9.00/base/rinkj/rinkj-byte-stream.c.vsnprintf 2008-04-04 02:02:16.000000000 +0100 --- ghostscript-9.01/base/rinkj/rinkj-byte-stream.c.vsnprintf 2008-04-04 02:02:16.000000000 +0100
+++ ghostscript-9.00/base/rinkj/rinkj-byte-stream.c 2010-09-23 10:01:48.154921184 +0100 +++ ghostscript-9.01/base/rinkj/rinkj-byte-stream.c 2011-02-10 09:48:01.338989692 +0000
@@ -43,7 +43,7 @@ rinkj_byte_stream_printf (RinkjByteStrea @@ -43,7 +43,7 @@ rinkj_byte_stream_printf (RinkjByteStrea
va_list ap; va_list ap;

32
ghostscript.spec
View File

@ -1,27 +1,25 @@
%define gs_ver 9.00 %define gs_ver 9.01
%define gs_dot_ver 9.00 %define gs_dot_ver 9.01
%{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: 14%{?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
License: GPLv3+ and Redistributable, no modification permitted License: GPLv3+ and Redistributable, no modification permitted
URL: http://www.ghostscript.com/ URL: http://www.ghostscript.com/
Group: Applications/Publishing Group: Applications/Publishing
Source0: http://ghostscript.com/releases/ghostscript-%{gs_ver}.tar.xz Source0: http://ghostscript.com/releases/ghostscript-%{gs_ver}.tar.bz2
Source2: CIDFnmap Source2: CIDFnmap
Source4: cidfmap Source4: cidfmap
Patch1: ghostscript-multilib.patch Patch1: ghostscript-multilib.patch
Patch2: ghostscript-scripts.patch Patch2: ghostscript-scripts.patch
Patch3: ghostscript-noopt.patch Patch3: ghostscript-noopt.patch
Patch4: ghostscript-scan_token.patch
Patch5: ghostscript-runlibfileifexists.patch Patch5: ghostscript-runlibfileifexists.patch
Patch6: ghostscript-system-jasper.patch
Patch7: ghostscript-pksmraw.patch Patch7: ghostscript-pksmraw.patch
Patch8: ghostscript-jbig2dec-nullderef.patch Patch8: ghostscript-jbig2dec-nullderef.patch
Patch10: ghostscript-cups-filters.patch Patch10: ghostscript-cups-filters.patch
@ -30,9 +28,6 @@ Patch21: ghostscript-jbig2-image-refcount.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-icc-fix.patch
Patch31: ghostscript-gdevcups-691733.patch
Patch32: ghostscript-glyph-stretch-691920.patch
Requires: urw-fonts >= 1.1, ghostscript-fonts Requires: urw-fonts >= 1.1, ghostscript-fonts
Requires: poppler-data Requires: poppler-data
@ -118,15 +113,9 @@ rm -rf libpng zlib jpeg jasper
# Build igcref.c with -O0 to work around bug #150771. # Build igcref.c with -O0 to work around bug #150771.
%patch3 -p1 -b .noopt %patch3 -p1 -b .noopt
# Avoid symbol clash with scan_token (bug #590914).
%patch4 -p1 -b .scan_token
# Define .runlibfileifexists. # Define .runlibfileifexists.
%patch5 -p1 %patch5 -p1
# Use the system jasper library.
%patch6 -p1 -b .system-jasper
# Fix pksmraw output (bug #308211). Still needed in 8.63. # Fix pksmraw output (bug #308211). Still needed in 8.63.
%patch7 -p1 -b .pksmraw %patch7 -p1 -b .pksmraw
@ -154,15 +143,6 @@ rm -rf libpng zlib jpeg jasper
# 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
# Applied upstream ICC fix (bug #655449).
%patch30 -p1 -b .icc-fix
# Applied fix for upstream bug #691733.
%patch31 -p1 -b .gdevcups-691733
# Applied fix for upstream bug #691920.
%patch32 -p1 -b .glyph-stretch-691920
# 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}_"
@ -354,6 +334,10 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libgs.so %{_libdir}/libgs.so
%changelog %changelog
* Thu Feb 10 2011 Tim Waugh <twaugh@redhat.com> 9.01-1
- 9.01. No longer needed gdevcups-691733, glyph-stretch-691920,
icc-fix, scan_token, or system-jasper patches.
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 9.00-14 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 9.00-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

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
1ca5f245677f78f573e6490bdb40702f ghostscript-9.00.tar.xz 9824d6a21ad8b4a831f67601959f1181 ghostscript-9.01.tar.bz2