Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18041
Modified Files:
netpbm11-shlibs_vasprintf.patch netpbm11-shlibs.info
Log Message:
fix ppmhist.test from upstream r1998
Index: netpbm11-shlibs.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics/netpbm11-shlibs.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- netpbm11-shlibs.info 30 Jul 2013 02:04:15 -0000 1.3
+++ netpbm11-shlibs.info 30 Jul 2013 20:09:30 -0000 1.4
@@ -26,9 +26,10 @@
PatchFile-MD5: 2567d5df273bab53aa4c3f085574a5a9
PatchFile2: %n_testrandom.patch
PatchFile2-MD5: 747fc168453de4cc9ec33e7b9f9f283b
-# fixed in 10.63.02 (r1993/4)
+# pnmpsnr and ppmcie tests fixed in 10.63.02 (r1993/4)
+# ppmhist test fixed in r1998
PatchFile3: %n_vasprintf.patch
-PatchFile3-MD5: b9b080b96b46bee81a514bfdc23cd32f
+PatchFile3-MD5: 47534beb2f1be82bb307c9283a29c6fa
PatchScript: <<
sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
cat config.mk.in Makefile.config.fink >config.mk
@@ -53,8 +54,6 @@
make package pkgdir=`pwd`/package resultdir=`pwd`/test-out SYMLINK='ln -s'
# run tests now if needed
if [ -f %b/INSTALL_MAKE_CHECK ]; then
- # ppmhist.test fails, so disable until a solution is found.
- perl -pi -e 's|ppmhist.test|# ppmhist.test|g' %b/test/Test-Order
chmod u+x %b/test/*.test
export DYLD_LIBRARY_PATH=%b/package/lib
make check pkgdir=`pwd`/package resultdir=`pwd`/test-out || exit 2
@@ -131,5 +130,6 @@
PatchFile2 from svn r1976, which fixes these errors:
unrecognized option '--testrandom'. Recognized options are:
-randomseed -maxval
- PatchFile3 simplified from r1993/4 and email with upstream.
+ PatchFile3 vasprintf simplified from r1993/4, and email with upstream.
+ ppmhist from r1998.
<<
Index: netpbm11-shlibs_vasprintf.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics/netpbm11-shlibs_vasprintf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- netpbm11-shlibs_vasprintf.patch 28 Jul 2013 18:15:18 -0000 1.1
+++ netpbm11-shlibs_vasprintf.patch 30 Jul 2013 20:09:30 -0000 1.2
@@ -11,3 +11,15 @@
#define HAVE_VASPRINTF 1
#else
#define HAVE_VASPRINTF 0
+Index: test/ppmhist.test
+===================================================================
+--- test/ppmhist.test (revision 1997)
++++ test/ppmhist.test (revision 1998)
+@@ -2,6 +2,6 @@
+ # This script tests: ppmhist
+ # Also requires: pgmramp
+
+-${PBM_BINPREFIX}pgmramp -maxval=8 -lr 8 2 | ${PBM_TESTPREFIX}ppmhist
++${PBM_BINPREFIX}pgmramp -maxval=8 -lr 8 2 | ${PBM_TESTPREFIX}ppmhist -sort=rgb
+ ${PBM_TESTPREFIX}ppmhist -map -sort=rgb testimg.ppm | cksum
+
------------------------------------------------------------------------------
Get your SQL database under version control now!
Version control is standard for application code, but databases havent
caught up. So what steps can you take to put your SQL databases under
version control? Why should you start doing it? Read more to find out.
http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
