Mercurial > mxe-octave

changeset 4785:34d290388ee9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-optim: update to 1.5.3 * build_packages.m: update optim version * dist-files.mk: remove ref to /of-optim-1-fixes.patch * src/of-optim.mk: update version, checksum * src/of-optim-1-fixes.patch: removed
author John Donoghue
date Tue, 07 Aug 2018 09:32:42 -0400
parents 0f531d829dce
children 0c6d7d14a615
files build_packages.m dist-files.mk src/of-optim-1-fixes.patch src/of-optim.mk
diffstat 4 files changed, 3 insertions(+), 147 deletions(-) [+]
line wrap: on
line diff
--- a/build_packages.m	Fri Aug 03 13:27:05 2018 -0400
+++ b/build_packages.m	Tue Aug 07 09:32:42 2018 -0400
@@ -31,7 +31,7 @@
   try_install general-2.1.0.tar.gz
   try_install miscellaneous-1.2.1.tar.gz
   try_install struct-1.0.15.tar.gz
-  try_install optim-1.5.2.tar.gz
+  try_install optim-1.5.3.tar.gz
   try_install control-3.1.0.tar.gz
   try_install signal-1.4.0.tar.gz
   try_install communications-1.2.1.tar.gz
--- a/dist-files.mk	Fri Aug 03 13:27:05 2018 -0400
+++ b/dist-files.mk	Tue Aug 07 09:32:42 2018 -0400
@@ -511,7 +511,6 @@
   of-odepkg-1-fixes.patch \
   of-odepkg-2-fixes.patch \
   of-odepkg.mk \
-  of-optim-1-fixes.patch \
   of-optim.mk \
   of-optiminterp.mk \
   of-quaternion-1-cross-fixes.patch \
--- a/src/of-optim-1-fixes.patch	Fri Aug 03 13:27:05 2018 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,143 +0,0 @@
-diff -uNr a/src/__bfgsmin.cc b/src/__bfgsmin.cc
---- a/src/__bfgsmin.cc	2016-09-18 13:31:55.000000000 -0400
-+++ b/src/__bfgsmin.cc	2018-04-09 12:24:30.969197504 -0400
-@@ -260,7 +260,7 @@
-       found_improvement = __bisectionstep(step, obj, f, f_args, x, dx, minarg, verbose);
-     }
-   else found_improvement = 1;
--  if (xisnan(obj)) {
-+  if (octave::math::isnan(obj)) {
-     obj = obj_0;
-     if (verbose) warning("__stepsize: objective function crash in Newton step, falling back to bisection");
-     found_improvement = __bisectionstep(step, obj, f, f_args, x, dx, minarg, verbose);
-diff -uNr a/src/error-helpers.cc b/src/error-helpers.cc
---- a/src/error-helpers.cc	2016-09-18 13:31:55.000000000 -0400
-+++ b/src/error-helpers.cc	2018-04-09 12:17:15.913535622 -0400
-@@ -24,7 +24,7 @@
- // call verror
- #ifdef HAVE_OCTAVE_VERROR_ARG_EXC
- void
--c_verror (octave_execution_exception& e, const char *fmt, ...)
-+c_verror (octave::execution_exception& e, const char *fmt, ...)
- {
-   va_list args;
-   va_start (args, fmt);
-@@ -33,7 +33,7 @@
- }
- #else
- void
--c_verror (const octave_execution_exception&, const char *fmt, ...)
-+c_verror (const octave::execution_exception&, const char *fmt, ...)
- {
-   va_list args;
-   va_start (args, fmt);
-diff -uNr a/src/error-helpers.h b/src/error-helpers.h
---- a/src/error-helpers.h	2016-09-18 13:31:55.000000000 -0400
-+++ b/src/error-helpers.h	2018-04-09 12:17:51.079891166 -0400
-@@ -21,9 +21,9 @@
- 
- // call verror
- #ifdef HAVE_OCTAVE_VERROR_ARG_EXC
--void c_verror (octave_execution_exception&, const char *, ...);
-+void c_verror (octave::execution_exception&, const char *, ...);
- #else
--void c_verror (const octave_execution_exception&, const char *, ...);
-+void c_verror (const octave::execution_exception&, const char *, ...);
- #endif
- 
- // call verror
-@@ -33,7 +33,7 @@
- // both if Octave uses exceptions for errors and if it still uses
- // error_state. In the latter case return 'retval'.
- #ifdef HAVE_OCTAVE_ERROR_STATE
--  // can throw octave_execution_exception despite of this
-+  // can throw octave::execution_exception despite of this
-   #define CHECK_ERROR(code, retval, ...)      \
-     try \
-       { \
-@@ -46,7 +46,7 @@
-             return retval; \
-           } \
-       } \
--    catch (octave_execution_exception& e) \
-+    catch (octave::execution_exception& e)	\
-       { \
-         c_verror (e, __VA_ARGS__); \
-  \
-@@ -58,7 +58,7 @@
-       { \
-         code ; \
-       } \
--    catch (octave_execution_exception& e) \
-+    catch (octave::execution_exception& e)	\
-       { \
-         c_verror (e, __VA_ARGS__); \
-  \
-@@ -70,7 +70,7 @@
- // Octave doesn't throw exceptions for errors but still uses
- // error_state.
- #ifdef HAVE_OCTAVE_ERROR_STATE
--  // can throw octave_execution_exception despite of this
-+  // can throw octave::execution_exception despite of this
-   #define CHECK_ERROR_EXIT1(code, ...) \
-     try \
-       { \
-@@ -83,7 +83,7 @@
-             exit (1); \
-           } \
-       } \
--    catch (octave_execution_exception& e) \
-+    catch (octave::execution_exception& e)	\
-       { \
-         c_verror (e, __VA_ARGS__); \
-  \
-@@ -95,7 +95,7 @@
-       { \
-         code ; \
-       } \
--    catch (octave_execution_exception& e) \
-+    catch (octave::execution_exception& e)	\
-       { \
-         c_verror (e, __VA_ARGS__); \
-  \
-@@ -107,7 +107,7 @@
- // Octave uses exceptions for errors and if it still uses
- // error_state. In the latter case reset error_state to 0.
- #ifdef HAVE_OCTAVE_ERROR_STATE
--  // can throw octave_execution_exception despite of this
-+  // can throw octave::execution_exception despite of this
-   #define SET_ERR(code, err) \
-     err = false; \
-  \
-@@ -120,7 +120,7 @@
-             err = true; \
-           } \
-       } \
--    catch (octave_execution_exception&) \
-+    catch (octave::execution_exception&)	\
-       { \
-         err = true; \
-       }
-@@ -130,7 +130,7 @@
-       { \
-         code ; \
-       } \
--    catch (octave_execution_exception&) \
-+    catch (octave::execution_exception&)	\
-       { \
-         err = true; \
-       }
-diff -uNr a/src/Makefile.in b/src/Makefile.in
---- a/src/Makefile.in	2016-09-18 13:31:55.000000000 -0400
-+++ b/src/Makefile.in	2018-04-10 07:45:13.400473175 -0400
-@@ -102,8 +102,8 @@
- # Docstrings defined as C strings are obtained from a compiled C
- # program. This should be the cleanest way to correctly get all
- # special characters defined in these strings.
--%.cc.docstrings: %.bin
--	(echo "### This file is generated automatically from the"; echo "### corresponding .cc file by a Makefile rule."; echo ""; ./$<) > $@
-+#%.cc.docstrings: %.bin
-+#	(echo "### This file is generated automatically from the"; echo "### corresponding .cc file by a Makefile rule."; echo ""; ./$<) > $@
- # Explanation of the command after the checks: Macro names are changed
- # by `sed' so that a different definition can be given to them on the
- # `cpp' commandline. After running the `cpp' command, one can be sure
--- a/src/of-optim.mk	Fri Aug 03 13:27:05 2018 -0400
+++ b/src/of-optim.mk	Tue Aug 07 09:32:42 2018 -0400
@@ -3,8 +3,8 @@
 
 PKG             := of-optim
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.5.2
-$(PKG)_CHECKSUM := fe296c374f3f9cfc891435b90bb208f210cad8f8
+$(PKG)_VERSION  := 1.5.3
+$(PKG)_CHECKSUM := 3633a5257fbf882e1d654303f9e3ce090456165a
 $(PKG)_REMOTE_SUBDIR := 
 $(PKG)_SUBDIR   := optim-$($(PKG)_VERSION)
 $(PKG)_FILE     := optim-$($(PKG)_VERSION).tar.gz