diff options
| -rw-r--r-- | libre/ghostscript-libre/PKGBUILD | 22 | ||||
| -rw-r--r-- | libre/ghostscript-libre/ijs-automake.patch | 10 | ||||
| -rw-r--r-- | libre/ghostscript-libre/svn_rev11948.diff | 16 |
3 files changed, 10 insertions, 38 deletions
diff --git a/libre/ghostscript-libre/PKGBUILD b/libre/ghostscript-libre/PKGBUILD index 499f4bab0..cf00963b8 100644 --- a/libre/ghostscript-libre/PKGBUILD +++ b/libre/ghostscript-libre/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 165015 2012-08-08 19:40:10Z andyrtr $ +# $Id: PKGBUILD 178158 2013-02-17 10:57:03Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer (Parabola): Joshua Haase <hahj87@gmail.com> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=ghostscript pkgname=ghostscript-libre -pkgver=9.06 -pkgrel=1.1 # rebuild for mips64el -march +pkgver=9.07 +pkgrel=1 # rebuild for mips64el -march pkgdesc="An interpreter for the PostScript language without non-free files" arch=('i686' 'x86_64' 'mips64el') -license=('GPL3') #non free files removed -depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg' 'libtiff>=4.0.0' 'lcms') # 'lcms2' won't get used) # move in libpaper from community? +license=('AGPL') #non free files removed +depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg' + 'libtiff>=4.0.0' 'lcms' 'dbus') makedepends=('gtk2' 'gnutls') optdepends=('texlive-core: needed for dvipdf' 'gtk2: needed for gsx') @@ -18,17 +19,12 @@ conflicts=('ghostscript') replaces=('ghostscript') provides=("ghostscript=$pkgver") url="http://www.ghostscript.com/" -source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2 - ijs-automake.patch) +source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2) options=('!libtool') -md5sums=('46f9ebe40dc52755287b30704270db11' - '686830841eb9004143a0d0f56b73aaaf') +md5sums=('eea27befc1e85bef6d4768202f6b03a5') build() { cd ${srcdir}/ghostscript-${pkgver} - - # Fix build with recent automake. - patch -p1 -i "$srcdir/ijs-automake.patch" # delete non-free packages grep -l "are not altered" Resource/CMap/* | xargs rm -fv @@ -49,12 +45,14 @@ build() { --enable-fontconfig \ --enable-freetype \ --without-luratech \ + --without-omni \ --with-system-libtiff \ --disable-compile-inits #--help # needed for linking with system-zlib make # Build IJS cd ${srcdir}/ghostscript-${pkgver}/ijs + sed -i "s:AM_PROG_CC_STDC:AC_PROG_CC:g" configure.ac ./autogen.sh ./configure --prefix=/usr --enable-shared --disable-static make diff --git a/libre/ghostscript-libre/ijs-automake.patch b/libre/ghostscript-libre/ijs-automake.patch deleted file mode 100644 index 1b890277a..000000000 --- a/libre/ghostscript-libre/ijs-automake.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ghostscript-9.06.orig/ijs/configure.ac 2012-08-08 10:01:36.000000000 +0200 -+++ ghostscript-9.06/ijs/configure.ac 2013-02-03 19:33:08.361797799 +0100 -@@ -117,7 +117,6 @@ - dnl Checks for programs - - AC_PROG_CC --AM_PROG_CC_STDC - AM_PROG_LIBTOOL - AC_SUBST(LIBTOOL_DEPS) - AC_ISC_POSIX diff --git a/libre/ghostscript-libre/svn_rev11948.diff b/libre/ghostscript-libre/svn_rev11948.diff deleted file mode 100644 index 92abb0d98..000000000 --- a/libre/ghostscript-libre/svn_rev11948.diff +++ /dev/null @@ -1,16 +0,0 @@ -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; - } - |