[arch-commits] Commit in imagemagick/trunk (PKGBUILD imagemagick-underlink.patch)

[Antonio Rojas]

    Date: Monday, July 24, 2017 @ 20:33:45
  Author: arojas
Revision: 301233

Update to 6.9.9.3

Modified:
  imagemagick/trunk/PKGBUILD
Deleted:
  imagemagick/trunk/imagemagick-underlink.patch

-----------------------------+
 PKGBUILD                    |   12 +++++-------
 imagemagick-underlink.patch |   13 -------------
 2 files changed, 5 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-07-24 20:31:58 UTC (rev 301232)
+++ PKGBUILD	2017-07-24 20:33:45 UTC (rev 301233)
@@ -3,8 +3,8 @@
 
 pkgbase=imagemagick
 pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.9.9.2
-pkgrel=2
+pkgver=6.9.9.3
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.imagemagick.org/"
 license=('custom')
@@ -12,11 +12,10 @@
              'openexr' 'libwmf' 'librsvg' 'libxml2' 'liblqr' 'openjpeg2' 'libraw'
              'opencl-headers' 'opencl-icd-loader' 'libwebp' 'subversion' 'glu' 'git')
 source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc}
-        perlmagick.rpath.patch imagemagick-underlink.patch)
-sha1sums=('e23ee6a54063c0ac36882fc71f54b660316f542d'
+        perlmagick.rpath.patch)
+sha1sums=('54572dc0ce60f8e46d2224442e51fe6781bb2a32'
           'SKIP'
-          'e143cf9d530fabf3b58023899b5cc544ba93daec'
-          'e0cb8d32952d9e1636d03b1b4c03d8c9206192c4')
+          'e143cf9d530fabf3b58023899b5cc544ba93daec')
 validpgpkeys=('D8272EF51DA223E4D05B466989AB63D48277377A')
 
 prepare() {
@@ -23,7 +22,6 @@
   cd ImageMagick-${pkgver%.*}-${pkgver##*.}
   sed '/AC_PATH_XTRA/d' -i configure.ac
   patch -p0 -i "${srcdir}/perlmagick.rpath.patch"
-  patch -p1 -i ../imagemagick-underlink.patch # Fix underlinking
   autoreconf --force --install
 }
 

Deleted: imagemagick-underlink.patch
===================================================================
--- imagemagick-underlink.patch	2017-07-24 20:31:58 UTC (rev 301232)
+++ imagemagick-underlink.patch	2017-07-24 20:33:45 UTC (rev 301233)
@@ -1,13 +0,0 @@
-diff --git a/coders/Makefile.am b/coders/Makefile.am
-index e39ed031f..689728353 100644
---- a/coders/Makefile.am
-+++ b/coders/Makefile.am
-@@ -469,7 +469,7 @@ coders_djvu_la_LIBADD      = $(MAGICKCORE_LIBS) $(DJVU_LIBS) $(JPEG_LIBS) $(LZMA
- coders_dng_la_SOURCES      = coders/dng.c
- coders_dng_la_CPPFLAGS     = $(MAGICK_CODER_CPPFLAGS)
- coders_dng_la_LDFLAGS      = $(MODULECOMMONFLAGS)
--coders_dng_la_LIBADD       = $(MAGICKCORE_LIBS) $(RAW_LIBS)
-+coders_dng_la_LIBADD       = $(MAGICKCORE_LIBS) $(RAW_R_LIBS)
- 
- # DPS coder module
- coders_dps_la_SOURCES      = coders/dps.c