Control: tags 1009706 + pending
Control: tags 1013190 + pending
Dear maintainer,
I've prepared an NMU for openems (versioned as
0.0.35+git20190103.6a75e98+dfsg.1-3.2)
and uploaded it to DELAYED/1. Please feel free to tell me if I should cancel it.
cu
Adrian
diff -Nru openems-0.0.35+git20190103.6a75e98+dfsg.1/debian/changelog openems-0.0.35+git20190103.6a75e98+dfsg.1/debian/changelog
--- openems-0.0.35+git20190103.6a75e98+dfsg.1/debian/changelog 2022-01-20 13:19:49.000000000 +0200
+++ openems-0.0.35+git20190103.6a75e98+dfsg.1/debian/changelog 2023-02-06 18:49:06.000000000 +0200
@@ -1,3 +1,13 @@
+openems (0.0.35+git20190103.6a75e98+dfsg.1-3.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Add patch from Francois Mazen to build with VTK 9.
+ (Closes: #1013190)
+ * Don't build in debug mode, thanks to Thomas Lepoix.
+ (Closes: #1009706)
+
+ -- Adrian Bunk <b...@debian.org> Mon, 06 Feb 2023 18:49:06 +0200
+
openems (0.0.35+git20190103.6a75e98+dfsg.1-3.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru openems-0.0.35+git20190103.6a75e98+dfsg.1/debian/control openems-0.0.35+git20190103.6a75e98+dfsg.1/debian/control
--- openems-0.0.35+git20190103.6a75e98+dfsg.1/debian/control 2021-02-21 11:42:01.000000000 +0200
+++ openems-0.0.35+git20190103.6a75e98+dfsg.1/debian/control 2023-02-06 18:49:06.000000000 +0200
@@ -10,7 +10,7 @@
libcgal-dev,
libcgal-qt5-dev,
libtinyxml-dev,
- libvtk7-qt-dev,
+ libvtk9-qt-dev,
libfparser-dev,
# It is called octave-pkg-dev in stretch
# and dh-octave in sid
diff -Nru openems-0.0.35+git20190103.6a75e98+dfsg.1/debian/patches/openems_vtk9.patch openems-0.0.35+git20190103.6a75e98+dfsg.1/debian/patches/openems_vtk9.patch
--- openems-0.0.35+git20190103.6a75e98+dfsg.1/debian/patches/openems_vtk9.patch 1970-01-01 02:00:00.000000000 +0200
+++ openems-0.0.35+git20190103.6a75e98+dfsg.1/debian/patches/openems_vtk9.patch 2023-02-06 18:49:06.000000000 +0200
@@ -0,0 +1,177 @@
+Index: openems-0.0.35+git20190103.6a75e98+dfsg.1/CSXCAD/src/CSPrimPolyhedronReader.cpp
+===================================================================
+--- openems-0.0.35+git20190103.6a75e98+dfsg.1.orig/CSXCAD/src/CSPrimPolyhedronReader.cpp
++++ openems-0.0.35+git20190103.6a75e98+dfsg.1/CSXCAD/src/CSPrimPolyhedronReader.cpp
+@@ -163,7 +163,7 @@ bool CSPrimPolyhedronReader::ReadFile()
+ AddVertex(polydata->GetPoint(n));
+
+ vtkIdType numP;
+- vtkIdType *vertices = new vtkIdType[10];
++ vtkIdType const *vertices = new vtkIdType[10];
+ while (verts->GetNextCell(numP, vertices))
+ {
+ face f;
+Index: openems-0.0.35+git20190103.6a75e98+dfsg.1/QCSXCAD/CMakeLists.txt
+===================================================================
+--- openems-0.0.35+git20190103.6a75e98+dfsg.1.orig/QCSXCAD/CMakeLists.txt
++++ openems-0.0.35+git20190103.6a75e98+dfsg.1/QCSXCAD/CMakeLists.txt
+@@ -6,7 +6,7 @@ ELSE()
+ SET( CMAKE_BUILD_TYPE Release CACHE STRING "Set to either \"Release\" or \"Debug\"" )
+ ENDIF()
+
+-PROJECT( QCSXCAD CXX)
++PROJECT( QCSXCAD C CXX)
+
+ cmake_minimum_required(VERSION 2.8)
+
+@@ -100,6 +100,8 @@ find_package(VTK REQUIRED)
+ message(STATUS "Found package VTK. Using version " ${VTK_VERSION})
+ include(${VTK_USE_FILE})
+ INCLUDE_DIRECTORIES (${VTK_INCLUDE_DIRS})
++message("VTK_MAJOR_VERSION: ${VTK_MAJOR_VERSION}")
++add_compile_definitions(VTK_MAJOR_VERSION=${VTK_MAJOR_VERSION})
+
+ # Qt
+ SET(RESOURCES resources.qrc)
+Index: openems-0.0.35+git20190103.6a75e98+dfsg.1/QCSXCAD/QCSXCAD.cpp
+===================================================================
+--- openems-0.0.35+git20190103.6a75e98+dfsg.1.orig/QCSXCAD/QCSXCAD.cpp
++++ openems-0.0.35+git20190103.6a75e98+dfsg.1/QCSXCAD/QCSXCAD.cpp
+@@ -58,7 +58,7 @@
+ #include "CSPrimWire.h"
+ #include "CSPrimUserDefined.h"
+
+-#include <QVTKWidget.h>
++#include <QVTKOpenGLNativeWidget.h>
+ #include <vtkRendererCollection.h>
+ #include <vtkRenderWindow.h>
+ #include <vtkRenderer.h>
+Index: openems-0.0.35+git20190103.6a75e98+dfsg.1/QCSXCAD/QVTKStructure.cpp
+===================================================================
+--- openems-0.0.35+git20190103.6a75e98+dfsg.1.orig/QCSXCAD/QVTKStructure.cpp
++++ openems-0.0.35+git20190103.6a75e98+dfsg.1/QCSXCAD/QVTKStructure.cpp
+@@ -20,7 +20,10 @@
+ #include "QVTKStructure.h"
+
+ #include "vtkCommand.h"
+-#if VTK_MAJOR_VERSION>=8
++#if VTK_MAJOR_VERSION>=9
++ #include "QVTKOpenGLNativeWidget.h"
++ #include "vtkGenericOpenGLRenderWindow.h"
++#elif VTK_MAJOR_VERSION>=8
+ #include "QVTKOpenGLWidget.h"
+ #include "vtkGenericOpenGLRenderWindow.h"
+ #else
+@@ -99,7 +102,10 @@ QVTKStructure::QVTKStructure()
+ iResolution=32;
+ AllowUpdate=true;
+
+-#if VTK_MAJOR_VERSION>=8
++#if VTK_MAJOR_VERSION>=9
++ VTKWidget = new QVTKOpenGLNativeWidget();
++ VTKWidget->SetRenderWindow(vtkGenericOpenGLRenderWindow::New());
++#elif VTK_MAJOR_VERSION>=8
+ VTKWidget = new QVTKOpenGLWidget();
+ VTKWidget->SetRenderWindow(vtkGenericOpenGLRenderWindow::New());
+ #else
+Index: openems-0.0.35+git20190103.6a75e98+dfsg.1/QCSXCAD/QVTKStructure.h
+===================================================================
+--- openems-0.0.35+git20190103.6a75e98+dfsg.1.orig/QCSXCAD/QVTKStructure.h
++++ openems-0.0.35+git20190103.6a75e98+dfsg.1/QCSXCAD/QVTKStructure.h
+@@ -21,7 +21,9 @@
+ #include <QtGui>
+
+ #include "vtkCommand.h"
+-#if VTK_MAJOR_VERSION>=8
++#if VTK_MAJOR_VERSION>=9
++ class QVTKOpenGLNativeWidget;
++#elif VTK_MAJOR_VERSION>=8
+ class QVTKOpenGLWidget;
+ #else
+ class QVTKWidget;
+@@ -100,7 +102,9 @@ protected:
+ unsigned int uID;
+ } VTKLayerStruct;
+
+-#if VTK_MAJOR_VERSION>=8
++#if VTK_MAJOR_VERSION>=9
++ QVTKOpenGLNativeWidget *VTKWidget;
++#elif VTK_MAJOR_VERSION>=8
+ QVTKOpenGLWidget *VTKWidget;
+ #else
+ QVTKWidget *VTKWidget;
+Index: openems-0.0.35+git20190103.6a75e98+dfsg.1/QCSXCAD/export_pov.cpp
+===================================================================
+--- openems-0.0.35+git20190103.6a75e98+dfsg.1.orig/QCSXCAD/export_pov.cpp
++++ openems-0.0.35+git20190103.6a75e98+dfsg.1/QCSXCAD/export_pov.cpp
+@@ -18,7 +18,7 @@
+ #include <QMessageBox>
+ #include <QtXml>
+
+-#include <QVTKWidget.h>
++#include <QVTKOpenGLNativeWidget.h>
+ #include <vtkRendererCollection.h>
+ #include <vtkRenderWindow.h>
+ #include <vtkRenderer.h>
+@@ -201,7 +201,7 @@ void export_pov::export_wire( QTextStrea
+
+ QString export_pov::get_camera()
+ {
+- vtkRendererCollection* collection = ((QVTKWidget*)(m_CSX->StructureVTK->GetVTKWidget()))->GetRenderWindow()->GetRenderers();
++ vtkRendererCollection* collection = ((QVTKOpenGLNativeWidget*)(m_CSX->StructureVTK->GetVTKWidget()))->GetRenderWindow()->GetRenderers();
+ vtkRenderer *r = collection->GetFirstRenderer();
+ if (!r)
+ return QString();
+@@ -231,7 +231,7 @@ QString export_pov::get_camera()
+
+ QString export_pov::get_light()
+ {
+- vtkRendererCollection* collection = ((QVTKWidget*)(m_CSX->StructureVTK->GetVTKWidget()))->GetRenderWindow()->GetRenderers();
++ vtkRendererCollection* collection = ((QVTKOpenGLNativeWidget*)(m_CSX->StructureVTK->GetVTKWidget()))->GetRenderWindow()->GetRenderers();
+ vtkRenderer *r = collection->GetFirstRenderer();
+ if (!r)
+ return QString();
+Index: openems-0.0.35+git20190103.6a75e98+dfsg.1/QCSXCAD/export_x3d.cpp
+===================================================================
+--- openems-0.0.35+git20190103.6a75e98+dfsg.1.orig/QCSXCAD/export_x3d.cpp
++++ openems-0.0.35+git20190103.6a75e98+dfsg.1/QCSXCAD/export_x3d.cpp
+@@ -17,7 +17,7 @@
+
+ #include <QMessageBox>
+
+-#include <QVTKWidget.h>
++#include <QVTKOpenGLNativeWidget.h>
+ #include <vtkRendererCollection.h>
+ #include <vtkRenderWindow.h>
+ #include <vtkRenderer.h>
+@@ -70,7 +70,7 @@ void export_X3D::save( QString filename
+ export_properties( Scene, properties, Material );
+
+ // create camera
+- vtkRendererCollection* collection = ((QVTKWidget*)(m_CSX->StructureVTK->GetVTKWidget()))->GetRenderWindow()->GetRenderers();
++ vtkRendererCollection* collection = ((QVTKOpenGLNativeWidget*)(m_CSX->StructureVTK->GetVTKWidget()))->GetRenderWindow()->GetRenderers();
+ vtkRenderer *r = collection->GetFirstRenderer();
+ if (!r)
+ return;
+Index: openems-0.0.35+git20190103.6a75e98+dfsg.1/openEMS/CMakeLists.txt
+===================================================================
+--- openems-0.0.35+git20190103.6a75e98+dfsg.1.orig/openEMS/CMakeLists.txt
++++ openems-0.0.35+git20190103.6a75e98+dfsg.1/openEMS/CMakeLists.txt
+@@ -122,7 +122,7 @@ find_package(Boost 1.46 COMPONENTS
+ )
+
+ # vtk
+-find_package(VTK COMPONENTS vtkIOXML vtkIOGeometry vtkIOLegacy vtkIOPLY NO_MODULE REQUIRED)
++find_package(VTK COMPONENTS IOXML IOGeometry IOLegacy IOPLY NO_MODULE REQUIRED)
+
+ message(STATUS "Found package VTK. Using version " ${VTK_VERSION})
+ if("${VTK_MAJOR_VERSION}" GREATER 5)
+@@ -174,7 +174,7 @@ TARGET_LINK_LIBRARIES( openEMS
+ ${HDF5_LIBRARIES}
+ ${HDF5_HL_LIBRARIES}
+ ${Boost_LIBRARIES}
+- ${vtk_LIBS}
++ ${VTK_LIBRARIES}
+ ${MPI_LIBRARIES}
+ hdf5_serial_hl
+ )
diff -Nru openems-0.0.35+git20190103.6a75e98+dfsg.1/debian/patches/series openems-0.0.35+git20190103.6a75e98+dfsg.1/debian/patches/series
--- openems-0.0.35+git20190103.6a75e98+dfsg.1/debian/patches/series 2021-02-21 12:18:19.000000000 +0200
+++ openems-0.0.35+git20190103.6a75e98+dfsg.1/debian/patches/series 2023-02-06 18:49:06.000000000 +0200
@@ -6,3 +6,4 @@
0006-Don-t-exit-from-library.patch
0007-Fix-some-imports-to-make-python-interface-work.patch
0008-Fix-SmoothMeshLines.py-TypeError.patch
+openems_vtk9.patch
diff -Nru openems-0.0.35+git20190103.6a75e98+dfsg.1/debian/rules openems-0.0.35+git20190103.6a75e98+dfsg.1/debian/rules
--- openems-0.0.35+git20190103.6a75e98+dfsg.1/debian/rules 2022-01-20 13:19:43.000000000 +0200
+++ openems-0.0.35+git20190103.6a75e98+dfsg.1/debian/rules 2023-02-06 18:49:06.000000000 +0200
@@ -35,12 +35,12 @@
override_dh_auto_build:
override_dh_auto_install:
- cd CSXCAD && mkdir -p build && cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) .. && make && make install DESTDIR=../../debian/tmp
- cd QCSXCAD && mkdir -p build && cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DCSXCAD_ROOT_DIR=../debian/tmp/usr -DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) .. && make && make install DESTDIR=../../debian/tmp
- cd openEMS && mkdir -p build && cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DCSXCAD_ROOT_DIR=../debian/tmp/usr -DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) ..
+ cd CSXCAD && mkdir -p build && cd build && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) .. && make && make install DESTDIR=../../debian/tmp
+ cd QCSXCAD && mkdir -p build && cd build && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DCSXCAD_ROOT_DIR=../debian/tmp/usr -DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) .. && make && make install DESTDIR=../../debian/tmp
+ cd openEMS && mkdir -p build && cd build && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DCSXCAD_ROOT_DIR=../debian/tmp/usr -DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) ..
cd openEMS/build && make
cd openEMS/build && make install DESTDIR=../../debian/tmp
- cd AppCSXCAD && mkdir -p build && cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DCSXCAD_ROOT_DIR=../debian/tmp/usr -DQCSXCAD_ROOT_DIR=../debian/tmp/usr -DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) ..
+ cd AppCSXCAD && mkdir -p build && cd build && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DCSXCAD_ROOT_DIR=../debian/tmp/usr -DQCSXCAD_ROOT_DIR=../debian/tmp/usr -DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) ..
cd AppCSXCAD/build && make
cd AppCSXCAD/build && make install DESTDIR=../../debian/tmp
cd debian/tmp/usr/share/openEMS/matlab && CXXFLAGS="-g -O2 -fstack-protector-strong -Wformat -Werror=format-security" mkoctfile -L/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial -lhdf5_cpp -DH5_USE_16_API -I/usr/include/hdf5/serial h5readatt_octave.cc
