Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv22601
Modified Files: netpbm10.info netpbm10.patch Log Message: revert to old version while i figure out what's wrong Index: netpbm10.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/netpbm10.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- netpbm10.patch 5 Jul 2010 20:08:33 -0000 1.3 +++ netpbm10.patch 5 Jul 2010 20:41:13 -0000 1.4 @@ -1,7 +1,7 @@ -diff -Naur netpbm-10.35.75/Makefile.config.fink netpbm-10.35.75-patched//Makefile.config.fink ---- netpbm-10.35.75/Makefile.config.fink 1970-01-01 01:00:00.000000000 +0100 -+++ netpbm-10.35.75-patched//Makefile.config.fink 2010-06-01 16:20:14.000000000 +0200 -@@ -0,0 +1,18 @@ +diff -Naur netpbm-10.12.old/Makefile.config.fink netpbm-10.12.new/Makefile.config.fink +--- netpbm-10.12.old/Makefile.config.fink Thu Jan 1 09:00:00 1970 ++++ netpbm-10.12.new/Makefile.config.fink Wed Dec 11 02:34:55 2002 +@@ -0,0 +1,19 @@ +# +# Configuration for fink +# @@ -20,19 +20,19 @@ +JPEGLIB = libjpeg.dylib +PNGLIB = libpng.dylib +ZLIB = libz.dylib -diff -Naur netpbm-10.35.75/buildtools/installnetpbm.pl netpbm-10.35.75-patched//buildtools/installnetpbm.pl ---- netpbm-10.35.75/buildtools/installnetpbm.pl 2007-01-15 03:50:02.000000000 +0100 -+++ netpbm-10.35.75-patched//buildtools/installnetpbm.pl 2010-06-01 16:17:26.000000000 +0200 -@@ -117,7 +117,7 @@ ++ +--- netpbm-10.18.old/buildtools/installnetpbm.pl Tue Sep 9 12:47:00 2003 ++++ netpbm-10.18.new/buildtools/installnetpbm.pl Tue Oct 14 11:54:06 2003 +@@ -105,7 +105,7 @@ } elsif ($ENV{OSTYPE} && $ENV{OSTYPE} eq "msdosdjgpp") { $default = "/dev/env/DJDIR"; } else { - $default = "/usr/local/netpbm"; -+ $default = "@PREFIX@"; ++ $default = "/sw"; } my $response = prompt("install prefix", $default); -@@ -572,7 +572,7 @@ +@@ -548,7 +548,7 @@ my $manDir; while (!$manDir) { @@ -41,7 +41,7 @@ my $response = prompt("man page directory", $default); -@@ -771,9 +771,9 @@ +@@ -747,9 +747,9 @@ print("\n"); @@ -51,12 +51,30 @@ - makeInManwebPath("$manDir/web"); +# makeInManwebPath("$manDir/web"); - $$mandirR = $manDir; } -diff -Naur netpbm-10.35.75/converter/other/pnmtopng.c netpbm-10.35.75-patched//converter/other/pnmtopng.c ---- netpbm-10.35.75/converter/other/pnmtopng.c 2009-09-03 17:34:36.000000000 +0200 -+++ netpbm-10.35.75-patched//converter/other/pnmtopng.c 2010-06-01 16:14:51.000000000 +0200 -@@ -527,7 +527,7 @@ + +--- netpbm-10.25/converter/other/pstopnm.c.CAN-2005-2471 2004-06-23 04:22:33.000000000 +0200 ++++ netpbm-10.25/converter/other/pstopnm.c 2005-08-09 08:41:42.000000000 +0200 +@@ -702,13 +702,13 @@ + + if (verbose) { + pm_message("execing '%s' with args '%s' (arg 0), " +- "'%s', '%s', '%s', '%s', '%s', '%s', '%s'", ++ "'%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s'", + ghostscriptProg, arg0, +- deviceopt, outfileopt, gopt, ropt, "-q", "-dNOPAUSE", "-"); ++ deviceopt, outfileopt, gopt, ropt, "-q", "-dNOPAUSE", "-dPARANOIDSAFER", "-"); + } + + execl(ghostscriptProg, arg0, deviceopt, outfileopt, gopt, ropt, "-q", +- "-dNOPAUSE", "-", NULL); ++ "-dNOPAUSE", "-dPARANOIDSAFER", "-", NULL); + + pm_error("execl() of Ghostscript ('%s') failed, errno=%d (%s)", + ghostscriptProg, errno, strerror(errno)); +--- netpbm-10.26.12/converter/other/pnmtopng.c.pnmtopng 2004-08-28 04:53:12.000000000 +0200 ++++ netpbm-10.26.12/converter/other/pnmtopng.c 2005-09-16 14:17:47.129390456 +0200 +@@ -159,7 +159,7 @@ unsigned int * const bestMatchP) { unsigned int paletteIndex; @@ -64,20 +82,8 @@ + unsigned int bestIndex = 0; unsigned int bestMatch; - assert(paletteSize > 0); -@@ -1427,9 +1427,9 @@ - colorhist_vector chv; - unsigned int colors; - -- gray * alphas_of_color[MAXPALETTEENTRIES]; -+ gray * alphas_of_color[MAXPALETTEENTRIES + 1]; - unsigned int alphas_first_index[MAXPALETTEENTRIES]; -- unsigned int alphas_of_color_cnt[MAXPALETTEENTRIES]; -+ unsigned int alphas_of_color_cnt[MAXPALETTEENTRIES + 1]; - - getChv(ifP, rasterPos, cols, rows, maxval, format, MAXCOLORS, - &chv, &colors); -@@ -2348,7 +2348,7 @@ + bestMatch = UINT_MAX; +@@ -1566,7 +1566,7 @@ /* The color part of the color/alpha palette passed to the PNG compressor */ @@ -86,15 +92,17 @@ gray trans_pnm[MAXCOLORS]; png_byte trans[MAXCOLORS]; -diff -Naur netpbm-10.35.75/pm_config.in.h netpbm-10.35.75-patched//pm_config.in.h ---- netpbm-10.35.75/pm_config.in.h 2006-10-18 20:29:13.000000000 +0200 -+++ netpbm-10.35.75-patched//pm_config.in.h 2010-06-01 16:19:18.000000000 +0200 -@@ -68,7 +68,7 @@ - #define RGB_DB3 "PBMplus_Dir:RGB.TXT" - #else - #define RGB_DB1 "/usr/lib/X11/rgb.txt" --#define RGB_DB2 "/usr/share/X11/rgb.txt" -+#define RGB_DB2 "/usr/X11/share/X11/rgb.txt" - #define RGB_DB3 "/usr/X11R6/lib/X11/rgb.txt" - #endif +--- netpbm-10.26.12/converter/other/pnmtopng.c ++++ netpbm-10.26.12/converter/other/pnmtopng.c +@@ -913,9 +913,9 @@ + colorhist_vector chv; + unsigned int colors; +- gray *alphas_of_color[MAXPALETTEENTRIES]; ++ gray *alphas_of_color[MAXPALETTEENTRIES + 1]; + unsigned int alphas_first_index[MAXPALETTEENTRIES]; +- unsigned int alphas_of_color_cnt[MAXPALETTEENTRIES]; ++ unsigned int alphas_of_color_cnt[MAXPALETTEENTRIES + 1]; + + getChv(ifP, imagepos, cols, rows, maxval, format, MAXCOLORS, + &chv, &colors); Index: netpbm10.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/netpbm10.info,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- netpbm10.info 5 Jul 2010 20:13:36 -0000 1.11 +++ netpbm10.info 5 Jul 2010 20:41:13 -0000 1.12 @@ -1,20 +1,21 @@ Package: netpbm10 -Version: 10.35.75 +Version: 10.26.60 Revision: 1 -BuildDepends: libjpeg8, libpng14, libtiff, fink (>= 0.24.12-1) +BuildDepends: libjpeg, libpng3, libtiff, fink (>= 0.24.12-1) Depends: %N-shlibs (= %v-%r) Replaces: netpbm Conflicts: netpbm BuildDependsOnly: True Source: mirror:sourceforge:netpbm/netpbm-%v.tgz -Source-MD5: 43fa6867e1147f1ff5cef4b0d7e12260 +Source-MD5: deff5832271d724b07837f172527dddf NoSetMAKEFLAGS: true NoSetLDFLAGS: true SetLIBRARY_PATH: %p/lib PatchFile: %n.patch -PatchFile-MD5: 78aea81d990beb6026d3fa019eb8c31a +PatchFile-MD5: 8729d202e76346cbcbab26917f5b7cf3 PatchScript: << sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1 + perl -pi -e 's|/usr/openwin/lib/rgb.txt|/usr/X11/share/X11/rgb.txt|' pm_config.in.h cat Makefile.config.in Makefile.config.fink >Makefile.config << CompileScript: make -j1 @@ -33,7 +34,7 @@ << SplitOff2: << Package: netpbm-bin - Depends: %N-shlibs (= %v-%r), libjpeg8-shlibs, libpng14-shlibs, libtiff-shlibs + Depends: %N-shlibs (= %v-%r), libpng3-shlibs, libtiff-shlibs Files: bin share/man/man1 share/man/man3 DocFiles: README doc/* << ------------------------------------------------------------------------------ This SF.net email is sponsored by Sprint What will you do first with EVO, the first 4G phone? Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs