[arch-commits] Commit in ghostscript/trunk (PKGBUILD libpng14.patch)

[Ionut Biru]

    Date: Saturday, January 16, 2010 @ 19:47:11
  Author: ibiru
Revision: 63333

upgpkg: ghostscript 8.70-4
    libpng1.4.0/libjpeg8 rebuild

Added:
  ghostscript/trunk/libpng14.patch
Modified:
  ghostscript/trunk/PKGBUILD

----------------+
 PKGBUILD       |   17 +++++++++++------
 libpng14.patch |   24 ++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-01-16 23:52:30 UTC (rev 63332)
+++ PKGBUILD	2010-01-17 00:47:11 UTC (rev 63333)
@@ -3,13 +3,13 @@
 
 pkgname=ghostscript
 pkgver=8.70
-pkgrel=3
+pkgrel=4
 pkgdesc="An interpreter for the PostScript language"
 arch=('i686' 'x86_64')
 license=('GPL3' 'custom')
-depends=('libxext' 'libxt' 'libcups>=1.4.2' 'fontconfig>=2.6.0' 'gnutls>=2.8.3' 'cairo>=1.8.8' 
-          'jasper>=1.900.1-3' 'zlib' 'libpng>=1.2.39' 'libjpeg>=7')
-makedepends=('automake' 'autoconf' 'gtk2>=2.18')
+depends=('libxext' 'libxt' 'libcups>=1.4.2-3' 'fontconfig>=2.6.0' 'gnutls>=2.8.3' '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')
@@ -17,17 +17,21 @@
 url="http://www.cs.wisc.edu/~ghost/"
 source=(http://ghostscript.com/releases/ghostscript-${pkgver}.tar.bz2
 	ghostscript-fPIC.patch
-	ghostscript-system-jasper.patch)
+	ghostscript-system-jasper.patch
+	libpng14.patch)
 options=('!libtool') # '!makeflags')
 md5sums=('526366f8cb4fda0d3d293597cc5b984b'
          '1a8fcacf0005214db823225c870f093d'
-         '03e27cd02471ab3b642c344fa06b623e')
+         '03e27cd02471ab3b642c344fa06b623e'
+         'be94ee357986f7f63d1b470da5bdc99e')
 
 build() {
   cd ${srcdir}/ghostscript-${pkgver}
   # force it to use system-libs
   rm -rf jpeg libpng zlib jasper expat
 
+  patch -Np1 -i ${srcdir}/libpng14.patch || return 1
+
   # fix build with systems jasper
   patch -Np1 -i ${srcdir}/ghostscript-system-jasper.patch || return 1
 
@@ -43,6 +47,7 @@
   make -j1 DESTDIR=${pkgdir} install || return 1
 
   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 \

Added: libpng14.patch
===================================================================
--- libpng14.patch	                        (rev 0)
+++ libpng14.patch	2010-01-17 00:47:11 UTC (rev 63333)
@@ -0,0 +1,24 @@
+diff -Nur ghostscript-8.70.orig/base/configure.ac ghostscript-8.70/base/configure.ac
+--- ghostscript-8.70.orig/base/configure.ac	2009-07-27 19:59:50.000000000 +0300
++++ ghostscript-8.70/base/configure.ac	2010-01-17 02:20:52.000000000 +0200
+@@ -402,7 +402,7 @@
+ 	PNGDEVS="$PNGDEVS_ALL"
+ else
+ 	AC_MSG_RESULT([no])
+-	AC_CHECK_LIB(png, png_check_sig, [
++	AC_CHECK_LIB(png, png_sig_cmp, [
+ 	  AC_CHECK_HEADERS(png.h, [
+ 		SHARE_LIBPNG=1
+ 		PNGDEVS="$PNGDEVS_ALL"
+diff -Nur ghostscript-8.70.orig/jbig2dec/configure.ac ghostscript-8.70/jbig2dec/configure.ac
+--- ghostscript-8.70.orig/jbig2dec/configure.ac	2009-05-29 09:48:44.000000000 +0300
++++ ghostscript-8.70/jbig2dec/configure.ac	2010-01-17 02:21:25.000000000 +0200
+@@ -34,7 +34,7 @@
+   fi
+   dnl libpng requires pow() which may be in libm
+   AC_SEARCH_LIBS([pow], [m])
+-  AC_CHECK_LIB([png], [png_check_sig], [
++  AC_CHECK_LIB([png], [png_sig_cmp], [
+     AC_CHECK_LIB([z], [deflate], [
+       AC_DEFINE(HAVE_LIBPNG, 1, [Define if libpng is available (-lpng)])
+       LIBS="-lpng -lz $LIBS"