From 11ec80481772c48bbc227b7cc35bf25a3169471b Mon Sep 17 00:00:00 2001
From: David Beauchamp <david@archlinuxarm.org>
Date: Tue, 6 Jan 2015 19:42:30 -0500
Subject: [PATCH] extra/imagemagick to 6.9.0.3-1

---
 extra/imagemagick/PKGBUILD              | 12 ++++--------
 extra/imagemagick/imagemagick-palm.diff | 11 -----------
 extra/imagemagick/imagemagick-rle.diff  | 18 ------------------
 3 files changed, 4 insertions(+), 37 deletions(-)
 delete mode 100644 extra/imagemagick/imagemagick-palm.diff
 delete mode 100644 extra/imagemagick/imagemagick-rle.diff

diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD
index 82e67fa5e..4b8d4e96a 100644
--- a/extra/imagemagick/PKGBUILD
+++ b/extra/imagemagick/PKGBUILD
@@ -8,7 +8,7 @@
 
 pkgbase=imagemagick
 pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.9.0.2
+pkgver=6.9.0.3
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.imagemagick.org/"
@@ -18,12 +18,10 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript'
              'libwebp' 'subversion')
 source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc}
 #source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc}
-        perlmagick.rpath.patch imagemagick-palm.diff imagemagick-rle.diff)
-sha1sums=('da0ad71290bf92a848ceddbbcf67d765542febd5'
+        perlmagick.rpath.patch)
+sha1sums=('c7bb4eebef59544d0411ed56bda64f34fafb11f3'
           'SKIP'
-          'e143cf9d530fabf3b58023899b5cc544ba93daec'
-          '34f4e402963e83f5c6e6da79d75d1f43afdbca86'
-          '75534ddcb9f787ee270bdeb0899983fc95eb33a5')
+          'e143cf9d530fabf3b58023899b5cc544ba93daec')
 validpgpkeys=('D8272EF51DA223E4D05B466989AB63D48277377A')
 
 prepare() {
@@ -31,8 +29,6 @@ prepare() {
   sed '/AC_PATH_XTRA/d' -i configure.ac
   autoreconf --force --install
   patch -p0 -i "${srcdir}/perlmagick.rpath.patch"
-  patch -p3 -i "${srcdir}/imagemagick-palm.diff"
-  patch -p3 -i "${srcdir}/imagemagick-rle.diff"
 }
 
 build() {
diff --git a/extra/imagemagick/imagemagick-palm.diff b/extra/imagemagick/imagemagick-palm.diff
deleted file mode 100644
index 049c8f5ea..000000000
--- a/extra/imagemagick/imagemagick-palm.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: ImageMagick/branches/ImageMagick-6/coders/palm.c
-===================================================================
---- ImageMagick/branches/ImageMagick-6/coders/palm.c	(revision 17434)
-+++ ImageMagick/branches/ImageMagick-6/coders/palm.c	(revision 17515)
-@@ -511,5 +511,5 @@
-         IndexPacket index=ConstrainColormapIndex(image,(mask-transparentIndex));
-         if (bits_per_pixel != 16)
--          SetMagickPixelPacket(image,image->colormap+index,
-+          SetMagickPixelPacket(image,image->colormap+(ssize_t) index,
-             (const IndexPacket *) NULL,&transpix);
-         (void) TransparentPaintImage(image,&transpix,(Quantum)
diff --git a/extra/imagemagick/imagemagick-rle.diff b/extra/imagemagick/imagemagick-rle.diff
deleted file mode 100644
index 9f2f0e93d..000000000
--- a/extra/imagemagick/imagemagick-rle.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: ImageMagick/branches/ImageMagick-6/coders/rle.c
-===================================================================
---- ImageMagick/branches/ImageMagick-6/coders/rle.c	(revision 17434)
-+++ ImageMagick/branches/ImageMagick-6/coders/rle.c	(revision 17516)
-@@ -457,5 +457,5 @@
-                 MagickFalse)
-               break;
--            *p=colormap[index];
-+            *p=colormap[(ssize_t) index];
-             p++;
-           }
-@@ -468,5 +468,5 @@
-                     (*p & mask)),&index,exception) == MagickFalse)
-                   break;
--                *p=colormap[index];
-+                *p=colormap[(ssize_t) index];
-                 p++;
-               }