# HG changeset patch
# User Markus Mützel <markus.muetzel@gmx.de>
# Date 1649959219 -7200
# Node ID 69a1e6fdc4e475df172e18f25c7ca127b44294cb
# Parent  9a19da04a1087ee612e0de8890ad6c14332802bc# Parent  1a9aa3d92cbb259ffef12eaec034cd5f2ee37678
maint: Merge release to default.

diff -r 9a19da04a108 -r 69a1e6fdc4e4 dist-files.mk
--- a/dist-files.mk	Thu Apr 14 19:32:22 2022 +0200
+++ b/dist-files.mk	Thu Apr 14 20:00:19 2022 +0200
@@ -521,7 +521,6 @@
   of-odepkg-2-fixes.patch \
   of-odepkg-3-deprecated.patch \
   of-odepkg.mk \
-  of-optim-1-verror.patch \
   of-optim.mk \
   of-optiminterp.mk \
   of-quaternion-1-cross-fixes.patch \
@@ -545,7 +544,6 @@
   of-strings-1-fixes.patch \
   of-strings-2-error_state.patch \
   of-strings.mk \
-  of-struct-1-verror.patch \
   of-struct.mk \
   of-symbolic.mk \
   of-tisean-1-fixes.patch \
diff -r 9a19da04a108 -r 69a1e6fdc4e4 src/of-optim-1-verror.patch
--- a/src/of-optim-1-verror.patch	Thu Apr 14 19:32:22 2022 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-# HG changeset patch
-# User Markus Mützel <markus.muetzel@gmx.de>
-# Date 1637940821 -3600
-#      Fri Nov 26 16:33:41 2021 +0100
-# Node ID c63a32659f1f68b7ec0e3d7431746fded68594ca
-# Parent  4c32793ffd1a83e3d4d918074bdaf659508d416a
-Fix compilation with Octave 8 (bug #61562).
-
-* src/error-helpers.h: Use wrapper function.
-
-diff -r 4c32793ffd1a -r c63a32659f1f src/error-helpers.h
---- a/src/error-helpers.h	Wed Mar 31 19:56:59 2021 +0200
-+++ b/src/error-helpers.h	Fri Nov 26 16:33:41 2021 +0100
-@@ -64,7 +64,7 @@
-       } \
-     catch (OCTAVE__EXECUTION_EXCEPTION& e) \
-       { \
--        verror (e, __VA_ARGS__); \
-+        c_verror (e, __VA_ARGS__); \
-       }
- #endif
- 
diff -r 9a19da04a108 -r 69a1e6fdc4e4 src/of-optim.mk
--- a/src/of-optim.mk	Thu Apr 14 19:32:22 2022 +0200
+++ b/src/of-optim.mk	Thu Apr 14 20:00:19 2022 +0200
@@ -3,8 +3,8 @@
 
 PKG             := of-optim
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.6.1
-$(PKG)_CHECKSUM := 3dd4efab7acb47f815c73ad4050114d00e1daf42
+$(PKG)_VERSION  := 1.6.2
+$(PKG)_CHECKSUM := 6f29759288f7ce6df01868f99bb09bac26f8d265
 $(PKG)_REMOTE_SUBDIR := 
 $(PKG)_SUBDIR   := optim-$($(PKG)_VERSION)
 $(PKG)_FILE     := optim-$($(PKG)_VERSION).tar.gz
diff -r 9a19da04a108 -r 69a1e6fdc4e4 src/of-struct-1-verror.patch
--- a/src/of-struct-1-verror.patch	Thu Apr 14 19:32:22 2022 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-# HG changeset patch
-# User Markus Mützel <markus.muetzel@gmx.de>
-# Date 1638187375 -3600
-#      Mon Nov 29 13:02:55 2021 +0100
-# Node ID 3d28b7df6df9c5c161f9e4518a03c34d6300f2b4
-# Parent  b38448d3d291256bedb125b2c52c40820acdc235
-Fix compilation with Octave 8 (bug #61582).
-
-* src/error-helpers.h: Use wrapper function.
-
-diff -r b38448d3d291 -r 3d28b7df6df9 src/error-helpers.h
---- a/src/error-helpers.h	Wed Feb 17 13:25:40 2021 +0100
-+++ b/src/error-helpers.h	Mon Nov 29 13:02:55 2021 +0100
-@@ -64,7 +64,7 @@
-       } \
-     catch (OCTAVE__EXECUTION_EXCEPTION& e) \
-       { \
--        verror (e, __VA_ARGS__); \
-+        c_verror (e, __VA_ARGS__); \
-       }
- #endif
- 
diff -r 9a19da04a108 -r 69a1e6fdc4e4 src/of-struct.mk
--- a/src/of-struct.mk	Thu Apr 14 19:32:22 2022 +0200
+++ b/src/of-struct.mk	Thu Apr 14 20:00:19 2022 +0200
@@ -3,8 +3,8 @@
 
 PKG             := of-struct
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.0.17
-$(PKG)_CHECKSUM := df82c63f13cece4e8dbd1aa9d52b9e8450f6fd09
+$(PKG)_VERSION  := 1.0.18
+$(PKG)_CHECKSUM := 2494d826f609aca8540c33f907559ff29d6a31a2
 $(PKG)_REMOTE_SUBDIR := 
 $(PKG)_SUBDIR   := struct-$($(PKG)_VERSION)
 $(PKG)_FILE     := struct-$($(PKG)_VERSION).tar.gz