17
0

2 Commits

3 changed files with 46 additions and 0 deletions

View File

@@ -0,0 +1,35 @@
From dda19a2f5b2db0b078ba7ce9f45a4c2ee2d81978 Mon Sep 17 00:00:00 2001
From: AvinoamK <a.kalma@gmail.com>
Date: Wed, 2 Apr 2025 19:59:33 +0300
Subject: [PATCH] Update msh2m_structured_mesh.m: Fix obsolete continuation
line markers
Fix Octave bug #51970
https://savannah.gnu.org/bugs/?51970
---
inst/msh2m_structured_mesh.m | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/inst/msh2m_structured_mesh.m b/inst/msh2m_structured_mesh.m
index 679d9fb..f122934 100644
--- a/inst/msh2m_structured_mesh.m
+++ b/inst/msh2m_structured_mesh.m
@@ -229,9 +229,9 @@
%!test
%! x = y = linspace(0,1,3);
%! msh = msh2m_structured_mesh(x,y,1,[1:4]);
-%! p = [0.00000 0.00000 0.00000 0.50000 0.50000 0.50000 \
+%! p = [0.00000 0.00000 0.00000 0.50000 0.50000 0.50000 ...
%! 1.00000 1.00000 1.00000
-%! 0.00000 0.50000 1.00000 0.00000 0.50000 1.00000 \
+%! 0.00000 0.50000 1.00000 0.00000 0.50000 1.00000 ...
%! 0.00000 0.50000 1.00000];
%! assert(msh.p,p)
%! e = [1 4 7 8 3 6 1 2
@@ -246,4 +246,4 @@
%! 4 5 7 8 5 6 8 9
%! 5 6 8 9 2 3 5 6
%! 1 1 1 1 1 1 1 1];
-%! assert(msh.t,t)
\ No newline at end of file
+%! assert(msh.t,t)

View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Aug 27 15:04:58 UTC 2025 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- Fix compatibility with current octave, add
fix_line_continuations.patch
- Exclude tests requiring gmsh
-------------------------------------------------------------------
Tue Nov 8 16:26:32 UTC 2022 - Stefan Brüns <stefan.bruens@rwth-aachen.de>

View File

@@ -25,6 +25,7 @@ License: GPL-2.0-or-later
Group: Productivity/Scientific/Math
URL: https://gnu-octave.github.io/packages/%{octpkg}/
Source0: https://github.com/carlodefalco/msh/archive/refs/tags/v%{version}.tar.gz#/%{octpkg}-%{version}.tar.gz
Patch0: https://patch-diff.githubusercontent.com/raw/carlodefalco/msh/pull/3.patch#/fix_line_continuations.patch
BuildRequires: gcc-c++
BuildRequires: octave-devel
Requires: octave-cli >= 3.0
@@ -38,6 +39,7 @@ This is part of the Octave-Forge project.
%prep
%setup -q -c %{name}-%{version}
%patch -p1 -P0 -d %{octpkg}-%{version}
%octave_pkg_src
%build
@@ -47,6 +49,8 @@ This is part of the Octave-Forge project.
%octave_pkg_install
%check
%global octskiptests msh2m_gmsh
echo "Skip tests requiring gmsh: %{octskiptests}"
%octave_pkg_test
%post