Hello community, here is the log from the commit of package QCSXCAD for openSUSE:Factory checked in at 2019-01-08 12:23:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/QCSXCAD (Old) and /work/SRC/openSUSE:Factory/.QCSXCAD.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "QCSXCAD" Tue Jan 8 12:23:40 2019 rev:7 rq:658627 version:0.6.2 Changes: -------- --- /work/SRC/openSUSE:Factory/QCSXCAD/QCSXCAD.changes 2018-06-22 13:32:22.581319516 +0200 +++ /work/SRC/openSUSE:Factory/.QCSXCAD.new.28833/QCSXCAD.changes 2019-01-08 12:25:30.164467676 +0100 @@ -1,0 +2,9 @@ +Fri Dec 14 22:29:20 UTC 2018 - Stefan Brüns <[email protected]> + +- Update to version 0.6.2 + * cmake: fix vtk include dirs + * fix vtk polydata exports +- Add QCSXCAD-vtk.patch - fix build on TW, avoid implicitly requiring + all VTK modules, leading to missing libraries. + +------------------------------------------------------------------- Old: ---- QCSXCAD-0.6.1.tar.gz New: ---- QCSXCAD-0.6.2.tar.gz QCSXCAD-vtk.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ QCSXCAD.spec ++++++ --- /var/tmp/diff_new_pack.n4hYZr/_old 2019-01-08 12:25:30.648467144 +0100 +++ /var/tmp/diff_new_pack.n4hYZr/_new 2019-01-08 12:25:30.648467144 +0100 @@ -12,17 +12,17 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: QCSXCAD -Version: 0.6.1 +Version: 0.6.2 Release: 0 %define so_ver 0 %define libname lib%{name}%{so_ver} Summary: Qt-GUI for CSXCAD library -License: LGPL-3.0+ +License: LGPL-3.0-or-later Group: Productivity/Graphics/CAD Url: http://openems.de Source0: https://github.com/thliebig/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -30,6 +30,8 @@ Patch0: qt5_use_modules.diff # PATCH-FIX-OPENSUSE QCSXCAD-no-build-date.patch -- Remove build date from binaries Patch1: QCSXCAD-no-build-date.patch +# PATCH-FIX-OPENSUSE QCSXCAD-vtk.patch -- Avoid pulling in unneeded VTK modules +Patch2: QCSXCAD-vtk.patch BuildRequires: CSXCAD-devel BuildRequires: cmake BuildRequires: tinyxml-devel @@ -68,6 +70,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %cmake ++++++ QCSXCAD-0.6.1.tar.gz -> QCSXCAD-0.6.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QCSXCAD-0.6.1/CMakeLists.txt new/QCSXCAD-0.6.2/CMakeLists.txt --- old/QCSXCAD-0.6.1/CMakeLists.txt 2016-05-12 21:19:34.000000000 +0200 +++ new/QCSXCAD-0.6.2/CMakeLists.txt 2017-02-18 15:20:28.000000000 +0100 @@ -22,7 +22,7 @@ # default set(LIB_VERSION_MAJOR 0) set(LIB_VERSION_MINOR 6) -set(LIB_VERSION_PATCH 1) +set(LIB_VERSION_PATCH 2) set(LIB_VERSION_STRING ${LIB_VERSION_MAJOR}.${LIB_VERSION_MINOR}.${LIB_VERSION_PATCH}) set(VERSION "v${LIB_VERSION_STRING}") @@ -107,7 +107,7 @@ message(STATUS "Found package VTK. Using version " ${VTK_VERSION}) include(${VTK_USE_FILE}) -INCLUDE_DIRECTORIES (${VTK_INCLUDE_DIR}) +INCLUDE_DIRECTORIES (${VTK_INCLUDE_DIRS}) # Qt SET(RESOURCES resources.qrc) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QCSXCAD-0.6.1/VTKPrimitives.cpp new/QCSXCAD-0.6.2/VTKPrimitives.cpp --- old/QCSXCAD-0.6.1/VTKPrimitives.cpp 2016-05-12 21:19:34.000000000 +0200 +++ new/QCSXCAD-0.6.2/VTKPrimitives.cpp 2017-02-18 15:20:28.000000000 +0100 @@ -778,7 +778,7 @@ filter->SetTransform(vtrans); #if VTK_MAJOR_VERSION>=6 - m_PolyDataCollection->AddInputData(filter->GetOutput()); + m_PolyDataCollection->AddInputConnection(filter->GetOutputPort()); #else m_PolyDataCollection->AddInput(filter->GetOutput()); #endif @@ -812,7 +812,7 @@ filter->SetTransform(vtrans); #if VTK_MAJOR_VERSION>=6 - m_PolyDataCollection->AddInputData(filter->GetOutput()); + m_PolyDataCollection->AddInputConnection(filter->GetOutputPort()); #else m_PolyDataCollection->AddInput(filter->GetOutput()); #endif @@ -855,7 +855,7 @@ if (scale==1.0) { #if VTK_MAJOR_VERSION>=6 - writer->SetInputData(m_PolyDataCollection->GetOutput()); + writer->SetInputConnection(m_PolyDataCollection->GetOutputPort()); #else writer->SetInput(m_PolyDataCollection->GetOutput()); #endif @@ -867,7 +867,7 @@ vtkTransformPolyDataFilter *transformFilter = vtkTransformPolyDataFilter::New(); #if VTK_MAJOR_VERSION>=6 - transformFilter->SetInputData(m_PolyDataCollection->GetOutput()); + transformFilter->SetInputConnection(m_PolyDataCollection->GetOutputPort()); #else transformFilter->SetInput(m_PolyDataCollection->GetOutput()); #endif @@ -875,7 +875,7 @@ transformFilter->SetTransform(transform); #if VTK_MAJOR_VERSION>=6 - writer->SetInputData(transformFilter->GetOutput()); + writer->SetInputConnection(transformFilter->GetOutputPort()); #else writer->SetInput(transformFilter->GetOutput()); #endif @@ -895,7 +895,7 @@ vtkTriangleFilter* filter = vtkTriangleFilter::New(); #if VTK_MAJOR_VERSION>=6 - filter->SetInputData(m_PolyDataCollection->GetOutput()); + filter->SetInputConnection(m_PolyDataCollection->GetOutputPort()); #else filter->SetInput(m_PolyDataCollection->GetOutput()); #endif @@ -917,7 +917,7 @@ transformFilter->SetTransform(transform); #if VTK_MAJOR_VERSION>=6 - writer->SetInputData(transformFilter->GetOutput()); + writer->SetInputConnection(transformFilter->GetOutputPort()); #else writer->SetInput(transformFilter->GetOutput()); #endif @@ -937,7 +937,7 @@ vtkTriangleFilter* filter = vtkTriangleFilter::New(); #if VTK_MAJOR_VERSION>=6 - filter->SetInputData(m_PolyDataCollection->GetOutput()); + filter->SetInputConnection(m_PolyDataCollection->GetOutputPort()); #else filter->SetInput(m_PolyDataCollection->GetOutput()); #endif @@ -960,7 +960,7 @@ transformFilter->SetTransform(transform); #if VTK_MAJOR_VERSION>=6 - writer->SetInputData(transformFilter->GetOutput()); + writer->SetInputConnection(transformFilter->GetOutputPort()); #else writer->SetInput(transformFilter->GetOutput()); #endif ++++++ QCSXCAD-vtk.patch ++++++ --- a/CMakeLists.txt 2018-12-14 23:45:50.112002905 +0100 +++ b/CMakeLists.txt 2018-12-15 00:01:35.322874327 +0100 @@ -98,8 +98,11 @@ if (WIN32) find_package(VTK 6.1 REQUIRED) else() + find_package(VTK COMPONENTS vtkGUISupportQt vtkRenderingLOD vtkIOGeometry vtkIOXML vtkIOPLY vtkIOImage vtkInteractionWidgets NO_MODULE) # prefer >=6.1, fallback to >=5.4 - find_package(VTK 6.1 COMPONENTS vtkGUISupportQt vtkRenderingLOD vtkRenderingOpenGL vtkIOXML vtkIOPLY vtkIOImage vtkInteractionWidgets NO_MODULE) + IF (NOT ${VTK_FOUND}) + find_package(VTK 6.1 COMPONENTS vtkGUISupportQt vtkRenderingLOD vtkRenderingOpenGL vtkIOXML vtkIOPLY vtkIOImage vtkInteractionWidgets NO_MODULE) + endif() IF (NOT ${VTK_FOUND}) find_package(VTK REQUIRED) endif()
