Update to version 7.0.8.10

2 files changed, 89 insertions, 104 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1ce3dba0e674..2ddd19db8234 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,49 +1,33 @@
 pkgbase = lib32-imagemagick
 	pkgdesc = An image viewing/manipulation program (32-bit)
-	pkgver = 7.0.7.19
-	pkgrel = 2
-	url = http://www.imagemagick.org/
+	pkgver = 7.0.8.10
+	pkgrel = 1
+	url = https://www.imagemagick.org/
 	arch = x86_64
 	license = custom
-	checkdepends = gsfonts
 	checkdepends = ttf-dejavu
-	makedepends = lib32-libltdl
-	makedepends = lib32-lcms2
-	makedepends = lib32-libxt
-	makedepends = lib32-fontconfig
-	makedepends = lib32-libxext
+	makedepends = chrpath
+	makedepends = ghostpcl
 	makedepends = ghostscript
-	makedepends = lib32-openexr
-	makedepends = lib32-libwmf
-	makedepends = lib32-librsvg
-	makedepends = lib32-libxml2
-	makedepends = lib32-liblqr
-	makedepends = lib32-openjpeg2
-	makedepends = lib32-libraw
-	makedepends = opencl-headers
-	makedepends = lib32-ocl-icd
-	makedepends = lib32-libwebp
-	makedepends = subversion
+	makedepends = ghostxps
 	makedepends = lib32-glu
-	makedepends = git
-	makedepends = imagemagick
-	depends = lib32-libltdl
-	depends = lib32-lcms2
-	depends = lib32-libxt
-	depends = lib32-fontconfig
-	depends = lib32-libxext
+	makedepends = lib32-ocl-icd
+	makedepends = opencl-headers
 	depends = lib32-liblqr
-	depends = lib32-ocl-icd
+	depends = lib32-libltdl
 	depends = lib32-libraqm
-	options = !docs
-	options = libtool
-	options = !emptydirs
-	options = libtool
-	source = http://www.imagemagick.org/download/ImageMagick-7.0.7-19.tar.xz
-	source = http://www.imagemagick.org/download/ImageMagick-7.0.7-19.tar.xz.asc
+	depends = lib32-libraw
+	depends = lib32-librsvg
+	depends = lib32-libwebp
+	depends = lib32-libwmf
+	depends = lib32-openexr
+	depends = lib32-openjpeg2
+	depends = imagemagick
+	source = https://www.imagemagick.org/download/releases/ImageMagick-7.0.8-10.tar.xz
+	source = https://www.imagemagick.org/download/releases/ImageMagick-7.0.8-10.tar.xz.asc
 	source = arch-fonts.diff
 	validpgpkeys = D8272EF51DA223E4D05B466989AB63D48277377A
-	sha256sums = 5f1156824c37e5dde6ec37c5b1c51d9806f6d0e97aeaeb1e6907d7aba15951d9
+	sha256sums = d5309031d59130befa283266011efaab15b1e113f1a218a4ba24c821cd906472
 	sha256sums = SKIP
 	sha256sums = a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73
 
diff --git a/PKGBUILD b/PKGBUILD
index 24c84869f691..519c9e658b7d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,93 +1,94 @@
-# Maintainer: orumin <dev at orum.in>
+# Maintainer: Rodrigo Bezerra <rodrigobezerra21 at gmail dot com>
+# Contributor: orumin <dev at orum.in>
 
-pkgname=lib32-imagemagick
 _basename=imagemagick
-pkgver=7.0.7.19
-pkgrel=2
+pkgname=lib32-imagemagick
+pkgver=7.0.8.10
+pkgrel=1
 pkgdesc="An image viewing/manipulation program (32-bit)"
-arch=('x86_64')
-url="http://www.imagemagick.org/"
-license=('custom')
-depends=('lib32-libltdl' 'lib32-lcms2' 'lib32-libxt' 'lib32-fontconfig'
-         'lib32-libxext' 'lib32-liblqr' 'lib32-ocl-icd' 'lib32-libraqm')
-makedepends=('lib32-libltdl' 'lib32-lcms2' 'lib32-libxt' 'lib32-fontconfig'
-             'lib32-libxext' 'ghostscript' 'lib32-openexr' 'lib32-libwmf'
-             'lib32-librsvg' 'lib32-libxml2' 'lib32-liblqr' 'lib32-openjpeg2' 'lib32-libraw'
-             'opencl-headers' 'lib32-ocl-icd' 'lib32-libwebp' 'subversion' 'lib32-glu' 'git' 'imagemagick')
-checkdepends=(gsfonts ttf-dejavu)
+url="https://www.imagemagick.org/"
+arch=(x86_64)
+license=(custom)
+depends=(lib32-liblqr lib32-libltdl lib32-libraqm lib32-libraw lib32-librsvg lib32-libwebp
+         lib32-libwmf lib32-openexr lib32-openjpeg2 imagemagick)
+makedepends=(chrpath ghostpcl ghostscript ghostxps lib32-glu lib32-ocl-icd opencl-headers)
+checkdepends=(ttf-dejavu)
+_relname=ImageMagick-${pkgver%%.*}
 _tarname=ImageMagick-${pkgver%.*}-${pkgver##*.}
-options=('!docs' 'libtool' '!emptydirs' libtool)
-
-source=(http://www.imagemagick.org/download/$_tarname.tar.xz{,.asc}
+source=(https://www.imagemagick.org/download/releases/$_tarname.tar.xz{,.asc}
         arch-fonts.diff)
-sha256sums=('5f1156824c37e5dde6ec37c5b1c51d9806f6d0e97aeaeb1e6907d7aba15951d9'
+sha256sums=('d5309031d59130befa283266011efaab15b1e113f1a218a4ba24c821cd906472'
             'SKIP'
             'a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73')
-validpgpkeys=('D8272EF51DA223E4D05B466989AB63D48277377A') # Lexie Parsimoniae
+validpgpkeys=(D8272EF51DA223E4D05B466989AB63D48277377A)  # Lexie Parsimoniae
 
 shopt -s extglob
 
 prepare() {
-  cd $_tarname
-
-  # Fix up typemaps to match our packages, where possible
-  patch -Np1 -i "${srcdir}/arch-fonts.diff"
+    cd $_tarname
 
+    # Fix up typemaps to match our packages, where possible
+    patch -Np1 -i ../arch-fonts.diff
 }
 
 build() {
-  cd $_tarname
+    cd $_tarname
+
+    export CC='gcc -m32'
+    export CXX='g++ -m32'
+    export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
 
-  export CC='gcc -m32'
-  export CXX='g++ -m32'
-  export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
+    ./configure \
+        --build=i686-pc-linux-gnu \
+        --prefix=/usr \
+        --libdir=/usr/lib32 \
+        --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 \
+        --enable-opencl \
+        --with-gslib \
+        --with-lqr \
+        --with-modules \
+        --with-openexr \
+        --with-openjp2 \
+        --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 \
+        --without-heic
 
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --build=i686-pc-linux-gnu --libdir=/usr/lib32 \
-    --with-dejavu-font-dir=/usr/share/fotns/TTF \
-    --with-gs-font-dir=/usr/share/fotns/gsfonts \
-    PSDelegate=/usr/bin/gs \
-    XPSDelegate=/usr/bin/gxps \
-    PCLDelegate=/usr/bin/gpcl6 \
-    --enable-hdri \
-    --enable-opencl \
-    --with-gslib \
-    --with-lqr \
-    --with-modules \
-    --with-openexr \
-    --with-openjp2 \
-    --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
+    sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+    make
 }
 
-#check() {
-#  cd $_tarname
-#  ulimit -n 4096
-#  make check
-#}
+check() {
+    cd $_tarname
+
+    make -k check || :
+}
 
 package() {
-  cd $_tarname
-  make -j1 DESTDIR="${pkgdir}" install
+    cd $_tarname
+
+    make DESTDIR="$pkgdir" install
 
-#Cleaning
-  rm -f "${pkgdir}"/usr/lib32/*.la
-  rm -rf "${pkgdir}"/usr/bin
-  rm -rf "${pkgdir}"/usr/include
-  rm -rf "${pkgdir}"/usr/share
-  rm -rf "${pkgdir}"/etc
+    rm -rf "${pkgdir}"/etc
+    rm -rf "${pkgdir}"/usr/bin
+    rm -rf "${pkgdir}"/usr/include
+    rm -rf "${pkgdir}"/usr/share
 
-# template end;
+    install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 LICENSE NOTICE
 }