[arch-commits] Commit in transfig/repos (7 files)
Ionut Biru
ibiru at archlinux.org
Sun Feb 5 11:57:09 UTC 2012
Date: Sunday, February 5, 2012 @ 06:57:09
Author: ibiru
Revision: 148943
db-move: moved transfig from [testing] to [extra] (i686)
Added:
transfig/repos/extra-i686/LICENSE
(from rev 148654, transfig/repos/testing-i686/LICENSE)
transfig/repos/extra-i686/PKGBUILD
(from rev 148654, transfig/repos/testing-i686/PKGBUILD)
transfig/repos/extra-i686/transfig-3.2.5d-libpng-1.5.patch
(from rev 148654, transfig/repos/testing-i686/transfig-3.2.5d-libpng-1.5.patch)
Deleted:
transfig/repos/extra-i686/ChangeLog
transfig/repos/extra-i686/LICENSE
transfig/repos/extra-i686/PKGBUILD
transfig/repos/testing-i686/
----------------------------------+
ChangeLog | 36 ------------------
LICENSE | 46 +++++++++++------------
PKGBUILD | 73 ++++++++++++++++++-------------------
transfig-3.2.5d-libpng-1.5.patch | 39 +++++++++++++++++++
4 files changed, 99 insertions(+), 95 deletions(-)
Deleted: extra-i686/ChangeLog
===================================================================
--- extra-i686/ChangeLog 2012-02-05 11:57:05 UTC (rev 148942)
+++ extra-i686/ChangeLog 2012-02-05 11:57:09 UTC (rev 148943)
@@ -1,36 +0,0 @@
-2010-05-26 Jan de Groot <jgc at archlinux.org>
- * transfig 3.2.5c-3
- * Rebuilt for libpng 1.4.2, png_set_dither has been renamed
-
-2010-01-27 Eric Belanger <eric at archlinux.org>
-
- * transfig 3.2.5c-2
- * Rebuilt for libpng 1.4 and libjpeg 8
-
-2010-01-11 Eric Belanger <eric at archlinux.org>
-
- * transfig 3.2.5c-1
- * Upstream update
- * Removed force option
-
-2009-08-12 Eric Belanger <eric at archlinux.org>
-
- * transfig 3.2.5a-1
- * Upstream update
- * Added force option
-
-2009-03-21 Eric Belanger <eric at archlinux.org>
-
- * transfig 3.2.5-2
- * Removed uneeded stderr message (close FS#13825)
-
-2008-12-14 Eric Belanger <eric at 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
Deleted: extra-i686/LICENSE
===================================================================
--- extra-i686/LICENSE 2012-02-05 11:57:05 UTC (rev 148942)
+++ extra-i686/LICENSE 2012-02-05 11:57:09 UTC (rev 148943)
@@ -1,23 +0,0 @@
-/*
- * TransFig: Facility for Translating Fig code
- * Copyright (c) 1991 by Micah Beck
- * Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
- *
- * Any party obtaining a copy of these files is granted, free of charge, a
- * full and unrestricted irrevocable, world-wide, paid up, royalty-free,
- * nonexclusive right and license to deal in this software and
- * documentation files (the "Software"), including without limitation the
- * rights to use, copy, modify, merge, publish and/or distribute copies of
- * the Software, and to permit persons who receive copies from any such
- * party to do so, with the only requirement being that this copyright
- * notice remain intact.
- *
- */
-
-THE LAWRENCE BERKELEY NATIONAL LABORATORY DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL,
-INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
Copied: transfig/repos/extra-i686/LICENSE (from rev 148654, transfig/repos/testing-i686/LICENSE)
===================================================================
--- extra-i686/LICENSE (rev 0)
+++ extra-i686/LICENSE 2012-02-05 11:57:09 UTC (rev 148943)
@@ -0,0 +1,23 @@
+/*
+ * TransFig: Facility for Translating Fig code
+ * Copyright (c) 1991 by Micah Beck
+ * Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
+ *
+ * Any party obtaining a copy of these files is granted, free of charge, a
+ * full and unrestricted irrevocable, world-wide, paid up, royalty-free,
+ * nonexclusive right and license to deal in this software and
+ * documentation files (the "Software"), including without limitation the
+ * rights to use, copy, modify, merge, publish and/or distribute copies of
+ * the Software, and to permit persons who receive copies from any such
+ * party to do so, with the only requirement being that this copyright
+ * notice remain intact.
+ *
+ */
+
+THE LAWRENCE BERKELEY NATIONAL LABORATORY DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL,
+INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-02-05 11:57:05 UTC (rev 148942)
+++ extra-i686/PKGBUILD 2012-02-05 11:57:09 UTC (rev 148943)
@@ -1,36 +0,0 @@
-# $Id$
-# Contributor: Eric Belanger <eric at archlinux.org>
-# Contributor: J. Santiago Hirschfeld <jsantiagoh at yahoo.com.ar>
-# Maintainer: Daniel J Griffiths <ghost1227 at archlinux.us>
-
-pkgname=transfig
-pkgver=3.2.5c
-pkgrel=3
-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')
-
-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
-
- xmkmf || return 1
- make FIG2DEV_LIBDIR=/usr/share/fig2dev Makefiles || return 1
- make FIG2DEV_LIBDIR=/usr/share/fig2dev XFIGLIBDIR=/usr/share/xfig || return 1
-}
-
-package() {
- 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
-}
Copied: transfig/repos/extra-i686/PKGBUILD (from rev 148654, transfig/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-02-05 11:57:09 UTC (rev 148943)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=transfig
+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 \
+ 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
+ sed -i 's/XCOMM USEINLINE = -DUSE_INLINE/USEINLINE = -DUSE_INLINE/' fig2dev/Imakefile
+ patch -p1 -i ../transfig-3.2.5d-libpng-1.5.patch
+
+ xmkmf
+ make FIG2DEV_LIBDIR=/usr/share/fig2dev Makefiles
+ make FIG2DEV_LIBDIR=/usr/share/fig2dev XFIGLIBDIR=/usr/share/xfig
+}
+
+package() {
+ cd "${srcdir}/${pkgname}.${pkgver}"
+
+ 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"
+}
Copied: transfig/repos/extra-i686/transfig-3.2.5d-libpng-1.5.patch (from rev 148654, transfig/repos/testing-i686/transfig-3.2.5d-libpng-1.5.patch)
===================================================================
--- extra-i686/transfig-3.2.5d-libpng-1.5.patch (rev 0)
+++ extra-i686/transfig-3.2.5d-libpng-1.5.patch 2012-02-05 11:57:09 UTC (rev 148943)
@@ -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) {
More information about the arch-commits
mailing list