16596944 Couldn't load a PNG image - file is corrupted or not enough memory.
authorDavid Marx <David.M.Marx@Oracle.Com>
Thu, 18 Apr 2013 15:40:55 -0700
changeset 1274 7496ebeb5327
parent 1273 7fe0aaf16d96
child 1275 03b86a2f9021
16596944 Couldn't load a PNG image - file is corrupted or not enough memory.
components/gnuplot/patches/libpng12.patch
--- a/components/gnuplot/patches/libpng12.patch	Thu Apr 18 09:21:46 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
---- gnuplot-4.6.0/src/Makefile.am.orig	2012-04-14 17:52:42.203033478 -0700
-+++ gnuplot-4.6.0/src/Makefile.am	2012-04-14 17:53:57.604828972 -0700
-@@ -57,7 +57,7 @@
- template.h term_api.h term.c term.h time.c unset.c util.c util.h \
- util3d.c util3d.h variable.c variable.h version.c version.h
- 
--gnuplot_LDADD = $(TERMLIBS) $(TERMXLIBS) $(WX_LIBS) $(QT_LIBS)
-+gnuplot_LDADD = $(shell echo -lpng $(TERMLIBS) $(TERMXLIBS) $(WX_LIBS) $(QT_LIBS) | sed -e s,-lpng[0123456789]*,-lpng12,g)
- 
- pkglibexec_PROGRAMS = 
- 
---- gnuplot-4.6.0/src/Makefile.in.orig	2012-04-14 17:55:00.314759690 -0700
-+++ gnuplot-4.6.0/src/Makefile.in	2012-04-14 17:55:41.703140495 -0700
-@@ -431,7 +431,7 @@
- 	util.c util.h util3d.c util3d.h variable.c variable.h \
- 	version.c version.h $(am__append_2) $(am__append_3) \
- 	$(am__append_4) $(am__append_6)
--gnuplot_LDADD = $(TERMLIBS) $(TERMXLIBS) $(WX_LIBS) $(QT_LIBS)
-+gnuplot_LDADD = $(shell echo -lpng $(TERMLIBS) $(TERMXLIBS) $(WX_LIBS) $(QT_LIBS) | sed -e s,-lpng[0123456789]*,-lpng12,g)
- @BUILD_GNUPLOT_X11_TRUE@gnuplot_x11_SOURCES = gplt_x11.c gplt_x11.h gpexecute.c gpexecute.h mousecmn.h version.c version.h
- @BUILD_GNUPLOT_X11_TRUE@XLIBS = @LIBRARIES_FOR_X@
- @BUILD_GNUPLOT_X11_TRUE@gnuplot_x11_LDADD = getcolor_x11.o $(XLIBS)