[arch-commits] Commit in transfig/trunk (PKGBUILD transfig-3.2.5d-libpng-1.5.patch)

[Eric Bélanger]

    Date: Monday, September 9, 2013 @ 20:47:38
  Author: eric
Revision: 194010

upgpkg: transfig 3.2.5e-1

Upstream update, Replace csh script by sh one, Add bc depends, Remove old patch

Modified:
  transfig/trunk/PKGBUILD
Deleted:
  transfig/trunk/transfig-3.2.5d-libpng-1.5.patch

----------------------------------+
 PKGBUILD                         |   20 ++++++++----------
 transfig-3.2.5d-libpng-1.5.patch |   39 -------------------------------------
 2 files changed, 9 insertions(+), 50 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-09-09 17:42:53 UTC (rev 194009)
+++ PKGBUILD	2013-09-09 18:47:38 UTC (rev 194010)
@@ -2,25 +2,22 @@
 # Maintainer: Eric Bélanger <eric at archlinux.org>
 
 pkgname=transfig
-pkgver=3.2.5d
-pkgrel=2
+pkgver=3.2.5e
+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')
+depends=('libpng' 'libxpm' 'bc')
 makedepends=('imake')
-source=(http://downloads.sourceforge.net/mcj/${pkgname}.${pkgver}.tar.gz LICENSE \
-        transfig-3.2.5d-libpng-1.5.patch)
-sha1sums=('90ff277cc9b3fa0d0313052fcf5e3ffad8652abc'
-          'b8b712871615308b8b6add92f86d218437d652f2'
-          '9f9f332b0b31e58e59542bc1568df9617b71710a')
+source=(http://downloads.sourceforge.net/mcj/${pkgname}.${pkgver}.tar.gz LICENSE)
+sha1sums=('27aa9691bf84f8775db9be39c453a8132148bad1'
+          'b8b712871615308b8b6add92f86d218437d652f2')
 
 prepare() {
   cd ${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
+  sed -i 's/XCOMM USELATEX2E/USELATEX2E/' transfig/Imakefile
+  sed -i 's/XCOMM USEINLINE/USEINLINE/' fig2dev/Imakefile
 }
 
 build() {
@@ -35,5 +32,6 @@
   make DESTDIR="${pkgdir}" XFIGLIBDIR=/usr/share/xfig \
     FIG2DEV_LIBDIR=/usr/share/fig2dev MANPATH=/usr/share/man \
     install install.man
+  mv "${pkgdir}/usr/bin/fig2ps2tex.sh" "${pkgdir}/usr/bin/fig2ps2tex"
   install -Dm644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }

Deleted: transfig-3.2.5d-libpng-1.5.patch
===================================================================
--- transfig-3.2.5d-libpng-1.5.patch	2013-09-09 17:42:53 UTC (rev 194009)
+++ transfig-3.2.5d-libpng-1.5.patch	2013-09-09 18:47:38 UTC (rev 194010)
@@ -1,39 +0,0 @@
-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) {