diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-25 12:01:49 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-25 12:01:49 +0100 |
commit | 8e40bdbb2496be15fdba2e683af427bc2333be42 (patch) | |
tree | 03ace0b9a2ffc12133cb0357fee75079c964f67a /staging/gif2png/gif2png-2.5.4-libpng15.patch | |
parent | 33fcf0e7b95e530b849e59e90fdea4001e01283d (diff) | |
parent | 2aa2acfff38de7de825868995e49792ecfc03126 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/libvisual-projectm/PKGBUILD
community/python-memcached/PKGBUILD
community/python-mpi4py/PKGBUILD
core/sqlite3/PKGBUILD
core/udev/PKGBUILD
extra/kdeplasma-applets-networkmanagement/PKGBUILD
extra/pixman/PKGBUILD
extra/sg3_utils/PKGBUILD
libre/kdeutils-libre/PKGBUILD
libre/linux-libre/PKGBUILD
libre/linux-libre/linux-libre.install
multilib/lib32-libxcb/PKGBUILD
multilib/lib32-openssl/PKGBUILD
multilib/lib32-sdl_image/PKGBUILD
multilib/lib32-sqlite3/PKGBUILD
multilib/lib32-udev/PKGBUILD
Diffstat (limited to 'staging/gif2png/gif2png-2.5.4-libpng15.patch')
-rw-r--r-- | staging/gif2png/gif2png-2.5.4-libpng15.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/staging/gif2png/gif2png-2.5.4-libpng15.patch b/staging/gif2png/gif2png-2.5.4-libpng15.patch deleted file mode 100644 index 9e5c333bb..000000000 --- a/staging/gif2png/gif2png-2.5.4-libpng15.patch +++ /dev/null @@ -1,43 +0,0 @@ -ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/graphics/gif2png/patches/patch-aa - ---- gif2png.c -+++ gif2png.c -@@ -10,6 +10,7 @@ - #include <string.h> - #include <stdlib.h> - #include <unistd.h> /* for isatty() */ -+#include <zlib.h> - - #if !defined(TRUE) - #define FALSE 0 -@@ -120,8 +121,8 @@ int writefile(struct GIFelement *s,struc - int colors_used = 0; - byte remap[MAXCMSIZE]; - int low_prec; -- png_struct *png_ptr = xalloc(sizeof (png_struct)); -- png_info *info_ptr = xalloc(sizeof (png_info)); -+ png_struct *png_ptr; -+ png_info *info_ptr; - int p; - int gray_bitdepth; - png_color pal_rgb[MAXCMSIZE], *pltep; -@@ -136,6 +137,19 @@ int writefile(struct GIFelement *s,struc - png_text software; - png_text comment; - -+ png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); -+ if (png_ptr == NULL) { -+ fprintf(stderr, "gif2png: fatal error, out of memory\n"); -+ fprintf(stderr, "gif2png: exiting ungracefully\n"); -+ exit(1); -+ } -+ info_ptr = png_create_info_struct(png_ptr); -+ if (info_ptr == NULL) { -+ fprintf(stderr, "gif2png: fatal error, out of memory\n"); -+ fprintf(stderr, "gif2png: exiting ungracefully\n"); -+ exit(1); -+ } -+ - /* these volatile declarations prevent gcc warnings ("variable might be - * clobbered by `longjmp' or `vfork'") */ - volatile int gray = TRUE; |