Mercurial > mxe-octave

changeset 5052:894bacabdfb8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-struct:update to v1.0.16 * dist-files.mk: remove patch refs * src/of-struct.mk: update version, checksum * src/of-struct-1-fixes.patch: removed * src/of-struct-2-devfixes.patch: removed
author John Donoghue
date Mon, 15 Apr 2019 08:04:03 -0400
parents f9628b2bd4d5
children 32e0ab8d4223
files dist-files.mk src/of-struct-1-fixes.patch src/of-struct-2-devfixes.patch src/of-struct.mk
diffstat 4 files changed, 2 insertions(+), 145 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Fri Apr 12 15:12:28 2019 -0400
+++ b/dist-files.mk	Mon Apr 15 08:04:03 2019 -0400
@@ -530,8 +530,6 @@
   of-stk.mk \
   of-strings-1-fixes.patch \
   of-strings.mk \
-  of-struct-1-fixes.patch \
-  of-struct-2-devfixes.patch \
   of-struct.mk \
   of-tisean-1-fixes.patch \
   of-tisean.mk \
--- a/src/of-struct-1-fixes.patch	Fri Apr 12 15:12:28 2019 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +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
-@@ -26,9 +26,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
-@@ -37,7 +37,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 \
-       { \
-@@ -50,7 +50,7 @@
-             return retval; \
-           } \
-       } \
--    catch (octave_execution_exception& e) \
-+    catch (octave::execution_exception& e) \
-       { \
-         c_verror (e, __VA_ARGS__); \
-  \
-@@ -60,7 +60,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&) \
-+    catch (octave::execution_exception&) \
-       { \
-         c_verror (e, __VA_ARGS__); \
-  \
-@@ -95,7 +95,7 @@
-       { \
-         code ; \
-       } \
--    catch (octave_execution_exception&) \
-+    catch (octave::execution_exception&) \
-       { \
-         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; \
-       }
-@@ -132,7 +132,7 @@
-       { \
-         code ; \
-       } \
--    catch (octave_execution_exception&) \
-+    catch (octave::execution_exception&) \
-       { \
-         err = true; \
-       }
-diff -r e0a0e577f1ae src/error-helpers.cc
---- a/src/error-helpers.cc	Fri Jun 22 07:52:08 2018 -0400
-+++ b/src/error-helpers.cc	Fri Jun 22 07:56:28 2018 -0400
-@@ -18,7 +18,7 @@
- */
- 
- #include <octave/oct.h>
--
-+#include <iostream>
- #include "error-helpers.h"
- 
- // call verror
--- a/src/of-struct-2-devfixes.patch	Fri Apr 12 15:12:28 2019 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-diff -ur struct-1.0.15.orig/src/structcat.cc struct-1.0.15/src/structcat.cc
---- struct-1.0.15.orig/src/structcat.cc	2019-01-02 12:23:45.625511373 -0500
-+++ struct-1.0.15/src/structcat.cc	2019-01-02 12:25:21.571914227 -0500
-@@ -132,7 +132,7 @@
- 
-   for (octave_idx_type i = m1_id; i < n_args; i++)
-     {
--      if (! args(i).is_map ())
-+      if (! args(i).isstruct ())
-         {
-           error ("%s: some argument not a structure", fname.c_str ());
- 
--- a/src/of-struct.mk	Fri Apr 12 15:12:28 2019 -0400
+++ b/src/of-struct.mk	Mon Apr 15 08:04:03 2019 -0400
@@ -3,8 +3,8 @@
 
 PKG             := of-struct
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.0.15
-$(PKG)_CHECKSUM := 2a5d1eef49e2fb7685cbbd3eff0dea45dd5c760a
+$(PKG)_VERSION  := 1.0.16
+$(PKG)_CHECKSUM := f6d80aba6749a5fa638776fae89be091b63dd0f7
 $(PKG)_REMOTE_SUBDIR := 
 $(PKG)_SUBDIR   := struct-$($(PKG)_VERSION)
 $(PKG)_FILE     := struct-$($(PKG)_VERSION).tar.gz