diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/ghostscript/APKBUILD | 14 | ||||
| -rw-r--r-- | main/ghostscript/ghostscript-system-jasper.patch | 12 | ||||
| -rw-r--r-- | main/ghostscript/libpng14.patch | 24 |
3 files changed, 11 insertions, 39 deletions
diff --git a/main/ghostscript/APKBUILD b/main/ghostscript/APKBUILD index 8891e55c40..b99fb9c070 100644 --- a/main/ghostscript/APKBUILD +++ b/main/ghostscript/APKBUILD @@ -1,24 +1,21 @@ # Contributor: Cameron Banta <cbanta@gmail.com> # Maintainer: Cameron Banta <cbanta@gmail.com> 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 444b76029f..dc704468cb 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 7ee08af931..0000000000 --- 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" |