Mercurial > mxe-octave
changeset 3835:bbb4050ad03e
update to 4.0.0-rc1 in octave.mk
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 05 Mar 2015 12:39:57 -0500 |
| parents | 291c610413cd |
| children | 1d83829da885 |
| files | src/octave-1-gnulib-isatty.patch src/octave.mk |
| diffstat | 2 files changed, 3 insertions(+), 42 deletions(-) [+] |
line wrap: on
line diff
--- a/src/octave-1-gnulib-isatty.patch Wed Mar 04 17:25:01 2015 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +0,0 @@ -Patch based on savannah.gnu.org/bugs/?327623#attached - -diff -ur octave-3.8.2-rc2.orig/libgnu/isatty.c octave-3.8.2-rc2/libgnu/isatty.c ---- octave-3.8.2-rc2.orig/libgnu/isatty.c 2014-08-12 15:31:01.710229546 -0400 -+++ octave-3.8.2-rc2/libgnu/isatty.c 2014-08-12 15:41:15.603406658 -0400 -@@ -34,7 +34,13 @@ - - /* Optimized test whether a HANDLE refers to a console. - See <http://lists.gnu.org/archive/html/bug-gnulib/2009-08/msg00065.html>. */ --#define IsConsoleHandle(h) (((intptr_t) (h) & 3) == 3) -+//#define IsConsoleHandle(h) (((intptr_t) (h) & 3) == 3) -+static BOOL -+IsConsoleHandle(HANDLE h) -+{ -+ DWORD mode; -+ return GetConsoleMode(h, &mode) != 0; -+} - - #if HAVE_MSVC_INVALID_PARAMETER_HANDLER - static int -diff -ur octave-3.8.2-rc2.orig/libgnu/select.c octave-3.8.2-rc2/libgnu/select.c ---- octave-3.8.2-rc2.orig/libgnu/select.c 2014-08-12 15:31:01.704229427 -0400 -+++ octave-3.8.2-rc2/libgnu/select.c 2014-08-12 15:44:44.268552023 -0400 -@@ -84,7 +84,14 @@ - - /* Optimized test whether a HANDLE refers to a console. - See <http://lists.gnu.org/archive/html/bug-gnulib/2009-08/msg00065.html>. */ --#define IsConsoleHandle(h) (((intptr_t) (h) & 3) == 3) -+//#define IsConsoleHandle(h) (((intptr_t) (h) & 3) == 3) -+static BOOL -+IsConsoleHandle(HANDLE h) -+{ -+ DWORD mode; -+ return GetConsoleMode(h, &mode) != 0; -+} -+ - - static BOOL - IsSocketHandle (HANDLE h)
--- a/src/octave.mk Wed Mar 04 17:25:01 2015 -0500 +++ b/src/octave.mk Thu Mar 05 12:39:57 2015 -0500 @@ -3,10 +3,10 @@ PKG := octave $(PKG)_IGNORE := -$(PKG)_VERSION := 3.8.2-rc2 -$(PKG)_CHECKSUM := 07b1266cd55cc79099382e858c430fdd8dcfb638 +$(PKG)_VERSION := 4.0.0-rc1 +$(PKG)_CHECKSUM := d7eada2b697474faacd8228167ca2b986df660ae $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) -$(PKG)_FILE := octave-$($(PKG)_VERSION).tar.gz +$(PKG)_FILE := octave-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := ftp://alpha.gnu.org/gnu/octave/$($(PKG)_FILE) ifeq ($(USE_SYSTEM_FONTCONFIG),no) $(PKG)_FONTCONFIG := fontconfig