diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-16 10:34:49 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-16 10:34:49 +0100 |
| commit | f24ad15758f8eebcc46cb0c210f888491869d3f0 (patch) | |
| tree | 85c74dd33e056502de7a306161d28f5b15b274c2 /extra/imagemagick | |
| parent | 5f4568c7f7ba204bc047d2c74a5721f23024b339 (diff) | |
| parent | 636ce8849a9c82c1787c2919ffcfe6685cb799d3 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/chmsee/PKGBUILD
community/darkstat/PKGBUILD
community/dbmail/PKGBUILD
community/dvdisaster/PKGBUILD
community/epic4/PKGBUILD
community/fb-client/PKGBUILD
community/fcrackzip/PKGBUILD
community/fdupes/PKGBUILD
community/flobopuyo/PKGBUILD
community/intel-tbb/PKGBUILD
community/openbsd-netcat/PKGBUILD
community/sunpinyin/PKGBUILD
community/tinc/PKGBUILD
community/uudeview/PKGBUILD
community/zathura/PKGBUILD
core/libedit/PKGBUILD
core/mkinitcpio-busybox/PKGBUILD
core/openssl/PKGBUILD
core/util-linux/PKGBUILD
extra/lua/PKGBUILD
gnome-unstable/pidgin/PKGBUILD
testing/openssl/PKGBUILD
testing/sudo/PKGBUILD
testing/udev/PKGBUILD
testing/util-linux/PKGBUILD
Diffstat (limited to 'extra/imagemagick')
| -rw-r--r-- | extra/imagemagick/PKGBUILD | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index df7da3c71..82da80045 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 149825 2012-02-11 09:11:58Z eric $ +# $Id: PKGBUILD 153440 2012-03-14 01:50:29Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.7.5.3 +pkgver=6.7.6.0 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.imagemagick.org/" license=('custom') -depends=('perl' 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'libjpeg-turbo') -makedepends=('ghostscript' 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'libpng') +makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \ + 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper') source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ perlmagick.rpath.patch) -sha1sums=('b6cee59cb380f38572ec40769c438901dcc7500e' +sha1sums=('878c264d070c70debc514d7da9f4feb7728bfe9f' '23405f80904b1de94ebd7bd6fe2a332471b8c283') build() { @@ -22,8 +22,7 @@ build() { autoreconf patch -p0 -i ../perlmagick.rpath.patch - LIBS="$LIBS -L/usr/lib/perl5/core_perl/CORE -lperl" \ - ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \ + ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \ --enable-openmp --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \ --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \ --with-perl --with-perl-options="INSTALLDIRS=vendor" \ @@ -39,6 +38,7 @@ check() { package_imagemagick() { pkgdesc="An image viewing/manipulation program" + depends=('perl' 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext') optdepends=('ghostscript: for Ghostscript support' 'openexr: for OpenEXR support' 'libwmf: for WMF support' @@ -53,13 +53,14 @@ package_imagemagick() { 'etc/ImageMagick/magic.xml' 'etc/ImageMagick/mime.xml' 'etc/ImageMagick/policy.xml' + 'etc/ImageMagick/quantization-table.xml' 'etc/ImageMagick/sRGB.icc' 'etc/ImageMagick/thresholds.xml' 'etc/ImageMagick/type.xml' 'etc/ImageMagick/type-dejavu.xml' 'etc/ImageMagick/type-ghostscript.xml' 'etc/ImageMagick/type-windows.xml') - options=('!makeflags' '!docs' 'libtool') + options=('!docs' 'libtool' '!emptydirs') cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} make DESTDIR="${pkgdir}" install @@ -74,8 +75,6 @@ package_imagemagick() { package_imagemagick-doc() { pkgdesc="The ImageMagick documentation (utilities manuals and libraries API)" - depends=() - options=('!makeflags') cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} make DESTDIR="${pkgdir}" install-data-html |