Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21361
Modified Files:
plotutils.info plotutils.patch
Log Message:
bug-fixes from debian; graphics-lib upgrades
Index: plotutils.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/plotutils.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- plotutils.info 22 Jul 2011 15:31:30 -0000 1.1
+++ plotutils.info 18 Jul 2013 04:13:14 -0000 1.2
@@ -1,6 +1,6 @@
Package: plotutils
Version: 2.6
-Revision: 2
+Revision: 3
Description: Functions for exporting 2-D vector graphics
License: GPL
Homepage: http://www.gnu.org/software/plotutils
@@ -8,23 +8,40 @@
Source: mirror:gnu:%n/%n-%v.tar.gz
Source-MD5: c08a424bd2438c80a786a7f4b5bb6a40
+Source2: mirror:debian:pool/main/p/%n/%n_%v-3.debian.tar.gz
+Source2-MD5: 88b0c2be771e47ef55922cded31b81ef
PatchFile: %n.patch
-PatchFile-MD5: 348e2e342685f309b17e8cff87d637ed
+PatchFile-MD5: 465fd947f7ca6ae9a447dd521c1216e0
+PatchScript: <<
+#!/bin/sh -ev
+ for file in \
+ 01_configure_ac \
+ 10_repair_postscript \
+ 11_manpages_sb_macro \
+ 14_manpage_spline \
+ 20_svg_attribute_syntax \
+ 25_libpng15 \
+ 30_hershey_glyphs \
+ ; do
+ echo "applying $file"
+ patch -p1 < ../debian/patches/$file
+ done
+ %{default_script}
+<<
GCC: 4.0
BuildDepends: <<
autoconf2.6,
- automake1.11,
- fink (>= 0.24.12-1),
+ automake1.13,
fink-package-precedence,
- libpng15,
+ libpng16,
libtool2,
x11-dev
<<
Depends: <<
%N-shlibs (= %v-%r),
- libpng15-shlibs,
+ libpng16-shlibs,
x11
<<
@@ -44,7 +61,7 @@
SplitOff: <<
Package: %N-shlibs
Replaces: %N (<= 2.4.1-1)
- Depends: x11-shlibs, libpng15-shlibs
+ Depends: x11-shlibs, libpng16-shlibs
Files: lib/libplot.*.dylib lib/libplotter.*.dylib
Shlibs: <<
%p/lib/libplotter.2.dylib 5.0.0 %n (>= 2.4.1-5)
@@ -70,9 +87,5 @@
Make really *really* sure not to supercede fink's -I flags
- Upgrade long-deprecated libpng jmpbuf. See:
- http://lists.gnu.org/archive/html/bug-plotutils/2011-01/msg00000.html
- http://llvm.org/bugs/show_bug.cgi?id=10338#c1
-
- Regenerating autotools needs AC_PROG_CXX b/c have c++ sources
+ Steal debian's patches to fix many bugs, and old-libpng API.
<<
Index: plotutils.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/plotutils.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- plotutils.patch 22 Jul 2011 15:31:30 -0000 1.1
+++ plotutils.patch 18 Jul 2013 04:13:15 -0000 1.2
@@ -1,15 +1,3 @@
-diff -Nurd -x'*~' plotutils-2.6.orig/configure.ac plotutils-2.6/configure.ac
---- plotutils-2.6.orig/configure.ac 2009-07-29 23:14:09.000000000 -0400
-+++ plotutils-2.6/configure.ac 2011-07-10 12:39:00.000000000 -0400
-@@ -331,7 +331,7 @@
- fi])
-
- # Do we build libplotter, the C++ library, and other C++ software?
--AC_ARG_ENABLE(libplotter, [ --enable-libplotter build the C++ Plotter
class library and C++ software], echo enabling construction of the C++ class
library; no_libplotter="no", no_libplotter="yes"; extralib="")
-+AC_ARG_ENABLE(libplotter, [ --enable-libplotter build the C++ Plotter
class library and C++ software], echo enabling construction of the C++ class
library; [AC_PROG_CXX] no_libplotter="no", no_libplotter="yes"; extralib="")
- AM_CONDITIONAL(NO_LIBPLOTTER, test "x$no_libplotter" = "xyes")
-
- # Do we build and install a standalone version of the libxmi
diff -Nurd -x'*~' plotutils-2.6.orig/libplot/Makefile.am
plotutils-2.6/libplot/Makefile.am
--- plotutils-2.6.orig/libplot/Makefile.am 2009-07-28 22:16:02.000000000
-0400
+++ plotutils-2.6/libplot/Makefile.am 2011-07-10 10:43:38.000000000 -0400
@@ -22,42 +10,6 @@
MISRC = mi_alloc.c mi_api.c mi_arc.c mi_canvas.c mi_fllarc.c mi_fllrct.c \
mi_fplycon.c mi_gc.c mi_ply.c mi_plycon.c mi_plygen.c mi_plypnt.c \
-diff -Nurd -x'*~' plotutils-2.6.orig/libplot/z_write.c
plotutils-2.6/libplot/z_write.c
---- plotutils-2.6.orig/libplot/z_write.c 2008-07-15 20:54:10.000000000
-0400
-+++ plotutils-2.6/libplot/z_write.c 2011-07-10 12:03:45.000000000 -0400
-@@ -164,7 +164,7 @@
- }
-
- /* cleanup after libpng errors (error handler does a longjmp) */
-- if (setjmp (png_ptr->jmpbuf))
-+ if (setjmp ((*png_set_longjmp_fn((png_ptr), (png_longjmp_ptr)longjmp,
sizeof(jmp_buf)))))
- {
- png_destroy_write_struct (&png_ptr, (png_info **)NULL);
- return -1;
-@@ -444,7 +444,11 @@
- #endif
- }
-
-+#if (PNG_LIBPNG_VER < 10500)
- longjmp (png_ptr->jmpbuf, 1);
-+#else
-+ png_longjmp (png_ptr, 1);
-+#endif
- }
-
- static void
-@@ -515,7 +519,11 @@
- #endif
- }
-
-+#if (PNG_LIBPNG_VER < 10500)
- longjmp (png_ptr->jmpbuf, 1);
-+#else
-+ png_longjmp (png_ptr, 1);
-+#endif
- }
-
- static void
diff -Nurd -x'*~' plotutils-2.6.orig/libplotter/Makefile.am
plotutils-2.6/libplotter/Makefile.am
--- plotutils-2.6.orig/libplotter/Makefile.am 2009-07-28 22:16:18.000000000
-0400
+++ plotutils-2.6/libplotter/Makefile.am 2011-07-10 10:48:44.000000000
-0400
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
