Date: Saturday, October 10, 2015 @ 15:02:01 Author: andyrtr Revision: 248864
archrelease: copy trunk to extra-i686, extra-x86_64 Added: ghostscript/repos/extra-i686/PKGBUILD (from rev 248863, ghostscript/trunk/PKGBUILD) ghostscript/repos/extra-i686/bug_696246.diff (from rev 248863, ghostscript/trunk/bug_696246.diff) ghostscript/repos/extra-i686/ghostscript-sys-zlib.patch (from rev 248863, ghostscript/trunk/ghostscript-sys-zlib.patch) ghostscript/repos/extra-x86_64/PKGBUILD (from rev 248863, ghostscript/trunk/PKGBUILD) ghostscript/repos/extra-x86_64/bug_696246.diff (from rev 248863, ghostscript/trunk/bug_696246.diff) ghostscript/repos/extra-x86_64/ghostscript-sys-zlib.patch (from rev 248863, ghostscript/trunk/ghostscript-sys-zlib.patch) Deleted: ghostscript/repos/extra-i686/PKGBUILD ghostscript/repos/extra-i686/ghostscript-sys-zlib.patch ghostscript/repos/extra-x86_64/PKGBUILD ghostscript/repos/extra-x86_64/ghostscript-sys-zlib.patch -----------------------------------------+ /PKGBUILD | 182 ++++++++++++++++++++++++++++++ /ghostscript-sys-zlib.patch | 50 ++++++++ extra-i686/PKGBUILD | 87 -------------- extra-i686/bug_696246.diff | 89 ++++++++++++++ extra-i686/ghostscript-sys-zlib.patch | 25 ---- extra-x86_64/PKGBUILD | 87 -------------- extra-x86_64/bug_696246.diff | 89 ++++++++++++++ extra-x86_64/ghostscript-sys-zlib.patch | 25 ---- 8 files changed, 410 insertions(+), 224 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2015-10-10 13:01:47 UTC (rev 248863) +++ extra-i686/PKGBUILD 2015-10-10 13:02:01 UTC (rev 248864) @@ -1,87 +0,0 @@ -# $Id$ -# Maintainer: AndyRTR <andy...@archlinux.org> - -### !!! rebuild groff from core that picks up hardcoding the GS versioned font path !!! ### - -pkgname=ghostscript -pkgver=9.18 -pkgrel=1 -pkgdesc="An interpreter for the PostScript language" -arch=('i686' 'x86_64') -license=('AGPL' 'custom') -depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg' - 'libtiff>=4.0.0' 'lcms2' 'dbus' 'libpaper') -makedepends=('gtk3' 'gnutls' 'hardening-wrapper') -optdepends=('texlive-core: needed for dvipdf' - 'gtk3: needed for gsx') -url="http://www.ghostscript.com/" -source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2 - ghostscript-sys-zlib.patch) -#options=('!makeflags') -# http://downloads.ghostscript.com/public/SHA1SUMS -sha1sums=('388fea50a38e422a4c6ff27c184491bf5ecb96e1' - 'e054caf753df4d67221b29a2eac66130653f7556') - -prepare() { - cd ghostscript-${pkgver} - # fix build with system zlib - patch -Np1 -i ${srcdir}/ghostscript-sys-zlib.patch -} - -build() { - cd ghostscript-${pkgver} - - # force it to use system-libs - # keep heavily patched included openjpeg, leads to segfault with system openjpeg - # https://bugs.archlinux.org/task/38226 - rm -rf jpeg libpng zlib jasper expat tiff lcms lcms2 freetype cups/libs # jbig2dec is in community - - autoconf --force - - ./configure --prefix=/usr \ - --enable-dynamic \ - --with-ijs \ - --with-jbig2dec \ - --with-omni \ - --with-x \ - --with-drivers=ALL\ - --with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \ - --enable-fontconfig \ - --enable-freetype \ - --enable-openjpeg \ - --without-luratech \ - --without-omni \ - --with-system-libtiff \ - --with-libpaper \ - --disable-compile-inits #--help # needed for linking with system-zlib - make - - # Build IJS - cd ijs - sed -i "s:AM_PROG_CC_STDC:AC_PROG_CC:g" configure.ac - ./autogen.sh - ./configure --prefix=/usr --enable-shared --disable-static - make -} - -package() { - cd ghostscript-${pkgver} - make DESTDIR="${pkgdir}" \ - cups_serverroot="${pkgdir}"/etc/cups \ - cups_serverbin="${pkgdir}"/usr/lib/cups install install-so - - # install missing doc files # http://bugs.archlinux.org/task/18023 - install -m 644 "${srcdir}"/ghostscript-${pkgver}/doc/{Ps2ps2.htm,gs-vms.hlp,gsdoc.el,pscet_status.txt} "${pkgdir}"/usr/share/ghostscript/$pkgver/doc/ - - install -D -m644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE - - # remove unwanted localized man-pages - rm -rf "$pkgdir"/usr/share/man/[^man1]* - - # install IJS - cd ijs - make DESTDIR="${pkgdir}" install - - # remove filters that are now maintained in cups-filters as upstream home - rm -rf "$pkgdir"/usr/lib/cups/filter/{gstopxl,gstoraster} -} Copied: ghostscript/repos/extra-i686/PKGBUILD (from rev 248863, ghostscript/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2015-10-10 13:02:01 UTC (rev 248864) @@ -0,0 +1,91 @@ +# $Id$ +# Maintainer: AndyRTR <andy...@archlinux.org> + +### !!! rebuild groff from core that picks up hardcoding the GS versioned font path !!! ### + +pkgname=ghostscript +pkgver=9.18 +pkgrel=2 +pkgdesc="An interpreter for the PostScript language" +arch=('i686' 'x86_64') +license=('AGPL' 'custom') +depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg' + 'libtiff>=4.0.0' 'lcms2' 'dbus' 'libpaper') +makedepends=('gtk3' 'gnutls' 'hardening-wrapper') +optdepends=('texlive-core: needed for dvipdf' + 'gtk3: needed for gsx') +url="http://www.ghostscript.com/" +source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2 + ghostscript-sys-zlib.patch + bug_696246.diff) +#options=('!makeflags') +# http://downloads.ghostscript.com/public/SHA1SUMS +sha1sums=('388fea50a38e422a4c6ff27c184491bf5ecb96e1' + 'e054caf753df4d67221b29a2eac66130653f7556' + '8bdcb72250f81d8d1f3b3cff4becb673113ed302') + +prepare() { + cd ghostscript-${pkgver} + # fix build with system zlib + patch -Np1 -i ${srcdir}/ghostscript-sys-zlib.patch + # fix http://bugs.ghostscript.com/show_bug.cgi?id=696246 - should also be FS#46637 + patch -Np1 -i ${srcdir}/bug_696246.diff +} + +build() { + cd ghostscript-${pkgver} + + # force it to use system-libs + # keep heavily patched included openjpeg, leads to segfault with system openjpeg + # https://bugs.archlinux.org/task/38226 + rm -rf jpeg libpng zlib jasper expat tiff lcms lcms2 freetype cups/libs # jbig2dec is in community + + autoconf --force + + ./configure --prefix=/usr \ + --enable-dynamic \ + --with-ijs \ + --with-jbig2dec \ + --with-omni \ + --with-x \ + --with-drivers=ALL\ + --with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \ + --enable-fontconfig \ + --enable-freetype \ + --enable-openjpeg \ + --without-luratech \ + --without-omni \ + --with-system-libtiff \ + --with-libpaper \ + --disable-compile-inits #--help # needed for linking with system-zlib + make + + # Build IJS + cd ijs + sed -i "s:AM_PROG_CC_STDC:AC_PROG_CC:g" configure.ac + ./autogen.sh + ./configure --prefix=/usr --enable-shared --disable-static + make +} + +package() { + cd ghostscript-${pkgver} + make DESTDIR="${pkgdir}" \ + cups_serverroot="${pkgdir}"/etc/cups \ + cups_serverbin="${pkgdir}"/usr/lib/cups install install-so + + # install missing doc files # http://bugs.archlinux.org/task/18023 + install -m 644 "${srcdir}"/ghostscript-${pkgver}/doc/{Ps2ps2.htm,gs-vms.hlp,gsdoc.el,pscet_status.txt} "${pkgdir}"/usr/share/ghostscript/$pkgver/doc/ + + install -D -m644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE + + # remove unwanted localized man-pages + rm -rf "$pkgdir"/usr/share/man/[^man1]* + + # install IJS + cd ijs + make DESTDIR="${pkgdir}" install + + # remove filters that are now maintained in cups-filters as upstream home + rm -rf "$pkgdir"/usr/lib/cups/filter/{gstopxl,gstoraster} +} Copied: ghostscript/repos/extra-i686/bug_696246.diff (from rev 248863, ghostscript/trunk/bug_696246.diff) =================================================================== --- extra-i686/bug_696246.diff (rev 0) +++ extra-i686/bug_696246.diff 2015-10-10 13:02:01 UTC (rev 248864) @@ -0,0 +1,89 @@ +From: Chris Liddell <chris.lidd...@artifex.com> +Date: Fri, 9 Oct 2015 09:54:10 +0000 (+0100) +Subject: Bug 696246: devijs account for device sublassing. +X-Git-Url: http://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff_plain;h=b68e05c3 + +Bug 696246: devijs account for device sublassing. + +The IJS device wasn't coping with the possibility it had been subclassed. + +No cluster differences +--- + +diff --git a/devices/gdevijs.c b/devices/gdevijs.c +index 5520716..a2e21ea 100644 +--- a/devices/gdevijs.c ++++ b/devices/gdevijs.c +@@ -827,6 +827,10 @@ gsijs_open(gx_device *dev) + if (code < 0) + return code; + ++ while (dev->child) ++ dev = dev->child; ++ ijsdev = (gx_device_ijs *)dev; ++ + if (use_outputfd) { + /* Note: dup() may not be portable to all interesting IJS + platforms. In that case, this branch should be #ifdef'ed out. +From: Chris Liddell <chris.lidd...@artifex.com> +Date: Fri, 9 Oct 2015 11:54:44 +0000 (+0100) +Subject: Bug 696246: patch the memory manager fields for sublassed devices. +X-Git-Url: http://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff_plain;h=95553954 + +Bug 696246: patch the memory manager fields for sublassed devices. + +When we subclass a device, we were patching the "visible" type field - that is, +the one referenced directly in the device structure. We were not patching +the type information in the memory object header so, in particular, the +garbage collector could end up calling the wrong methods for the subclassed +device. + +No cluster differences. +--- + +diff --git a/base/gdevdflt.c b/base/gdevdflt.c +index 5768937..305f89d 100644 +--- a/base/gdevdflt.c ++++ b/base/gdevdflt.c +@@ -17,6 +17,8 @@ + #include "math_.h" + #include "memory_.h" + #include "gx.h" ++#include "gsstruct.h" ++#include "gxobj.h" + #include "gserrors.h" + #include "gsropt.h" + #include "gxcomp.h" +@@ -26,6 +28,7 @@ + #include "gstrans.h" /* For gs_pdf14trans_t */ + #include "gxistate.h" /* for gs_image_state_s */ + ++ + /* defined in gsdpram.c */ + int gx_default_get_param(gx_device *dev, char *Param, void *list); + +@@ -1294,6 +1297,11 @@ int gx_device_subclass(gx_device *dev_to_subclass, gx_device *new_prototype, uns + ptr1 = ((char *)new_prototype) + sizeof(gx_device); + memcpy(ptr, ptr1, new_prototype->params_size - sizeof(gx_device)); + ++ /* We have to patch up the "type" parameters that the memory manage/garbage ++ * collector will use, as well. ++ */ ++ (((obj_header_t *)dev_to_subclass) - 1)->o_type = new_prototype->stype; ++ + /* If the original device's stype structure was dynamically allocated, we need + * to 'fixup' the contents, it's procs need to point to the new device's procs + * for instance. +diff --git a/base/lib.mak b/base/lib.mak +index de78333..09b70e5 100644 +--- a/base/lib.mak ++++ b/base/lib.mak +@@ -1210,7 +1210,7 @@ $(GLOBJ)gdevdsha.$(OBJ) : $(GLSRC)gdevdsha.c $(AK) $(gx_h)\ + + $(GLOBJ)gdevdflt.$(OBJ) : $(GLSRC)gdevdflt.c $(AK) $(gx_h)\ + $(gserrors_h) $(gsropt_h) $(gxcomp_h) $(gxdevice_h) $(gxdevsop_h) $(math__h)\ +- $(MAKEDIRS) ++ $(gsstruct_h) $(gxobj_h) $(MAKEDIRS) + $(GLCC) $(GLO_)gdevdflt.$(OBJ) $(C_) $(GLSRC)gdevdflt.c + + $(GLOBJ)gdevdgbr.$(OBJ) : $(GLSRC)gdevdgbr.c $(AK) $(gx_h)\ Deleted: extra-i686/ghostscript-sys-zlib.patch =================================================================== --- extra-i686/ghostscript-sys-zlib.patch 2015-10-10 13:01:47 UTC (rev 248863) +++ extra-i686/ghostscript-sys-zlib.patch 2015-10-10 13:02:01 UTC (rev 248864) @@ -1,25 +0,0 @@ -diff -up ghostscript-9.12/configure.ac.sys-zlib ghostscript-9.12/configure.ac ---- ghostscript-9.12/configure.ac.sys-zlib 2014-03-26 11:48:54.983972222 +0000 -+++ ghostscript-9.12/configure.ac 2014-03-26 11:49:36.807230531 +0000 -@@ -854,7 +854,7 @@ AC_MSG_CHECKING([for local zlib source]) - dnl zlib is needed for language level 3, and libpng - # we must define ZLIBDIR regardless because png.mak does a -I$(ZLIBDIR) - # this seems a harmless default --ZLIBDIR=src -+ZLIBDIR=$includedir - AUX_SHARED_ZLIB= - - if test -d $srcdir/zlib; then -diff -up ghostscript-9.12/configure.sys-zlib ghostscript-9.12/configure ---- ghostscript-9.12/configure.sys-zlib 2014-03-26 11:49:45.547284521 +0000 -+++ ghostscript-9.12/configure 2014-03-26 11:49:56.171350127 +0000 -@@ -6254,7 +6254,7 @@ fi - $as_echo_n "checking for local zlib source... " >&6; } - # we must define ZLIBDIR regardless because png.mak does a -I$(ZLIBDIR) - # this seems a harmless default --ZLIBDIR=src -+ZLIBDIR=$includedir - AUX_SHARED_ZLIB= - - if test -d $srcdir/zlib; then - Copied: ghostscript/repos/extra-i686/ghostscript-sys-zlib.patch (from rev 248863, ghostscript/trunk/ghostscript-sys-zlib.patch) =================================================================== --- extra-i686/ghostscript-sys-zlib.patch (rev 0) +++ extra-i686/ghostscript-sys-zlib.patch 2015-10-10 13:02:01 UTC (rev 248864) @@ -0,0 +1,25 @@ +diff -up ghostscript-9.12/configure.ac.sys-zlib ghostscript-9.12/configure.ac +--- ghostscript-9.12/configure.ac.sys-zlib 2014-03-26 11:48:54.983972222 +0000 ++++ ghostscript-9.12/configure.ac 2014-03-26 11:49:36.807230531 +0000 +@@ -854,7 +854,7 @@ AC_MSG_CHECKING([for local zlib source]) + dnl zlib is needed for language level 3, and libpng + # we must define ZLIBDIR regardless because png.mak does a -I$(ZLIBDIR) + # this seems a harmless default +-ZLIBDIR=src ++ZLIBDIR=$includedir + AUX_SHARED_ZLIB= + + if test -d $srcdir/zlib; then +diff -up ghostscript-9.12/configure.sys-zlib ghostscript-9.12/configure +--- ghostscript-9.12/configure.sys-zlib 2014-03-26 11:49:45.547284521 +0000 ++++ ghostscript-9.12/configure 2014-03-26 11:49:56.171350127 +0000 +@@ -6254,7 +6254,7 @@ fi + $as_echo_n "checking for local zlib source... " >&6; } + # we must define ZLIBDIR regardless because png.mak does a -I$(ZLIBDIR) + # this seems a harmless default +-ZLIBDIR=src ++ZLIBDIR=$includedir + AUX_SHARED_ZLIB= + + if test -d $srcdir/zlib; then + Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2015-10-10 13:01:47 UTC (rev 248863) +++ extra-x86_64/PKGBUILD 2015-10-10 13:02:01 UTC (rev 248864) @@ -1,87 +0,0 @@ -# $Id$ -# Maintainer: AndyRTR <andy...@archlinux.org> - -### !!! rebuild groff from core that picks up hardcoding the GS versioned font path !!! ### - -pkgname=ghostscript -pkgver=9.18 -pkgrel=1 -pkgdesc="An interpreter for the PostScript language" -arch=('i686' 'x86_64') -license=('AGPL' 'custom') -depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg' - 'libtiff>=4.0.0' 'lcms2' 'dbus' 'libpaper') -makedepends=('gtk3' 'gnutls' 'hardening-wrapper') -optdepends=('texlive-core: needed for dvipdf' - 'gtk3: needed for gsx') -url="http://www.ghostscript.com/" -source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2 - ghostscript-sys-zlib.patch) -#options=('!makeflags') -# http://downloads.ghostscript.com/public/SHA1SUMS -sha1sums=('388fea50a38e422a4c6ff27c184491bf5ecb96e1' - 'e054caf753df4d67221b29a2eac66130653f7556') - -prepare() { - cd ghostscript-${pkgver} - # fix build with system zlib - patch -Np1 -i ${srcdir}/ghostscript-sys-zlib.patch -} - -build() { - cd ghostscript-${pkgver} - - # force it to use system-libs - # keep heavily patched included openjpeg, leads to segfault with system openjpeg - # https://bugs.archlinux.org/task/38226 - rm -rf jpeg libpng zlib jasper expat tiff lcms lcms2 freetype cups/libs # jbig2dec is in community - - autoconf --force - - ./configure --prefix=/usr \ - --enable-dynamic \ - --with-ijs \ - --with-jbig2dec \ - --with-omni \ - --with-x \ - --with-drivers=ALL\ - --with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \ - --enable-fontconfig \ - --enable-freetype \ - --enable-openjpeg \ - --without-luratech \ - --without-omni \ - --with-system-libtiff \ - --with-libpaper \ - --disable-compile-inits #--help # needed for linking with system-zlib - make - - # Build IJS - cd ijs - sed -i "s:AM_PROG_CC_STDC:AC_PROG_CC:g" configure.ac - ./autogen.sh - ./configure --prefix=/usr --enable-shared --disable-static - make -} - -package() { - cd ghostscript-${pkgver} - make DESTDIR="${pkgdir}" \ - cups_serverroot="${pkgdir}"/etc/cups \ - cups_serverbin="${pkgdir}"/usr/lib/cups install install-so - - # install missing doc files # http://bugs.archlinux.org/task/18023 - install -m 644 "${srcdir}"/ghostscript-${pkgver}/doc/{Ps2ps2.htm,gs-vms.hlp,gsdoc.el,pscet_status.txt} "${pkgdir}"/usr/share/ghostscript/$pkgver/doc/ - - install -D -m644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE - - # remove unwanted localized man-pages - rm -rf "$pkgdir"/usr/share/man/[^man1]* - - # install IJS - cd ijs - make DESTDIR="${pkgdir}" install - - # remove filters that are now maintained in cups-filters as upstream home - rm -rf "$pkgdir"/usr/lib/cups/filter/{gstopxl,gstoraster} -} Copied: ghostscript/repos/extra-x86_64/PKGBUILD (from rev 248863, ghostscript/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2015-10-10 13:02:01 UTC (rev 248864) @@ -0,0 +1,91 @@ +# $Id$ +# Maintainer: AndyRTR <andy...@archlinux.org> + +### !!! rebuild groff from core that picks up hardcoding the GS versioned font path !!! ### + +pkgname=ghostscript +pkgver=9.18 +pkgrel=2 +pkgdesc="An interpreter for the PostScript language" +arch=('i686' 'x86_64') +license=('AGPL' 'custom') +depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg' + 'libtiff>=4.0.0' 'lcms2' 'dbus' 'libpaper') +makedepends=('gtk3' 'gnutls' 'hardening-wrapper') +optdepends=('texlive-core: needed for dvipdf' + 'gtk3: needed for gsx') +url="http://www.ghostscript.com/" +source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2 + ghostscript-sys-zlib.patch + bug_696246.diff) +#options=('!makeflags') +# http://downloads.ghostscript.com/public/SHA1SUMS +sha1sums=('388fea50a38e422a4c6ff27c184491bf5ecb96e1' + 'e054caf753df4d67221b29a2eac66130653f7556' + '8bdcb72250f81d8d1f3b3cff4becb673113ed302') + +prepare() { + cd ghostscript-${pkgver} + # fix build with system zlib + patch -Np1 -i ${srcdir}/ghostscript-sys-zlib.patch + # fix http://bugs.ghostscript.com/show_bug.cgi?id=696246 - should also be FS#46637 + patch -Np1 -i ${srcdir}/bug_696246.diff +} + +build() { + cd ghostscript-${pkgver} + + # force it to use system-libs + # keep heavily patched included openjpeg, leads to segfault with system openjpeg + # https://bugs.archlinux.org/task/38226 + rm -rf jpeg libpng zlib jasper expat tiff lcms lcms2 freetype cups/libs # jbig2dec is in community + + autoconf --force + + ./configure --prefix=/usr \ + --enable-dynamic \ + --with-ijs \ + --with-jbig2dec \ + --with-omni \ + --with-x \ + --with-drivers=ALL\ + --with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \ + --enable-fontconfig \ + --enable-freetype \ + --enable-openjpeg \ + --without-luratech \ + --without-omni \ + --with-system-libtiff \ + --with-libpaper \ + --disable-compile-inits #--help # needed for linking with system-zlib + make + + # Build IJS + cd ijs + sed -i "s:AM_PROG_CC_STDC:AC_PROG_CC:g" configure.ac + ./autogen.sh + ./configure --prefix=/usr --enable-shared --disable-static + make +} + +package() { + cd ghostscript-${pkgver} + make DESTDIR="${pkgdir}" \ + cups_serverroot="${pkgdir}"/etc/cups \ + cups_serverbin="${pkgdir}"/usr/lib/cups install install-so + + # install missing doc files # http://bugs.archlinux.org/task/18023 + install -m 644 "${srcdir}"/ghostscript-${pkgver}/doc/{Ps2ps2.htm,gs-vms.hlp,gsdoc.el,pscet_status.txt} "${pkgdir}"/usr/share/ghostscript/$pkgver/doc/ + + install -D -m644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE + + # remove unwanted localized man-pages + rm -rf "$pkgdir"/usr/share/man/[^man1]* + + # install IJS + cd ijs + make DESTDIR="${pkgdir}" install + + # remove filters that are now maintained in cups-filters as upstream home + rm -rf "$pkgdir"/usr/lib/cups/filter/{gstopxl,gstoraster} +} Copied: ghostscript/repos/extra-x86_64/bug_696246.diff (from rev 248863, ghostscript/trunk/bug_696246.diff) =================================================================== --- extra-x86_64/bug_696246.diff (rev 0) +++ extra-x86_64/bug_696246.diff 2015-10-10 13:02:01 UTC (rev 248864) @@ -0,0 +1,89 @@ +From: Chris Liddell <chris.lidd...@artifex.com> +Date: Fri, 9 Oct 2015 09:54:10 +0000 (+0100) +Subject: Bug 696246: devijs account for device sublassing. +X-Git-Url: http://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff_plain;h=b68e05c3 + +Bug 696246: devijs account for device sublassing. + +The IJS device wasn't coping with the possibility it had been subclassed. + +No cluster differences +--- + +diff --git a/devices/gdevijs.c b/devices/gdevijs.c +index 5520716..a2e21ea 100644 +--- a/devices/gdevijs.c ++++ b/devices/gdevijs.c +@@ -827,6 +827,10 @@ gsijs_open(gx_device *dev) + if (code < 0) + return code; + ++ while (dev->child) ++ dev = dev->child; ++ ijsdev = (gx_device_ijs *)dev; ++ + if (use_outputfd) { + /* Note: dup() may not be portable to all interesting IJS + platforms. In that case, this branch should be #ifdef'ed out. +From: Chris Liddell <chris.lidd...@artifex.com> +Date: Fri, 9 Oct 2015 11:54:44 +0000 (+0100) +Subject: Bug 696246: patch the memory manager fields for sublassed devices. +X-Git-Url: http://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff_plain;h=95553954 + +Bug 696246: patch the memory manager fields for sublassed devices. + +When we subclass a device, we were patching the "visible" type field - that is, +the one referenced directly in the device structure. We were not patching +the type information in the memory object header so, in particular, the +garbage collector could end up calling the wrong methods for the subclassed +device. + +No cluster differences. +--- + +diff --git a/base/gdevdflt.c b/base/gdevdflt.c +index 5768937..305f89d 100644 +--- a/base/gdevdflt.c ++++ b/base/gdevdflt.c +@@ -17,6 +17,8 @@ + #include "math_.h" + #include "memory_.h" + #include "gx.h" ++#include "gsstruct.h" ++#include "gxobj.h" + #include "gserrors.h" + #include "gsropt.h" + #include "gxcomp.h" +@@ -26,6 +28,7 @@ + #include "gstrans.h" /* For gs_pdf14trans_t */ + #include "gxistate.h" /* for gs_image_state_s */ + ++ + /* defined in gsdpram.c */ + int gx_default_get_param(gx_device *dev, char *Param, void *list); + +@@ -1294,6 +1297,11 @@ int gx_device_subclass(gx_device *dev_to_subclass, gx_device *new_prototype, uns + ptr1 = ((char *)new_prototype) + sizeof(gx_device); + memcpy(ptr, ptr1, new_prototype->params_size - sizeof(gx_device)); + ++ /* We have to patch up the "type" parameters that the memory manage/garbage ++ * collector will use, as well. ++ */ ++ (((obj_header_t *)dev_to_subclass) - 1)->o_type = new_prototype->stype; ++ + /* If the original device's stype structure was dynamically allocated, we need + * to 'fixup' the contents, it's procs need to point to the new device's procs + * for instance. +diff --git a/base/lib.mak b/base/lib.mak +index de78333..09b70e5 100644 +--- a/base/lib.mak ++++ b/base/lib.mak +@@ -1210,7 +1210,7 @@ $(GLOBJ)gdevdsha.$(OBJ) : $(GLSRC)gdevdsha.c $(AK) $(gx_h)\ + + $(GLOBJ)gdevdflt.$(OBJ) : $(GLSRC)gdevdflt.c $(AK) $(gx_h)\ + $(gserrors_h) $(gsropt_h) $(gxcomp_h) $(gxdevice_h) $(gxdevsop_h) $(math__h)\ +- $(MAKEDIRS) ++ $(gsstruct_h) $(gxobj_h) $(MAKEDIRS) + $(GLCC) $(GLO_)gdevdflt.$(OBJ) $(C_) $(GLSRC)gdevdflt.c + + $(GLOBJ)gdevdgbr.$(OBJ) : $(GLSRC)gdevdgbr.c $(AK) $(gx_h)\ Deleted: extra-x86_64/ghostscript-sys-zlib.patch =================================================================== --- extra-x86_64/ghostscript-sys-zlib.patch 2015-10-10 13:01:47 UTC (rev 248863) +++ extra-x86_64/ghostscript-sys-zlib.patch 2015-10-10 13:02:01 UTC (rev 248864) @@ -1,25 +0,0 @@ -diff -up ghostscript-9.12/configure.ac.sys-zlib ghostscript-9.12/configure.ac ---- ghostscript-9.12/configure.ac.sys-zlib 2014-03-26 11:48:54.983972222 +0000 -+++ ghostscript-9.12/configure.ac 2014-03-26 11:49:36.807230531 +0000 -@@ -854,7 +854,7 @@ AC_MSG_CHECKING([for local zlib source]) - dnl zlib is needed for language level 3, and libpng - # we must define ZLIBDIR regardless because png.mak does a -I$(ZLIBDIR) - # this seems a harmless default --ZLIBDIR=src -+ZLIBDIR=$includedir - AUX_SHARED_ZLIB= - - if test -d $srcdir/zlib; then -diff -up ghostscript-9.12/configure.sys-zlib ghostscript-9.12/configure ---- ghostscript-9.12/configure.sys-zlib 2014-03-26 11:49:45.547284521 +0000 -+++ ghostscript-9.12/configure 2014-03-26 11:49:56.171350127 +0000 -@@ -6254,7 +6254,7 @@ fi - $as_echo_n "checking for local zlib source... " >&6; } - # we must define ZLIBDIR regardless because png.mak does a -I$(ZLIBDIR) - # this seems a harmless default --ZLIBDIR=src -+ZLIBDIR=$includedir - AUX_SHARED_ZLIB= - - if test -d $srcdir/zlib; then - Copied: ghostscript/repos/extra-x86_64/ghostscript-sys-zlib.patch (from rev 248863, ghostscript/trunk/ghostscript-sys-zlib.patch) =================================================================== --- extra-x86_64/ghostscript-sys-zlib.patch (rev 0) +++ extra-x86_64/ghostscript-sys-zlib.patch 2015-10-10 13:02:01 UTC (rev 248864) @@ -0,0 +1,25 @@ +diff -up ghostscript-9.12/configure.ac.sys-zlib ghostscript-9.12/configure.ac +--- ghostscript-9.12/configure.ac.sys-zlib 2014-03-26 11:48:54.983972222 +0000 ++++ ghostscript-9.12/configure.ac 2014-03-26 11:49:36.807230531 +0000 +@@ -854,7 +854,7 @@ AC_MSG_CHECKING([for local zlib source]) + dnl zlib is needed for language level 3, and libpng + # we must define ZLIBDIR regardless because png.mak does a -I$(ZLIBDIR) + # this seems a harmless default +-ZLIBDIR=src ++ZLIBDIR=$includedir + AUX_SHARED_ZLIB= + + if test -d $srcdir/zlib; then +diff -up ghostscript-9.12/configure.sys-zlib ghostscript-9.12/configure +--- ghostscript-9.12/configure.sys-zlib 2014-03-26 11:49:45.547284521 +0000 ++++ ghostscript-9.12/configure 2014-03-26 11:49:56.171350127 +0000 +@@ -6254,7 +6254,7 @@ fi + $as_echo_n "checking for local zlib source... " >&6; } + # we must define ZLIBDIR regardless because png.mak does a -I$(ZLIBDIR) + # this seems a harmless default +-ZLIBDIR=src ++ZLIBDIR=$includedir + AUX_SHARED_ZLIB= + + if test -d $srcdir/zlib; then +