ports/174065: cad/salome-gui: chase various upgrades and unbreak
Thierry Thomas
thierry at FreeBSD.org
Sun Dec 2 22:10:01 UTC 2012
>Number: 174065
>Category: ports
>Synopsis: cad/salome-gui: chase various upgrades and unbreak
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun Dec 02 22:10:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Thierry Thomas
>Release: FreeBSD 9.1-PRERELEASE i386
>Organization:
Kabbale Eros
>Environment:
System: FreeBSD graf.pompo.net 9.1-PRERELEASE FreeBSD 9.1-PRERELEASE #0 r243502: Sun Nov 25 18:43:08 CET 2012 thierry at graf.pompo.net:/usr/obj/usr/src/sys/GRAF120125 i386
>Description:
- Chase Qt upgrade;
- Chase VTK upgrade;
- Unbreak.
>How-To-Repeat:
Apply the attached patches.
>Fix:
Credit: most of these patches have been sent by Roger Mason
(rmason (at) mun.ca) to the maintainer.
--- salome.diff begins here ---
diff -urN cad/salome.orig/Makefile cad/salome/Makefile
--- cad/salome.orig/Makefile 2012-07-18 22:24:43.000000000 +0200
+++ cad/salome/Makefile 2012-12-02 22:27:02.000000000 +0100
@@ -1,12 +1,9 @@
-# New ports collection makefile for: cad/salome
-# Date created: 16 Oct 2009
-# Whom: Stas Timokhin <devel at stasyan.com>
-#
+# Created by: Stas Timokhin <devel at stasyan.com>
# $FreeBSD: head/cad/salome/Makefile 300895 2012-07-14 12:56:14Z beat $
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
diff -urN cad/salome.orig/Makefile.ext cad/salome/Makefile.ext
--- cad/salome.orig/Makefile.ext 2012-07-18 22:24:43.000000000 +0200
+++ cad/salome/Makefile.ext 2012-11-08 23:21:37.000000000 +0100
@@ -187,7 +187,7 @@
.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
--- salome.diff ends here ---
--- salome-gui.diff begins here ---
diff -urN cad/salome-gui.orig/Makefile cad/salome-gui/Makefile
--- cad/salome-gui.orig/Makefile 2012-11-28 20:15:50.000000000 +0100
+++ cad/salome-gui/Makefile 2012-12-02 22:14:11.000000000 +0100
@@ -1,10 +1,7 @@
-# New ports collection makefile for: cad/salome-gui
-# Date created: 20 May 2009
-# Whom: Stas Timokhin <devel at stasyan.com>
-#
+# Created by: Stas Timokhin <devel at stasyan.com>
# $FreeBSD: head/cad/salome-gui/Makefile 307929 2012-11-28 19:15:53Z thierry $
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= cad science
MASTERDIR= ${.CURDIR}/../salome
@@ -13,9 +10,4 @@
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"
diff -urN cad/salome-gui.orig/files/patch-GUI_SalomePy.cxx cad/salome-gui/files/patch-GUI_SalomePy.cxx
--- cad/salome-gui.orig/files/patch-GUI_SalomePy.cxx 1970-01-01 01:00:00.000000000 +0100
+++ cad/salome-gui/files/patch-GUI_SalomePy.cxx 2012-12-01 14:21:52.000000000 +0100
@@ -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 );
+ }
+ }
+ };
diff -urN cad/salome-gui.orig/files/patch-GUI_VTKViewer_ArcBuilder.cxx cad/salome-gui/files/patch-GUI_VTKViewer_ArcBuilder.cxx
--- cad/salome-gui.orig/files/patch-GUI_VTKViewer_ArcBuilder.cxx 1970-01-01 01:00:00.000000000 +0100
+++ cad/salome-gui/files/patch-GUI_VTKViewer_ArcBuilder.cxx 2012-12-01 14:21:43.000000000 +0100
@@ -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);
+
diff -urN cad/salome-gui.orig/files/patch-GUI_adm_local_unix_config_files_py-compile cad/salome-gui/files/patch-GUI_adm_local_unix_config_files_py-compile
--- cad/salome-gui.orig/files/patch-GUI_adm_local_unix_config_files_py-compile 1970-01-01 01:00:00.000000000 +0100
+++ cad/salome-gui/files/patch-GUI_adm_local_unix_config_files_py-compile 2012-12-02 21:54:31.000000000 +0100
@@ -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*)
diff -urN cad/salome-gui.orig/files/patch-GUI_make_common.starter.am cad/salome-gui/files/patch-GUI_make_common.starter.am
--- cad/salome-gui.orig/files/patch-GUI_make_common.starter.am 1970-01-01 01:00:00.000000000 +0100
+++ cad/salome-gui/files/patch-GUI_make_common.starter.am 2012-12-02 22:34:20.000000000 +0100
@@ -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 $@
--- salome-gui.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list