pcr/imagemagick-nox: updated to 7.0.7.22

1 files changed, 19 insertions, 18 deletions

diff --git a/pcr/imagemagick-nox/PKGBUILD b/pcr/imagemagick-nox/PKGBUILD
index 24983b7f0..327615bf4 100644
--- a/pcr/imagemagick-nox/PKGBUILD
+++ b/pcr/imagemagick-nox/PKGBUILD
@@ -1,34 +1,35 @@
-# Maintainer: Andreas Grapentin <andreas@grapentin.org>
+# $Id$
 # Maintainer (Arch): Eric Bélanger <eric@archlinux.org>
 # Contributor: Márcio Silva <coadde@hyperbola.info>
 # Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer: Andreas Grapentin <andreas@grapentin.org>
 
-_pkgbase=imagemagick
-pkgname=imagemagick-nox
+# parabola changes and rationale:
+#  - adapted from extra/imagemagick
+#  - building only imagemagick, without X11 and opencl support
+#  - added provides and conflicts: imagemagick
+#  - removed depends: libxt, libxext, libcl, opencl-icd-loader
+#  - removed makedepends: libxt, libxext, opencl-headers, opencl-id-loader, libcl, glu
 
-pkgver=7.0.7.21
+pkgbase=imagemagick
+pkgname=(imagemagick-nox)
+pkgver=7.0.7.22
 pkgrel=1
-arch=(i686 x86_64 armv7h)
-
 pkgdesc="An image viewing/manipulation program (without X11 support)"
 url="http://www.imagemagick.org/"
+arch=(x86_64 i686 armv7h)
 license=(custom)
-
-# Remove libxt, libxext, libcl, opencl-icd-loader
 depends=(libltdl lcms2 fontconfig liblqr libraqm libpng)
-# Remove libxt, libxext, opencl-headers, opencl-id-loader, libcl, glu
 makedepends=(ghostscript openexr libwmf librsvg libxml2 openjpeg2 libraw libwebp
-             chrpath ocl-icd subversion)
+             chrpath ocl-icd ghostpcl ghostxps)
 checkdepends=(gsfonts ttf-dejavu)
 _relname=ImageMagick-${pkgver%%.*}
 _tarname=ImageMagick-${pkgver%.*}-${pkgver##*.}
-provides=("$_pkgbase=$pkgver")
-conflicts=("$_pkgbase")
-replaces=("imagemagick-srv")
-
+provides=("$pkgbase=$pkgver")
+conflicts=("$pkgbase")
 source=(https://www.imagemagick.org/download/$_tarname.tar.xz{,.asc}
         parabola-fonts.diff)
-sha256sums=('3b2783a845279f76a4250f2c3caf04af22766e2d5f084bde589ebd73de6a0019'
+sha256sums=('49de9e08ea255a1f939158d85d50dfa29285bccbdcb7fee0fe4309061d438489'
             'SKIP'
             'a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73')
 validpgpkeys=(D8272EF51DA223E4D05B466989AB63D48277377A)  # Lexie Parsimoniae
@@ -36,12 +37,12 @@ validpgpkeys=(D8272EF51DA223E4D05B466989AB63D48277377A)  # Lexie Parsimoniae
 shopt -s extglob
 
 prepare() {
-  mkdir -p binpkg/usr/lib/pkgconfig binpkg/usr/share
+  mkdir -p binpkg/usr/lib/pkgconfig {binpkg,docpkg}/usr/share
 
   cd $_tarname
 
   # Fix up typemaps to match our packages, where possible
-  patch -Np1 -i $srcdir/parabola-fonts.diff
+  patch -Np1 -i ../parabola-fonts.diff
 
   # Don't run auto(re)conf; assumes use of git
 }
@@ -66,7 +67,7 @@ build() {
     --with-openexr \
     --with-openjp2 \
     --with-perl \
-    --with-perl-options="INSTALLDIRS=vendor" \
+    --with-perl-options=INSTALLDIRS=vendor \
     --with-rsvg \
     --with-webp \
     --with-wmf \