# HG changeset patch
# User John Donoghue
# Date 1572263941 14400
# Node ID be7aab9651b2778c646a5e2d9ec6fa79405c8ef9
# Parent ef15e1ae14735cdc060c7e48e7edfec4bde26a56
Update of-miscellaneous to v1.3.0
* src/of-miscellaneous.mk: update version, checksum
* dist-files.mk: remove ref to deleted file
* src/of-miscellaneous-1-fixes.patch,
src/of-miscellaneous-2-fixes.patch,
src/of-miscellaneous-3-dev-fixes.patch: removed
diff -r ef15e1ae1473 -r be7aab9651b2 dist-files.mk
--- a/dist-files.mk Thu Oct 24 09:18:48 2019 -0400
+++ b/dist-files.mk Mon Oct 28 07:59:01 2019 -0400
@@ -494,9 +494,6 @@
of-ltfat-1-cross-fixes.patch \
of-ltfat.mk \
of-mapping.mk \
- of-miscellaneous-1-fixes.patch \
- of-miscellaneous-2-fixes.patch \
- of-miscellaneous-3-dev-fixes.patch \
of-miscellaneous.mk \
of-nan.mk \
of-netcdf.mk \
diff -r ef15e1ae1473 -r be7aab9651b2 src/of-miscellaneous-1-fixes.patch
--- a/src/of-miscellaneous-1-fixes.patch Thu Oct 24 09:18:48 2019 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +0,0 @@
-diff -urN miscellaneous-1.2.1.orig/inst/private/strsplit.m miscellaneous-1.2.1/inst/private/strsplit.m
---- miscellaneous-1.2.1.orig/inst/private/strsplit.m 2015-04-22 19:58:09.000000000 -0400
-+++ miscellaneous-1.2.1/inst/private/strsplit.m 1969-12-31 19:00:00.000000000 -0500
-@@ -1,125 +0,0 @@
--## Copyright (C) 2009-2012 Jaroslav Hajek
--##
--## This file is part of Octave.
--##
--## Octave is free software; you can redistribute it and/or modify it
--## under the terms of the GNU General Public License as published by
--## the Free Software Foundation; either version 3 of the License, or (at
--## your option) any later version.
--##
--## Octave is distributed in the hope that it will be useful, but
--## WITHOUT ANY WARRANTY; without even the implied warranty of
--## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
--## General Public License for more details.
--##
--## You should have received a copy of the GNU General Public License
--## along with Octave; see the file COPYING. If not, see
--## .
--##
--## FIXME: this file is here to avoid conflicts with new Octave versions. Matlab
--## has recently added strplit function (used to exist in Octave only) but
--## their syntax is not compatible with ours. Rather than timing the
--## release of each octave forge package that used strsplit, a copy of the
--## old version was placed as private. Once the new Octave version is
--## released, this file can be removed, and the calls to strsplit fixed.
--
--## -*- texinfo -*-
--## @deftypefn {Function File} {[@var{cstr}] =} strsplit (@var{s}, @var{sep})
--## @deftypefnx {Function File} {[@var{cstr}] =} strsplit (@var{s}, @var{sep}, @var{strip_empty})
--## Split the string @var{s} using one or more separators @var{sep} and return
--## a cell array of strings. Consecutive separators and separators at
--## boundaries result in empty strings, unless @var{strip_empty} is true.
--## The default value of @var{strip_empty} is false.
--##
--## 2-D character arrays are split at separators and at the original column
--## boundaries.
--##
--## Example:
--##
--## @example
--## @group
--## strsplit ("a,b,c", ",")
--## @result{}
--## @{
--## [1,1] = a
--## [1,2] = b
--## [1,3] = c
--## @}
--##
--## strsplit (["a,b" ; "cde"], ",")
--## @result{}
--## @{
--## [1,1] = a
--## [1,2] = b
--## [1,3] = cde
--## @}
--## @end group
--## @end example
--## @seealso{strtok}
--## @end deftypefn
--
--function cstr = strsplit (s, sep, strip_empty = false)
--
-- if (nargin < 2 || nargin > 3)
-- print_usage ();
-- elseif (! ischar (s) || ! ischar (sep))
-- error ("strsplit: S and SEP must be string values");
-- elseif (! isscalar (strip_empty))
-- error ("strsplit: STRIP_EMPTY must be a scalar value");
-- endif
--
-- if (isempty (s))
-- cstr = cell (size (s));
-- else
-- if (rows (s) > 1)
-- ## For 2-D arrays, add separator character at line boundaries
-- ## and transform to single string
-- s(:, end+1) = sep(1);
-- s = reshape (s.', 1, numel (s));
-- s(end) = [];
-- endif
--
-- ## Split s according to delimiter
-- if (isscalar (sep))
-- ## Single separator
-- idx = find (s == sep);
-- else
-- ## Multiple separators
-- idx = strchr (s, sep);
-- endif
--
-- ## Get substring lengths.
-- if (isempty (idx))
-- strlens = length (s);
-- else
-- strlens = [idx(1)-1, diff(idx)-1, numel(s)-idx(end)];
-- endif
-- ## Remove separators.
-- s(idx) = [];
-- if (strip_empty)
-- ## Omit zero lengths.
-- strlens = strlens(strlens != 0);
-- endif
--
-- ## Convert!
-- cstr = mat2cell (s, 1, strlens);
-- endif
--
--endfunction
--
--
--%!assert (strsplit ("road to hell", " "), {"road", "to", "hell"})
--%!assert (strsplit ("road to^hell", " ^"), {"road", "to", "hell"})
--%!assert (strsplit ("road to--hell", " -", true), {"road", "to", "hell"})
--%!assert (strsplit (["a,bc";",de"], ","), {"a", "bc", char(ones(1,0)), "de "})
--%!assert (strsplit (["a,bc";",de"], ",", true), {"a", "bc", "de "})
--%!assert (strsplit (["a,bc";",de"], ", ", true), {"a", "bc", "de"})
--
--%% Test input validation
--%!error strsplit ()
--%!error strsplit ("abc")
--%!error strsplit ("abc", "b", true, 4)
--%!error strsplit (123, "b")
--%!error strsplit ("abc", 1)
--%!error strsplit ("abc", "def", ones (3,3))
--
diff -r ef15e1ae1473 -r be7aab9651b2 src/of-miscellaneous-2-fixes.patch
--- a/src/of-miscellaneous-2-fixes.patch Thu Oct 24 09:18:48 2019 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-diff -uNr a/src/configure.ac b/src/configure.ac
---- a/src/configure.ac 2014-06-05 02:17:00.000000000 -0400
-+++ b/src/configure.ac 2018-04-21 11:03:02.000000000 -0400
-@@ -6,7 +6,10 @@
- [],
- [AC_CHECK_HEADER([termcap.h],
- [],
-- [AC_MSG_ERROR([Unable to find ncurses library headers.])]
-+ [AC_CHECK_HEADER([ncurses/termcap.h],
-+ [],
-+ [AC_MSG_ERROR([Unable to find ncurses library headers.])]
-+ ])
- ])
- )
-
-diff -uNr a/src/text_waitbar.cc b/src/text_waitbar.cc
---- a/src/text_waitbar.cc 2014-06-05 02:17:00.000000000 -0400
-+++ b/src/text_waitbar.cc 2018-04-21 11:03:37.000000000 -0400
-@@ -23,6 +23,8 @@
- # include
- #elif defined (HAVE_TERMCAP_H)
- # include
-+#elif defined (HAVE_NCURSES_TERMCAP_H)
-+# include
- #endif
- };
-
-diff -uNr a/src/configure b/src/configure
---- a/src/configure 2014-06-05 02:18:24.000000000 -0400
-+++ b/src/configure 2018-04-21 11:06:46.000000000 -0400
-@@ -3205,10 +3205,18 @@
- if test "x$ac_cv_header_termcap_h" = xyes; then :
-
- else
-+ ac_fn_c_check_header_mongrel "$LINENO" "ncurses/termcap.h" "ac_cv_header_ncurses_termcap_h" "$ac_includes_default"
-+if test "x$ac_cv_header_ncurses_termcap_h" = xyes; then :
-+
-+else
- as_fn_error $? "Unable to find ncurses library headers." "$LINENO" 5
-
- fi
-
-+
-+
-+fi
-+
-
-
- fi
diff -r ef15e1ae1473 -r be7aab9651b2 src/of-miscellaneous-3-dev-fixes.patch
--- a/src/of-miscellaneous-3-dev-fixes.patch Thu Oct 24 09:18:48 2019 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-diff -ur miscellaneous-1.2.1.orig/inst/units.m miscellaneous-1.2.1/inst/units.m
---- miscellaneous-1.2.1.orig/inst/units.m 2018-07-11 12:44:26.038777666 -0400
-+++ miscellaneous-1.2.1/inst/units.m 2018-07-11 12:45:50.033750024 -0400
-@@ -107,7 +107,7 @@
-
- function fpath = check_units ()
- ## See bug #38270 about why we're checking this way.
-- fpath = file_in_path (getenv ("PATH"), sprintf ("units%s", octave_config_info ("EXEEXT")));
-+ fpath = file_in_path (getenv ("PATH"), sprintf ("units%s", __octave_config_info__ ("EXEEXT")));
- if (isempty (fpath))
- error ("units: %s\nVerify that GNU units is installed in the current path.",
- rawoutput);
-diff -ur miscellaneous-1.2.1.orig/src/partint.cc miscellaneous-1.2.1/src/partint.cc
---- miscellaneous-1.2.1.orig/src/partint.cc 2019-01-02 12:13:28.286461534 -0500
-+++ miscellaneous-1.2.1/src/partint.cc 2019-01-02 12:14:43.200262618 -0500
-@@ -77,7 +77,7 @@
- error("partcnt accepts exactly one argument");
- return r;
- }
-- if ( ! args(0).is_numeric_type()) {
-+ if ( ! args(0).isnumeric()) {
- error("partcnt only accepts a numeric argument");
- return r;
- }
-@@ -181,7 +181,7 @@
- int nargin = args.length ();
- if (nargin != 1 ||
- ! args(0).is_scalar_type() ||
-- ! args(0).is_numeric_type()
-+ ! args(0).isnumeric()
- ) {
- error("partint only accepts one scalar positive integer argument");
- return r;
-diff -ur miscellaneous-1.2.1.orig/src/sample.cc miscellaneous-1.2.1/src/sample.cc
---- miscellaneous-1.2.1.orig/src/sample.cc 2019-01-02 12:18:26.373626834 -0500
-+++ miscellaneous-1.2.1/src/sample.cc 2019-01-02 12:19:15.234801067 -0500
-@@ -123,7 +123,7 @@
- /* as in the code from "Programming Pearls" */
- IntSetBins2 S(m, n);
- while (S.size() < m)
-- S.insert(floor(oct_randu()*n)); // use Octave's uniform RNG
-+ S.insert(floor(octave::rand_uniform ()*n)); // use Octave's uniform RNG
- S.report(s.fortran_vec());
- return octave_value (s);
- }
diff -r ef15e1ae1473 -r be7aab9651b2 src/of-miscellaneous.mk
--- a/src/of-miscellaneous.mk Thu Oct 24 09:18:48 2019 -0400
+++ b/src/of-miscellaneous.mk Mon Oct 28 07:59:01 2019 -0400
@@ -3,8 +3,8 @@
PKG := of-miscellaneous
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 1.2.1
-$(PKG)_CHECKSUM := 01a55890d4f62f2700c0bf4051493c454fc5c042
+$(PKG)_VERSION := 1.3.0
+$(PKG)_CHECKSUM := 254e4d0db99d0c54208bf4654ad06fb903f98bc3
$(PKG)_REMOTE_SUBDIR :=
$(PKG)_SUBDIR := miscellaneous-$($(PKG)_VERSION)
$(PKG)_FILE := miscellaneous-$($(PKG)_VERSION).tar.gz