components/gnuplot/patches/libpng12.patch
changeset 778 9d5e4d6466cd
parent 204 78dfe4707c7c
equal deleted inserted replaced
777:e2e604cdbd6a 778:9d5e4d6466cd
     1 --- gnuplot-4.4.0/src/Makefile.am.orig	Fri Mar  5 18:09:39 2010
     1 --- gnuplot-4.6.0/src/Makefile.am.orig	2012-04-14 17:52:42.203033478 -0700
     2 +++ gnuplot-4.4.0/src/Makefile.am	Tue Apr 19 15:59:18 2011
     2 +++ gnuplot-4.6.0/src/Makefile.am	2012-04-14 17:53:57.604828972 -0700
     3 @@ -51,7 +51,7 @@
     3 @@ -57,7 +57,7 @@
     4  template.h term_api.h term.c term.h time.c unset.c util.c util.h \
     4  template.h term_api.h term.c term.h time.c unset.c util.c util.h \
     5  util3d.c util3d.h variable.c variable.h version.c version.h
     5  util3d.c util3d.h variable.c variable.h version.c version.h
     6  
     6  
     7 -gnuplot_LDADD = $(TERMLIBS) $(TERMXLIBS) $(WX_LIBS)
     7 -gnuplot_LDADD = $(TERMLIBS) $(TERMXLIBS) $(WX_LIBS) $(QT_LIBS)
     8 +gnuplot_LDADD = $(shell echo -lpng $(TERMLIBS) $(TERMXLIBS) $(WX_LIBS) | sed -e s,-lpng[0123456789]*,-lpng12,g)
     8 +gnuplot_LDADD = $(shell echo -lpng $(TERMLIBS) $(TERMXLIBS) $(WX_LIBS) $(QT_LIBS) | sed -e s,-lpng[0123456789]*,-lpng12,g)
     9  
     9  
    10  pkglibexec_PROGRAMS = 
    10  pkglibexec_PROGRAMS = 
    11  
    11  
    12 --- gnuplot-4.4.0/src/Makefile.in.orig	Sat Mar 13 13:20:04 2010
    12 --- gnuplot-4.6.0/src/Makefile.in.orig	2012-04-14 17:55:00.314759690 -0700
    13 +++ gnuplot-4.4.0/src/Makefile.in	Tue Apr 19 16:46:03 PDT 2011
    13 +++ gnuplot-4.6.0/src/Makefile.in	2012-04-14 17:55:41.703140495 -0700
    14 @@ -347,7 +347,7 @@
    14 @@ -431,7 +431,7 @@
    15  	template.h term_api.h term.c term.h time.c unset.c util.c \
    15  	util.c util.h util3d.c util3d.h variable.c variable.h \
    16  	util.h util3d.c util3d.h variable.c variable.h version.c \
    16  	version.c version.h $(am__append_2) $(am__append_3) \
    17  	version.h $(am__append_2) $(am__append_3)
    17  	$(am__append_4) $(am__append_6)
    18 -gnuplot_LDADD = $(TERMLIBS) $(TERMXLIBS) $(WX_LIBS)
    18 -gnuplot_LDADD = $(TERMLIBS) $(TERMXLIBS) $(WX_LIBS) $(QT_LIBS)
    19 +gnuplot_LDADD = $(shell echo -lpng $(TERMLIBS) $(TERMXLIBS) $(WX_LIBS) | sed -e s,-lpng[0123456789]*,-lpng12,g)
    19 +gnuplot_LDADD = $(shell echo -lpng $(TERMLIBS) $(TERMXLIBS) $(WX_LIBS) $(QT_LIBS) | sed -e s,-lpng[0123456789]*,-lpng12,g)
    20  @[email protected]_x11_SOURCES = gplt_x11.c gplt_x11.h gpexecute.c gpexecute.h mousecmn.h
    20  @[email protected]_x11_SOURCES = gplt_x11.c gplt_x11.h gpexecute.c gpexecute.h mousecmn.h version.c version.h
    21  @[email protected] = @[email protected]
    21  @[email protected] = @[email protected]
    22  @[email protected]_x11_LDADD = getcolor_x11.o $(XLIBS)
    22  @[email protected]_x11_LDADD = getcolor_x11.o $(XLIBS)