Hello community, here is the log from the commit of package QCSXCAD for openSUSE:Factory checked in at 2016-05-05 08:12:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/QCSXCAD (Old) and /work/SRC/openSUSE:Factory/.QCSXCAD.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "QCSXCAD" Changes: -------- --- /work/SRC/openSUSE:Factory/QCSXCAD/QCSXCAD.changes 2015-11-26 17:01:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.QCSXCAD.new/QCSXCAD.changes 2016-05-05 08:12:29.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Mar 21 07:52:31 UTC 2016 - dmitry_r@opensuse.org + +- Fix build with VTK 7 + * QCSXCAD-vtk7-support.patch + +------------------------------------------------------------------- New: ---- QCSXCAD-vtk7-support.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ QCSXCAD.spec ++++++ --- /var/tmp/diff_new_pack.ud6Ayg/_old 2016-05-05 08:12:30.000000000 +0200 +++ /var/tmp/diff_new_pack.ud6Ayg/_new 2016-05-05 08:12:30.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package QCSXCAD # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,9 +18,9 @@ Name: QCSXCAD Version: 0.6.0 +Release: 0 %define so_ver 0 %define libname lib%{name}%{so_ver} -Release: 0 Summary: Qt-GUI for CSXCAD library License: LGPL-3.0 Group: Productivity/Graphics/CAD @@ -30,6 +30,8 @@ Patch1: QCSXCAD-no-build-date.patch # PATCH-FIX-UPSTREAM QCSXCAD-vtk.patch -- Fix build with VTK 6.3 Patch2: QCSXCAD-vtk.patch +# PATCH-FIX-UPSTREAM QCSXCAD-vtk7-support.patch -- Fix build with VTK 7 +Patch3: QCSXCAD-vtk7-support.patch BuildRequires: CSXCAD-devel BuildRequires: cmake BuildRequires: tinyxml-devel @@ -37,7 +39,7 @@ BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5Xml) BuildRequires: pkgconfig(freetype2) -BuildRequires: pkgconfig(python2) +BuildRequires: pkgconfig(python3) BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(xt) BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -67,6 +69,7 @@ %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %cmake ++++++ QCSXCAD-vtk7-support.patch ++++++ Index: QCSXCAD-0.6.0/QVTKStructure.cpp =================================================================== --- QCSXCAD-0.6.0.orig/QVTKStructure.cpp +++ QCSXCAD-0.6.0/QVTKStructure.cpp @@ -311,7 +311,7 @@ void QVTKStructure::RenderGridDir(int di } vtkRectilinearGridGeometryFilter *grid_plane = vtkRectilinearGridGeometryFilter::New(); plane = grid_plane; -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 grid_plane->SetInputData(m_Rect_Grid); #else grid_plane->SetInput(m_Rect_Grid); @@ -348,7 +348,7 @@ void QVTKStructure::RenderGridDir(int di vtkStructuredGridGeometryFilter *grid_plane = vtkStructuredGridGeometryFilter::New(); plane = grid_plane; -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 grid_plane->SetInputData(m_Struct_Grid); #else grid_plane->SetInput(m_Struct_Grid); Index: QCSXCAD-0.6.0/VTKPrimitives.cpp =================================================================== --- QCSXCAD-0.6.0.orig/VTKPrimitives.cpp +++ QCSXCAD-0.6.0/VTKPrimitives.cpp @@ -52,7 +52,7 @@ #include "vtkDiskSource.h" #include "vtkPLYWriter.h" -#if (VTK_MAJOR_VERSION==5 && VTK_MINOR_VERSION>=10) || (VTK_MAJOR_VERSION==6) +#if (VTK_MAJOR_VERSION==5 && VTK_MINOR_VERSION>=10) || (VTK_MAJOR_VERSION>=6) #include "vtkBooleanOperationPolyDataFilter.h" #endif @@ -192,7 +192,7 @@ void VTKPrimitives::AddCylindricalCube(d return; vtkRotationalExtrusionFilter *extrude = vtkRotationalExtrusionFilter::New(); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 extrude->SetInputConnection(PDSource->GetOutputPort()); #else extrude->SetInput(PDSource->GetOutput()); @@ -297,7 +297,7 @@ void VTKPrimitives::AddClosedPoly(double profile->SetPoints(points); profile->SetPolys(poly); vtkTriangleFilter *tf = vtkTriangleFilter::New(); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 tf->SetInputData(profile); #else tf->SetInput(profile); @@ -360,7 +360,7 @@ void VTKPrimitives::AddTubePoly(const do vtkTubeFilter* m_profileTubes = vtkTubeFilter::New(); m_profileTubes->SetNumberOfSides(iResolution); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 m_profileTubes->SetInputData(profile); #else m_profileTubes->SetInput(profile); @@ -404,7 +404,7 @@ void VTKPrimitives::AddCylinder(const do transform->PostMultiply(); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 transformFilter->SetInputConnection(Source->GetOutputPort()); #else transformFilter->SetInput(Source->GetOutput()); @@ -431,7 +431,7 @@ void VTKPrimitives::AddCylindricalShell( // extrude in +z vtkLinearExtrusionFilter *linearExtrusionFilter = vtkLinearExtrusionFilter::New(); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 linearExtrusionFilter->SetInputConnection( diskSource->GetOutputPort() ); #else linearExtrusionFilter->SetInput( diskSource->GetOutput() ); @@ -484,7 +484,7 @@ void VTKPrimitives::AddSphere(const doub void VTKPrimitives::AddSphericalShell(const double *dCenter, double r_i, double r_o, double *dRGB, double dOpacity, int iResolution, const double* tf_matrix) {//complete -#if (VTK_MAJOR_VERSION==5 && VTK_MINOR_VERSION>=10) || (VTK_MAJOR_VERSION==6) +#if (VTK_MAJOR_VERSION==5 && VTK_MINOR_VERSION>=10) || (VTK_MAJOR_VERSION>=6) vtkSphereSource *Source_o = vtkSphereSource::New(); double center[3]={dCenter[0],dCenter[1],dCenter[2]}; Source_o->SetCenter(center); @@ -540,7 +540,7 @@ void VTKPrimitives::AddArrow(double *dSt transform->PostMultiply(); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 transformFilter->SetInputConnection(Source->GetOutputPort()); #else transformFilter->SetInput(Source->GetOutput()); @@ -563,7 +563,7 @@ void VTKPrimitives::AddLabel(char *cText vtkTransformPolyDataFilter* filter = vtkTransformPolyDataFilter::New(); vtkTransform* vtrans = vtkTransform::New(); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 filter->SetInputConnection(text->GetOutputPort()); #else filter->SetInput(text->GetOutput()); @@ -626,7 +626,7 @@ void VTKPrimitives::AddRotationalPoly(co profile->SetPoints(points); profile->SetPolys(poly); vtkTriangleFilter *tf = vtkTriangleFilter::New(); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 tf->SetInputData(profile); #else tf->SetInput(profile); @@ -695,7 +695,7 @@ void VTKPrimitives::AddRotationalSolid(c profile->SetPoints(points); profile->SetLines(poly); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 extrude->SetInputData(profile); #else extrude->SetInput(profile); @@ -768,7 +768,7 @@ vtkActor* VTKPrimitives::AddPolyData(vtk { vtkTransformPolyDataFilter* filter = vtkTransformPolyDataFilter::New(); vtkTransform* vtrans = vtkTransform::New(); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 filter->SetInputData(polydata); #else filter->SetInput(polydata); @@ -777,7 +777,7 @@ vtkActor* VTKPrimitives::AddPolyData(vtk vtrans->SetMatrix(tf_matrix); filter->SetTransform(vtrans); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 m_PolyDataCollection->AddInputData(filter->GetOutput()); #else m_PolyDataCollection->AddInput(filter->GetOutput()); @@ -811,7 +811,7 @@ vtkActor* VTKPrimitives::AddPolyData(vtk vtrans->SetMatrix(tf_matrix); filter->SetTransform(vtrans); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 m_PolyDataCollection->AddInputData(filter->GetOutput()); #else m_PolyDataCollection->AddInput(filter->GetOutput()); @@ -854,7 +854,7 @@ void VTKPrimitives::WritePolyData2File(c if (scale==1.0) { -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 writer->SetInputData(m_PolyDataCollection->GetOutput()); #else writer->SetInput(m_PolyDataCollection->GetOutput()); @@ -866,7 +866,7 @@ void VTKPrimitives::WritePolyData2File(c vtkTransform *transform = vtkTransform::New(); vtkTransformPolyDataFilter *transformFilter = vtkTransformPolyDataFilter::New(); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 transformFilter->SetInputData(m_PolyDataCollection->GetOutput()); #else transformFilter->SetInput(m_PolyDataCollection->GetOutput()); @@ -874,7 +874,7 @@ void VTKPrimitives::WritePolyData2File(c transform->Scale(scale,scale,scale); transformFilter->SetTransform(transform); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 writer->SetInputData(transformFilter->GetOutput()); #else writer->SetInput(transformFilter->GetOutput()); @@ -894,7 +894,7 @@ void VTKPrimitives::WritePolyData2STL(co vtkTriangleFilter* filter = vtkTriangleFilter::New(); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 filter->SetInputData(m_PolyDataCollection->GetOutput()); #else filter->SetInput(m_PolyDataCollection->GetOutput()); @@ -916,7 +916,7 @@ void VTKPrimitives::WritePolyData2STL(co transform->Scale(scale,scale,scale); transformFilter->SetTransform(transform); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 writer->SetInputData(transformFilter->GetOutput()); #else writer->SetInput(transformFilter->GetOutput()); @@ -936,7 +936,7 @@ void VTKPrimitives::WritePolyData2PLY(co vtkTriangleFilter* filter = vtkTriangleFilter::New(); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 filter->SetInputData(m_PolyDataCollection->GetOutput()); #else filter->SetInput(m_PolyDataCollection->GetOutput()); @@ -959,7 +959,7 @@ void VTKPrimitives::WritePolyData2PLY(co transform->Scale(scale,scale,scale); transformFilter->SetTransform(transform); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 writer->SetInputData(transformFilter->GetOutput()); #else writer->SetInput(transformFilter->GetOutput()); Index: QCSXCAD-0.6.0/CMakeLists.txt =================================================================== --- QCSXCAD-0.6.0.orig/CMakeLists.txt +++ QCSXCAD-0.6.0/CMakeLists.txt @@ -121,7 +121,7 @@ else() QT4_ADD_RESOURCES(RESOURCES_SRCS ${RESOURCES}) endif() -if("${VTK_MAJOR_VERSION}" EQUAL 6) +if("${VTK_MAJOR_VERSION}" GREATER 5) set( vtk_LIBS ${VTK_LIBRARIES} ) else() set( vtk_LIBS
participants (1)
-
root＠hilbert.suse.de