FreeBSD Bugzilla – Attachment 180958 Details for
Bug 217917
[patch] cad/freecad: update port to 20170310
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
cad/freecad port update
cad_freecad_update.patch (text/plain), 10.80 KB, created by
Thibault Jouan
on 2017-03-19 10:29:10 UTC
(
hide
)
Description:
cad/freecad port update
Filename:
MIME Type:
Creator:
Thibault Jouan
Created:
2017-03-19 10:29:10 UTC
Size:
10.80 KB
patch
obsolete
>Update cad/freecad port > >* Remove obsolete cmake pivy option; >* Fix line separators in source and data files; >* Build with fortran support, which is required for some of FreeCAD > modules: > /lib/libgcc_s.so.1: version GCC_4.6.0 required by > /usr/local/lib/gcc49/libgfortran.so.3 not found >* Add option to import collada files; >* Update to 20170310 snapshot. > >diff --git a/cad/freecad/Makefile b/cad/freecad/Makefile >index 4cd82faf1f32..c45cbec40af9 100644 >--- a/cad/freecad/Makefile >+++ b/cad/freecad/Makefile >@@ -1,7 +1,7 @@ > # $FreeBSD$ > > PORTNAME= FreeCAD >-DISTVERSION= 0.17.g20170204 >+DISTVERSION= 0.17.g20170310 > CATEGORIES= cad > > MAINTAINER= tj+freebsd_ports@a13.fr >@@ -32,16 +32,17 @@ LIB_DEPENDS= libexpat.so:textproc/expat2 \ > RUN_DEPENDS= pivy>0:graphics/py-pivy > > USE_GITHUB= yes >-GH_TAGNAME= 36b7e03 >+GH_TAGNAME= 91c59c7 > >-USES= compiler:c++11-lib cmake:outsource jpeg python localbase >+USES= dos2unix compiler:c++11-lib cmake:outsource fortran jpeg \ >+ python localbase > USE_XORG= ice sm x11 xext xt > USE_GL= gl glu > USE_QT4= qmake_build corelib gui moc_build network opengl rcc_build \ > uic_build svg xml webkit > USE_LDCONFIG= yes >-CMAKE_ARGS= -DOCC_INCLUDE_DIR="${LOCALBASE}/include/OpenCASCADE" \ >- -DFREECAD_USE_EXTERNAL_PIVY=1 >+DOS2UNIX_GLOB= *.txt *.h *.cpp *.py *.qss *.csv *.pov *.stp *.ui *.wrl *.WRL >+CMAKE_ARGS= -DOCC_INCLUDE_DIR="${LOCALBASE}/include/OpenCASCADE" > > # To be removed when french/med will be built against science/hdf5 > LIB_DEPENDS+= libhdf5-18.so:science/hdf5-18 >@@ -54,6 +55,11 @@ CFLAGS+= -I${LOCALBASE}/include/hdf5-18 > > CMAKE_INSTALL_PREFIX= ${PREFIX}/${PORTNAME} > >+OPTIONS_DEFINE= COLLADA >+ >+COLLADA_DESC= Install pycollada for Collada files import >+COLLADA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycollada>0:graphics/py-pycollada >+ > DESKTOP_ENTRIES=${PORTNAME} "" "${PREFIX}/FreeCAD/data/freecad.svg" \ > ${PORTNAME} "Engineering;" false > >diff --git a/cad/freecad/distinfo b/cad/freecad/distinfo >index 1cd63e133072..cc5c4efa80b0 100644 >--- a/cad/freecad/distinfo >+++ b/cad/freecad/distinfo >@@ -1,3 +1,3 @@ >-TIMESTAMP = 1486284865 >-SHA256 (FreeCAD-FreeCAD-0.17.g20170204-36b7e03_GH0.tar.gz) = bc49ccb5bb973a50cb699a2a02437c99812f4865752c17a572f52c1064929b0d >-SIZE (FreeCAD-FreeCAD-0.17.g20170204-36b7e03_GH0.tar.gz) = 115953097 >+TIMESTAMP = 1489314013 >+SHA256 (FreeCAD-FreeCAD-0.17.g20170310-91c59c7_GH0.tar.gz) = a3f97637842f2215f1be90dd876c23a2446a939aabe10e3c2fdf583e68dfa333 >+SIZE (FreeCAD-FreeCAD-0.17.g20170310-91c59c7_GH0.tar.gz) = 120327486 >diff --git a/cad/freecad/pkg-plist b/cad/freecad/pkg-plist >index af5aff8cfcc5..08701d1edd27 100644 >--- a/cad/freecad/pkg-plist >+++ b/cad/freecad/pkg-plist >@@ -61,100 +61,100 @@ FreeCAD/Mod/Draft/importDWG.py > FreeCAD/Mod/Draft/importDXF.py > FreeCAD/Mod/Draft/importOCA.py > FreeCAD/Mod/Draft/importSVG.py >-FreeCAD/Mod/Drawing/DrawingAlgos.py > FreeCAD/Mod/Drawing/DrawingExample.py > FreeCAD/Mod/Drawing/DrawingPatterns.py > FreeCAD/Mod/Drawing/DrawingTests.py > FreeCAD/Mod/Drawing/Init.py > FreeCAD/Mod/Drawing/InitGui.py >-FreeCAD/Mod/Fem/FemAnalysis.py >-FreeCAD/Mod/Fem/FemBeamSection.py >-FreeCAD/Mod/Fem/FemCommands.py >-FreeCAD/Mod/Fem/FemConstraintSelfWeight.py > FreeCAD/Mod/Fem/FemGmshTools.py > FreeCAD/Mod/Fem/FemInputWriter.py > FreeCAD/Mod/Fem/FemInputWriterCcx.py > FreeCAD/Mod/Fem/FemInputWriterZ88.py >-FreeCAD/Mod/Fem/FemMaterial.py >-FreeCAD/Mod/Fem/FemMaterialMechanicalNonlinear.py > FreeCAD/Mod/Fem/FemMesh2Mesh.py >-FreeCAD/Mod/Fem/FemMeshGmsh.py >-FreeCAD/Mod/Fem/FemMeshGroup.py >-FreeCAD/Mod/Fem/FemMeshRegion.py > FreeCAD/Mod/Fem/FemMeshTools.py > FreeCAD/Mod/Fem/FemSelectionObserver.py >-FreeCAD/Mod/Fem/FemShellThickness.py >-FreeCAD/Mod/Fem/FemSolverCalculix.py >-FreeCAD/Mod/Fem/FemSolverZ88.py > FreeCAD/Mod/Fem/FemTools.py > FreeCAD/Mod/Fem/FemToolsCcx.py > FreeCAD/Mod/Fem/FemToolsZ88.py > FreeCAD/Mod/Fem/Init.py > FreeCAD/Mod/Fem/InitGui.py >-FreeCAD/Mod/Fem/TaskPanelFemBeamSection.ui >-FreeCAD/Mod/Fem/TaskPanelFemMaterial.ui >-FreeCAD/Mod/Fem/TaskPanelFemMeshGmsh.ui >-FreeCAD/Mod/Fem/TaskPanelFemMeshGroup.ui >-FreeCAD/Mod/Fem/TaskPanelFemMeshRegion.ui >-FreeCAD/Mod/Fem/TaskPanelFemShellThickness.ui >-FreeCAD/Mod/Fem/TaskPanelFemSolverCalculix.ui >-FreeCAD/Mod/Fem/TaskPanelShowResult.ui >+FreeCAD/Mod/Fem/ObjectsFem.py >+FreeCAD/Mod/Fem/PyGui/FemCommands.py >+FreeCAD/Mod/Fem/PyGui/TaskPanelFemElementFluid1D.ui >+FreeCAD/Mod/Fem/PyGui/TaskPanelFemElementGeometry1D.ui >+FreeCAD/Mod/Fem/PyGui/TaskPanelFemElementGeometry2D.ui >+FreeCAD/Mod/Fem/PyGui/TaskPanelFemMaterial.ui >+FreeCAD/Mod/Fem/PyGui/TaskPanelFemMeshGmsh.ui >+FreeCAD/Mod/Fem/PyGui/TaskPanelFemMeshGroup.ui >+FreeCAD/Mod/Fem/PyGui/TaskPanelFemMeshRegion.ui >+FreeCAD/Mod/Fem/PyGui/TaskPanelFemResultShow.ui >+FreeCAD/Mod/Fem/PyGui/TaskPanelFemSolverCalculix.ui >+FreeCAD/Mod/Fem/PyGui/_CommandFemAnalysis.py >+FreeCAD/Mod/Fem/PyGui/_CommandFemConstraintSelfWeight.py >+FreeCAD/Mod/Fem/PyGui/_CommandFemElementFluid1D.py >+FreeCAD/Mod/Fem/PyGui/_CommandFemElementGeometry1D.py >+FreeCAD/Mod/Fem/PyGui/_CommandFemElementGeometry2D.py >+FreeCAD/Mod/Fem/PyGui/_CommandFemMaterialFluid.py >+FreeCAD/Mod/Fem/PyGui/_CommandFemMaterialMechanicalNonlinear.py >+FreeCAD/Mod/Fem/PyGui/_CommandFemMaterialSolid.py >+FreeCAD/Mod/Fem/PyGui/_CommandFemMesh2Mesh.py >+FreeCAD/Mod/Fem/PyGui/_CommandFemMeshClear.py >+FreeCAD/Mod/Fem/PyGui/_CommandFemMeshGmshFromShape.py >+FreeCAD/Mod/Fem/PyGui/_CommandFemMeshGroup.py >+FreeCAD/Mod/Fem/PyGui/_CommandFemMeshNetgenFromShape.py >+FreeCAD/Mod/Fem/PyGui/_CommandFemMeshPrintInfo.py >+FreeCAD/Mod/Fem/PyGui/_CommandFemMeshRegion.py >+FreeCAD/Mod/Fem/PyGui/_CommandFemResultShow.py >+FreeCAD/Mod/Fem/PyGui/_CommandFemResultsPurge.py >+FreeCAD/Mod/Fem/PyGui/_CommandFemSolverCalculix.py >+FreeCAD/Mod/Fem/PyGui/_CommandFemSolverControl.py >+FreeCAD/Mod/Fem/PyGui/_CommandFemSolverRun.py >+FreeCAD/Mod/Fem/PyGui/_CommandFemSolverZ88.py >+FreeCAD/Mod/Fem/PyGui/_TaskPanelFemElementFluid1D.py >+FreeCAD/Mod/Fem/PyGui/_TaskPanelFemElementGeometry1D.py >+FreeCAD/Mod/Fem/PyGui/_TaskPanelFemElementGeometry2D.py >+FreeCAD/Mod/Fem/PyGui/_TaskPanelFemMaterial.py >+FreeCAD/Mod/Fem/PyGui/_TaskPanelFemMeshGmsh.py >+FreeCAD/Mod/Fem/PyGui/_TaskPanelFemMeshGroup.py >+FreeCAD/Mod/Fem/PyGui/_TaskPanelFemMeshRegion.py >+FreeCAD/Mod/Fem/PyGui/_TaskPanelFemResultShow.py >+FreeCAD/Mod/Fem/PyGui/_TaskPanelFemSolverCalculix.py >+FreeCAD/Mod/Fem/PyGui/_ViewProviderFemConstraintSelfWeight.py >+FreeCAD/Mod/Fem/PyGui/_ViewProviderFemElementFluid1D.py >+FreeCAD/Mod/Fem/PyGui/_ViewProviderFemElementGeometry1D.py >+FreeCAD/Mod/Fem/PyGui/_ViewProviderFemElementGeometry2D.py >+FreeCAD/Mod/Fem/PyGui/_ViewProviderFemMaterial.py >+FreeCAD/Mod/Fem/PyGui/_ViewProviderFemMaterialMechanicalNonlinear.py >+FreeCAD/Mod/Fem/PyGui/_ViewProviderFemMeshGmsh.py >+FreeCAD/Mod/Fem/PyGui/_ViewProviderFemMeshGroup.py >+FreeCAD/Mod/Fem/PyGui/_ViewProviderFemMeshRegion.py >+FreeCAD/Mod/Fem/PyGui/_ViewProviderFemResultMechanical.py >+FreeCAD/Mod/Fem/PyGui/_ViewProviderFemSolverCalculix.py >+FreeCAD/Mod/Fem/PyGui/_ViewProviderFemSolverZ88.py >+FreeCAD/Mod/Fem/PyGui/__init__.py >+FreeCAD/Mod/Fem/PyObjects/_FemConstraintSelfWeight.py >+FreeCAD/Mod/Fem/PyObjects/_FemElementFluid1D.py >+FreeCAD/Mod/Fem/PyObjects/_FemElementGeometry1D.py >+FreeCAD/Mod/Fem/PyObjects/_FemElementGeometry2D.py >+FreeCAD/Mod/Fem/PyObjects/_FemMaterial.py >+FreeCAD/Mod/Fem/PyObjects/_FemMaterialMechanicalNonlinear.py >+FreeCAD/Mod/Fem/PyObjects/_FemMeshGmsh.py >+FreeCAD/Mod/Fem/PyObjects/_FemMeshGroup.py >+FreeCAD/Mod/Fem/PyObjects/_FemMeshRegion.py >+FreeCAD/Mod/Fem/PyObjects/_FemResultMechanical.py >+FreeCAD/Mod/Fem/PyObjects/_FemSolverCalculix.py >+FreeCAD/Mod/Fem/PyObjects/_FemSolverZ88.py >+FreeCAD/Mod/Fem/PyObjects/__init__.py > FreeCAD/Mod/Fem/TestFem.py >-FreeCAD/Mod/Fem/_CommandAnalysis.py >-FreeCAD/Mod/Fem/_CommandBeamSection.py >-FreeCAD/Mod/Fem/_CommandClearMesh.py >-FreeCAD/Mod/Fem/_CommandConstraintSelfWeight.py >-FreeCAD/Mod/Fem/_CommandControlSolver.py >-FreeCAD/Mod/Fem/_CommandFEMMesh2Mesh.py >-FreeCAD/Mod/Fem/_CommandMaterialFluid.py >-FreeCAD/Mod/Fem/_CommandMaterialMechanicalNonlinear.py >-FreeCAD/Mod/Fem/_CommandMaterialSolid.py >-FreeCAD/Mod/Fem/_CommandMeshGmshFromShape.py >-FreeCAD/Mod/Fem/_CommandMeshGroup.py >-FreeCAD/Mod/Fem/_CommandMeshNetgenFromShape.py >-FreeCAD/Mod/Fem/_CommandMeshRegion.py >-FreeCAD/Mod/Fem/_CommandPrintMeshInfo.py >-FreeCAD/Mod/Fem/_CommandPurgeResults.py >-FreeCAD/Mod/Fem/_CommandRunSolver.py >-FreeCAD/Mod/Fem/_CommandShellThickness.py >-FreeCAD/Mod/Fem/_CommandShowResult.py >-FreeCAD/Mod/Fem/_CommandSolverCalculix.py >-FreeCAD/Mod/Fem/_CommandSolverZ88.py >-FreeCAD/Mod/Fem/_FemBeamSection.py >-FreeCAD/Mod/Fem/_FemConstraintSelfWeight.py >-FreeCAD/Mod/Fem/_FemMaterial.py >-FreeCAD/Mod/Fem/_FemMaterialMechanicalNonlinear.py >-FreeCAD/Mod/Fem/_FemMeshGmsh.py >-FreeCAD/Mod/Fem/_FemMeshGroup.py >-FreeCAD/Mod/Fem/_FemMeshRegion.py >-FreeCAD/Mod/Fem/_FemShellThickness.py >-FreeCAD/Mod/Fem/_FemSolverCalculix.py >-FreeCAD/Mod/Fem/_FemSolverZ88.py >-FreeCAD/Mod/Fem/_TaskPanelFemBeamSection.py >-FreeCAD/Mod/Fem/_TaskPanelFemMaterial.py >-FreeCAD/Mod/Fem/_TaskPanelFemMeshGmsh.py >-FreeCAD/Mod/Fem/_TaskPanelFemMeshGroup.py >-FreeCAD/Mod/Fem/_TaskPanelFemMeshRegion.py >-FreeCAD/Mod/Fem/_TaskPanelFemShellThickness.py >-FreeCAD/Mod/Fem/_TaskPanelFemSolverCalculix.py >-FreeCAD/Mod/Fem/_TaskPanelShowResult.py >-FreeCAD/Mod/Fem/_ViewProviderFemBeamSection.py >-FreeCAD/Mod/Fem/_ViewProviderFemConstraintSelfWeight.py >-FreeCAD/Mod/Fem/_ViewProviderFemMaterial.py >-FreeCAD/Mod/Fem/_ViewProviderFemMaterialMechanicalNonlinear.py >-FreeCAD/Mod/Fem/_ViewProviderFemMeshGmsh.py >-FreeCAD/Mod/Fem/_ViewProviderFemMeshGroup.py >-FreeCAD/Mod/Fem/_ViewProviderFemMeshRegion.py >-FreeCAD/Mod/Fem/_ViewProviderFemShellThickness.py >-FreeCAD/Mod/Fem/_ViewProviderFemSolverCalculix.py >-FreeCAD/Mod/Fem/_ViewProviderFemSolverZ88.py >-FreeCAD/Mod/Fem/ccxDatReader.py >-FreeCAD/Mod/Fem/ccxFrdReader.py > FreeCAD/Mod/Fem/convert2TetGen.py >+FreeCAD/Mod/Fem/importCcxDatResults.py >+FreeCAD/Mod/Fem/importCcxFrdResults.py >+FreeCAD/Mod/Fem/importFenicsMesh.py > FreeCAD/Mod/Fem/importInpMesh.py >+FreeCAD/Mod/Fem/importToolsFem.py > FreeCAD/Mod/Fem/importVTKResults.py > FreeCAD/Mod/Fem/importZ88Mesh.py >-FreeCAD/Mod/Fem/importZ88Results.py >+FreeCAD/Mod/Fem/importZ88O2Results.py > FreeCAD/Mod/Fem/test_files/ccx/cube.fcstd > FreeCAD/Mod/Fem/test_files/ccx/cube_frequency.dat > FreeCAD/Mod/Fem/test_files/ccx/cube_frequency.frd >@@ -259,6 +259,9 @@ FreeCAD/Mod/Part/BOPTools/SplitAPI.py > FreeCAD/Mod/Part/BOPTools/SplitFeatures.py > FreeCAD/Mod/Part/BOPTools/Utils.py > FreeCAD/Mod/Part/BOPTools/__init__.py >+FreeCAD/Mod/Part/CompoundTools/CompoundFilter.py >+FreeCAD/Mod/Part/CompoundTools/_CommandCompoundFilter.py >+FreeCAD/Mod/Part/CompoundTools/__init__.py > FreeCAD/Mod/Part/Init.py > FreeCAD/Mod/Part/InitGui.py > FreeCAD/Mod/Part/JoinFeatures.py >@@ -500,6 +503,9 @@ FreeCAD/Mod/Test/Workbench.py > FreeCAD/Mod/Test/qtunittest.py > FreeCAD/Mod/Test/testmakeWireString.py > FreeCAD/Mod/Test/unittestgui.py >+FreeCAD/Mod/Tux/InitGui.py >+FreeCAD/Mod/Tux/NavigationIndicatorGui.py >+FreeCAD/Mod/Tux/Tux_rc.py > FreeCAD/Mod/Web/Init.py > FreeCAD/Mod/Web/InitGui.py > FreeCAD/bin/FreeCAD
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 217917
: 180958