Mercurial > mxe-octave

changeset 4243:a40ff07ce987

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-io: add patch file for error from 2.4.5 release of io package. * src/of-io-1-fixes.patch: new file * dist-files.mk: add of-io-1-fixes.patch
author John D
date Mon, 14 Nov 2016 05:06:13 -0500
parents 63a1257dd4f1
children 366dc3466a3a
files dist-files.mk src/of-io-1-fixes.patch
diffstat 2 files changed, 13 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Sun Nov 13 09:59:42 2016 -0500
+++ b/dist-files.mk	Mon Nov 14 05:06:13 2016 -0500
@@ -465,6 +465,7 @@
   of-image.mk \
   of-interval.mk \
   of-instrument-control.mk \
+  of-io-1-fixes.patch \
   of-io.mk \
   of-linear-algebra-1-cross-fixes.patch \
   of-linear-algebra.mk \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/of-io-1-fixes.patch	Mon Nov 14 05:06:13 2016 -0500
@@ -0,0 +1,12 @@
+diff -ur io-2.4.5.orig/inst/private/__OCT_xlsx2oct__.m io-2.4.5/inst/private/__OCT_xlsx2oct__.m
+--- orig/inst/private/__OCT_xlsx2oct__.m     2016-11-08 22:05:13.000000000 +0100
++++ src/inst/private/__OCT_xlsx2oct__.m      2016-11-12 21:43:52.076390219 +0100
+@@ -196,7 +196,7 @@
+         vals = ctext(vals);
+         ids = cellfun (@isempty, vals);
+         if (any (ids))
+-          vals {find (ids)} = "";
++          vals(ids) = {""};
+         endif
+         ## Cell addresses
+         valraws = cell2mat (regexp (rawdata, '<c r="(\w+)"(?: s="\d+")? t="s"><v(?:.*?)>\d+</v>', "tokens"));