diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-01-03 03:19:39 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-01-03 03:19:39 +0000 |
| commit | f72cb0ced39aca827b5269eba5455dbf846410e2 (patch) | |
| tree | 7047d64bf11194dc5e44ed4f6765ffccb11676cf /extra/graphicsmagick | |
| parent | 3cbc40e327b77b23d48f55c76c0efde35a5dad16 (diff) | |
Fri Jan 3 03:17:00 UTC 2014
Diffstat (limited to 'extra/graphicsmagick')
| -rw-r--r-- | extra/graphicsmagick/PKGBUILD | 18 | ||||
| -rw-r--r-- | extra/graphicsmagick/benign.patch | 43 |
2 files changed, 5 insertions, 56 deletions
diff --git a/extra/graphicsmagick/PKGBUILD b/extra/graphicsmagick/PKGBUILD index dca38908c..09b123e8e 100644 --- a/extra/graphicsmagick/PKGBUILD +++ b/extra/graphicsmagick/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 202659 2013-12-23 18:00:07Z ronald $ +# $Id: PKGBUILD 203038 2014-01-02 10:14:56Z bisson $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Anton Leontiev <bunder@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 @@ optdepends=('jasper: jp2 module' '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 \ diff --git a/extra/graphicsmagick/benign.patch b/extra/graphicsmagick/benign.patch deleted file mode 100644 index f9fe6a642..000000000 --- a/extra/graphicsmagick/benign.patch +++ /dev/null @@ -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@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. - */ |