Author: qboosh Date: Wed Feb 1 19:45:34 2012 GMT Module: packages Tag: HEAD ---- Log message: - updated to 2.5.5 - added libpng patch to fix build with libpng 1.5.x
---- Files affected: packages/gif2png: gif2png.spec (1.56 -> 1.57) , gif2png-libpng.patch (1.2 -> 1.3) ---- Diffs: ================================================================ Index: packages/gif2png/gif2png.spec diff -u packages/gif2png/gif2png.spec:1.56 packages/gif2png/gif2png.spec:1.57 --- packages/gif2png/gif2png.spec:1.56 Wed Jan 26 15:48:43 2011 +++ packages/gif2png/gif2png.spec Wed Feb 1 20:45:29 2012 @@ -5,12 +5,13 @@ Summary(pl.UTF-8): Narzędzia do konwersji plików GIF na pliki PNG Summary(pt_BR.UTF-8): Ferramentas para a conversão de arquivos no formato GIF para PNG Name: gif2png -Version: 2.5.4 +Version: 2.5.5 Release: 1 License: BSD-like Group: Applications/Graphics Source0: http://catb.org/~esr/gif2png/%{name}-%{version}.tar.gz -# Source0-md5: d63ea3fc6b6119589e8d4d6fead30df9 +# Source0-md5: cfb4c003966866b6069d3707bfb12435 +Patch0: %{name}-libpng.patch URL: http://catb.org/~esr/gif2png/ BuildRequires: autoconf BuildRequires: automake @@ -50,6 +51,7 @@ %prep %setup -q +%patch0 -p1 %build %{__aclocal} @@ -81,6 +83,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.57 2012/02/01 19:45:29 qboosh +- updated to 2.5.5 +- added libpng patch to fix build with libpng 1.5.x + Revision 1.56 2011/01/26 14:48:43 qboosh - updated to 2.5.4 ================================================================ Index: packages/gif2png/gif2png-libpng.patch diff -u /dev/null packages/gif2png/gif2png-libpng.patch:1.3 --- /dev/null Wed Feb 1 20:45:35 2012 +++ packages/gif2png/gif2png-libpng.patch Wed Feb 1 20:45:29 2012 @@ -0,0 +1,50 @@ +--- gif2png-2.5.5/gif2png.c.orig 2012-01-29 00:02:06.000000000 +0100 ++++ gif2png-2.5.5/gif2png.c 2012-02-01 20:43:37.080071919 +0100 +@@ -122,8 +122,8 @@ + 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 = NULL; ++ png_info *info_ptr = NULL; + int p; + int gray_bitdepth; + png_color pal_rgb[MAXCMSIZE], *pltep; +@@ -283,13 +283,6 @@ + colors[i].red, colors[i].blue, colors[i].green); + } + +- if (setjmp(png_jmpbuf(png_ptr))) { +- fprintf(stderr, "gif2png: libpng returns fatal error condition\n"); +- free(png_ptr); +- free(info_ptr); +- return 1; +- } +- + + /* Create and initialize the png_struct with the desired error handler + * functions. If you want to use the default stderr and longjump method, +@@ -303,6 +296,13 @@ + if (png_ptr == NULL) + return(2); + ++ if (setjmp(png_jmpbuf(png_ptr))) { ++ fprintf(stderr, "gif2png: libpng returns fatal error condition\n"); ++ free(png_ptr); ++ free(info_ptr); ++ return 1; ++ } ++ + /* Allocate/initialize the image information data. REQUIRED */ + info_ptr = png_create_info_struct(png_ptr); + if (info_ptr == NULL) +@@ -321,7 +321,7 @@ + png_init_io(png_ptr, fp); + + if(optimize) +- png_set_compression_level(png_ptr, Z_BEST_COMPRESSION); ++ png_set_compression_level(png_ptr, 9 /*Z_BEST_COMPRESSION*/); + + if (gamma_srgb) + { ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gif2png/gif2png.spec?r1=1.56&r2=1.57&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gif2png/gif2png-libpng.patch?r1=1.2&r2=1.3&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
