X-Original-To: alpine-devel@lists.alpinelinux.org Delivered-To: alpine-devel@lists.alpinelinux.org Received: from mail-gy0-f182.google.com (mail-gy0-f182.google.com [209.85.160.182]) by lists.alpinelinux.org (Postfix) with ESMTP id 423461EBFEE for ; Wed, 17 Nov 2010 16:53:44 +0000 (UTC) Received: by gyg13 with SMTP id 13so1263850gyg.13 for ; Wed, 17 Nov 2010 08:53:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=7ilj6aQCTdoYGUrbIOsjWCrTBt+CNQJrS2xhAFZj3lg=; b=niNzA6nqEilaW/3ixlRSsgiHnrHmXvWeVUAbclP2Ks3kd0iBtFcZn+d9nyEuk6VU9Y pGF+SoamuwNk+LkF/4DQm/SS2LvWYbeM49IT5472q07t1i4RH95SUIUJY31XjITw/fWL 90O9SRstLIX7DxDd0Up+tABQTs4B7VrDwEP+s= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=WYwRNFm1hwWUJQFMSd1SdKsZH7WDegmjGd0i2tUY4ZMlPHRog133qha+yY7Kwnc95p sWQTnxXcci2dR11T+BZo1K+kSmJRylzhs2H8s1h8doiZOjjOPt3Q1YpQWPfztQ52/rjY Vwwgvz9HiyYSrDXirNBqg3/8cotfhb3Nc5gLU= Received: by 10.90.7.15 with SMTP id 15mr11890364agg.13.1290012821880; Wed, 17 Nov 2010 08:53:41 -0800 (PST) Received: from localhost.localdomain (c-71-228-19-24.hsd1.il.comcast.net [71.228.19.24]) by mx.google.com with ESMTPS id x32sm6567545anx.24.2010.11.17.08.53.40 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 17 Nov 2010 08:53:41 -0800 (PST) From: Cameron Banta To: alpine-devel@lists.alpinelinux.org Cc: Cameron Banta Subject: [alpine-devel] [PATCH] main/ghostscript: upgrade to version 9.00 Date: Wed, 3 Nov 2010 18:11:14 +0000 Message-Id: <1288807874-21491-1-git-send-email-cbanta@gmail.com> X-Mailer: git-send-email 1.7.3.2 X-Mailinglist: alpine-devel Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- main/ghostscript/APKBUILD | 14 ++++-------- main/ghostscript/ghostscript-system-jasper.patch | 12 +++++----- main/ghostscript/libpng14.patch | 24 ---------------------- 3 files changed, 11 insertions(+), 39 deletions(-) delete mode 100644 main/ghostscript/libpng14.patch diff --git a/main/ghostscript/APKBUILD b/main/ghostscript/APKBUILD index 8891e55..b99fb9c 100644 --- a/main/ghostscript/APKBUILD +++ b/main/ghostscript/APKBUILD @@ -1,24 +1,21 @@ # Contributor: Cameron Banta # Maintainer: Cameron Banta pkgname=ghostscript -pkgver=8.71 -pkgrel=4 +pkgver=9.00 +pkgrel=0 pkgdesc="An interpreter for the PostScript language and for PDF" url="http://ghostscript.com/" license="GPL" makedepends="autoconf automake jpeg-dev libpng-dev jasper-dev expat-dev zlib-dev tiff-dev libiconv-dev" subpackages="$pkgname-doc $pkgname-dev" source="http://ghostscript.com/releases/$pkgname-$pkgver.tar.gz - libpng14.patch ghostscript-system-jasper.patch" prepare() { cd "$srcdir/$pkgname-$pkgver" # force it to use system-libs - rm -rf jpeg libpng jasper expat tiff - - patch -Np1 -i "${srcdir}"/libpng14.patch || return 1 + rm -rf jpeg libpng jasper expat tiff zlib # fix build with systems jasper patch -Np1 -i "${srcdir}"/ghostscript-system-jasper.patch || return 1 @@ -70,6 +67,5 @@ package() { mv "$pkgdir/usr/share/$pkgname/$pkgver/examples" "$pkgdir/usr/share/doc/$pkgname" } -md5sums="51a522a5b4818bd3dc7c1c0e9dd22bad ghostscript-8.71.tar.gz -be94ee357986f7f63d1b470da5bdc99e libpng14.patch -03e27cd02471ab3b642c344fa06b623e ghostscript-system-jasper.patch" +md5sums="a402462478b4cdda3e1816899227b845 ghostscript-9.00.tar.gz +f5bc029b0ed05ac8d602bff0e1c021bd ghostscript-system-jasper.patch" diff --git a/main/ghostscript/ghostscript-system-jasper.patch b/main/ghostscript/ghostscript-system-jasper.patch index 444b760..dc70446 100644 --- a/main/ghostscript/ghostscript-system-jasper.patch +++ b/main/ghostscript/ghostscript-system-jasper.patch @@ -1,9 +1,9 @@ -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 +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 */ + defined in sjpx.h */ -/* error reporting callback for the jpx library */ -static void @@ -16,7 +16,7 @@ diff -up ghostscript-8.64/base/sjpx.c.system-jasper ghostscript-8.64/base/sjpx.c /* 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) +@@ -56,7 +48,6 @@ s_jpxd_init(stream_state * ss) } status = jas_init(); diff --git a/main/ghostscript/libpng14.patch b/main/ghostscript/libpng14.patch deleted file mode 100644 index 7ee08af..0000000 --- a/main/ghostscript/libpng14.patch +++ /dev/null @@ -1,24 +0,0 @@ -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" -- 1.7.3.2 --- Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org Help: alpine-devel+help@lists.alpinelinux.org ---