cad/qcsxcad: update 0.6.2-9 → 0.6.3

Reported by:	portscout

4 files changed, 8 insertions, 158 deletions

diff --git a/cad/qcsxcad/Makefile b/cad/qcsxcad/Makefile
index 0efd6dedae18..6a5e384ec7f4 100644
--- a/cad/qcsxcad/Makefile
+++ b/cad/qcsxcad/Makefile
@@ -1,8 +1,6 @@
 PORTNAME=	qcsxcad
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.6.2-9
-PORTREVISION=	5
-DISTVERSIONSUFFIX=	-g3f09a8b
+DISTVERSION=	0.6.3
 CATEGORIES=	cad
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -13,17 +11,14 @@ LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libCSXCAD.so:cad/csxcad \
-		libexpat.so:textproc/expat2 \
 		libfreetype.so:print/freetype2 \
-		libpng16.so:graphics/png \
-		libtiff.so:graphics/tiff \
 		libtinyxml.so:textproc/tinyxml \
 		libvtkCommonCore-${VTK_VER}.so:math/vtk${VTK_VER:R}
 
-USES=		cmake gl jpeg pkgconfig qt:5 xorg
-USE_QT=		core gui opengl sql widgets xml buildtools:build qmake:build
+USES=		cmake gl pkgconfig qt:5 xorg
+USE_QT=		core gui opengl widgets xml buildtools:build qmake:build
 USE_XORG=	ice sm x11 xext xt
-USE_GL=		gl opengl
+USE_GL=		opengl
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
diff --git a/cad/qcsxcad/distinfo b/cad/qcsxcad/distinfo
index 477b3aa50c36..b2ded722b92e 100644
--- a/cad/qcsxcad/distinfo
+++ b/cad/qcsxcad/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1656263043
-SHA256 (thliebig-QCSXCAD-v0.6.2-9-g3f09a8b_GH0.tar.gz) = a2c2da8093b5ef38bfc5450da012aac28d17fb417f3dba53c8e6e3d4600e9e22
-SIZE (thliebig-QCSXCAD-v0.6.2-9-g3f09a8b_GH0.tar.gz) = 628638
+TIMESTAMP = 1698112285
+SHA256 (thliebig-QCSXCAD-v0.6.3_GH0.tar.gz) = f05edbcca65f0bf8a3fb6ab20baa3db0b8651c2baab2f6a3f0113436c866f879
+SIZE (thliebig-QCSXCAD-v0.6.3_GH0.tar.gz) = 628739
diff --git a/cad/qcsxcad/files/patch-QVTKStructure.cpp b/cad/qcsxcad/files/patch-QVTKStructure.cpp
deleted file mode 100644
index 4036157911b4..000000000000
--- a/cad/qcsxcad/files/patch-QVTKStructure.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-- workaround for https://github.com/thliebig/QCSXCAD/issues/10
-
---- QVTKStructure.cpp.orig	2022-10-23 18:25:43 UTC
-+++ QVTKStructure.cpp
-@@ -113,12 +113,12 @@ QVTKStructure::QVTKStructure()

- #endif

- 

- 	ren = vtkRenderer::New();

--	VTKWidget->GetRenderWindow()->AddRenderer(ren);

-+	VTKWidget->renderWindow()->AddRenderer(ren);

- 

- 	AddAxes();

- 	SetBackgroundColor(255,255,255);

- 

--	SetCallback(VTKWidget->GetRenderWindow()->GetInteractor());

-+	SetCallback(VTKWidget->renderWindow()->GetInteractor());

- }

- 

- QVTKStructure::~QVTKStructure()

-@@ -137,7 +137,7 @@ void QVTKStructure::AddAxes()

- 	marker->SetOrientationMarker(assembly);

- 	marker->SetViewport(0.0,0.0,0.25,0.25);

- 

--	marker->SetInteractor(VTKWidget->GetRenderWindow()->GetInteractor());

-+	marker->SetInteractor(VTKWidget->renderWindow()->GetInteractor());

- 	marker->SetEnabled(1);

- 	marker->InteractiveOff();

- 

-@@ -159,7 +159,7 @@ void QVTKStructure::SetBackgroundColor(int r, int g, i
- 	{

- 		if (ActorGridPlane[i]!=NULL) ActorGridPlane[i]->GetProperty()->SetColor(irgb);

- 	}

--    VTKWidget->GetRenderWindow()->GetInteractor()->Render();

-+    VTKWidget->renderWindow()->GetInteractor()->Render();

- }

- 

- void QVTKStructure::SetGeometry(ContinuousStructure *CS)

-@@ -277,20 +277,20 @@ void QVTKStructure::RenderGrid()

- void QVTKStructure::RenderGridX(int plane_pos)

- {

- 	RenderGridDir(0,plane_pos);

--	VTKWidget->GetRenderWindow()->GetInteractor()->Render();

-+	VTKWidget->renderWindow()->GetInteractor()->Render();

- }

- 

- void QVTKStructure::RenderGridY(int plane_pos)

- {

- 	RenderGridDir(1,plane_pos);

--	VTKWidget->GetRenderWindow()->GetInteractor()->Render();

-+	VTKWidget->renderWindow()->GetInteractor()->Render();

- 

- }

- 

- void QVTKStructure::RenderGridZ(int plane_pos)

- {

- 	RenderGridDir(2,plane_pos);

--	VTKWidget->GetRenderWindow()->GetInteractor()->Render();

-+	VTKWidget->renderWindow()->GetInteractor()->Render();

- }

- 

- void QVTKStructure::RenderGridDir(int dir, unsigned int plane_pos)

-@@ -413,13 +413,13 @@ void QVTKStructure::SetGridOpacity(int val)

- 	{

- 		if (ActorGridPlane[i]!=NULL) ActorGridPlane[i]->GetProperty()->SetOpacity((double)val/255.0);

- 	}

--	VTKWidget->GetRenderWindow()->GetInteractor()->Render();

-+	VTKWidget->renderWindow()->GetInteractor()->Render();

- }

- 

- void QVTKStructure::ResetView()

- {

- 	ren->ResetCamera();

--    VTKWidget->GetRenderWindow()->GetInteractor()->Render();

-+    VTKWidget->renderWindow()->GetInteractor()->Render();

- }

- 

- void QVTKStructure::setXY()

-@@ -472,7 +472,7 @@ void QVTKStructure::SetPropOpacity(unsigned int uiID, 
- 			if (LayerPrimitives.at(i).VTKProp!=NULL) LayerPrimitives.at(i).VTKProp->SetOpacity2All((double)val/255.0);

- 		}

- 	}

--	VTKWidget->GetRenderWindow()->GetInteractor()->Render();

-+	VTKWidget->renderWindow()->GetInteractor()->Render();

- }

- 

- void QVTKStructure::RenderGeometry()

-@@ -679,7 +679,7 @@ void QVTKStructure::RenderGeometry()

- 			}

- 		}

- 	}

--	VTKWidget->GetRenderWindow()->GetInteractor()->Render();

-+	VTKWidget->renderWindow()->GetInteractor()->Render();

- }

- 

- void QVTKStructure::RenderDiscMaterialModel()

-@@ -716,7 +716,7 @@ void QVTKStructure::RenderDiscMaterialModel()

- 			delete transform;

- 		}

- 	}

--	VTKWidget->GetRenderWindow()->GetInteractor()->Render();

-+	VTKWidget->renderWindow()->GetInteractor()->Render();

- }

- 

- void QVTKStructure::SetParallelProjection(bool val, bool render)

-@@ -725,18 +725,18 @@ void QVTKStructure::SetParallelProjection(bool val, bo
- 	cam->SetParallelProjection(val);

- 

- 	if (render)

--		VTKWidget->GetRenderWindow()->GetInteractor()->Render();

-+		VTKWidget->renderWindow()->GetInteractor()->Render();

- }

- 

- void QVTKStructure::Set2DInteractionStyle(bool val, bool render)

- {

- 	if (val)

--		VTKWidget->GetRenderWindow()->GetInteractor()->SetInteractorStyle(vtkInteractorStyleRubberBand2DPlane::New());

-+		VTKWidget->renderWindow()->GetInteractor()->SetInteractorStyle(vtkInteractorStyleRubberBand2DPlane::New());

- 	else

--		VTKWidget->GetRenderWindow()->GetInteractor()->SetInteractorStyle(vtkInteractorStyleTrackballCamera::New());

-+		VTKWidget->renderWindow()->GetInteractor()->SetInteractorStyle(vtkInteractorStyleTrackballCamera::New());

- 

- 	if (render)

--		VTKWidget->GetRenderWindow()->GetInteractor()->Render();

-+		VTKWidget->renderWindow()->GetInteractor()->Render();

- }

- 

- void QVTKStructure::SaveCamData()

-@@ -765,7 +765,7 @@ void QVTKStructure::RestoreCamData(bool render)

- 	Camera->Modified();

- 

- 	if (render)

--		VTKWidget->GetRenderWindow()->GetInteractor()->Render();

-+		VTKWidget->renderWindow()->GetInteractor()->Render();

- }

- 

- 

-@@ -777,7 +777,7 @@ void QVTKStructure::ExportView2Image()

- 		return;

- 

- 	vtkWindowToImageFilter* filter = vtkWindowToImageFilter::New();

--	filter->SetInput(VTKWidget->GetRenderWindow());

-+	filter->SetInput(VTKWidget->renderWindow());

- 

- 	vtkPNGWriter* png_writer= vtkPNGWriter::New();

- 	png_writer->SetInputConnection(filter->GetOutputPort());

diff --git a/cad/qcsxcad/pkg-plist b/cad/qcsxcad/pkg-plist
index b8e6ed133f3c..7e1cfb456614 100644
--- a/cad/qcsxcad/pkg-plist
+++ b/cad/qcsxcad/pkg-plist
@@ -12,4 +12,4 @@ include/QCSXCAD/export_x3d.h
 include/QCSXCAD/vtkInteractorStyleRubberBand2DPlane.h
 lib/libQCSXCAD.so
 lib/libQCSXCAD.so.0
-lib/libQCSXCAD.so.0.6.2
+lib/libQCSXCAD.so.0.6.3