diff --git a/.files b/.files
index 72db078..6833630 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index 4f9565f..988cc09 100644
--- a/.rev
+++ b/.rev
@@ -82,4 +82,12 @@ for adi:25
818876
+
+ d5f2ff561225d822f5cbc072c03dae4e
+ 0.6.3
+
+ dimstar_suse
+
+ 1136042
+
diff --git a/0001-Fix-build-with-VTK-9.0-fix-memory-leak.patch b/0001-Fix-build-with-VTK-9.0-fix-memory-leak.patch
deleted file mode 100644
index 26d8b31..0000000
--- a/0001-Fix-build-with-VTK-9.0-fix-memory-leak.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 4fb68af94c89bb2eb44d810cbfc043524c024c81 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Stefan=20Br=C3=BCns?=
-Date: Sun, 7 Jun 2020 23:53:51 +0200
-Subject: [PATCH] Fix build with VTK 9.0, fix memory leak
-
-The vertices array contains immutable IDs, which is reflected by the
-changed API in VTK 9.0.
-
-As GetNextCell(numP, vertices) overwrites vertices (it is a reference),
-the previously pointed to/acllocated array was leaked.
----
- src/CSPrimPolyhedronReader.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/CSPrimPolyhedronReader.cpp b/src/CSPrimPolyhedronReader.cpp
-index 4d44f49..e3d347e 100644
---- a/src/CSPrimPolyhedronReader.cpp
-+++ b/src/CSPrimPolyhedronReader.cpp
-@@ -163,7 +163,11 @@ bool CSPrimPolyhedronReader::ReadFile()
- AddVertex(polydata->GetPoint(n));
-
- vtkIdType numP;
-- vtkIdType *vertices = new vtkIdType[10];
-+#if VTK_MAJOR_VERSION >= 9
-+ vtkIdType const *vertices = nullptr;
-+#else
-+ vtkIdType *vertices = nullptr;
-+#endif
- while (verts->GetNextCell(numP, vertices))
- {
- face f;
---
-2.26.2
-
diff --git a/CSXCAD-0.6.2.tar.gz b/CSXCAD-0.6.2.tar.gz
deleted file mode 120000
index d76cef0..0000000
--- a/CSXCAD-0.6.2.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafkreih5f4a446b3p4o6zvntii76uzebm4azpwisyp5ncvpkwx75canmtm
\ No newline at end of file
diff --git a/CSXCAD-0.6.3.tar.gz b/CSXCAD-0.6.3.tar.gz
new file mode 120000
index 0000000..28ddb0a
--- /dev/null
+++ b/CSXCAD-0.6.3.tar.gz
@@ -0,0 +1 @@
+/ipfs/bafkreicivnx72giwjvdtmvigmrupyta6iylmnw36kpjaqoiphkguboil44
\ No newline at end of file
diff --git a/CSXCAD-hdf5.patch b/CSXCAD-hdf5.patch
deleted file mode 100644
index d8c5f44..0000000
--- a/CSXCAD-hdf5.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: CSXCAD-0.6.1/CMakeLists.txt
-===================================================================
---- CSXCAD-0.6.1.orig/CMakeLists.txt
-+++ CSXCAD-0.6.1/CMakeLists.txt
-@@ -90,7 +90,7 @@ INCLUDE_DIRECTORIES( ${fparser_INCLUDE_D
- find_package(TinyXML REQUIRED)
- ADD_DEFINITIONS( -DTIXML_USE_STL )
-
--find_package(HDF5 1.8 COMPONENTS C HL REQUIRED)
-+find_package(HDF5 1.8 COMPONENTS CXX HL REQUIRED)
- INCLUDE_DIRECTORIES (${HDF5_INCLUDE_DIRS})
- link_directories(${HDF5_LIBRARY_DIRS})
- # hdf5 compat
diff --git a/CSXCAD-no-build-date.patch b/CSXCAD-no-build-date.patch
deleted file mode 100644
index ec2d6dd..0000000
--- a/CSXCAD-no-build-date.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: CSXCAD-0.6.0/src/ContinuousStructure.cpp
-===================================================================
---- CSXCAD-0.6.0.orig/src/ContinuousStructure.cpp
-+++ CSXCAD-0.6.0/src/ContinuousStructure.cpp
-@@ -645,7 +645,6 @@ std::string ContinuousStructure::GetInfo
- +std::string("\nAuthor: ") + std::string(_CSXCAD_AUTHOR_)
- +std::string("\nMail: ") +std::string(_CSXCAD_AUTHOR_MAIL_)
- +std::string("\nVersion: ") + std::string(_CSXCAD_VERSION_)
-- +std::string("\tBuild: ") + std::string(__DATE__) + std::string(" ") + std::string(__TIME__)
- +std::string("\nLicense: ") + std::string(_CSXCAD_LICENSE_);
- return InfoLine;
- }
diff --git a/CSXCAD-octave-AppCSXCAD-load.patch b/CSXCAD-octave-AppCSXCAD-load.patch
index af37c3b..4c63eeb 100644
--- a/CSXCAD-octave-AppCSXCAD-load.patch
+++ b/CSXCAD-octave-AppCSXCAD-load.patch
@@ -3,13 +3,13 @@ Index: CSXCAD-0.6.0/matlab/CSXGeomPlot.m
--- CSXCAD-0.6.0.orig/matlab/CSXGeomPlot.m
+++ CSXCAD-0.6.0/matlab/CSXGeomPlot.m
@@ -28,9 +28,7 @@ filename = mfilename('fullpath');
- dir = fileparts( filename );
+ pathname = fileparts( filename );
if isunix
- AppCSXCAD_bin = searchBinary('AppCSXCAD.sh', ...
-- {[dir filesep '..' filesep '..' filesep 'AppCSXCAD' filesep], ...
-- [dir filesep '..' filesep '..' filesep '..' filesep 'bin' filesep]});
+- {[pathname filesep '..' filesep '..' filesep 'AppCSXCAD' filesep], ...
+- [pathname filesep '..' filesep '..' filesep '..' filesep 'bin' filesep]});
+ AppCSXCAD_bin = 'AppCSXCAD.sh';
else % assume windows
- AppCSXCAD_bin = searchBinary('AppCSXCAD.exe',[dir filesep '..' filesep]);
+ AppCSXCAD_bin = searchBinary('AppCSXCAD.exe',[pathname filesep '..' filesep]);
end
diff --git a/CSXCAD-readme-octave-package.patch b/CSXCAD-readme-octave-package.patch
deleted file mode 100644
index 9b05a3b..0000000
--- a/CSXCAD-readme-octave-package.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: CSXCAD-0.6.0/README
-===================================================================
---- CSXCAD-0.6.0.orig/README
-+++ CSXCAD-0.6.0/README
-@@ -11,8 +11,11 @@ Forum: http://openems.de/forum/
- Tutorials: http://openems.de/index.php/Tutorials
-
-
--To use CSXCAD from Matlab or Octave, you need to include the /matlab folder in the respective environment:
--> addpath( '/matlab' );
-+To use CSXCAD from Octave, you need to load CSXCAD package:
-+> pkg load csxcad;
-+
-+To use CSXCAD from Matlab, you need to include the addpath( '/usr/share/CSXCAD/matlab' );
-
- To verify the correct installation follow the instructions at:
- http://openems.de/index.php/Tutorial:_First_Steps
diff --git a/CSXCAD-vtk.patch b/CSXCAD-vtk.patch
deleted file mode 100644
index d8c8562..0000000
--- a/CSXCAD-vtk.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: CSXCAD-0.6.1/CMakeLists.txt
-===================================================================
---- CSXCAD-0.6.1.orig/CMakeLists.txt
-+++ CSXCAD-0.6.1/CMakeLists.txt
-@@ -121,7 +121,7 @@ find_package(Boost 1.46 COMPONENTS
- find_package(VTK 6.1 REQUIRED)
- else()
- # prefer >=6.1, fallback to >=5.4
-- find_package(VTK 6.1 COMPONENTS vtkIOGeometry vtkIOPLY NO_MODULE)
-+ find_package(VTK COMPONENTS vtkIOGeometry vtkIOPLY NO_MODULE)
- IF (NOT ${VTK_FOUND})
- find_package(VTK REQUIRED)
- endif()
diff --git a/CSXCAD.changes b/CSXCAD.changes
index 151c363..c2bbd21 100644
--- a/CSXCAD.changes
+++ b/CSXCAD.changes
@@ -1,4 +1,16 @@
-------------------------------------------------------------------
+Sun Dec 31 19:29:12 UTC 2023 - Stefan Brüns
+
+- Update to version 0.6.3
+ * Various bug fixes and enhancements, no changelog available.
+- Drop obsolete/upstream patches:
+ * CSXCAD-vtk.patch
+ * CSXCAD-readme-octave-package.patch
+ * 0001-Fix-build-with-VTK-9.0-fix-memory-leak.patch
+ * CSXCAD-hdf5.patch
+ * CSXCAD-no-build-date.patch
+
+-------------------------------------------------------------------
Sun Jun 7 21:55:05 UTC 2020 - Stefan Brüns
- Fix build with VTK 9.0, which reflects constness more strictly:
diff --git a/CSXCAD.spec b/CSXCAD.spec
index 12f91ab..bfa2090 100644
--- a/CSXCAD.spec
+++ b/CSXCAD.spec
@@ -1,7 +1,7 @@
#
# spec file for package CSXCAD
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
Name: CSXCAD
%define octpkg csxcad
-Version: 0.6.2
+Version: 0.6.3
Release: 0
%define so_ver 0
%define libname lib%{name}%{so_ver}
@@ -27,18 +27,8 @@ License: LGPL-3.0-or-later
Group: Productivity/Scientific/Physics
URL: https://openems.de
Source0: https://github.com/thliebig/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM CSXCAD-vtk.patch
-Patch1: CSXCAD-vtk.patch
-# PATCH-FIX-OPENSUSE CSXCAD-no-build-date.patch -- Remove build time from binaries
-Patch2: CSXCAD-no-build-date.patch
# PATCH-FIX-OPENSUSE CSXCAD-octave-AppCSXCAD-load.patch -- Fix AppCSXCAD.sh load
Patch3: CSXCAD-octave-AppCSXCAD-load.patch
-# PATCH-FIX-OPENSUSE CSXCAD-readme-octave-package.patch -- Add correct instruction about Octave and MATLAB packages
-Patch4: CSXCAD-readme-octave-package.patch
-# PATCH-FIX-UPSTREAM CSXCAD-HDF5.patch
-Patch5: CSXCAD-hdf5.patch
-# PATCH-FIX-UPSTREAM -- https://github.com/thliebig/CSXCAD/pull/17
-Patch6: 0001-Fix-build-with-VTK-9.0-fix-memory-leak.patch
BuildRequires: cgal-devel
BuildRequires: cmake
BuildRequires: double-conversion-devel
@@ -107,12 +97,7 @@ This package provides MATLAB interface for CSXCAD.
%prep
%setup -q
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
+%autopatch -p1
echo "Name: %{octpkg}" >> DESCRIPTION
echo "Version: %{version}" >> DESCRIPTION
@@ -139,8 +124,8 @@ popd
%build
%cmake \
-DFPARSER_ROOT_DIR=%{_prefix} \
- -DCMAKE_SHARED_LINKER_FLAGS=""
-make %{?_smp_mflags}
+ %{nil}
+%cmake_build
cd ..
pushd octave_build
@@ -155,7 +140,6 @@ pushd octave_build
popd
%post -n %{libname} -p /sbin/ldconfig
-
%postun -n %{libname} -p /sbin/ldconfig
%post -n octave-%{name}