Mercurial > mxe-octave

changeset 4700:60424c1f370a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-database: update to v2.4.3 * build_packages.m: update database version. * dist-files.mk: revome fes to of-database-*.patch files * src/of-database.mk: update version, checksum * src/of-database-1-cross-fixes.patch, src/of-database-2-dev-fixes.patch, src/of-database-3-fixes.patch: removed.
author John Donoghue
date Mon, 21 May 2018 07:51:37 -0400
parents cc074b479646
children 58d201e9e747
files build_packages.m dist-files.mk src/of-database-1-cross-fixes.patch src/of-database-2-dev-fixes.patch src/of-database-3-fixes.patch src/of-database.mk
diffstat 6 files changed, 3 insertions(+), 209 deletions(-) [+]
line wrap: on
line diff
--- a/build_packages.m	Fri May 18 12:16:40 2018 -0400
+++ b/build_packages.m	Mon May 21 07:51:37 2018 -0400
@@ -51,7 +51,7 @@
   try_install dicom-0.2.1.tar.gz
   try_install netcdf-1.0.12.tar.gz
   try_install ltfat-2.2.0.tar.gz
-  try_install database-2.4.2.tar.gz
+  try_install database-2.4.3.tar.gz
   try_install instrument-control-0.3.1.tar.gz
   try_install generate_html-0.3.1.tar.gz
   try_install financial-0.5.1.tar.gz
--- a/dist-files.mk	Fri May 18 12:16:40 2018 -0400
+++ b/dist-files.mk	Mon May 21 07:51:37 2018 -0400
@@ -462,9 +462,6 @@
   of-communications.mk \
   of-control.mk \
   of-data-smoothing.mk \
-  of-database-1-cross-fixes.patch \
-  of-database-2-dev-fixes.patch \
-  of-database-3-fixes.patch \
   of-database.mk \
   of-dataframe.mk \
   of-dicom-1-fixes.patch \
--- a/src/of-database-1-cross-fixes.patch	Fri May 18 12:16:40 2018 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-diff -ur database-2.4.2.orig/src/Makefile.in database-2.4.2/src/Makefile.in
---- database-2.4.2.orig/src/Makefile.in	2016-10-02 15:12:37.447321334 -0400
-+++ database-2.4.2/src/Makefile.in	2016-10-02 18:19:06.118462056 -0400
-@@ -32,6 +32,8 @@
- 
- CXXCPP = @CXXCPP@
- 
-+BUILD_CXX ?= gcc
-+
- MKOCTFILE ?= @MKOCTFILE@
- PG_CONFIG ?= @PG_CONFIG@
- OCTAVE_CONFIG ?= @OCTAVE_CONFIG@
-@@ -130,7 +132,7 @@
- %.bin: %.cc
- 	if grep -q $(RDEFUN_DLD) $<; then echo "The string '$(RDEFUN_DLD)' must not be present in source code, but is in $<."; exit 1; fi
- 	if grep -q $(RDEFUNX_DLD) $<; then echo "The string '$(RDEFUNX_DLD)' must not be present in source code, but is in $<."; exit 1; fi
--	(echo "#include <stdio.h>"; echo "int main () {"; sed -e s/DEFUN_DLD/$(RDEFUN_DLD)/g -e s/DEFUNX_DLD/$(RDEFUNX_DLD)/g $< | $(CXXCPP) `$(MKOCTFILE) -p INCFLAGS` -I`$(PG_CONFIG) --includedir` -x c++ -iquote '.' -D'$(RDEFUN_DLD)(name,args,nargout,doc)=$(RDEFUN_DLD)(name,doc)' -D'$(RDEFUNX_DLD)(name,fname,gname,args,nargout,doc)=$(RDEFUN_DLD)(name,doc)' - | sed -e '/.*$(RDEFUN_DLD)/!D'; echo "}";) | $(CXX) -x c++ -D'$(RDEFUN_DLD)(name,doc)=printf("%c" #name "\n@c " #name " $<\n" doc "\n\n", 0x1D);' -o $@ -
-+	(echo "#include <stdio.h>"; echo "int main () {"; sed -e s/DEFUN_DLD/$(RDEFUN_DLD)/g -e s/DEFUNX_DLD/$(RDEFUNX_DLD)/g $< | $(CXXCPP) `$(MKOCTFILE) -p INCFLAGS` -I`$(PG_CONFIG) --includedir` -x c++ -iquote '.' -D'$(RDEFUN_DLD)(name,args,nargout,doc)=$(RDEFUN_DLD)(name,doc)' -D'$(RDEFUNX_DLD)(name,fname,gname,args,nargout,doc)=$(RDEFUN_DLD)(name,doc)' - | sed -e '/.*$(RDEFUN_DLD)/!D'; echo "}";) | $(BUILD_CXX) -x c++ -D'$(RDEFUN_DLD)(name,doc)=printf("%c" #name "\n@c " #name " $<\n" doc "\n\n", 0x1D);' -o $@ -
- 
- clean:
- 	$(RM) *.o octave-core *.oct *.cc.docstrings MFDOCSTRINGS $(INFOFILE) $(TEXIFILE) *~
--- a/src/of-database-2-dev-fixes.patch	Fri May 18 12:16:40 2018 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-diff -r d85ae875cc23 src/bytea2var.cc
---- a/src/bytea2var.cc	Tue Mar 28 11:33:49 2017 +0200
-+++ b/src/bytea2var.cc	Thu Jul 13 16:47:45 2017 -0400
-@@ -94,7 +94,11 @@
- 
-       flt_fmt = mopt_digit_to_float_format (tmp);
- 
-+#ifdef HAVE_OCTAVE_MACH_INFO
-+      if (flt_fmt == octave::mach_info::flt_fmt_unknown)
-+#else
-       if (flt_fmt == oct_mach_info::flt_fmt_unknown)
-+#endif
-         {
-           error ("%s: unrecognized binary format", fname.c_str ());
- 
-diff -r d85ae875cc23 src/config.h.in
---- a/src/config.h.in	Tue Mar 28 11:33:49 2017 +0200
-+++ b/src/config.h.in	Thu Jul 13 16:47:45 2017 -0400
-@@ -4,3 +4,6 @@
- /* Define as 1 if liboctinterp has
- 'verror (octave_execution_exception&, const char *, va_list)'. */
- #undef HAVE_OCTAVE_VERROR_ARG_EXC
-+
-+/* Define as 1 if we have octave::mach_info */
-+#undef HAVE_OCTAVE_MACH_INFO
-diff -r d85ae875cc23 src/configure.ac
---- a/src/configure.ac	Tue Mar 28 11:33:49 2017 +0200
-+++ b/src/configure.ac	Thu Jul 13 16:47:45 2017 -0400
-@@ -102,6 +102,15 @@
-                     [verror (e, "test", args);]])],
-   [AC_DEFINE([HAVE_OCTAVE_VERROR_ARG_EXC], 1)])
- 
-+## look for newer octave::mach_info in octave
-+LIBS="-loctave $LIBS"
-+AC_LINK_IFELSE(
-+  [AC_LANG_PROGRAM([[#include <octave/oct.h>]
-+                    [#include <octave/byte-swap.h>]],
-+                   [[octave::mach_info::native_float_format();]])],
-+  [AC_DEFINE([HAVE_OCTAVE_MACH_INFO], 1)])
-+
-+
- LIBS=$TLIBS
- LDFLAGS=$TLDFLAGS
- CXXFLAGS=$TCXXFLAGS
-diff -r d34d55e54a26 src/command.cc
---- a/src/command.cc	Thu Jul 20 11:28:22 2017 +0200
-+++ b/src/command.cc	Mon Sep 18 18:26:07 2017 -0400
-@@ -305,7 +305,7 @@
-           valid = 0;
-           _p_error ("%s: wrong number of given returned types",
-                     caller.c_str ());
--          return octave_value_list ();
-+          return octave_value (octave_value_list ());
-         }
-       rtypes_given = true;
-     }
-@@ -437,7 +437,7 @@
-     }
- 
-   if (! valid)
--    return octave_value_list ();
-+    return octave_value (octave_value_list ());
-   else
-     {
-       ret.assign ("data", octave_value (data));
--- a/src/of-database-3-fixes.patch	Fri May 18 12:16:40 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 14:36:40.000000000 -0400
-+++ b/src/error-helpers.cc	2018-04-09 14:52:43.380796194 -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 14:36:40.000000000 -0400
-+++ b/src/error-helpers.h	2018-04-09 14:52:56.204181295 -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-database.mk	Fri May 18 12:16:40 2018 -0400
+++ b/src/of-database.mk	Mon May 21 07:51:37 2018 -0400
@@ -3,8 +3,8 @@
 
 PKG             := of-database
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.4.2
-$(PKG)_CHECKSUM := cb9654c724012509e2d2e0ceb3ec2c67b20f1eb0
+$(PKG)_VERSION  := 2.4.3
+$(PKG)_CHECKSUM := 33b76d2fec629100f1be45f8cbf7a57846842109
 $(PKG)_REMOTE_SUBDIR := 
 $(PKG)_SUBDIR   := database-$($(PKG)_VERSION)
 $(PKG)_FILE     := database-$($(PKG)_VERSION).tar.gz