Mercurial > mxe-octave
changeset 4364:39e5f8d6cb85
of-image: update to 2.4.6
* build_packages.m: update io version
* src/of-io.mk: update version, checksum, and subdir
* src/of-io-1-fixes.patch: removed
* dist-files.mk: remove ref to of-image-1-fixes.patch
| author | John D |
|---|---|
| date | Tue, 14 Mar 2017 12:27:39 -0400 |
| parents | 37d9ce07e4d7 |
| children | 15570dc33a8c |
| files | build_packages.m dist-files.mk src/of-io-1-fixes.patch src/of-io.mk |
| diffstat | 4 files changed, 4 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/build_packages.m Mon Mar 13 08:17:08 2017 -0400 +++ b/build_packages.m Tue Mar 14 12:27:39 2017 -0400 @@ -37,7 +37,7 @@ try_install signal-1.3.2.tar.gz try_install communications-1.2.1.tar.gz try_install image-2.6.1.tar.gz - try_install io-2.4.5.tar.gz + try_install io-2.4.6.tar.gz try_install statistics-1.3.0.tar.gz try_install geometry-2.1.1.tar.gz try_install windows-1.2.4.tar.gz
--- a/dist-files.mk Mon Mar 13 08:17:08 2017 -0400 +++ b/dist-files.mk Tue Mar 14 12:27:39 2017 -0400 @@ -465,7 +465,6 @@ of-interval-1-cross-fixes.patch \ 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 \
--- a/src/of-io-1-fixes.patch Mon Mar 13 08:17:08 2017 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -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"));
--- a/src/of-io.mk Mon Mar 13 08:17:08 2017 -0400 +++ b/src/of-io.mk Tue Mar 14 12:27:39 2017 -0400 @@ -3,10 +3,10 @@ PKG := of-io $(PKG)_IGNORE := -$(PKG)_VERSION := 2.4.5 -$(PKG)_CHECKSUM := 22ce66fbf42c35b24258376c6ef8a435bf7c662d +$(PKG)_VERSION := 2.4.6 +$(PKG)_CHECKSUM := 9a75b7afb4949f6d2b7877370ea1a2c33710ba68 $(PKG)_REMOTE_SUBDIR := -$(PKG)_SUBDIR := io +$(PKG)_SUBDIR := io-$($(PKG)_VERSION) $(PKG)_FILE := io-$($(PKG)_VERSION).tar.gz $(PKG)_URL := '$(OCTAVE_FORGE_BASE_URL)/$($(PKG)_FILE)/download' $(PKG)_DEPS :=