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

[Antonio Rojas]

    Date: Monday, July 24, 2017 @ 07:17:45
  Author: arojas
Revision: 301194

Fix underlinking in dng module (FS#54912)

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

-----------------------------+
 PKGBUILD                    |   10 ++++++----
 imagemagick-underlink.patch |   13 +++++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-07-23 23:33:24 UTC (rev 301193)
+++ PKGBUILD	2017-07-24 07:17:45 UTC (rev 301194)
@@ -4,7 +4,7 @@
 pkgbase=imagemagick
 pkgname=('imagemagick' 'imagemagick-doc')
 pkgver=6.9.9.2
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.imagemagick.org/"
 license=('custom')
@@ -12,17 +12,19 @@
              '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)
+        perlmagick.rpath.patch imagemagick-underlink.patch)
 sha1sums=('e23ee6a54063c0ac36882fc71f54b660316f542d'
           'SKIP'
-          'e143cf9d530fabf3b58023899b5cc544ba93daec')
+          'e143cf9d530fabf3b58023899b5cc544ba93daec'
+          'e0cb8d32952d9e1636d03b1b4c03d8c9206192c4')
 validpgpkeys=('D8272EF51DA223E4D05B466989AB63D48277377A')
 
 prepare() {
   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
-  patch -p0 -i "${srcdir}/perlmagick.rpath.patch"
 }
 
 build() {

Added: imagemagick-underlink.patch
===================================================================
--- imagemagick-underlink.patch	                        (rev 0)
+++ imagemagick-underlink.patch	2017-07-24 07:17:45 UTC (rev 301194)
@@ -0,0 +1,13 @@
+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