Date: Monday, September 9, 2013 @ 20:48:23 Author: eric Revision: 194011
archrelease: copy trunk to extra-i686, extra-x86_64 Added: transfig/repos/extra-i686/LICENSE (from rev 194010, transfig/trunk/LICENSE) transfig/repos/extra-i686/PKGBUILD (from rev 194010, transfig/trunk/PKGBUILD) transfig/repos/extra-x86_64/LICENSE (from rev 194010, transfig/trunk/LICENSE) transfig/repos/extra-x86_64/PKGBUILD (from rev 194010, transfig/trunk/PKGBUILD) Deleted: transfig/repos/extra-i686/LICENSE transfig/repos/extra-i686/PKGBUILD transfig/repos/extra-i686/transfig-3.2.5d-libpng-1.5.patch transfig/repos/extra-x86_64/LICENSE transfig/repos/extra-x86_64/PKGBUILD transfig/repos/extra-x86_64/transfig-3.2.5d-libpng-1.5.patch -----------------------------------------------+ /LICENSE | 46 ++++++++++++++ /PKGBUILD | 74 ++++++++++++++++++++++++ extra-i686/LICENSE | 23 ------- extra-i686/PKGBUILD | 39 ------------ extra-i686/transfig-3.2.5d-libpng-1.5.patch | 39 ------------ extra-x86_64/LICENSE | 23 ------- extra-x86_64/PKGBUILD | 39 ------------ extra-x86_64/transfig-3.2.5d-libpng-1.5.patch | 39 ------------ 8 files changed, 120 insertions(+), 202 deletions(-) Deleted: extra-i686/LICENSE =================================================================== --- extra-i686/LICENSE 2013-09-09 18:47:38 UTC (rev 194010) +++ extra-i686/LICENSE 2013-09-09 18:48:23 UTC (rev 194011) @@ -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 194010, transfig/trunk/LICENSE) =================================================================== --- extra-i686/LICENSE (rev 0) +++ extra-i686/LICENSE 2013-09-09 18:48:23 UTC (rev 194011) @@ -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 2013-09-09 18:47:38 UTC (rev 194010) +++ extra-i686/PKGBUILD 2013-09-09 18:48:23 UTC (rev 194011) @@ -1,39 +0,0 @@ -# $Id$ -# Maintainer: Eric Bélanger <e...@archlinux.org> - -pkgname=transfig -pkgver=3.2.5d -pkgrel=2 -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') - -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 -} - -build() { - cd ${pkgname}.${pkgver} - xmkmf - make FIG2DEV_LIBDIR=/usr/share/fig2dev Makefiles - make FIG2DEV_LIBDIR=/usr/share/fig2dev XFIGLIBDIR=/usr/share/xfig -} - -package() { - cd ${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/PKGBUILD (from rev 194010, transfig/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2013-09-09 18:48:23 UTC (rev 194011) @@ -0,0 +1,37 @@ +# $Id$ +# Maintainer: Eric Bélanger <e...@archlinux.org> + +pkgname=transfig +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' 'bc') +makedepends=('imake') +source=(http://downloads.sourceforge.net/mcj/${pkgname}.${pkgver}.tar.gz LICENSE) +sha1sums=('27aa9691bf84f8775db9be39c453a8132148bad1' + 'b8b712871615308b8b6add92f86d218437d652f2') + +prepare() { + cd ${pkgname}.${pkgver} + sed -i 's/XCOMM USELATEX2E/USELATEX2E/' transfig/Imakefile + sed -i 's/XCOMM USEINLINE/USEINLINE/' fig2dev/Imakefile +} + +build() { + cd ${pkgname}.${pkgver} + xmkmf + make FIG2DEV_LIBDIR=/usr/share/fig2dev Makefiles + make FIG2DEV_LIBDIR=/usr/share/fig2dev XFIGLIBDIR=/usr/share/xfig +} + +package() { + cd ${pkgname}.${pkgver} + 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: extra-i686/transfig-3.2.5d-libpng-1.5.patch =================================================================== --- extra-i686/transfig-3.2.5d-libpng-1.5.patch 2013-09-09 18:47:38 UTC (rev 194010) +++ extra-i686/transfig-3.2.5d-libpng-1.5.patch 2013-09-09 18:48:23 UTC (rev 194011) @@ -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) { Deleted: extra-x86_64/LICENSE =================================================================== --- extra-x86_64/LICENSE 2013-09-09 18:47:38 UTC (rev 194010) +++ extra-x86_64/LICENSE 2013-09-09 18:48:23 UTC (rev 194011) @@ -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-x86_64/LICENSE (from rev 194010, transfig/trunk/LICENSE) =================================================================== --- extra-x86_64/LICENSE (rev 0) +++ extra-x86_64/LICENSE 2013-09-09 18:48:23 UTC (rev 194011) @@ -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-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2013-09-09 18:47:38 UTC (rev 194010) +++ extra-x86_64/PKGBUILD 2013-09-09 18:48:23 UTC (rev 194011) @@ -1,39 +0,0 @@ -# $Id$ -# Maintainer: Eric Bélanger <e...@archlinux.org> - -pkgname=transfig -pkgver=3.2.5d -pkgrel=2 -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') - -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 -} - -build() { - cd ${pkgname}.${pkgver} - xmkmf - make FIG2DEV_LIBDIR=/usr/share/fig2dev Makefiles - make FIG2DEV_LIBDIR=/usr/share/fig2dev XFIGLIBDIR=/usr/share/xfig -} - -package() { - cd ${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-x86_64/PKGBUILD (from rev 194010, transfig/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2013-09-09 18:48:23 UTC (rev 194011) @@ -0,0 +1,37 @@ +# $Id$ +# Maintainer: Eric Bélanger <e...@archlinux.org> + +pkgname=transfig +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' 'bc') +makedepends=('imake') +source=(http://downloads.sourceforge.net/mcj/${pkgname}.${pkgver}.tar.gz LICENSE) +sha1sums=('27aa9691bf84f8775db9be39c453a8132148bad1' + 'b8b712871615308b8b6add92f86d218437d652f2') + +prepare() { + cd ${pkgname}.${pkgver} + sed -i 's/XCOMM USELATEX2E/USELATEX2E/' transfig/Imakefile + sed -i 's/XCOMM USEINLINE/USEINLINE/' fig2dev/Imakefile +} + +build() { + cd ${pkgname}.${pkgver} + xmkmf + make FIG2DEV_LIBDIR=/usr/share/fig2dev Makefiles + make FIG2DEV_LIBDIR=/usr/share/fig2dev XFIGLIBDIR=/usr/share/xfig +} + +package() { + cd ${pkgname}.${pkgver} + 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: extra-x86_64/transfig-3.2.5d-libpng-1.5.patch =================================================================== --- extra-x86_64/transfig-3.2.5d-libpng-1.5.patch 2013-09-09 18:47:38 UTC (rev 194010) +++ extra-x86_64/transfig-3.2.5d-libpng-1.5.patch 2013-09-09 18:48:23 UTC (rev 194011) @@ -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) {