Mercurial > mxe-octave

changeset 3281:53c8b9c843c6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update gnuplot to 4.6.4 * index,html: update gnuplot-version tag to 4.6.4. * src/gnuplot.mk: update checksum and build rules for 4.6.4. * src/gnuplot-1-fixes.patch: update patch for 4.6.4.
author John Donoghue <john.donoghue@ieee.org>
date Mon, 04 Nov 2013 12:57:10 -0500
parents 508061be6797
children 0f01d4dc9644
files index.html src/gnuplot-1-fixes.patch src/gnuplot.mk
diffstat 3 files changed, 23 insertions(+), 31 deletions(-) [+]
line wrap: on
line diff
--- a/index.html	Mon Nov 04 18:23:29 2013 -0500
+++ b/index.html	Mon Nov 04 12:57:10 2013 -0500
@@ -1293,7 +1293,7 @@
     </tr>
     <tr>
         <td id="gnuplot-package">gnuplot</td>
-        <td id="gnuplot-version">4.6.1</td>
+        <td id="gnuplot-version">4.6.4</td>
         <td id="gnuplot-website"><a href="http://www.gnuplot.info/">gnuplot</a></td>
     </tr>
     <tr>
--- a/src/gnuplot-1-fixes.patch	Mon Nov 04 18:23:29 2013 -0500
+++ b/src/gnuplot-1-fixes.patch	Mon Nov 04 12:57:10 2013 -0500
@@ -1,5 +1,6 @@
---- a/config/mingw/Makefile	2012-11-30 16:52:35.622821917 -0500
-+++ b/config/mingw/Makefile	2012-11-30 16:52:23.071255685 -0500
+diff -ur gnuplot-4.6.4.orig/config/mingw/Makefile gnuplot-4.6.4/config/mingw/Makefile
+--- gnuplot-4.6.4.orig/config/mingw/Makefile	2013-11-04 18:26:55.000000000 -0500
++++ gnuplot-4.6.4/config/mingw/Makefile	2013-11-04 18:28:37.000000000 -0500
 @@ -27,7 +27,7 @@
  
  # Use more modern HTML help instead of no longer supported Windows help system
@@ -60,7 +61,7 @@
  
  # Choose which windres/rc do you want to use (GNU windres or MS RC):
  GNU_RC = 1
-@@ -397,7 +397,7 @@
+@@ -401,7 +401,7 @@
    RES2COFF = res2coff -i wgnuplot.res -o wgplt_res.$(O)
  endif
  
@@ -69,16 +70,7 @@
  
  console:
  	$(MAKE) TARGET=gnuplot.exe gnuplot.exe
-@@ -433,7 +433,7 @@
- 	$(W)/winmain.c $(W)/wmenu.c $(W)/wpause.c $(W)/wprinter.c \
- 	$(W)/wresourc.h $(W)/wtext.c $(W)/wtext.h $(W)/geticon.c \
- 	$(W)/screenbuf.c $(W)/screenbuf.h $(W)/wgdiplus.cpp $(W)/wgdiplus.h \
--	$(D)doc2rtf.c $(T)win.trm $(W)/grpicon.ico $(W)/texticon.ico
-+	$(D)doc2rtf.c $(T)win.trm $(W)/GRPICON.ico $(W)/TEXTICON.ico
- 
- ifdef HTML_HELP
- WINDOWS +=	$(D)windows/doc2html.c
-@@ -453,7 +453,7 @@
+@@ -443,7 +443,7 @@
    LDFLAGS2 += -L$(HHWPATH)lib
  endif
  
@@ -87,17 +79,17 @@
  	$(LDX) $(LDFLAGS) $(LDFLAGS2) -o $@ $(OBJS) $(WINOBJS) wgplt_res.$(O) $(LDLIBS)\
  	$(TERMLIBS) $(WX_LIBS) $(PANGOCAIRO_LIBS)
  
-@@ -462,7 +462,7 @@
+@@ -458,7 +458,7 @@
  
- # rules
+ # explicit rules
  
--wgplt_res.$(O) :  $(W)/wgnuplot.rc $(W)/wgnuplib.rc $(W)/wresourc.h texticon.ico grpicon.ico
-+wgplt_res.$(O) :  $(W)/wgnuplot.rc $(W)/wgnuplib.rc $(W)/wresourc.h TEXTICON.ico GRPICON.ico
+-wgplt_res.$(O): $(W)/wgnuplot.rc $(W)/wgnuplib.rc $(W)/wresourc.h texticon.ico grpicon.ico
++wgplt_res.$(O): $(W)/wgnuplot.rc $(W)/wgnuplib.rc $(W)/wresourc.h TEXTICON.ico GRPICON.ico
  	$(RC) $(RCFLAGS) $< $(RCOUT)
  	$(RES2COFF)
  
-@@ -521,13 +521,13 @@
- 	$(CC) -c $(CFLAGS) -o $@ $<
+@@ -494,13 +494,13 @@
+ 	$(CC) -c $(CFLAGS) $(CXXFLAGS) $(PANGOCAIRO_CFLAGS) -MMD -MT '$*.$$(O)' -MF $*.d -o $@ $<
  
  # extract icons from wgnuplot.rc
 -texticon.ico: grpicon.ico
@@ -114,16 +106,16 @@
  
  ifdef HTML_HELP
  # convert gnuplot.doc to windows/wgnuplot.html
-@@ -730,7 +730,7 @@
+@@ -703,7 +703,7 @@
  	$(RM) config.h wgnuplot.map wgnuplot.res $(W)/gnuplot.rtf
- 	$(RM) *.$(O) *.po *.o *.co
+ 	$(RM) *.$(O) *.po *.o *.co *.d
  	$(RM) doc2*.exe $(W)/wgnuplib.res wgnuplib.map wgnuplot.lib
 -	$(RM) $(M)bf_test.exe *.ico geticon.exe allterm.h allterm.c
 +	$(RM) $(M)bf_test.exe *.ico geticon allterm.h allterm.c
  	$(RM) *.aux *.log *.dvi *.toc
  	$(RM) gnuplot.tex gnuplot-figures.tex pdffigures.tex figure_*.pdf
  	$(RM) titlepag.tex toc_entr.sty VERSION
-@@ -829,7 +829,7 @@
+@@ -802,7 +802,7 @@
  
  installer:
  	$(MAKE) DESTDIR=./dist install
@@ -131,9 +123,10 @@
 +	cp -p GRPICON.ico ./dist/bin/
  	cp -p $(TOP)/win/*.iss ./dist
  	(cd ./dist; $(ISCC) gnuplot.iss)
- 	mv ./dist/gp*-setup.exe .
---- a/src/win/wgnuplot.rc	2011-05-13 14:32:22.000000000 -0400
-+++ b/src/win/wgnuplot.rc	2012-11-30 16:53:59.407926642 -0500
+ ifdef RELEASE
+diff -ur gnuplot-4.6.4.orig/src/win/wgnuplot.rc gnuplot-4.6.4/src/win/wgnuplot.rc
+--- gnuplot-4.6.4.orig/src/win/wgnuplot.rc	2013-11-04 18:26:55.000000000 -0500
++++ gnuplot-4.6.4/src/win/wgnuplot.rc	2013-11-04 18:27:15.000000000 -0500
 @@ -15,8 +15,8 @@
     * rc -30 -k -dMSRC win\wgnuplot.rc wgnuplot.exe
     */
--- a/src/gnuplot.mk	Mon Nov 04 18:23:29 2013 -0500
+++ b/src/gnuplot.mk	Mon Nov 04 12:57:10 2013 -0500
@@ -3,10 +3,10 @@
 
 PKG             := gnuplot
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 1ea21a628223159b0297ae65fe8293afd5aab3c0
+$(PKG)_CHECKSUM := 54ee5ce9a0a2698b046064bd275e772673350013
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := gnuplot-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := http://sourceforge.net/projects/gnuplot/files/gnuplot/4.6.1/$($(PKG)_FILE)
+$(PKG)_URL      := http://sourceforge.net/projects/gnuplot/files/gnuplot/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     :=
 
 define $(PKG)_UPDATE
@@ -18,17 +18,16 @@
 define $(PKG)_BUILD
     make -C '$(1)/config/mingw' CC='$(MXE_CC)' CXX='$(MXE_CXX)' RC='$(MXE_WINDRES)' -j '$(JOBS)' TARGET=gnuplot.exe gnuplot.exe
     make -C '$(1)/config/mingw' CC='$(MXE_CC)' CXX='$(MXE_CXX)' RC='$(MXE_WINDRES)' -j '$(JOBS)' TARGET=wgnuplot.exe wgnuplot.exe
-    make -C '$(1)/config/mingw' CC='$(MXE_CC)' CXX='$(MXE_CXX)' RC='$(MXE_WINDRES)' -j '$(JOBS)' wgnuplot.mnu
 
     $(INSTALL) -d '$(HOST_BINDIR)'
     $(INSTALL) -m755 '$(1)/config/mingw/gnuplot.exe' '$(HOST_BINDIR)'
     $(INSTALL) -m755 '$(1)/config/mingw/wgnuplot.exe' '$(HOST_BINDIR)'
-    $(INSTALL) -m644 '$(1)/config/mingw/wgnuplot.mnu' '$(HOST_BINDIR)'
+    $(INSTALL) -m644 '$(1)/src/win/wgnuplot.mnu' '$(HOST_BINDIR)'
 
     $(INSTALL) -d '$(TOP_DIR)/gnuplot/bin'
     $(INSTALL) -m755 '$(1)/config/mingw/gnuplot.exe' '$(TOP_DIR)/gnuplot/bin/'
     $(INSTALL) -m755 '$(1)/config/mingw/wgnuplot.exe' '$(TOP_DIR)/gnuplot/bin/'
-    $(INSTALL) -m644 '$(1)/config/mingw/wgnuplot.mnu' '$(TOP_DIR)/gnuplot/bin/'
+    $(INSTALL) -m644 '$(1)/src/win/wgnuplot.mnu' '$(TOP_DIR)/gnuplot/bin/'
 
 endef
 else