Mercurial > mxe-octave
changeset 2898:23a535663fce
merge stable to default
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 04 Dec 2012 10:47:47 -0500 |
parents | 5da5a3cf24db (diff) 81e4b37912bf (current diff) |
children | 2784771bed32 |
files | |
diffstat | 3 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/index.html Tue Dec 04 10:47:21 2012 -0500 +++ b/index.html Tue Dec 04 10:47:47 2012 -0500 @@ -1680,7 +1680,7 @@ </tr> <tr> <td id="octave-package">octave</td> - <td id="octave-version">3.6.2</td> + <td id="octave-version">3.7.0+</td> <td id="octave-website"><a href="http://octave.org/">Octave</a></td> </tr> <tr>
--- a/src/octave-1-fixes.patch Tue Dec 04 10:47:21 2012 -0500 +++ b/src/octave-1-fixes.patch Tue Dec 04 10:47:47 2012 -0500 @@ -1,6 +1,6 @@ ---- a/libgnu/unistd.in.h 2012-05-31 11:24:06.000000000 -0400 -+++ a/libgnu/unistd.in.h 2012-12-03 21:16:42.442531641 -0500 -@@ -22,23 +22,7 @@ +--- a/libgnu/unistd.in.h 2012-12-03 12:57:36.000000000 -0500 ++++ b/libgnu/unistd.in.h 2012-12-03 14:22:38.421760035 -0500 +@@ -19,23 +19,7 @@ #endif @PRAGMA_COLUMNS@
--- a/src/octave.mk Tue Dec 04 10:47:21 2012 -0500 +++ b/src/octave.mk Tue Dec 04 10:47:47 2012 -0500 @@ -3,10 +3,10 @@ PKG := octave $(PKG)_IGNORE := -$(PKG)_CHECKSUM := ff5d66986789412475d64d8ba2c30714ddfc13c4 +$(PKG)_CHECKSUM := 618eda703553b79de4c83b2217ae6c26cef66b01 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := octave-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := ftp://gnu.org/gnu/octave/$($(PKG)_FILE) +$(PKG)_URL := http://jweaton.org/$($(PKG)_FILE) $(PKG)_DEPS := arpack blas curl fftw fltk gcc glpk gnuplot graphicsmagick lapack pcre qhull qrupdate readline suitesparse zlib define $(PKG)_UPDATE @@ -23,6 +23,7 @@ --prefix='$(PREFIX)/$(TARGET)' \ --without-opengl \ --disable-docs \ + --disable-gui \ gl_cv_func_gettimeofday_clobber=no $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install