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

Gaetan Bisson bisson at nymeria.archlinux.org
Thu Jan 2 10:14:23 UTC 2014


    Date: Thursday, January 2, 2014 @ 11:14:23
  Author: bisson
Revision: 203037

upstream update

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

--------------+
 PKGBUILD     |   16 ++++------------
 benign.patch |   43 -------------------------------------------
 2 files changed, 4 insertions(+), 55 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-01-02 09:41:35 UTC (rev 203036)
+++ PKGBUILD	2014-01-02 10:14:23 UTC (rev 203037)
@@ -5,8 +5,8 @@
 # Contributor: Anton Leontiev <bunder at t-25.ru>
 
 pkgname=graphicsmagick
-pkgver=1.3.18
-pkgrel=6
+pkgver=1.3.19
+pkgrel=1
 pkgdesc='Image processing system'
 url='http://www.graphicsmagick.org/'
 arch=('i686' 'x86_64')
@@ -19,21 +19,13 @@
             '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')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/GraphicsMagick-${pkgver}.tar.xz")
+sha1sums=('621c3e9a3b12e38dad225ee3466fd55a24c62066')
 
 options=('!emptydirs' 'libtool')
 
-prepare() {
-	cd "${srcdir}/GraphicsMagick-${pkgver}"
-	patch -p1 -i ../benign.patch
-}
-
 build() {
 	cd "${srcdir}/GraphicsMagick-${pkgver}"
-
 	./configure \
 		--prefix=/usr \
 		--enable-shared \

Deleted: benign.patch
===================================================================
--- benign.patch	2014-01-02 09:41:35 UTC (rev 203036)
+++ benign.patch	2014-01-02 10:14:23 UTC (rev 203037)
@@ -1,43 +0,0 @@
-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.
-   */




More information about the arch-commits mailing list