Mercurial > mxe-octave

changeset 6185:8df7db467c66 release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-optim: Cherry-pick upstream patch for Octave 7 (bug #61801). * src/of-optim-1-nargin.patch: Add new patch from upstream. * dist-files.mk: Add file to list.
author Markus Mützel <markus.muetzel@gmx.de>
date Fri, 22 Apr 2022 20:00:07 +0200
parents d02b5d26ac28
children 4e45e976d7af 1d3ec84b2a49
files dist-files.mk src/of-optim-1-nargin.patch
diffstat 2 files changed, 39 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Fri Apr 22 19:19:31 2022 +0200
+++ b/dist-files.mk	Fri Apr 22 20:00:07 2022 +0200
@@ -525,6 +525,7 @@
   of-odepkg-2-fixes.patch \
   of-odepkg-3-deprecated.patch \
   of-odepkg.mk \
+  of-optim-1-nargin.patch \
   of-optim.mk \
   of-optiminterp.mk \
   of-quaternion-1-cross-fixes.patch \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/of-optim-1-nargin.patch	Fri Apr 22 20:00:07 2022 +0200
@@ -0,0 +1,38 @@
+# HG changeset patch
+# User Olaf Till <i7tiol@t-online.de>
+# Date 1650012368 -7200
+#      Fri Apr 15 10:46:08 2022 +0200
+# Node ID 197b5a882a41bc9945b6df95f0ef1fb2c7bfc82f
+# Parent  83eefe952baafe45135fac7f6ea23debde2f7267
+avoid 'too many arguments' in fmincon with user-supplied gradient
+
+* inst/fmincon.m: Define anonymous function f.dftp with (unused)
+'varargin'.
+
+diff -r 83eefe952baa -r 197b5a882a41 inst/fmincon.m
+--- a/inst/fmincon.m	Sun Apr 10 16:31:04 2022 +0200
++++ b/inst/fmincon.m	Fri Apr 15 10:46:08 2022 +0200
+@@ -217,7 +217,7 @@
+   o.df_equc_idx = false;
+ 
+   if (strcmp (o.GradObj, "on"))
+-    f.dfdp = @ (p) out_2_wrapper (f.objf, p);
++    f.dfdp = @ (p, varargin) out_2_wrapper (f.objf, p);
+     dfdp_specified = true;
+   else
+     f.dfdp = @ __dfdp__;
+
+Cross-building the docs doesn't work with the generic build rules in MXE Octave.
+De-activate building them (and use the existing docs from the tarball).
+diff -urN optim-1.6.2/src/Makefile.in.orig optim-1.6.2/src/Makefile.in
+--- optim-1.6.2/src/Makefile.in.orig	2022-04-10 16:31:04.000000000 +0200
++++ optim-1.6.2/src/Makefile.in	2022-04-22 19:48:02.532175109 +0200
+@@ -61,7 +61,7 @@
+ 
+ .INTERMEDIATE: MFDOCSTRINGS $(DSFILES)
+ 
+-all: doc $(OCTFILES)
++all: $(OCTFILES)
+ 
+ prebuild: doc html
+