[arch-commits] Commit in graphicsmagick/trunk (PKGBUILD benign.patch)

[Gaetan Bisson]

    Date: Friday, November 22, 2013 @ 17:50:08
  Author: bisson
Revision: 200217

fix FS#37876

Added:
  graphicsmagick/trunk/benign.patch
Modified:
  graphicsmagick/trunk/PKGBUILD

--------------+
 PKGBUILD     |   13 ++++++++++---
 benign.patch |   43 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-11-22 15:28:24 UTC (rev 200216)
+++ PKGBUILD	2013-11-22 16:50:08 UTC (rev 200217)
@@ -6,7 +6,7 @@
 
 pkgname=graphicsmagick
 pkgver=1.3.18
-pkgrel=4
+pkgrel=5
 pkgdesc='Image processing system'
 url='http://www.graphicsmagick.org/'
 arch=('i686' 'x86_64')
@@ -19,11 +19,18 @@
             '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")
-sha1sums=('085c23666adcf88585119cb6aea7efe5c58481d4')
+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}"
 

Added: benign.patch
===================================================================
--- benign.patch	                        (rev 0)
+++ benign.patch	2013-11-22 16:50:08 UTC (rev 200217)
@@ -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 at 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 at 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.
+   */