From 65eeff79fff8a1bfdf67ca51d147384f46f4d5c0 Mon Sep 17 00:00:00 2001
From: Nicolás Reynolds <fauno@endefensadelsl.org>
Date: Fri, 27 Dec 2013 23:55:53 +0000
Subject: Fri Dec 27 23:54:04 UTC 2013

---
 extra/graphicsmagick/PKGBUILD     | 36 +++++++++++++++++++++++---------
 extra/graphicsmagick/benign.patch | 43 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+), 10 deletions(-)
 create mode 100644 extra/graphicsmagick/benign.patch

(limited to 'extra/graphicsmagick')

diff --git a/extra/graphicsmagick/PKGBUILD b/extra/graphicsmagick/PKGBUILD
index a8fb9710b..dca38908c 100644
--- a/extra/graphicsmagick/PKGBUILD
+++ b/extra/graphicsmagick/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 198048 2013-10-30 12:29:09Z allan $
+# $Id: PKGBUILD 202659 2013-12-23 18:00:07Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
@@ -6,27 +6,43 @@
 
 pkgname=graphicsmagick
 pkgver=1.3.18
-pkgrel=3
+pkgrel=6
 pkgdesc='Image processing system'
 url='http://www.graphicsmagick.org/'
 arch=('i686' 'x86_64')
 license=('MIT')
-makedepends=('perl')
-depends=('bzip2' 'freetype2' 'ghostscript' 'jasper' 'lcms2' 'xz'
-         'libtiff' 'libwmf' 'libsm' 'libxml2' 'libltdl')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/GraphicsMagick-${pkgver}.tar.xz")
-sha1sums=('085c23666adcf88585119cb6aea7efe5c58481d4')
+optdepends=('jasper: jp2 module'
+            'libpng: png module'
+            'libwmf: wmf module'
+            'libxml2: msl, svg, url modules'
+            'libtiff: ps2, ps3, tiff modules'
+            'ghostscript: pdf, ps modules')
+makedepends=('perl' 'jasper' 'libpng' 'libwmf' 'libxml2' 'libtiff')
+depends=('freetype2' 'libxext' 'libsm' 'lcms2' 'libltdl' 'bzip2' 'xz')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/GraphicsMagick-${pkgver}.tar.xz"
+        'benign.patch')
+sha1sums=('085c23666adcf88585119cb6aea7efe5c58481d4'
+          '04e16b9fe255e87cf16d4c61e313e8cdf7b2e24e')
+
+options=('!emptydirs' 'libtool')
+
+prepare() {
+	cd "${srcdir}/GraphicsMagick-${pkgver}"
+	patch -p1 -i ../benign.patch
+}
 
 build() {
 	cd "${srcdir}/GraphicsMagick-${pkgver}"
 
 	./configure \
 		--prefix=/usr \
-		--with-perl \
 		--enable-shared \
-		--disable-static \
+		--with-modules \
+		--with-perl \
 		--with-gs-font-dir=/usr/share/fonts/Type1 \
-
+		--with-quantum-depth=32 \
+		--with-openmp \
+		--with-threads
 	make
 }
 
diff --git a/extra/graphicsmagick/benign.patch b/extra/graphicsmagick/benign.patch
new file mode 100644
index 000000000..f9fe6a642
--- /dev/null
+++ b/extra/graphicsmagick/benign.patch
@@ -0,0 +1,43 @@
+diff -Naur old/ChangeLog new/ChangeLog
+--- old/ChangeLog	2013-03-09 13:19:31.000000000 -1000
++++ new/ChangeLog	2013-11-22 06:33:59.189976814 -1000
+@@ -1,3 +1,10 @@
++2013-10-16  Glenn Randers-Pehrson  <glennrp@simple.dallas.tx.us>
++
++	* Added calls to png_set_benign_errors() to allow benign errors
++	to be handled as warnings.  In particular, GM builds with libpng-1.6.x
++	will not crash while copying a PNG with a "known incorrect ICC
++	profile".
++
+ 2013-03-09  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
+ 
+ 	* version.sh, www/index.rst: Prepare for 1.3.18 release.
+diff -Naur old/coders/png.c new/coders/png.c
+--- old/coders/png.c	2013-03-09 13:19:31.000000000 -1000
++++ new/coders/png.c	2013-11-22 06:33:25.423156308 -1000
+@@ -1689,6 +1689,12 @@
+         }
+       return(image);
+     }
++
++#ifdef PNG_BENIGN_ERRORS_SUPPORTED
++  /* Allow benign errors */
++  png_set_benign_errors(ping, 1);
++#endif
++
+   /*
+     Prepare PNG for reading.
+   */
+@@ -6453,6 +6459,12 @@
+ #endif
+       return(MagickFail);
+     }
++
++#ifdef PNG_BENIGN_ERRORS_SUPPORTED
++  /* Allow benign errors */
++  png_set_benign_errors(ping, 1);
++#endif
++
+   /*
+     Prepare PNG for writing.
+   */
-- 
cgit v1.2.3-54-g00ecf