[arch-commits] Commit in imagemagick/trunk (3 files)
Eric Bélanger
eric at archlinux.org
Wed Dec 31 19:37:30 UTC 2014
Date: Wednesday, December 31, 2014 @ 20:37:29
Author: eric
Revision: 228247
upgpkg: imagemagick 6.9.0.2-1
Upstream update
Added:
imagemagick/trunk/imagemagick-palm.diff
imagemagick/trunk/imagemagick-rle.diff
Modified:
imagemagick/trunk/PKGBUILD
-----------------------+
PKGBUILD | 13 +++++++++----
imagemagick-palm.diff | 11 +++++++++++
imagemagick-rle.diff | 18 ++++++++++++++++++
3 files changed, 38 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-12-31 19:32:48 UTC (rev 228246)
+++ PKGBUILD 2014-12-31 19:37:29 UTC (rev 228247)
@@ -3,7 +3,7 @@
pkgbase=imagemagick
pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.9.0.0
+pkgver=6.9.0.2
pkgrel=1
arch=('i686' 'x86_64')
url="http://www.imagemagick.org/"
@@ -13,10 +13,13 @@
'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)
-sha1sums=('6bf4263ceaeea61e00fe15a95db320d49bcc48c4'
+ perlmagick.rpath.patch imagemagick-palm.diff imagemagick-rle.diff)
+sha1sums=('da0ad71290bf92a848ceddbbcf67d765542febd5'
'SKIP'
- 'e143cf9d530fabf3b58023899b5cc544ba93daec')
+ 'e143cf9d530fabf3b58023899b5cc544ba93daec'
+ '34f4e402963e83f5c6e6da79d75d1f43afdbca86'
+ '75534ddcb9f787ee270bdeb0899983fc95eb33a5')
+validpgpkeys=('D8272EF51DA223E4D05B466989AB63D48277377A')
prepare() {
cd ImageMagick-${pkgver%.*}-${pkgver##*.}
@@ -23,6 +26,8 @@
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() {
Added: imagemagick-palm.diff
===================================================================
--- imagemagick-palm.diff (rev 0)
+++ imagemagick-palm.diff 2014-12-31 19:37:29 UTC (rev 228247)
@@ -0,0 +1,11 @@
+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)
Added: imagemagick-rle.diff
===================================================================
--- imagemagick-rle.diff (rev 0)
+++ imagemagick-rle.diff 2014-12-31 19:37:29 UTC (rev 228247)
@@ -0,0 +1,18 @@
+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++;
+ }
More information about the arch-commits
mailing list