components/gnuplot/patches/libpng12.patch
changeset 778 9d5e4d6466cd
parent 204 78dfe4707c7c
--- a/components/gnuplot/patches/libpng12.patch	Wed Apr 18 10:38:45 2012 -0700
+++ b/components/gnuplot/patches/libpng12.patch	Wed Apr 18 11:08:05 2012 -0700
@@ -1,22 +1,22 @@
---- gnuplot-4.4.0/src/Makefile.am.orig	Fri Mar  5 18:09:39 2010
-+++ gnuplot-4.4.0/src/Makefile.am	Tue Apr 19 15:59:18 2011
[email protected]@ -51,7 +51,7 @@
+--- 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
[email protected]@ -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)
-+gnuplot_LDADD = $(shell echo -lpng $(TERMLIBS) $(TERMXLIBS) $(WX_LIBS) | sed -e s,-lpng[0123456789]*,-lpng12,g)
+-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.4.0/src/Makefile.in.orig	Sat Mar 13 13:20:04 2010
-+++ gnuplot-4.4.0/src/Makefile.in	Tue Apr 19 16:46:03 PDT 2011
[email protected]@ -347,7 +347,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 $(am__append_2) $(am__append_3)
--gnuplot_LDADD = $(TERMLIBS) $(TERMXLIBS) $(WX_LIBS)
-+gnuplot_LDADD = $(shell echo -lpng $(TERMLIBS) $(TERMXLIBS) $(WX_LIBS) | sed -e s,-lpng[0123456789]*,-lpng12,g)
- @[email protected]_x11_SOURCES = gplt_x11.c gplt_x11.h gpexecute.c gpexecute.h mousecmn.h
+--- 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
[email protected]@ -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)
+ @[email protected]_x11_SOURCES = gplt_x11.c gplt_x11.h gpexecute.c gpexecute.h mousecmn.h version.c version.h
  @[email protected] = @[email protected]
  @[email protected]_x11_LDADD = getcolor_x11.o $(XLIBS)