Mercurial > hg > mxe-octave-anirudha

changeset 2900:2784771bed32

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge stable with default and update to newer Octave version
author John W. Eaton <jwe@octave.org>
date Tue, 04 Dec 2012 14:10:44 -0500
parents 23a535663fce (diff) b4e625571bf6 (current diff)
children 558397d29e38
files src/octave-1-fixes.patch src/octave.mk
diffstat 3 files changed, 8 insertions(+), 33 deletions(-) [+]
line wrap: on
line diff
--- a/index.html
+++ b/index.html
@@ -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
+++ b/src/octave-1-fixes.patch
@@ -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@
  
@@ -25,28 +25,3 @@
  
  /* The include_next requires a split double-inclusion guard.  */
  #if @HAVE_UNISTD_H@
---- a/configure.ac	2012-05-31 11:20:35.000000000 -0400
-+++ b/configure.ac	2012-12-04 12:50:58.666092831 -0500
-@@ -857,9 +857,19 @@
- 
-   ## freetype 2
- 
--  AC_CHECK_FT2([9.0.3], [AC_DEFINE(HAVE_FREETYPE, 1, [Define to 1 if you have Freetype library.])
--    XTRA_CXXFLAGS="$XTRA_CXXFLAGS $FT2_CFLAGS"],
--    [warn_freetype="FreeType library not found.  Native graphics will be disabled."])
-+  PKG_CHECK_MODULES([FT2], [freetype2], [
-+    min_ft2_version=9.03
-+    AC_MSG_CHECKING([for FreeType -- version >= $min_ft2_version])
-+    $PKG_CONFIG freetype2 --atleast-version=$min_ft2_version
-+    ac_status=$?
-+    if test $ac_status = 0; then
-+      AC_MSG_RESULT(yes)
-+      AC_DEFINE(HAVE_FREETYPE, 1, [Define to 1 if you have Freetype library.])
-+      XTRA_CXXFLAGS="$XTRA_CXXFLAGS $FT2_CFLAGS"
-+    else
-+      AC_MSG_RESULT(no)
-+      warn_freetype="FreeType library not found.  Native graphics will be disabled."
-+    fi])
- 
-   ## fontconfig library
- 
--- a/src/octave.mk
+++ b/src/octave.mk
@@ -3,11 +3,11 @@
 
 PKG             := octave
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := ff5d66986789412475d64d8ba2c30714ddfc13c4
+$(PKG)_CHECKSUM := 8df8e9641dc5dedd170035b0e2648c37f9c15e8e
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := octave-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := ftp://gnu.org/gnu/octave/$($(PKG)_FILE)
-$(PKG)_DEPS     := arpack blas curl fftw fltk fontconfig freetype gcc glpk gnuplot graphicsmagick lapack pcre qhull qrupdate readline suitesparse zlib
+$(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
     echo 'Warning: Updates are temporarily disabled for package octave.' >&2;
@@ -15,13 +15,13 @@
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && autoreconf
     mkdir '$(1)/.build'
     cd '$(1)/.build' && '$(1)/configure' \
         --host='$(TARGET)' \
         --build="`config.guess`" \
         --prefix='$(PREFIX)/$(TARGET)' \
         --disable-docs \
+        --disable-gui \
         FLTK_CONFIG="$(PREFIX)/bin/$(TARGET)-fltk-config" \
         gl_cv_func_gettimeofday_clobber=no