diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-29 21:01:44 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-29 21:01:44 -0300 |
commit | 6d4537b67f90b1decadcf8434e1a5bdcb6694f7f (patch) | |
tree | 0dfcf0ebb742c6e359f0502d9207b3a600aa3462 /community-staging/xloadimage | |
parent | 7a501772e3cb37f438506df7c22a34ed9bba9d88 (diff) | |
parent | db0dace84403023c8d89b8801f12a5ab278dc440 (diff) |
Merge branch 'master' of ssh://gparabola/abslibre-mips64el
Conflicts:
core/glibc/PKGBUILD
Diffstat (limited to 'community-staging/xloadimage')
-rw-r--r-- | community-staging/xloadimage/PKGBUILD | 42 | ||||
-rw-r--r-- | community-staging/xloadimage/enable-image-types.patch | 74 | ||||
-rw-r--r-- | community-staging/xloadimage/license.txt | 19 | ||||
-rw-r--r-- | community-staging/xloadimage/png15-tiff4.patch | 50 |
4 files changed, 0 insertions, 185 deletions
diff --git a/community-staging/xloadimage/PKGBUILD b/community-staging/xloadimage/PKGBUILD deleted file mode 100644 index 6d56ec5c4..000000000 --- a/community-staging/xloadimage/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 62316 2012-01-19 08:03:43Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Eric Belanger <belanger@astro.umontreal.ca> -# Contributor: Link Dupont <link@subpop.net> - -pkgname=xloadimage -pkgver=4.1 -pkgrel=12 -pkgdesc="An utility to view many different types of images under X11" -arch=(i686 x86_64) -#url="http://world.std.com/~jimf/xloadimage.html" -url="http://sioseis.ucsd.edu/xloadimage.html" -license=("MIT") -depends=('libtiff' 'libpng' 'libx11' 'libxext') -makedepends=('patch' 'imake') -source=(http://archlinux-stuff.googlecode.com/files/xloadimage.$pkgver-1.tar.gz - license.txt - enable-image-types.patch - png15-tiff4.patch) -md5sums=('86b42b1b628a9c00008b7deec21e1175' - 'cc16a51aeb5083b8ff07939dfe244130' - '3a2703925011276fd2d2bd139b676487' - 'c797cfc3f4588b96275d82c2c9cc7025') - -build() { - cd $srcdir/$pkgname.$pkgver - - patch -p1 <$srcdir/enable-image-types.patch - patch -p1 <$srcdir/png15-tiff4.patch - xmkmf - make - - install -D -m755 xloadimage $pkgdir/usr/bin/xloadimage - install -D -m755 uufilter $pkgdir/usr/bin/uufilter - install -D -m644 xloadimagerc $pkgdir/etc/xloadimagerc.example - install -D -m644 xloadimage.man $pkgdir/usr/man/man1/xloadimage.1x - install -D -m644 uufilter.man $pkgdir/usr/man/man1/uufilter.1x - install -D -m644 $srcdir/license.txt $pkgdir/usr/share/licenses/$pkgname/license.txt - ln -s /usr/bin/xloadimage $pkgdir/usr/bin/xsetbg - - mv $pkgdir/usr/man $pkgdir/usr/share/ -} diff --git a/community-staging/xloadimage/enable-image-types.patch b/community-staging/xloadimage/enable-image-types.patch deleted file mode 100644 index b61e36b87..000000000 --- a/community-staging/xloadimage/enable-image-types.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -wbBur xloadimage.4.1/imagetypes.h xloadimage.4.1.my/imagetypes.h ---- xloadimage.4.1/imagetypes.h 2011-02-11 11:47:37.000000000 +0000 -+++ xloadimage.4.1.my/imagetypes.h 2011-02-11 16:04:35.000000000 +0000 -@@ -94,15 +94,9 @@ - {niffIdent, niffLoad, niffDump, "niff", "Native Image File Format (NIFF)"}, - {sunRasterIdent, sunRasterLoad, NULL, "sunraster", "Sun Rasterfile"}, - {gifIdent, gifLoad, NULL, "gif", "GIF Image"}, --#ifdef HAVE_LIBJPEG - {jpegIdent, jpegLoad, jpegDump, "jpeg", "JFIF-style JPEG Image"}, --#endif --#ifdef HAVE_LIBTIFF - {tiffIdent, tiffLoad, tiffDump, "tiff", "TIFF image"}, --#endif --#ifdef HAVE_LIBPNG - {pngIdent, pngLoad, NULL, "png", "PNG image"}, --#endif - {fbmIdent, fbmLoad, NULL, "fbm", "FBM Image"}, - {cmuwmIdent, cmuwmLoad, NULL, "cmuraster", "CMU WM Raster"}, - {pbmIdent, pbmLoad, pbmDump, "pbm", "Portable Bit Map (PBM, PGM, PPM)"}, -diff -wbBur xloadimage.4.1/Imakefile xloadimage.4.1.my/Imakefile ---- xloadimage.4.1/Imakefile 2011-02-11 12:05:53.000000000 +0000 -+++ xloadimage.4.1.my/Imakefile 2011-02-11 16:06:21.000000000 +0000 -@@ -40,7 +40,7 @@ - PNG_SRC = png.c - PNG_OBJ = png.o - -- EXTRA_DEFINES = $(TIFF_DEFS) $(JPEG_DEFS) $(PNG_DEFS) -+ EXTRA_DEFINES = $(TIFF_DEFS) $(JPEG_DEFS) $(PNG_DEFS) -DHAVE_LIBJPEG -DHAVE_LIBTIFF -DHAVE_LIBPNG - LOCAL_LIBRARIES = $(TIFF_LIB) $(JPEG_LIB) $(PNG_LIB) $(XLIB) - - SRCS = new.c niff.c value.c zio.c cmuwmraster.c faces.c fbm.c gif.c imagetypes.c img.c mac.c mcidas.c mc_tables.c pbm.c pcx.c pdsuncomp.c rle.c rlelib.c sunraster.c vff.c vicar.c xbitmap.c xpixmap.c xwd.c bright.c clip.c compress.c dither.c fill.c halftone.c merge.c reduce.c rotate.c smooth.c undither.c zoom.c config.c misc.c options.c root.c send.c window.c xloadimage.c $(TIFF_SRC) $(JPEG_SRC) $(PNG_SRC) -diff -wbBur xloadimage.4.1/Makefile xloadimage.4.1.my/Makefile ---- xloadimage.4.1/Makefile 2011-02-11 12:06:16.000000000 +0000 -+++ xloadimage.4.1.my/Makefile 2011-02-11 16:06:24.000000000 +0000 -@@ -2,7 +2,7 @@ - # $Xorg: imake.c,v 1.6 2001/02/09 02:03:15 xorgcvs Exp $ - - # ---------------------------------------------------------------------- --# Makefile generated from "Imake.tmpl" and </tmp/IIf.yUZBVe> -+# Makefile generated from "Imake.tmpl" and </tmp/IIf.7u155R> - # $Xorg: Imake.tmpl,v 1.4 2000/08/17 19:41:46 cpqbld Exp $ - # $XdotOrg: xc/config/cf/Imake.tmpl,v 1.9 2005/01/24 06:37:31 daniels Exp $ - # -@@ -1063,7 +1063,7 @@ - PNG_SRC = png.c - PNG_OBJ = png.o - -- EXTRA_DEFINES = $(TIFF_DEFS) $(JPEG_DEFS) $(PNG_DEFS) -+ EXTRA_DEFINES = $(TIFF_DEFS) $(JPEG_DEFS) $(PNG_DEFS) -DHAVE_LIBJPEG -DHAVE_LIBTIFF -DHAVE_LIBPNG - LOCAL_LIBRARIES = $(TIFF_LIB) $(JPEG_LIB) $(PNG_LIB) $(XLIB) - - SRCS = new.c niff.c value.c zio.c cmuwmraster.c faces.c fbm.c gif.c imagetypes.c img.c mac.c mcidas.c mc_tables.c pbm.c pcx.c pdsuncomp.c rle.c rlelib.c sunraster.c vff.c vicar.c xbitmap.c xpixmap.c xwd.c bright.c clip.c compress.c dither.c fill.c halftone.c merge.c reduce.c rotate.c smooth.c undither.c zoom.c config.c misc.c options.c root.c send.c window.c xloadimage.c $(TIFF_SRC) $(JPEG_SRC) $(PNG_SRC) -diff -wbBur xloadimage.4.1/png.c xloadimage.4.1.my/png.c ---- xloadimage.4.1/png.c 2011-02-11 11:47:37.000000000 +0000 -+++ xloadimage.4.1.my/png.c 2011-02-11 16:06:50.000000000 +0000 -@@ -18,6 +18,7 @@ - * - */ - -+#define _GETOPT_H - - #include "image.h" /* xloadimage declarations */ - #ifdef HAVE_LIBPNG -diff -wbBur xloadimage.4.1/jpeg.c xloadimage.4.1.my/jpeg.c ---- xloadimage.4.1/jpeg.c 2011-02-11 14:47:37.000000000 +0300 -+++ xloadimage.4.1.my/jpeg.c 2011-11-21 14:32:30.000000000 +0400 -@@ -319,6 +319,7 @@ - if (verbose) - printf(" Using arithmetic coding.\n"); - cinfo->arith_code = TRUE; -+ } - #else - fprintf(stderr, "jpegDump: sorry, arithmetic coding not supported\n"); - } diff --git a/community-staging/xloadimage/license.txt b/community-staging/xloadimage/license.txt deleted file mode 100644 index be7eec597..000000000 --- a/community-staging/xloadimage/license.txt +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright 1989, 1993 Jim Frost - * - * Permission to use, copy, modify, distribute, and sell this software - * and its documentation for any purpose is hereby granted without fee, - * provided that the above copyright notice appear in all copies and - * that both that copyright notice and this permission notice appear - * in supporting documentation. The author makes no representations - * about the suitability of this software for any purpose. It is - * provided "as is" without express or implied warranty. - * - * THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN - * NO EVENT SHALL THE AUTHOR 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. - */ diff --git a/community-staging/xloadimage/png15-tiff4.patch b/community-staging/xloadimage/png15-tiff4.patch deleted file mode 100644 index 8536e36f3..000000000 --- a/community-staging/xloadimage/png15-tiff4.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -wbBur xloadimage.4.1/png.c xloadimage.4.1.my/png.c ---- xloadimage.4.1/png.c 2011-02-11 14:47:37.000000000 +0300 -+++ xloadimage.4.1.my/png.c 2012-01-19 11:58:44.000000000 +0400 -@@ -75,7 +75,7 @@ - { - debug(" #error "); - output_warn( png_ptr, str); -- longjmp(png_ptr->jmpbuf, 1); /* return control to outer routine */ -+ longjmp(png_jmpbuf(png_ptr), 1); /* return control to outer routine */ - } - - -@@ -164,7 +164,7 @@ - png_destroy_read_struct(png_pp, info_pp, end_pp); - return 0; - } -- if (setjmp((*png_pp)->jmpbuf)) { -+ if (setjmp(png_jmpbuf(*png_pp))) { - /* On error */ - png_destroy_read_struct(png_pp, info_pp, end_pp); - return 0; -@@ -220,7 +220,7 @@ - zclose(zinput_file); - return 0; - } -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - /* On error */ - freeImage(image); - png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); -diff -wbBur xloadimage.4.1/tiff.c xloadimage.4.1.my/tiff.c ---- xloadimage.4.1/tiff.c 2011-02-11 14:47:38.000000000 +0300 -+++ xloadimage.4.1.my/tiff.c 2012-01-19 12:00:00.000000000 +0400 -@@ -34,14 +34,14 @@ - struct tiff_info *info; - { - ZFILE *zf; -- TIFFHeader th; -+ TIFFHeaderCommon th; - TIFF *tiff; - - zf = zopen(fullname); - - /* read TIFF header and see if it looks right - */ -- if ((zread(zf, (byte *)&th, sizeof(TIFFHeader)) == sizeof(TIFFHeader)) && -+ if ((zread(zf, (byte *)&th, sizeof(TIFFHeaderCommon)) == sizeof(TIFFHeaderCommon)) && - ((th.tiff_magic == TIFF_BIGENDIAN) || - (th.tiff_magic == TIFF_LITTLEENDIAN))) { - |