view src/of-io-1-fixes.patch @ 4352:bf358512f67e

Correctly locate cross-compiler versions of Qt tools (bug #50258). * default-octave.mk: Set environment variables for RCC_QTVER, UIC_QTVER, MOC_QTVER, LRELEASE_QTVER so that Octave configure script locates cross-compiler versions of these tools.
author Rik <rik@octave.org>
date Tue, 14 Feb 2017 11:35:52 -0800
parents a40ff07ce987
children
line wrap: on
line source

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"));