pcr/imagemagick-nox: updated to 7.0.7.19

1 files changed, 76 insertions, 67 deletions

diff --git a/pcr/imagemagick-nox/PKGBUILD b/pcr/imagemagick-nox/PKGBUILD
index ef0bdf4b9..744c2dc01 100644
--- a/pcr/imagemagick-nox/PKGBUILD
+++ b/pcr/imagemagick-nox/PKGBUILD
@@ -6,7 +6,7 @@
 _pkgbase=imagemagick
 pkgname=imagemagick-nox
 
-pkgver=6.9.9.23
+pkgver=7.0.7.19
 pkgrel=1
 arch=(i686 x86_64 armv7h)
 
@@ -14,97 +14,106 @@ pkgdesc="An image viewing/manipulation program (without X11 support)"
 url="http://www.imagemagick.org/"
 license=(custom)
 
-# Remove libxt, libxext, opencl-headers, opencl-id-loader, libcl, glu
-makedepends=(libltdl lcms2 fontconfig ghostscript
-             openexr libwmf librsvg libxml2 liblqr openjpeg2 libraw libraqm
-             libwebp subversion)
 # Remove libxt, libxext, libcl, opencl-icd-loader
-depends=(libltdl lcms2 fontconfig liblqr libraqm)
-optdepends=('imagemagick-doc: for additional information'
-            'ghostscript: for Ghostscript support'
-            'openexr: for OpenEXR support'
-            'openjpeg2: for JP2 support'
-            'libwmf: for WMF support'
-            'librsvg: for SVG support'
-            'libxml2: for XML support'
-            'libpng: for PNG support'
-            'libwebp: for WEBP support'
-            'libraw: for DNG support')
-backup=("etc/ImageMagick-${pkgver%%.*}/coder.xml"
-        "etc/ImageMagick-${pkgver%%.*}/colors.xml"
-        "etc/ImageMagick-${pkgver%%.*}/delegates.xml"
-        "etc/ImageMagick-${pkgver%%.*}/log.xml"
-        "etc/ImageMagick-${pkgver%%.*}/magic.xml"
-        "etc/ImageMagick-${pkgver%%.*}/mime.xml"
-        "etc/ImageMagick-${pkgver%%.*}/policy.xml"
-        "etc/ImageMagick-${pkgver%%.*}/quantization-table.xml"
-        "etc/ImageMagick-${pkgver%%.*}/thresholds.xml"
-        "etc/ImageMagick-${pkgver%%.*}/type.xml"
-        "etc/ImageMagick-${pkgver%%.*}/type-dejavu.xml"
-        "etc/ImageMagick-${pkgver%%.*}/type-ghostscript.xml"
-        "etc/ImageMagick-${pkgver%%.*}/type-windows.xml")
-options=('!docs' 'libtool' '!emptydirs')
+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)
+checkdepends=(gsfonts ttf-dejavu)
+_relname=ImageMagick-${pkgver%%.*}
+_tarname=ImageMagick-${pkgver%.*}-${pkgver##*.}
 provides=("$_pkgbase=$pkgver")
 conflicts=("$_pkgbase")
 replaces=("imagemagick-srv")
 
-source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc}
-        perlmagick.rpath.patch)
-sha256sums=('88a422ecc2888745373586b04f1ebd8e91ca090bbf133c2270f66fc716fba631'
+source=(https://www.imagemagick.org/download/$_tarname.tar.xz{,.asc}
+        parabola-fonts.diff)
+sha256sums=('5f1156824c37e5dde6ec37c5b1c51d9806f6d0e97aeaeb1e6907d7aba15951d9'
             'SKIP'
-            '17218bbecc17f3c7a86935a09d5a47e46113a1fc28f7d91c2fe495019cc36088')
-validpgpkeys=('D8272EF51DA223E4D05B466989AB63D48277377A')
+            'a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73')
+validpgpkeys=(D8272EF51DA223E4D05B466989AB63D48277377A)  # Lexie Parsimoniae
 
+shopt -s extglob
 
 prepare() {
-  cd ImageMagick-${pkgver%.*}-${pkgver##*.}
+  mkdir -p binpkg/usr/lib/pkgconfig binpkg/usr/share
+
+  cd $_tarname
+
+  # Fix up typemaps to match our packages, where possible
+  patch -Np1 -i $srcdir/parabola-fonts.diff
 
-  sed '/AC_PATH_XTRA/d' -i configure.ac
-  patch -p0 -i "$srcdir/perlmagick.rpath.patch"
-  autoreconf --force --install
+  # Don't run auto(re)conf; assumes use of git
 }
 
 build() {
-  cd ImageMagick-${pkgver%.*}-${pkgver##*.}
-
-  [[ $CARCH = "i686" ]] && EXTRAOPTS="--with-gcc-arch=i686"
-  [[ $CARCH = "x86_64" ]] && EXTRAOPTS="--with-gcc-arch=x86-64"
-  [[ $CARCH = "armv7h" ]] && EXTRAOPTS="--with-gcc-arch=armv7h"
+  cd $_tarname
 
   no_x=yes with_x=no \
-  ./configure --prefix=/usr --sysconfdir=/etc --with-modules \
-    --enable-hdri --with-wmf --with-openexr --with-xml \
-    --with-webp --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \
-    --with-perl --with-perl-options="INSTALLDIRS=vendor" --with-lqr --with-rsvg \
-    --disable-opencl --with-openjp2 --without-gvc --without-djvu --without-autotrace \
-    --without-jbig --without-fpx --without-dps --without-fftw $EXTRAOPTS
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --with-dejavu-font-dir=/usr/share/fonts/TTF \
+    --with-gs-font-dir=/usr/share/fonts/gsfonts \
+    PSDelegate=/usr/bin/gs \
+    XPSDelegate=/usr/bin/gxps \
+    PCLDelegate=/usr/bin/gpcl6 \
+    --enable-hdri \
+    --disable-opencl \
+    --with-gslib \
+    --with-lqr \
+    --with-modules \
+    --with-openexr \
+    --with-openjp2 \
+    --with-perl \
+    --with-perl-options="INSTALLDIRS=vendor" \
+    --with-rsvg \
+    --with-webp \
+    --with-wmf \
+    --with-xml \
+    --without-autotrace \
+    --without-djvu \
+    --without-dps \
+    --without-fftw \
+    --without-fpx \
+    --without-gcc-arch \
+    --without-gvc \
+    --without-jbig
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
 
 check() {
-  cd ImageMagick-${pkgver%.*}-${pkgver##*.}
-
-  # make check
+  cd $_tarname
+  ulimit -n 4096
+  make check
 }
 
-package() {
-  cd ImageMagick-${pkgver%.*}-${pkgver##*.}
+package_imagemagick-nox() {
+  depends=("libmagick=$pkgver-$pkgrel")
+  optdepends=('imagemagick-doc: manual and API docs')
+  options=('!emptydirs')
 
-  make -j1 DESTDIR="${pkgdir}" install
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/${pkgname}/NOTICE"
+  cd $_tarname
+  make DESTDIR="$srcdir/binpkg" install
 
-  # Cleaning
-  rm -f "$pkgdir"/usr/lib/*.la
+  mkdir -p "$pkgdir/usr/"{lib,share}
+  mv "$srcdir/binpkg/usr/bin" "$pkgdir/usr/"
+  mv "$srcdir/binpkg/usr/lib/perl5" "$pkgdir/usr/lib"
+  mv "$srcdir/binpkg/usr/share/man" "$pkgdir/usr/share"
 
   # remove useless display
   rm -vf "$pkgdir/usr/bin/display"
 
-  # template start; name=perl-binary-module-dependency; version=1;
-  if [[ $(find "$pkgdir/usr/lib/perl5/" -name "*.so") ]]; then
-    _perlver_min=$(perl -e '$v = $^V->{version}; print $v->[0].".".($v->[1]);')
-    _perlver_max=$(perl -e '$v = $^V->{version}; print $v->[0].".".($v->[1]+1);')
-    depends+=("perl>=$_perlver_min" "perl<$_perlver_max")
-  fi
-  # template end;
+  find "$pkgdir/usr/lib/perl5" -name '*.so' -exec chrpath -d {} +
+
+# template start; name=perl-binary-module-dependency; version=1;
+if [[ $(find "$pkgdir/usr/lib/perl5/" -name "*.so") ]]; then
+        _perlver_min=$(perl -e '$v = $^V->{version}; print $v->[0].".".($v->[1]);')
+        _perlver_max=$(perl -e '$v = $^V->{version}; print $v->[0].".".($v->[1]+1);')
+        depends+=("perl>=$_perlver_min" "perl<$_perlver_max")
+fi
+# template end;
+
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 LICENSE NOTICE
 }