Date: Wednesday, January 18, 2012 @ 20:34:08
Author: eric
Revision: 146870
upgpkg: transfig 3.2.5d-1
Upstream update, Rebuild against libpng 1.5 and libtiff 4.0, Remove ChangeLog,
PKGBUILD clean up
Added:
transfig/trunk/transfig-3.2.5d-libpng-1.5.patch
Modified:
transfig/trunk/PKGBUILD
Deleted:
transfig/trunk/ChangeLog
----------------------------------+
ChangeLog | 36 ----------------------------------
PKGBUILD | 39 ++++++++++++++++++-------------------
transfig-3.2.5d-libpng-1.5.patch | 39 +++++++++++++++++++++++++++++++++++++
3 files changed, 59 insertions(+), 55 deletions(-)
Deleted: ChangeLog
===================================================================
--- ChangeLog 2012-01-19 01:23:02 UTC (rev 146869)
+++ ChangeLog 2012-01-19 01:34:08 UTC (rev 146870)
@@ -1,36 +0,0 @@
-2010-05-26 Jan de Groot <j...@archlinux.org>
- * transfig 3.2.5c-3
- * Rebuilt for libpng 1.4.2, png_set_dither has been renamed
-
-2010-01-27 Eric Belanger <e...@archlinux.org>
-
- * transfig 3.2.5c-2
- * Rebuilt for libpng 1.4 and libjpeg 8
-
-2010-01-11 Eric Belanger <e...@archlinux.org>
-
- * transfig 3.2.5c-1
- * Upstream update
- * Removed force option
-
-2009-08-12 Eric Belanger <e...@archlinux.org>
-
- * transfig 3.2.5a-1
- * Upstream update
- * Added force option
-
-2009-03-21 Eric Belanger <e...@archlinux.org>
-
- * transfig 3.2.5-2
- * Removed uneeded stderr message (close FS#13825)
-
-2008-12-14 Eric Belanger <e...@archlinux.org>
-
- * transfig 3.2.5-1
- * Upstream update
- * Added arch tag
- * Added license
- * Added imake makedepends
- * Added man pages
- * Removed old patches
- * Added ChangeLog
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-01-19 01:23:02 UTC (rev 146869)
+++ PKGBUILD 2012-01-19 01:34:08 UTC (rev 146870)
@@ -1,36 +1,37 @@
# $Id$
-# Contributor: Eric Belanger <e...@archlinux.org>
-# Contributor: J. Santiago Hirschfeld <jsantia...@yahoo.com.ar>
-# Maintainer: Daniel J Griffiths <ghost1...@archlinux.us>
+# Maintainer: Eric Bélanger <e...@archlinux.org>
pkgname=transfig
-pkgver=3.2.5c
-pkgrel=3
+pkgver=3.2.5d
+pkgrel=1
pkgdesc="Format conversion utility that can be used with xfig"
arch=('i686' 'x86_64')
url="http://www.xfig.org";
license=('custom')
depends=('libpng' 'libxpm')
makedepends=('imake')
-source=(http://downloads.sourceforge.net/mcj/${pkgname}.${pkgver}.tar.gz
LICENSE)
-md5sums=('0cc55ed6b4ae67a3e610e501acd694f9' 'a0b2ea903821c46dbc77afefc06d1aa4')
-sha1sums=('20013b350e81400943cd91744173445d7bd4d98e'
'b8b712871615308b8b6add92f86d218437d652f2')
+source=(http://downloads.sourceforge.net/mcj/${pkgname}.${pkgver}.tar.gz
LICENSE \
+ transfig-3.2.5d-libpng-1.5.patch)
+sha1sums=('90ff277cc9b3fa0d0313052fcf5e3ffad8652abc'
+ 'b8b712871615308b8b6add92f86d218437d652f2'
+ '9f9f332b0b31e58e59542bc1568df9617b71710a')
build() {
- cd ${srcdir}/${pkgname}.${pkgver}
- sed -i 's/XCOMM USELATEX2E = -DLATEX2E/USELATEX2E = -DLATEX2E/'
transfig/Imakefile || return 1
- sed -i 's/XCOMM USEINLINE = -DUSE_INLINE/USEINLINE = -DUSE_INLINE/'
fig2dev/Imakefile || return 1
+ cd "${srcdir}/${pkgname}.${pkgver}"
+ sed -i 's/XCOMM USELATEX2E = -DLATEX2E/USELATEX2E = -DLATEX2E/'
transfig/Imakefile
+ sed -i 's/XCOMM USEINLINE = -DUSE_INLINE/USEINLINE = -DUSE_INLINE/'
fig2dev/Imakefile
+ patch -p1 -i ../transfig-3.2.5d-libpng-1.5.patch
- xmkmf || return 1
- make FIG2DEV_LIBDIR=/usr/share/fig2dev Makefiles || return 1
- make FIG2DEV_LIBDIR=/usr/share/fig2dev XFIGLIBDIR=/usr/share/xfig ||
return 1
+ xmkmf
+ make FIG2DEV_LIBDIR=/usr/share/fig2dev Makefiles
+ make FIG2DEV_LIBDIR=/usr/share/fig2dev XFIGLIBDIR=/usr/share/xfig
}
package() {
- cd ${srcdir}/${pkgname}.${pkgver}
+ cd "${srcdir}/${pkgname}.${pkgver}"
- make DESTDIR=${pkgdir} XFIGLIBDIR=/usr/share/xfig \
- FIG2DEV_LIBDIR=/usr/share/fig2dev MANPATH=/usr/share/man \
- install install.man || return 1
- install -Dm644 ../LICENSE
${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1
+ make DESTDIR="${pkgdir}" XFIGLIBDIR=/usr/share/xfig \
+ FIG2DEV_LIBDIR=/usr/share/fig2dev MANPATH=/usr/share/man \
+ install install.man
+ install -Dm644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
Added: transfig-3.2.5d-libpng-1.5.patch
===================================================================
--- transfig-3.2.5d-libpng-1.5.patch (rev 0)
+++ transfig-3.2.5d-libpng-1.5.patch 2012-01-19 01:34:08 UTC (rev 146870)
@@ -0,0 +1,39 @@
+http://bugs.gentoo.org/show_bug.cgi?id=356751
+
+Index: transfig.3.2.5d/fig2dev/dev/readpng.c
+===================================================================
+--- transfig.3.2.5d.orig/fig2dev/dev/readpng.c
++++ transfig.3.2.5d/fig2dev/dev/readpng.c
+@@ -62,7 +62,7 @@ read_png(file,filetype,pic,llx,lly)
+ }
+
+ /* set long jump here */
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ /* if we get here there was a problem reading the file */
+ png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
+ return 0;
+@@ -78,15 +78,17 @@ read_png(file,filetype,pic,llx,lly)
+ png_get_IHDR(png_ptr, info_ptr, &w, &h, &bit_depth, &color_type,
+ &interlace_type, &compression_type, &filter_type);
+
+- if (info_ptr->valid & PNG_INFO_gAMA)
+- png_set_gamma(png_ptr, 2.2, info_ptr->gamma);
+- else
+- png_set_gamma(png_ptr, 2.2, 0.45);
++ png_fixed_point gamma = 0.45;
++ png_get_gAMA_fixed(png_ptr,info_ptr,&gamma);
++ png_set_gamma(png_ptr, 2.2, gamma);
+
+- if (info_ptr->valid & PNG_INFO_bKGD)
++ if (png_get_valid(png_ptr,info_ptr,PNG_INFO_bKGD)) {
+ /* set the background to the one supplied */
+- png_set_background(png_ptr, &info_ptr->background,
++ png_color_16p background;
++ png_get_bKGD(png_ptr,info_ptr,&background);
++ png_set_background(png_ptr, background,
+ PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
++ }
+ else {
+ /* blend the canvas background using the alpha channel */
+ if (bgspec) {
