# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1354586026 18000
# Node ID 0d9aa105b49e88880c7f60ffac3d2b70fec1d3d4
# Parent  848118c648ae15858376cf254a360e3ebaf50f64
Update Octave version.  Fix unistd.h problem in gnulib, not Octave.

diff -r 848118c648ae -r 0d9aa105b49e src/octave-1-fixes.patch
--- a/src/octave-1-fixes.patch	Mon Dec 03 09:15:05 2012 -0500
+++ b/src/octave-1-fixes.patch	Mon Dec 03 20:53:46 2012 -0500
@@ -1,50 +1,27 @@
---- a/liboctave/system/oct-env.cc	2012-10-01 18:29:42.000000000 -0400
-+++ b/liboctave/system/oct-env.cc	2012-11-28 16:56:46.075849540 -0500
-@@ -48,5 +48,6 @@
- 
- #include <sys/types.h>
- #include <unistd.h>
-+#include <unistd.h>
- 
- #include "progname.h"
-
---- a/libinterp/parse-tree/lex.cc	2012-10-01 18:34:09.000000000 -0400
-+++ b/libinterp/parse-tree/lex.cc	2012-11-28 17:25:36.779585192 -0500
-@@ -1260,6 +1260,7 @@
- 
- #include <sys/types.h>
- #include <unistd.h>
-+#include <unistd.h>
- 
- #include "cmd-edit.h"
- #include "quit.h"
---- a/libinterp/parse-tree/lex.ll	2012-10-01 18:31:00.000000000 -0400
-+++ b/libinterp/parse-tree/lex.ll	2012-11-28 17:25:24.652007989 -0500
-@@ -48,6 +48,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@
  
- #include <sys/types.h>
- #include <unistd.h>
-+#include <unistd.h>
- 
- #include "cmd-edit.h"
- #include "quit.h"
---- a/libinterp/interpfcn/oct-hist.cc~	2012-10-01 18:28:21.000000000 -0400
-+++ b/libinterp/interpfcn/oct-hist.cc	2012-11-28 17:30:46.296796575 -0500
-@@ -44,6 +44,7 @@
+-/* Special invocation convention:
+-   - On mingw, several headers, including <winsock2.h>, include <unistd.h>,
+-     but we need to ensure that both the system <unistd.h> and <winsock2.h>
+-     are completely included before we replace gethostname.  */
+-#if @GNULIB_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@ \
+-  && !defined _GL_WINSOCK2_H_WITNESS && defined _WINSOCK2_H
+-/* <unistd.h> is being indirectly included for the first time from
+-   <winsock2.h>; avoid declaring any overrides.  */
+-# if @HAVE_UNISTD_H@
+-#  @INCLUDE_NEXT@ @NEXT_UNISTD_H@
+-# else
+-#  error unexpected; report this to bug-gnulib@gnu.org
+-# endif
+-# define _GL_WINSOCK2_H_WITNESS
+-
+-/* Normal invocation.  */
+-#elif !defined _@GUARD_PREFIX@_UNISTD_H
++#if !defined _@GUARD_PREFIX@_UNISTD_H
  
- #include <sys/types.h>
- #include <unistd.h>
-+#include <unistd.h>
- 
- #include "cmd-hist.h"
- #include "file-ops.h"
---- a/libinterp/interpfcn/sysdep.cc	2012-09-19 15:28:19.000000000 -0400
-+++ b/libinterp/interpfcn/sysdep.cc	2012-11-28 17:32:34.109039479 -0500
-@@ -35,6 +35,7 @@
- 
- #include <sys/types.h>
- #include <unistd.h>
-+#include <unistd.h>
- 
- #if defined (HAVE_TERMIOS_H)
- #include <termios.h>
+ /* The include_next requires a split double-inclusion guard.  */
+ #if @HAVE_UNISTD_H@
diff -r 848118c648ae -r 0d9aa105b49e src/octave.mk
--- a/src/octave.mk	Mon Dec 03 09:15:05 2012 -0500
+++ b/src/octave.mk	Mon Dec 03 20:53:46 2012 -0500
@@ -3,7 +3,7 @@
 
 PKG             := octave
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 1ea936554aaabaabb747a4fcf98ecfbbfb265656
+$(PKG)_CHECKSUM := 618eda703553b79de4c83b2217ae6c26cef66b01
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := octave-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://jweaton.org/$($(PKG)_FILE)