[arch-commits] Commit in graphicsmagick/repos (6 files)
Gaetan Bisson
bisson at nymeria.archlinux.org
Fri Nov 22 16:50:50 UTC 2013
Date: Friday, November 22, 2013 @ 17:50:50
Author: bisson
Revision: 200218
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
graphicsmagick/repos/extra-i686/PKGBUILD
(from rev 200217, graphicsmagick/trunk/PKGBUILD)
graphicsmagick/repos/extra-i686/benign.patch
(from rev 200217, graphicsmagick/trunk/benign.patch)
graphicsmagick/repos/extra-x86_64/PKGBUILD
(from rev 200217, graphicsmagick/trunk/PKGBUILD)
graphicsmagick/repos/extra-x86_64/benign.patch
(from rev 200217, graphicsmagick/trunk/benign.patch)
Deleted:
graphicsmagick/repos/extra-i686/PKGBUILD
graphicsmagick/repos/extra-x86_64/PKGBUILD
---------------------------+
/PKGBUILD | 128 ++++++++++++++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 57 -------------------
extra-i686/benign.patch | 43 ++++++++++++++
extra-x86_64/PKGBUILD | 57 -------------------
extra-x86_64/benign.patch | 43 ++++++++++++++
5 files changed, 214 insertions(+), 114 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2013-11-22 16:50:08 UTC (rev 200217)
+++ extra-i686/PKGBUILD 2013-11-22 16:50:50 UTC (rev 200218)
@@ -1,57 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-# Contributor: Anton Leontiev <bunder at t-25.ru>
-
-pkgname=graphicsmagick
-pkgver=1.3.18
-pkgrel=4
-pkgdesc='Image processing system'
-url='http://www.graphicsmagick.org/'
-arch=('i686' 'x86_64')
-license=('MIT')
-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")
-sha1sums=('085c23666adcf88585119cb6aea7efe5c58481d4')
-
-options=('!emptydirs' 'libtool')
-
-build() {
- cd "${srcdir}/GraphicsMagick-${pkgver}"
-
- ./configure \
- --prefix=/usr \
- --enable-shared \
- --with-modules \
- --with-perl \
- --with-gs-font-dir=/usr/share/fonts/Type1 \
-
- make
-}
-
-package() {
- cd "${srcdir}/GraphicsMagick-${pkgver}"
-
- make DESTDIR="${pkgdir}" install
-
- # Install MIT license
- install -Dm644 "Copyright.txt" "${pkgdir}/usr/share/licenses/${pkgname}/Copyright.txt"
-
- # Install perl bindings
- # The patching was introduced in order to build perl module without installing package itself and
- # not to introduce unnecessary path into LD_RUN_PATH
- cd PerlMagick
- sed -i -e "s:'LDDLFLAGS' => \"\(.*\)\":'LDDLFLAGS' => \"-L${pkgdir}/usr/lib \1\":" Makefile.PL
- perl Makefile.PL INSTALLDIRS=vendor PREFIX=/usr DESTDIR="${pkgdir}"
- sed -i -e "s/LDLOADLIBS =/LDLOADLIBS = -lGraphicsMagick/" Makefile
- make
- make install
-}
Copied: graphicsmagick/repos/extra-i686/PKGBUILD (from rev 200217, graphicsmagick/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-11-22 16:50:50 UTC (rev 200218)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+# Contributor: Anton Leontiev <bunder at t-25.ru>
+
+pkgname=graphicsmagick
+pkgver=1.3.18
+pkgrel=5
+pkgdesc='Image processing system'
+url='http://www.graphicsmagick.org/'
+arch=('i686' 'x86_64')
+license=('MIT')
+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 \
+ --enable-shared \
+ --with-modules \
+ --with-perl \
+ --with-gs-font-dir=/usr/share/fonts/Type1 \
+
+ make
+}
+
+package() {
+ cd "${srcdir}/GraphicsMagick-${pkgver}"
+
+ make DESTDIR="${pkgdir}" install
+
+ # Install MIT license
+ install -Dm644 "Copyright.txt" "${pkgdir}/usr/share/licenses/${pkgname}/Copyright.txt"
+
+ # Install perl bindings
+ # The patching was introduced in order to build perl module without installing package itself and
+ # not to introduce unnecessary path into LD_RUN_PATH
+ cd PerlMagick
+ sed -i -e "s:'LDDLFLAGS' => \"\(.*\)\":'LDDLFLAGS' => \"-L${pkgdir}/usr/lib \1\":" Makefile.PL
+ perl Makefile.PL INSTALLDIRS=vendor PREFIX=/usr DESTDIR="${pkgdir}"
+ sed -i -e "s/LDLOADLIBS =/LDLOADLIBS = -lGraphicsMagick/" Makefile
+ make
+ make install
+}
Copied: graphicsmagick/repos/extra-i686/benign.patch (from rev 200217, graphicsmagick/trunk/benign.patch)
===================================================================
--- extra-i686/benign.patch (rev 0)
+++ extra-i686/benign.patch 2013-11-22 16:50:50 UTC (rev 200218)
@@ -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.
+ */
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2013-11-22 16:50:08 UTC (rev 200217)
+++ extra-x86_64/PKGBUILD 2013-11-22 16:50:50 UTC (rev 200218)
@@ -1,57 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-# Contributor: Anton Leontiev <bunder at t-25.ru>
-
-pkgname=graphicsmagick
-pkgver=1.3.18
-pkgrel=4
-pkgdesc='Image processing system'
-url='http://www.graphicsmagick.org/'
-arch=('i686' 'x86_64')
-license=('MIT')
-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")
-sha1sums=('085c23666adcf88585119cb6aea7efe5c58481d4')
-
-options=('!emptydirs' 'libtool')
-
-build() {
- cd "${srcdir}/GraphicsMagick-${pkgver}"
-
- ./configure \
- --prefix=/usr \
- --enable-shared \
- --with-modules \
- --with-perl \
- --with-gs-font-dir=/usr/share/fonts/Type1 \
-
- make
-}
-
-package() {
- cd "${srcdir}/GraphicsMagick-${pkgver}"
-
- make DESTDIR="${pkgdir}" install
-
- # Install MIT license
- install -Dm644 "Copyright.txt" "${pkgdir}/usr/share/licenses/${pkgname}/Copyright.txt"
-
- # Install perl bindings
- # The patching was introduced in order to build perl module without installing package itself and
- # not to introduce unnecessary path into LD_RUN_PATH
- cd PerlMagick
- sed -i -e "s:'LDDLFLAGS' => \"\(.*\)\":'LDDLFLAGS' => \"-L${pkgdir}/usr/lib \1\":" Makefile.PL
- perl Makefile.PL INSTALLDIRS=vendor PREFIX=/usr DESTDIR="${pkgdir}"
- sed -i -e "s/LDLOADLIBS =/LDLOADLIBS = -lGraphicsMagick/" Makefile
- make
- make install
-}
Copied: graphicsmagick/repos/extra-x86_64/PKGBUILD (from rev 200217, graphicsmagick/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-11-22 16:50:50 UTC (rev 200218)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+# Contributor: Anton Leontiev <bunder at t-25.ru>
+
+pkgname=graphicsmagick
+pkgver=1.3.18
+pkgrel=5
+pkgdesc='Image processing system'
+url='http://www.graphicsmagick.org/'
+arch=('i686' 'x86_64')
+license=('MIT')
+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 \
+ --enable-shared \
+ --with-modules \
+ --with-perl \
+ --with-gs-font-dir=/usr/share/fonts/Type1 \
+
+ make
+}
+
+package() {
+ cd "${srcdir}/GraphicsMagick-${pkgver}"
+
+ make DESTDIR="${pkgdir}" install
+
+ # Install MIT license
+ install -Dm644 "Copyright.txt" "${pkgdir}/usr/share/licenses/${pkgname}/Copyright.txt"
+
+ # Install perl bindings
+ # The patching was introduced in order to build perl module without installing package itself and
+ # not to introduce unnecessary path into LD_RUN_PATH
+ cd PerlMagick
+ sed -i -e "s:'LDDLFLAGS' => \"\(.*\)\":'LDDLFLAGS' => \"-L${pkgdir}/usr/lib \1\":" Makefile.PL
+ perl Makefile.PL INSTALLDIRS=vendor PREFIX=/usr DESTDIR="${pkgdir}"
+ sed -i -e "s/LDLOADLIBS =/LDLOADLIBS = -lGraphicsMagick/" Makefile
+ make
+ make install
+}
Copied: graphicsmagick/repos/extra-x86_64/benign.patch (from rev 200217, graphicsmagick/trunk/benign.patch)
===================================================================
--- extra-x86_64/benign.patch (rev 0)
+++ extra-x86_64/benign.patch 2013-11-22 16:50:50 UTC (rev 200218)
@@ -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.
+ */
More information about the arch-commits
mailing list