# HG changeset patch
# User John Donoghue
# Date 1448472543 18000
# Node ID b5a28d770997e8bf2a4afc6af3d294726344307f
# Parent  c7e31c07c915aef8487d9e1e7d775b2b003816f4
of-communications, of-octcdf: update patch for default repo of octave

* src/of-communications-1-fixes.patch: update patch

* src/of-octcdf-1-cross-fixes.patch: update patch

diff -r c7e31c07c915 -r b5a28d770997 src/of-communications-1-fixes.patch
--- a/src/of-communications-1-fixes.patch	Sun Nov 22 19:01:31 2015 -0500
+++ b/src/of-communications-1-fixes.patch	Wed Nov 25 12:29:03 2015 -0500
@@ -52,3 +52,27 @@
  
  #include "galois.h"
  #include "ov-galois.h"
+# HG changeset patch
+# User John Donoghue
+# Date 1448402937 18000
+#      Tue Nov 24 17:08:57 2015 -0500
+# Node ID e8b6bae07002b9e94bfc104b1e844963ccaa5f41
+# Parent  eeb20b3c6074e8932e40b14c9f99985340ceeca5
+define OV_REP_TYPE it it is not defined (Bug #46521)
+
+* src/ov-galois.h: define OV_REP_TYPE if not defined already
+
+diff -r eeb20b3c6074 -r e8b6bae07002 src/ov-galois.h
+--- a/src/ov-galois.h	Thu Sep 03 13:19:03 2015 -0400
++++ b/src/ov-galois.h	Tue Nov 24 17:08:57 2015 -0500
+@@ -44,6 +44,10 @@
+ #endif
+ #endif
+ 
++#if ! defined (OV_REP_TYPE)
++#  define OV_REP_TYPE octave_base_value
++#endif
++
+ class octave_value_list;
+ class tree_walker;
+ 
diff -r c7e31c07c915 -r b5a28d770997 src/of-octcdf-1-cross-fixes.patch
--- a/src/of-octcdf-1-cross-fixes.patch	Sun Nov 22 19:01:31 2015 -0500
+++ b/src/of-octcdf-1-cross-fixes.patch	Wed Nov 25 12:29:03 2015 -0500
@@ -1106,3 +1106,33 @@
  
  HAVE_NETCDF=@HAVE_NETCDF@
  OCTCDF_LIBS=@OCTCDF_LIBS@
+diff -ur octcdf.orig/src/configure octcdf/src/configure
+--- octcdf.orig/src/configure	2015-11-25 08:22:54.216927907 -0500
++++ octcdf/src/configure	2015-11-25 08:43:20.679996250 -0500
+@@ -2887,6 +2887,11 @@
+ 
+ 
+ 
++oct_ver=`echo $OCTAVE_VERSION | sed -e "s/\.//" -e "s/\..*$//"`
++if test "$oct_ver" -ge "40" ; then
++   OCTCDF_CFLAGS="$OCTCDF_CFLAGS -DOV_REP_TYPE=octave_base_value"
++fi
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CANONICAL_HOST_TYPE in octave-config" >&5
+ $as_echo_n "checking for CANONICAL_HOST_TYPE in octave-config... " >&6; }
+ canonical_host_type=`$OCTAVE_CONFIG -p CANONICAL_HOST_TYPE`
+diff -ur octcdf.orig/src/configure.base octcdf/src/configure.base
+--- octcdf.orig/src/configure.base	2015-11-25 08:22:54.215927888 -0500
++++ octcdf/src/configure.base	2015-11-25 08:43:05.311695338 -0500
+@@ -281,6 +281,11 @@
+ AC_CHECK_PROG(OCTAVE,octave,octave)
+ OCTAVE_CONFIG_EVAL(VERSION,OCTAVE_VERSION)
+ 
++oct_ver=`echo $OCTAVE_VERSION | sed -e "s/\.//" -e "s/\..*$//"`
++if test "$ocvt_ver" -ge "40" ; then
++   OCTCDF_CFLAGS="$OCTCDF_CFLAGS -DOV_REP_TYPE=octave_base_value"
++fi
++
+ dnl grab canonical host type so we can write system specific install stuff
+ OCTAVE_CONFIG_EVAL(CANONICAL_HOST_TYPE,canonical_host_type)
+