From nobody Tue Oct 24 03:10:18 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDxrW1BTtz4xNjd; Tue, 24 Oct 2023 03:10:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SDxrW0ZPmz4dv0; Tue, 24 Oct 2023 03:10:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698117019; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m5v+7+YtSb4D42l1foPNFRZ1Edt2GJRHGxNJlLSJz6k=; b=GqvkZQqNxwYnhDcSkc3DINyYioyUq1H8hGZUCpxSOVPBBHBOG74BwW6Sv2LtC/Li8J+UU3 rvi9jsNeEdp1gcJ5mchziO4tTX1hOKFpcI9uBtN9YkkEfwGmCkRl8gaHhbwUEloiu4iP2E 5+qHDusZFobH9ahbNI9UOT89zudFP2kVlNyEAQcYG5CZzZ2XuIqYp0v+ADfdg9bLJgPSXb ARhXxxQsqxwm2OwwPRGlYhVmJ1rUpSGSRkYC4L4WTCk6YRQPD+5eHNwujj8ulMd5XYMkqW +GOWxif+Pb+Fge/7UcvxfUAiQEUMqO0Cta8cxJBviknGBAOII3+QFh+bduQEvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698117019; a=rsa-sha256; cv=none; b=TQokoZkHMGhfvqX8Zt1UNUKZbV35CES4Kru+BlGzH5vHCSIWtaheppi7+uxtn6+awPK2u+ 1JMviF34QHEldMCSL50MRmVEX/Mz1wrrvIwCoDWHt1+pMqSNVBQMmYjrphrPFvJK0VzBTl KMFXPN7ENeBdR9TPHinou0/XAr+4Nd+qfkh2ovHaP9jsXTgJc6qowMnQELktDbA1hd/Xtr dKqubio+unepdDU9SjQAVkRMGPGOeJ281kBurXvQvfzqkAVLZOPWkwrSa7rvMKY63HYhcp 5QKq8OC//0P5ZgSCzpNV73ZFXyWJAp37PmFjZxDmf0bMoToV2HUhIDvFTLBr2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698117019; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m5v+7+YtSb4D42l1foPNFRZ1Edt2GJRHGxNJlLSJz6k=; b=iu9weKP1ZnDX9bQVCuwzqBn++1ixfBldNUyo9i7Pf7jKGc/CZPB5geYMln9HGhl5i6fHxe ONYSkX2eK3Um5qePAQLq5Uim5HXuK7m8xNhpF5ahpiGbNHZmo4CluV+vPB06uAhP4mcp+s h2z6MjOc9MVx98dftnHQkWpoFOn6KMIjPYHUgK7goA3AIl68W7F+u8zYOVb0RuXZW/VceM ivI2bsclQ43Rf7h+AXn0V65bjnovTIzhd4r1iRmTDzPFFwEyJkqkQGTc2tqmIe+wWGCBc1 LtXc4XHJLs4q9wb75hgNw8o7gAuTNl9cdw0RCOy4NNc9SlDTNHQFHzo3yTBL3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDxrV6lPpz159m; Tue, 24 Oct 2023 03:10:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39O3AIlg049241; Tue, 24 Oct 2023 03:10:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39O3AI1i049238; Tue, 24 Oct 2023 03:10:18 GMT (envelope-from git) Date: Tue, 24 Oct 2023 03:10:18 GMT Message-Id: <202310240310.39O3AI1i049238@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 2a19d09f93ba - main - cad/qcsxcad: update 0.6.2-9 =?utf-8?Q?=E2=86=92?= 0.6.3 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2a19d09f93ba4b239b0291b565f7ca0c637f588f Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=2a19d09f93ba4b239b0291b565f7ca0c637f588f commit 2a19d09f93ba4b239b0291b565f7ca0c637f588f Author: Yuri Victorovich AuthorDate: 2023-10-24 02:03:02 +0000 Commit: Yuri Victorovich CommitDate: 2023-10-24 03:10:13 +0000 cad/qcsxcad: update 0.6.2-9 → 0.6.3 Reported by: portscout --- cad/qcsxcad/Makefile | 13 +-- cad/qcsxcad/distinfo | 6 +- cad/qcsxcad/files/patch-QVTKStructure.cpp | 145 ------------------------------ cad/qcsxcad/pkg-plist | 2 +- 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