Date: Sat, 29 Dec 2012 17:53:14 +0000 (UTC) From: Thierry Thomas <thierry@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r309623 - in head/cad: salome salome-gui salome-gui/files Message-ID: <201212291753.qBTHrEYW019080@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: thierry Date: Sat Dec 29 17:53:13 2012 New Revision: 309623 URL: http://svnweb.freebsd.org/changeset/ports/309623 Log: - Chase Qt upgrade; - Chase VTK upgrade; - Unbreak. Credit: most of these patches have been sent by Roger Mason (rmason (at) mun.ca) to the maintainer. PR: ports/174065 Submitted by: /me Approved by: maintainer Added: head/cad/salome-gui/files/patch-GUI_SalomePy.cxx (contents, props changed) head/cad/salome-gui/files/patch-GUI_VTKViewer_ArcBuilder.cxx (contents, props changed) head/cad/salome-gui/files/patch-GUI_adm_local_unix_config_files_py-compile (contents, props changed) head/cad/salome-gui/files/patch-GUI_make_common.starter.am (contents, props changed) Modified: head/cad/salome-gui/Makefile head/cad/salome/Makefile (contents, props changed) head/cad/salome/Makefile.ext (contents, props changed) Modified: head/cad/salome-gui/Makefile ============================================================================== --- head/cad/salome-gui/Makefile Sat Dec 29 17:47:53 2012 (r309622) +++ head/cad/salome-gui/Makefile Sat Dec 29 17:53:13 2012 (r309623) @@ -1,10 +1,7 @@ -# New ports collection makefile for: cad/salome-gui -# Date created: 20 May 2009 -# Whom: Stas Timokhin <devel@stasyan.com> -# +# Created by: Stas Timokhin <devel@stasyan.com> # $FreeBSD$ -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= cad science MASTERDIR= ${.CURDIR}/../salome @@ -13,9 +10,4 @@ PORTNAME= salome PKGNAMESUFFIX= -gui SAL_MODULE_UPPER= GUI -DEPRECATED= BROKEN for more than 6 month -EXPIRATION_DATE= 2012-12-31 - -BROKEN= does not compile - .include "${MASTERDIR}/Makefile" Added: head/cad/salome-gui/files/patch-GUI_SalomePy.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/salome-gui/files/patch-GUI_SalomePy.cxx Sat Dec 29 17:53:13 2012 (r309623) @@ -0,0 +1,38 @@ +--- src/SALOME_PY/SalomePy.cxx.orig 2010-06-17 12:55:19.000000000 -0230 ++++ src/SALOME_PY/SalomePy.cxx 2012-09-13 17:12:24.000000000 -0230 +@@ -205,8 +205,9 @@ + SVTK_ViewWindow* aVTKViewWindow = + ::GetVTKViewWindow( myCreate ? __Create : __FindOrCreate ); + if( aVTKViewWindow && aPyClass ) { +- vtkRenderer* aVTKObject = aVTKViewWindow->getRenderer(); +- myResult = PyVTKObject_New( aPyClass, aVTKObject ); ++ PyObject* aVTKObject = (PyObject*)aVTKViewWindow->getRenderer(); ++ vtkObjectBase *vtk_ptr; ++ myResult = PyVTKObject_New( aPyClass, aVTKObject, vtk_ptr ); + } + } + }; +@@ -254,8 +255,9 @@ + SVTK_ViewWindow* aVTKViewWindow = + ::GetVTKViewWindow( myCreate ? __Create : __FindOrCreate ); + if( aVTKViewWindow && aPyClass ) { +- vtkRenderWindow* aVTKObject = aVTKViewWindow->getRenderWindow(); +- myResult = PyVTKObject_New( aPyClass, aVTKObject ); ++ PyObject* aVTKObject = (PyObject*)aVTKViewWindow->getRenderWindow(); ++ vtkObjectBase *vtk_ptr; ++ myResult = PyVTKObject_New( aPyClass, aVTKObject, vtk_ptr ); + } + } + }; +@@ -303,8 +305,9 @@ + SVTK_ViewWindow* aVTKViewWindow = + ::GetVTKViewWindow( myCreate ? __Create : __FindOrCreate ); + if( aVTKViewWindow && aPyClass ) { +- vtkRenderWindowInteractor* aVTKObject = aVTKViewWindow->getInteractor(); +- myResult = PyVTKObject_New( aPyClass, aVTKObject ); ++ PyObject* aVTKObject = (PyObject*)aVTKViewWindow->getInteractor(); ++ vtkObjectBase *vtk_ptr; ++ myResult = PyVTKObject_New( aPyClass, aVTKObject, vtk_ptr ); + } + } + }; Added: head/cad/salome-gui/files/patch-GUI_VTKViewer_ArcBuilder.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/salome-gui/files/patch-GUI_VTKViewer_ArcBuilder.cxx Sat Dec 29 17:53:13 2012 (r309623) @@ -0,0 +1,22 @@ +--- src/VTKViewer/VTKViewer_ArcBuilder.cxx.orig 2010-06-17 12:55:20.000000000 -0230 ++++ src/VTKViewer/VTKViewer_ArcBuilder.cxx 2012-09-13 13:37:37.000000000 -0230 +@@ -148,7 +148,9 @@ + * Calculate angle between vectors in degrees + */ + double Vec::AngleBetweenInGrad(const Vec & Other){ +- return AngleBetween(Other)*vtkMath::DoubleRadiansToDegrees(); ++ double res; ++ res = AngleBetween(Other); ++ return vtkMath::DegreesFromRadians(res); + } + + /* +@@ -463,7 +465,7 @@ + double angle3 = GetPointAngleOnCircle(xCenter,yCenter,x3,y3); + + +- double aMaxAngle = vtkMath::DoubleDegreesToRadians()*myAngle*2; ++ double aMaxAngle = vtkMath::DegreesFromRadians(myAngle*2); + + /* double aTotalAngle = fabs(angle3 - angle1); + Added: head/cad/salome-gui/files/patch-GUI_adm_local_unix_config_files_py-compile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/salome-gui/files/patch-GUI_adm_local_unix_config_files_py-compile Sat Dec 29 17:53:13 2012 (r309623) @@ -0,0 +1,13 @@ +--- adm_local/unix/config_files/py-compile.orig 2010-06-17 17:26:08.000000000 +0200 ++++ adm_local/unix/config_files/py-compile 2012-12-02 21:53:46.000000000 +0100 +@@ -48,10 +48,6 @@ + ;; + --destdir) + destdir=$2 +- if test -z "$destdir"; then +- echo "$0: Missing argument to --destdir." 1>&2 +- exit 1 +- fi + shift + ;; + -h|--h*) Added: head/cad/salome-gui/files/patch-GUI_make_common.starter.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/salome-gui/files/patch-GUI_make_common.starter.am Sat Dec 29 17:53:13 2012 (r309623) @@ -0,0 +1,12 @@ +--- adm_local/unix/make_common_starter.am.orig 2012-09-28 11:29:12.000000000 +0700 ++++ adm_local/unix/make_common_starter.am 2012-09-28 11:30:27.000000000 +0700 +@@ -67,7 +67,8 @@ + # meta object implementation files generation (moc) + %_moc.cxx: %.h + $(MOC) $(MOC_FLAGS) $< -o $@ +- ++ sed -i -e 's|static_cast|dynamic_cast|;' $@ ++ + # translation (*.qm) files generation (lrelease) + %.qm: resources/%.ts + $(LRELEASE) $< -qm $@ Modified: head/cad/salome/Makefile ============================================================================== --- head/cad/salome/Makefile Sat Dec 29 17:47:53 2012 (r309622) +++ head/cad/salome/Makefile Sat Dec 29 17:53:13 2012 (r309623) @@ -1,12 +1,9 @@ -# New ports collection makefile for: cad/salome -# Date created: 16 Oct 2009 -# Whom: Stas Timokhin <devel@stasyan.com> -# +# Created by: Stas Timokhin <devel@stasyan.com> # $FreeBSD$ PORTNAME= salome PORTVERSION= 5.1.4 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES= cad science MASTER_SITES= http://www.stasyan.com/devel/distfiles/ DISTNAME= src5.1.4 Modified: head/cad/salome/Makefile.ext ============================================================================== --- head/cad/salome/Makefile.ext Sat Dec 29 17:47:53 2012 (r309622) +++ head/cad/salome/Makefile.ext Sat Dec 29 17:53:13 2012 (r309623) @@ -187,7 +187,7 @@ CONFIGURE_ARGS+= --with-qsci4-libraries= .if !${SAL_MODULE} == "kernel" && !${SAL_MODULE} == "randomizer" LIB_DEPENDS+= vtkCommon.5:${PORTSDIR}/math/vtk5 CONFIGURE_ARGS+= --with-vtk=${LOCALBASE} -#CONFIGURE_ENV+= VTKHOME=${LOCALBASE} +CONFIGURE_ENV+= VTKSUFFIX=-5.10 .endif #Dependency from cad/netgen
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212291753.qBTHrEYW019080>