Mercurial > mxe-octave

changeset 4699:cc074b479646

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-struct: update to v1.0.15 * build_packages.m: update struct version * dist-files.mk: remove ref to of-struct-1-fixes.patch * src/of-struct-1-fixes.patch: removed * src/of-struct.mk: update version, checksum
author John Donoghue
date Fri, 18 May 2018 12:16:40 -0400
parents 62d71f1bb5f5
children 60424c1f370a
files build_packages.m dist-files.mk src/of-struct-1-fixes.patch src/of-struct.mk
diffstat 4 files changed, 3 insertions(+), 121 deletions(-) [+]
line wrap: on
line diff
--- a/build_packages.m	Wed May 16 10:38:15 2018 -0400
+++ b/build_packages.m	Fri May 18 12:16:40 2018 -0400
@@ -30,7 +30,7 @@
   % install the packages
   try_install general-2.1.0.tar.gz
   try_install miscellaneous-1.2.1.tar.gz
-  try_install struct-1.0.14.tar.gz
+  try_install struct-1.0.15.tar.gz
   try_install optim-1.5.2.tar.gz
   try_install control-3.1.0.tar.gz
   try_install signal-1.3.2.tar.gz
--- a/dist-files.mk	Wed May 16 10:38:15 2018 -0400
+++ b/dist-files.mk	Fri May 18 12:16:40 2018 -0400
@@ -527,7 +527,6 @@
   of-stk.mk \
   of-strings-1-fixes.patch \
   of-strings.mk \
-  of-struct-1-fixes.patch \
   of-struct.mk \
   of-tisean.mk \
   of-tsa.mk \
--- a/src/of-struct-1-fixes.patch	Wed May 16 10:38:15 2018 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +0,0 @@
-diff -uNr a/src/error-helpers.cc b/src/error-helpers.cc
---- a/src/error-helpers.cc	2016-09-18 12:09:18.000000000 -0400
-+++ b/src/error-helpers.cc	2018-04-09 13:00:47.302704176 -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 12:09:18.000000000 -0400
-+++ b/src/error-helpers.h	2018-04-09 13:01:12.285532698 -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; \
-       }
--- a/src/of-struct.mk	Wed May 16 10:38:15 2018 -0400
+++ b/src/of-struct.mk	Fri May 18 12:16:40 2018 -0400
@@ -3,8 +3,8 @@
 
 PKG             := of-struct
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.0.14
-$(PKG)_CHECKSUM := c017ae121f2c9535704c677e64ea5fd2ac7b88f5
+$(PKG)_VERSION  := 1.0.15
+$(PKG)_CHECKSUM := 2a5d1eef49e2fb7685cbbd3eff0dea45dd5c760a
 $(PKG)_REMOTE_SUBDIR := 
 $(PKG)_SUBDIR   := struct-$($(PKG)_VERSION)
 $(PKG)_FILE     := struct-$($(PKG)_VERSION).tar.gz