[arch-commits] Commit in imagemagick/trunk (3 files)

[Eric Bélanger]

    Date: Wednesday, January 7, 2015 @ 01:14:16
  Author: eric
Revision: 228717

upgpkg: imagemagick 6.9.0.3-1

Upstream update, Remove old patches

Modified:
  imagemagick/trunk/PKGBUILD
Deleted:
  imagemagick/trunk/imagemagick-palm.diff
  imagemagick/trunk/imagemagick-rle.diff

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-01-06 17:03:36 UTC (rev 228716)
+++ PKGBUILD	2015-01-07 00:14:16 UTC (rev 228717)
@@ -3,7 +3,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/"
@@ -13,12 +13,10 @@
              'opencl-headers' 'libcl' '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() {
@@ -26,8 +24,6 @@
   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() {

Deleted: imagemagick-palm.diff
===================================================================
--- imagemagick-palm.diff	2015-01-06 17:03:36 UTC (rev 228716)
+++ imagemagick-palm.diff	2015-01-07 00:14:16 UTC (rev 228717)
@@ -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)

Deleted: imagemagick-rle.diff
===================================================================
--- imagemagick-rle.diff	2015-01-06 17:03:36 UTC (rev 228716)
+++ imagemagick-rle.diff	2015-01-07 00:14:16 UTC (rev 228717)
@@ -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++;
-               }