[arch-commits] Commit in ghostscript/trunk (PKGBUILD svn_rev11948.diff)

[andyrtr at archlinux.org]

    Date: Saturday, December 18, 2010 @ 05:42:15
  Author: andyrtr
Revision: 103336

upgpkg: ghostscript 9.00-2
add fix for #22006; fix deps; ; use system libtiff; some minor PKGBUILD cleanups

Added:
  ghostscript/trunk/svn_rev11948.diff
Modified:
  ghostscript/trunk/PKGBUILD

-------------------+
 PKGBUILD          |   61 +++++++++++++++++++++++++++++++---------------------
 svn_rev11948.diff |   16 +++++++++++++
 2 files changed, 53 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-12-18 02:05:45 UTC (rev 103335)
+++ PKGBUILD	2010-12-18 10:42:15 UTC (rev 103336)
@@ -3,57 +3,66 @@
 
 pkgname=ghostscript
 pkgver=9.00
-pkgrel=1
+pkgrel=2
 pkgdesc="An interpreter for the PostScript language"
 arch=('i686' 'x86_64')
 license=('GPL3' 'custom')
-depends=('libxext' 'libxt' 'libcups>=1.4.2-3' 'fontconfig>=2.8.0' 'gnutls>=2.8.5' 'cairo>=1.8.8-2'
-          'jasper>=1.900.1-4' 'zlib' 'libpng>=1.4.0' 'libjpeg>=8')
-makedepends=('automake' 'autoconf' 'gtk2>=2.18.6')
-optdepends=('texlive-core:	dvipdf'
-            'gtk2:		gsx')
-replaces=('ghostscript-lrpng')
-provides=('ghostscript-lprng')
+depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng' 'libjpeg' 'libtiff')
+makedepends=('gtk2' 'gnutls')
+optdepends=('texlive-core:      needed for dvipdf'
+            'gtk2:              needed for gsx')
 url="http://www.ghostscript.com/"
 source=(http://ghostscript.com/releases/ghostscript-${pkgver}.tar.xz
 	ghostscript-fPIC.patch
-	ghostscript-system-jasper.patch)
+	ghostscript-system-jasper.patch
+	svn_rev11948.diff)
 options=('!libtool' '!makeflags')
 md5sums=('1ca5f245677f78f573e6490bdb40702f'
          '766d44c47c693f96941b658e360c1277'
-         '03e27cd02471ab3b642c344fa06b623e')
+         '03e27cd02471ab3b642c344fa06b623e'
+         '78f2b9c2d6a5a60891b2d8b593a15b00')
 
 build() {
   cd ${srcdir}/ghostscript-${pkgver}
   # force it to use system-libs
-  rm -rf jpeg libpng zlib jasper expat
+  rm -rf jpeg libpng zlib jasper expat tiff
 
   # fix build with systems jasper
-  patch -Np1 -i ${srcdir}/ghostscript-system-jasper.patch || return 1
+  patch -Np1 -i ${srcdir}/ghostscript-system-jasper.patch
 
   if [ "$CARCH" = "x86_64" ]; then
-    patch -Np1 -i ${srcdir}/ghostscript-fPIC.patch || return 1
+    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
+  
+  ./autogen.sh
+  ./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 \
+	--disable-compile-inits # needed for linking with system-zlib
+  make || return 1
+  
   # Build IJS
   cd ${srcdir}/ghostscript-${pkgver}/ijs
   ./autogen.sh
   ./configure --prefix=/usr --enable-shared --disable-static
-  make || return 1
-  make -j1 DESTDIR=${pkgdir} install || return 1
+  make
+}
 
-  cd ..
-  ./autogen.sh
-  ./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 \
-	      --disable-compile-inits # needed for linking with system-zlib
-  make || return 1
-  make -j1 DESTDIR=${pkgdir} \
+package() {
+  cd ${srcdir}/ghostscript-${pkgver}
+  make DESTDIR=${pkgdir} \
 	cups_serverroot=${pkgdir}/etc/cups \
 	cups_serverbin=${pkgdir}/usr/lib/cups install soinstall
 
-  # install a missing doc files # http://bugs.archlinux.org/task/18023
+  # 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/
   
   mkdir -p ${pkgdir}/usr/share/licenses/${pkgname}
@@ -61,4 +70,8 @@
 
   # remove unwanted localized man-pages
   rm -rf $pkgdir/usr/share/man/[^man1]*
+
+  # install IJS
+  cd ${srcdir}/ghostscript-${pkgver}/ijs
+  make DESTDIR=${pkgdir} install
 }

Added: svn_rev11948.diff
===================================================================
--- svn_rev11948.diff	                        (rev 0)
+++ svn_rev11948.diff	2010-12-18 10:42:15 UTC (rev 103336)
@@ -0,0 +1,16 @@
+Modified: trunk/gs/base/gximag3x.c
+===================================================================
+--- trunk/gs/base/gximag3x.c	2010-12-10 19:50:53 UTC (rev 11947)
++++ trunk/gs/base/gximag3x.c	2010-12-11 23:02:25 UTC (rev 11948)
+@@ -241,7 +241,9 @@
+ 	    const gs_image3x_mask_t *pixm =
+ 		(i == 0 ? &pim->Opacity : &pim->Shape);
+ 
+-	    *(gs_data_image_t *)&mask[i].image = pixm->MaskDict;
++            /* Use memcpy because direct assignment breaks ANSI aliasing */
++            /* rules and causes SEGV with gcc 4.5.1 */
++            memcpy(&mask[i].image, &pixm->MaskDict, sizeof(pixm->MaskDict));
+ 	    mask[i].image.type = type1;
+ 	    mask[i].image.BitsPerComponent = pixm->MaskDict.BitsPerComponent;
+ 	}
+