Author: Thibault Jouan Date: Thu May 25 18:44:21 2017 +0000 Update cad/freecad port to e24aa3f diff --git a/cad/freecad/Makefile b/cad/freecad/Makefile index 86c54fc1dc05..8cd8a2f02227 100644 --- a/cad/freecad/Makefile +++ b/cad/freecad/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= FreeCAD -DISTVERSION= 0.17.g20170310 -PORTREVISION= 4 +DISTVERSION= 0.17.g20170616 CATEGORIES= cad MAINTAINER= tj+freebsd_ports@a13.fr @@ -33,7 +32,7 @@ LIB_DEPENDS= libexpat.so:textproc/expat2 \ RUN_DEPENDS= pivy>0:graphics/py-pivy USE_GITHUB= yes -GH_TAGNAME= 91c59c7 +GH_TAGNAME= d28bae3 USES= dos2unix compiler:c++11-lib cmake:outsource fortran jpeg \ python localbase diff --git a/cad/freecad/distinfo b/cad/freecad/distinfo index cc5c4efa80b0..257e2eac1e0b 100644 --- a/cad/freecad/distinfo +++ b/cad/freecad/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1489314013 -SHA256 (FreeCAD-FreeCAD-0.17.g20170310-91c59c7_GH0.tar.gz) = a3f97637842f2215f1be90dd876c23a2446a939aabe10e3c2fdf583e68dfa333 -SIZE (FreeCAD-FreeCAD-0.17.g20170310-91c59c7_GH0.tar.gz) = 120327486 +TIMESTAMP = 1497621665 +SHA256 (FreeCAD-FreeCAD-0.17.g20170616-d28bae3_GH0.tar.gz) = 3da1d1384bfdf573a4edca04ba97be8abfa4847d0479ec3cc8d11aa73a193a82 +SIZE (FreeCAD-FreeCAD-0.17.g20170616-d28bae3_GH0.tar.gz) = 120122816 diff --git a/cad/freecad/files/patch-src_3rdParty_salomesmesh_src_SMDS_SMDS__Mesh.cpp b/cad/freecad/files/patch-src_3rdParty_salomesmesh_src_SMDS_SMDS__Mesh.cpp index ca0fbdbc6a03..62470566d76a 100644 --- a/cad/freecad/files/patch-src_3rdParty_salomesmesh_src_SMDS_SMDS__Mesh.cpp +++ b/cad/freecad/files/patch-src_3rdParty_salomesmesh_src_SMDS_SMDS__Mesh.cpp @@ -1,4 +1,4 @@ ---- src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp.orig 2016-09-07 14:39:54 UTC +--- src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp.orig 2017-06-16 13:00:26 UTC +++ src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp @@ -57,7 +57,7 @@ using namespace std; diff --git a/cad/freecad/files/patch-src_Base_Console.cpp b/cad/freecad/files/patch-src_Base_Console.cpp new file mode 100644 index 000000000000..10ffc5a93b41 --- /dev/null +++ b/cad/freecad/files/patch-src_Base_Console.cpp @@ -0,0 +1,11 @@ +--- src/Base/Console.cpp.orig 2017-06-16 13:04:23 UTC ++++ src/Base/Console.cpp +@@ -714,7 +714,7 @@ void ConsoleObserverFile::Log (const + ConsoleObserverStd::ConsoleObserverStd() : + # if defined(FC_OS_WIN32) + useColorStderr( true ) +-# elif defined(FC_OS_LINUX) || defined(FC_OS_MACOSX) ++# else + useColorStderr( isatty(STDERR_FILENO) ) + # endif + { diff --git a/cad/freecad/files/patch-src_Gui_CMakeLists.txt b/cad/freecad/files/patch-src_Gui_CMakeLists.txt index b29aa2bcc26e..992e4cfc3226 100644 --- a/cad/freecad/files/patch-src_Gui_CMakeLists.txt +++ b/cad/freecad/files/patch-src_Gui_CMakeLists.txt @@ -1,11 +1,11 @@ ---- src/Gui/CMakeLists.txt.orig 2016-09-07 14:39:54 UTC +--- src/Gui/CMakeLists.txt.orig 2017-06-16 13:00:26 UTC +++ src/Gui/CMakeLists.txt -@@ -57,7 +57,7 @@ else(MSVC) +@@ -58,7 +58,7 @@ else(MSVC) + FreeCADApp ${COIN3D_LIBRARIES} - ${QT_LIBRARIES} ${Boost_LIBRARIES} - ${OPENGL_gl_LIBRARY} -+ ${OPENGL_gl_LIBRARY} -L%%LOCALBASE%%/lib ++ ${OPENGL_gl_LIBRARY} -L/usr/local/lib ${3DCONNEXION_LINKFLAGS} ) endif(MSVC) diff --git a/cad/freecad/pkg-plist b/cad/freecad/pkg-plist index 08701d1edd27..b5823d1871e8 100644 --- a/cad/freecad/pkg-plist +++ b/cad/freecad/pkg-plist @@ -20,7 +20,6 @@ FreeCAD/Mod/Arch/ArchRebar.py FreeCAD/Mod/Arch/ArchRoof.py FreeCAD/Mod/Arch/ArchSchedule.py FreeCAD/Mod/Arch/ArchSectionPlane.py -FreeCAD/Mod/Arch/ArchServer.py FreeCAD/Mod/Arch/ArchSite.py FreeCAD/Mod/Arch/ArchSpace.py FreeCAD/Mod/Arch/ArchStairs.py @@ -155,24 +154,28 @@ FreeCAD/Mod/Fem/importToolsFem.py FreeCAD/Mod/Fem/importVTKResults.py FreeCAD/Mod/Fem/importZ88Mesh.py FreeCAD/Mod/Fem/importZ88O2Results.py +FreeCAD/Mod/Fem/readFenicsXDMF.py +FreeCAD/Mod/Fem/readFenicsXML.py +FreeCAD/Mod/Fem/test_files/__init__.py +FreeCAD/Mod/Fem/test_files/ccx/__init__.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 FreeCAD/Mod/Fem/test_files/ccx/cube_frequency.inp FreeCAD/Mod/Fem/test_files/ccx/cube_frequency_expected_values +FreeCAD/Mod/Fem/test_files/ccx/cube_mesh.py FreeCAD/Mod/Fem/test_files/ccx/cube_static.dat FreeCAD/Mod/Fem/test_files/ccx/cube_static.frd FreeCAD/Mod/Fem/test_files/ccx/cube_static.inp FreeCAD/Mod/Fem/test_files/ccx/cube_static_expected_values -FreeCAD/Mod/Fem/test_files/ccx/mesh_points.csv -FreeCAD/Mod/Fem/test_files/ccx/mesh_volumes.csv -FreeCAD/Mod/Fem/test_files/ccx/spine_points.csv +FreeCAD/Mod/Fem/test_files/ccx/spine_mesh.py FreeCAD/Mod/Fem/test_files/ccx/spine_thermomech.dat FreeCAD/Mod/Fem/test_files/ccx/spine_thermomech.fcstd FreeCAD/Mod/Fem/test_files/ccx/spine_thermomech.frd FreeCAD/Mod/Fem/test_files/ccx/spine_thermomech.inp FreeCAD/Mod/Fem/test_files/ccx/spine_thermomech_expected_values -FreeCAD/Mod/Fem/test_files/ccx/spine_volumes.csv +FreeCAD/Mod/Fem/writeFenicsXDMF.py +FreeCAD/Mod/Fem/writeFenicsXML.py FreeCAD/Mod/Idf/Idf.py FreeCAD/Mod/Idf/Idflibs/0603_SMD.stp FreeCAD/Mod/Idf/Idflibs/0805_SMD.stp @@ -345,7 +348,6 @@ FreeCAD/Mod/Path/PathScripts/PathToolLenOffset.py FreeCAD/Mod/Path/PathScripts/PathToolLibraryManager.py FreeCAD/Mod/Path/PathScripts/PathUtils.py FreeCAD/Mod/Path/PathScripts/PostUtils.py -FreeCAD/Mod/Path/PathScripts/TooltableEditor.py FreeCAD/Mod/Path/PathScripts/__init__.py FreeCAD/Mod/Path/PathScripts/centroid_post.py FreeCAD/Mod/Path/PathScripts/comparams_post.py @@ -365,6 +367,7 @@ FreeCAD/Mod/Path/PathScripts/opensbp_pre.py FreeCAD/Mod/Path/PathScripts/phillips_post.py FreeCAD/Mod/Path/PathScripts/rml_post.py FreeCAD/Mod/Path/PathScripts/slic3r_pre.py +FreeCAD/Mod/Path/PathScripts/smoothie_post.py FreeCAD/Mod/Path/PathTests/PathTestUtils.py FreeCAD/Mod/Path/PathTests/TestPathCore.py FreeCAD/Mod/Path/PathTests/TestPathDepthParams.py @@ -486,7 +489,10 @@ FreeCAD/Mod/Spreadsheet/importXLSX.py FreeCAD/Mod/Start/Init.py FreeCAD/Mod/Start/InitGui.py FreeCAD/Mod/Start/StartPage/StartPage.py +FreeCAD/Mod/Start/StartPage/TranslationTexts.py FreeCAD/Mod/Start/StartPage/__init__.py +FreeCAD/Mod/Surface/Init.py +FreeCAD/Mod/Surface/InitGui.py FreeCAD/Mod/TechDraw/Init.py FreeCAD/Mod/TechDraw/InitGui.py FreeCAD/Mod/TechDraw/TestTechDrawApp.py @@ -500,9 +506,12 @@ FreeCAD/Mod/Test/TestGui.py FreeCAD/Mod/Test/UnicodeTests.py FreeCAD/Mod/Test/UnitTests.py FreeCAD/Mod/Test/Workbench.py +FreeCAD/Mod/Test/__init__.py FreeCAD/Mod/Test/qtunittest.py FreeCAD/Mod/Test/testmakeWireString.py FreeCAD/Mod/Test/unittestgui.py +FreeCAD/Mod/Tux/PersistentToolbars.py +FreeCAD/Mod/Tux/PersistentToolbarsGui.py FreeCAD/Mod/Tux/InitGui.py FreeCAD/Mod/Tux/NavigationIndicatorGui.py FreeCAD/Mod/Tux/Tux_rc.py @@ -788,9 +797,27 @@ FreeCAD/data/Mod/Start/StartPage/PartDesignExample.png FreeCAD/data/Mod/Start/StartPage/Ship.png FreeCAD/data/Mod/Start/StartPage/Ship.py FreeCAD/data/Mod/Start/StartPage/ShipExample.png +FreeCAD/data/Mod/Start/StartPage/StartPage.css +FreeCAD/data/Mod/Start/StartPage/StartPage.html +FreeCAD/data/Mod/Start/StartPage/StartPage.js FreeCAD/data/Mod/Start/StartPage/blank.png FreeCAD/data/Mod/Start/StartPage/complete.jpg FreeCAD/data/Mod/Start/StartPage/freecad-doc.png +FreeCAD/data/Mod/Start/StartPage/images/ArchDesign.png +FreeCAD/data/Mod/Start/StartPage/images/ArchExample.png +FreeCAD/data/Mod/Start/StartPage/images/Background.jpg +FreeCAD/data/Mod/Start/StartPage/images/Banner.jpeg +FreeCAD/data/Mod/Start/StartPage/images/Complete.png +FreeCAD/data/Mod/Start/StartPage/images/FreeCAD.png +FreeCAD/data/Mod/Start/StartPage/images/Mesh.png +FreeCAD/data/Mod/Start/StartPage/images/PartDesign.png +FreeCAD/data/Mod/Start/StartPage/images/PartDesignExample.png +FreeCAD/data/Mod/Start/StartPage/images/Ship.png +FreeCAD/data/Mod/Start/StartPage/images/ShipExample.png +FreeCAD/data/Mod/Start/StartPage/images/blank.png +FreeCAD/data/Mod/Start/StartPage/images/complete.jpg +FreeCAD/data/Mod/Start/StartPage/images/freecad-doc.png +FreeCAD/data/Mod/Start/StartPage/images/web.png FreeCAD/data/Mod/Start/StartPage/web.png FreeCAD/data/Mod/TechDraw/Resources/icons/preferences-techdraw.svg FreeCAD/data/Mod/TechDraw/Templates/A0_Landscape_ISO7200TD.svg @@ -820,8 +847,6 @@ FreeCAD/data/freecad.svg FreeCAD/data/freecad.xpm FreeCAD/doc/freecad.qch FreeCAD/doc/freecad.qhc -FreeCAD/lib/Complete.so -FreeCAD/lib/CompleteGui.so FreeCAD/lib/DraftUtils.so FreeCAD/lib/Drawing.so FreeCAD/lib/DrawingGui.so @@ -860,6 +885,8 @@ FreeCAD/lib/Spreadsheet.so FreeCAD/lib/SpreadsheetGui.so FreeCAD/lib/Start.so FreeCAD/lib/StartGui.so +FreeCAD/lib/Surface.so +FreeCAD/lib/SurfaceGui.so FreeCAD/lib/TechDraw.so FreeCAD/lib/TechDrawGui.so FreeCAD/lib/Web.so