[arch-commits] Commit in ghostscript/trunk (4 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Wed Mar 30 16:30:47 UTC 2011
Date: Wednesday, March 30, 2011 @ 12:30:46
Author: andyrtr
Revision: 117276
upgpkg: ghostscript 9.02-1
upstream update 9.02
Modified:
ghostscript/trunk/PKGBUILD
Deleted:
ghostscript/trunk/ghostscript-fPIC.patch
ghostscript/trunk/ghostscript-gdevcups-691733.patch
ghostscript/trunk/ghostscript-system-jasper.patch
-----------------------------------+
PKGBUILD | 33 +----------
ghostscript-fPIC.patch | 20 ------
ghostscript-gdevcups-691733.patch | 107 ------------------------------------
ghostscript-system-jasper.patch | 26 --------
4 files changed, 4 insertions(+), 182 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-03-30 15:08:33 UTC (rev 117275)
+++ PKGBUILD 2011-03-30 16:30:46 UTC (rev 117276)
@@ -2,7 +2,7 @@
# Maintainer: AndyRTR <andyrtr at archlinux.org>
pkgname=ghostscript
-pkgver=9.01
+pkgver=9.02
pkgrel=1
pkgdesc="An interpreter for the PostScript language"
arch=('i686' 'x86_64')
@@ -12,41 +12,16 @@
optdepends=('texlive-core: needed for dvipdf'
'gtk2: needed for gsx')
url="http://www.ghostscript.com/"
-source=(http://ghostscript.com/releases/ghostscript-${pkgver}.tar.bz2
- ghostscript-fPIC.patch
- ghostscript-system-jasper.patch
- svn_rev11948.diff
- ghostscript-gdevcups-691733.patch
- gs_bug691759and691760.diff)
+source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2)
options=('!libtool' '!makeflags')
-md5sums=('9824d6a21ad8b4a831f67601959f1181'
- '766d44c47c693f96941b658e360c1277'
- '03e27cd02471ab3b642c344fa06b623e'
- '78f2b9c2d6a5a60891b2d8b593a15b00'
- 'e459d4cf897bdb54fefbba9d57bd2fa2'
- '21841b0ea5bd67cf4b68ba64c5d5755b')
+md5sums=('f67151444bd56a7904579fc75a083dd6')
build() {
cd ${srcdir}/ghostscript-${pkgver}
+
# force it to use system-libs
rm -rf jpeg libpng zlib jasper expat tiff
- # fix build with systems jasper
-# patch -Np1 -i ${srcdir}/ghostscript-system-jasper.patch
-
-# if [ "$CARCH" = "x86_64" ]; then
-# patch -Np1 -i ${srcdir}/ghostscript-fPIC.patch
-# fi
-
- # part of https://bugs.archlinux.org/task/22006 - http://bugs.ghostscript.com/show_bug.cgi?id=691831
-# patch -Np2 -i ${srcdir}/svn_rev11948.diff
- # upstream fix for http://bugs.ghostscript.com/show_bug.cgi?id=691733 / part of https://bugs.archlinux.org/task/21388
- # patch taken from Fedora RawHide master
-# patch -Np1 -i ${srcdir}/ghostscript-gdevcups-691733.patch
- # patch for http://bugs.ghostscript.com/show_bug.cgi?id=691760 and http://bugs.ghostscript.com/show_bug.cgi?id=691759 / part of https://bugs.archlinux.org/task/21388
-# patch -Np2 -i ${srcdir}/gs_bug691759and691760.diff
-
-# ./autogen.sh
./configure --prefix=/usr \
--enable-dynamic \
--with-ijs \
Deleted: ghostscript-fPIC.patch
===================================================================
--- ghostscript-fPIC.patch 2011-03-30 15:08:33 UTC (rev 117275)
+++ ghostscript-fPIC.patch 2011-03-30 16:30:46 UTC (rev 117276)
@@ -1,20 +0,0 @@
---- ghostscript-8.60-r8112/base/lib.mak.fPIC 2007-07-10 17:03:11.000000000 +0100
-+++ ghostscript-8.60-r8112/base/lib.mak 2007-07-10 17:05:56.000000000 +0100
-@@ -874,7 +874,7 @@
- $(GLOBJ)gsparamx.$(OBJ) : $(GLSRC)gsparamx.c $(string__h)\
- $(gserror_h) $(gserrors_h) $(gsmemory_h) $(gsparam_h) $(gsparamx_h)\
- $(gstypes_h)
-- $(GLCC) $(GLO_)gsparamx.$(OBJ) $(C_) $(GLSRC)gsparamx.c
-+ $(GLCCSHARED) $(GLO_)gsparamx.$(OBJ) $(C_) $(GLSRC)gsparamx.c
-
- # Future replacement for gsparams.c
- $(GLOBJ)gsparam2.$(OBJ) : $(GLSRC)gsparam2.c $(GXERR) $(memory__h)\
-@@ -1077,7 +1077,7 @@
-
- # Provide a mapping between StandardEncoding and ISOLatin1Encoding.
- $(GLOBJ)gdevemap.$(OBJ) : $(GLSRC)gdevemap.c $(AK) $(std_h)
-- $(GLCC) $(GLO_)gdevemap.$(OBJ) $(C_) $(GLSRC)gdevemap.c
-+ $(GLCCSHARED) $(GLO_)gdevemap.$(OBJ) $(C_) $(GLSRC)gdevemap.c
-
- ###### Create a pseudo-"feature" for the entire graphics library.
-
Deleted: ghostscript-gdevcups-691733.patch
===================================================================
--- ghostscript-gdevcups-691733.patch 2011-03-30 15:08:33 UTC (rev 117275)
+++ ghostscript-gdevcups-691733.patch 2011-03-30 16:30:46 UTC (rev 117276)
@@ -1,107 +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 :
-
Deleted: ghostscript-system-jasper.patch
===================================================================
--- ghostscript-system-jasper.patch 2011-03-30 15:08:33 UTC (rev 117275)
+++ ghostscript-system-jasper.patch 2011-03-30 16:30:46 UTC (rev 117276)
@@ -1,26 +0,0 @@
-diff -up ghostscript-8.64/base/sjpx.c.system-jasper ghostscript-8.64/base/sjpx.c
---- ghostscript-8.64/base/sjpx.c.system-jasper 2008-08-21 00:22:49.000000000 +0100
-+++ ghostscript-8.64/base/sjpx.c 2009-02-04 11:35:56.000000000 +0000
-@@ -34,14 +34,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.
-@@ -59,7 +51,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);
More information about the arch-commits
mailing list