aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cad/salome-gui/Makefile12
-rw-r--r--cad/salome-gui/files/patch-GUI_SalomePy.cxx38
-rw-r--r--cad/salome-gui/files/patch-GUI_VTKViewer_ArcBuilder.cxx22
-rw-r--r--cad/salome-gui/files/patch-GUI_adm_local_unix_config_files_py-compile13
-rw-r--r--cad/salome-gui/files/patch-GUI_make_common.starter.am12
-rw-r--r--cad/salome/Makefile7
-rw-r--r--cad/salome/Makefile.ext2
7 files changed, 90 insertions, 16 deletions
diff --git a/cad/salome-gui/Makefile b/cad/salome-gui/Makefile
index 7e1546ca4c7a..0b134860b870 100644
--- a/cad/salome-gui/Makefile
+++ b/cad/salome-gui/Makefile
@@ -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"
diff --git a/cad/salome-gui/files/patch-GUI_SalomePy.cxx b/cad/salome-gui/files/patch-GUI_SalomePy.cxx
new file mode 100644
index 000000000000..816ab156d211
--- /dev/null
+++ b/cad/salome-gui/files/patch-GUI_SalomePy.cxx
@@ -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 --git a/cad/salome-gui/files/patch-GUI_VTKViewer_ArcBuilder.cxx b/cad/salome-gui/files/patch-GUI_VTKViewer_ArcBuilder.cxx
new file mode 100644
index 000000000000..14f63bdd2c08
--- /dev/null
+++ b/cad/salome-gui/files/patch-GUI_VTKViewer_ArcBuilder.cxx
@@ -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 --git a/cad/salome-gui/files/patch-GUI_adm_local_unix_config_files_py-compile b/cad/salome-gui/files/patch-GUI_adm_local_unix_config_files_py-compile
new file mode 100644
index 000000000000..ed8e98eadc91
--- /dev/null
+++ b/cad/salome-gui/files/patch-GUI_adm_local_unix_config_files_py-compile
@@ -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 --git a/cad/salome-gui/files/patch-GUI_make_common.starter.am b/cad/salome-gui/files/patch-GUI_make_common.starter.am
new file mode 100644
index 000000000000..5a7af5ce5c43
--- /dev/null
+++ b/cad/salome-gui/files/patch-GUI_make_common.starter.am
@@ -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 $@
diff --git a/cad/salome/Makefile b/cad/salome/Makefile
index 13d788d7a812..e9ad8f71e23a 100644
--- a/cad/salome/Makefile
+++ b/cad/salome/Makefile
@@ -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
diff --git a/cad/salome/Makefile.ext b/cad/salome/Makefile.ext
index a7cb5f0b1de5..466e7cd72a0b 100644
--- a/cad/salome/Makefile.ext
+++ b/cad/salome/Makefile.ext
@@ -187,7 +187,7 @@ CONFIGURE_ARGS+= --with-qsci4-libraries=${QT_LIBDIR} --with-qsci4-includes=${QT_
.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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-13 09:30:14 +0000