git: 7aece98e4a7a - main - cad/freecad: update to 0.20.2

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Christoph Moench-Tegeder <cmt_at_FreeBSD.org>
Date: Tue, 06 Dec 2022 23:15:54 UTC
The branch main has been updated by cmt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7aece98e4a7ad3e1904872e034062ccf72f3fecd

commit 7aece98e4a7ad3e1904872e034062ccf72f3fecd
Author:     Christoph Moench-Tegeder <cmt@FreeBSD.org>
AuthorDate: 2022-12-06 23:15:26 +0000
Commit:     Christoph Moench-Tegeder <cmt@FreeBSD.org>
CommitDate: 2022-12-06 23:15:26 +0000

    cad/freecad: update to 0.20.2
    
    Release Notes:
      https://github.com/FreeCAD/FreeCAD/releases/tag/0.20.2
---
 cad/freecad/Makefile                               |  3 +-
 cad/freecad/distinfo                               |  6 +-
 .../files/patch-src_Mod_Part_App_OCCError.h        | 12 +++
 cad/freecad/pkg-plist                              | 92 +++++++++++++---------
 4 files changed, 71 insertions(+), 42 deletions(-)

diff --git a/cad/freecad/Makefile b/cad/freecad/Makefile
index 7c94f3e0b9cd..d76e9f774dea 100644
--- a/cad/freecad/Makefile
+++ b/cad/freecad/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	FreeCAD
-DISTVERSION=	0.20.1
-PORTREVISION=	4
+DISTVERSION=	0.20.2
 # use these for bugfixes/snapshots
 # DISTVERSION=	0.18-16093 # git rev-list --count
 # DISTVERSIONSUFFIX=	-g690774c0e
diff --git a/cad/freecad/distinfo b/cad/freecad/distinfo
index 10b47a24744f..94f9a3e40388 100644
--- a/cad/freecad/distinfo
+++ b/cad/freecad/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1660064663
-SHA256 (FreeCAD-FreeCAD-0.20.1_GH0.tar.gz) = 1a992d2dc005be6979600c53e1f4cceeb9c4047a00bc5053e64b3b96912f9ebc
-SIZE (FreeCAD-FreeCAD-0.20.1_GH0.tar.gz) = 85816653
+TIMESTAMP = 1670364675
+SHA256 (FreeCAD-FreeCAD-0.20.2_GH0.tar.gz) = be3b0be917142d36074f58782b276973890a3fad850bc1db2db99a5ad0c8732b
+SIZE (FreeCAD-FreeCAD-0.20.2_GH0.tar.gz) = 75558140
diff --git a/cad/freecad/files/patch-src_Mod_Part_App_OCCError.h b/cad/freecad/files/patch-src_Mod_Part_App_OCCError.h
new file mode 100644
index 000000000000..02f00c05cee2
--- /dev/null
+++ b/cad/freecad/files/patch-src_Mod_Part_App_OCCError.h
@@ -0,0 +1,12 @@
+--- src/Mod/Part/App/OCCError.h.orig	2022-12-06 23:30:48.794152000 +0100
++++ src/Mod/Part/App/OCCError.h	2022-12-06 23:31:40.841019000 +0100
+@@ -50,7 +50,9 @@
+ # include <Standard_Overflow.hxx>
+ # include <Standard_ProgramError.hxx>
+ # include <Standard_RangeError.hxx>
++# if OCC_VERSION_HEX <= 0x070600
+ # include <Standard_TooManyUsers.hxx>
++# endif
+ # include <Standard_TypeMismatch.hxx>
+ # include <Standard_Underflow.hxx>
+ 
diff --git a/cad/freecad/pkg-plist b/cad/freecad/pkg-plist
index 1b7d369e483a..84d77dfdc2b8 100644
--- a/cad/freecad/pkg-plist
+++ b/cad/freecad/pkg-plist
@@ -39,7 +39,6 @@ FreeCAD/Mod/AddonManager/AddonManager_rc.py
 FreeCAD/Mod/AddonManager/Init.py
 FreeCAD/Mod/AddonManager/InitGui.py
 FreeCAD/Mod/AddonManager/NetworkManager.py
-FreeCAD/Mod/AddonManager/PythonDependencyUpdateDialog.ui
 FreeCAD/Mod/AddonManager/TestAddonManagerApp.py
 FreeCAD/Mod/AddonManager/TestAddonManagerGui.py
 FreeCAD/Mod/AddonManager/add_toolbar_button_dialog.ui
@@ -54,7 +53,6 @@ FreeCAD/Mod/AddonManager/expanded_view.py
 FreeCAD/Mod/AddonManager/first_run.ui
 FreeCAD/Mod/AddonManager/install_to_toolbar.py
 FreeCAD/Mod/AddonManager/loading.html
-FreeCAD/Mod/AddonManager/manage_python_dependencies.py
 FreeCAD/Mod/AddonManager/package_details.py
 FreeCAD/Mod/AddonManager/package_list.py
 FreeCAD/Mod/AddonManager/select_toolbar_dialog.ui
@@ -364,6 +362,12 @@ FreeCAD/Mod/Draft/importDWG.py
 FreeCAD/Mod/Draft/importDXF.py
 FreeCAD/Mod/Draft/importOCA.py
 FreeCAD/Mod/Draft/importSVG.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/Drawing/README.md
 FreeCAD/Mod/Fem/Init.py
 FreeCAD/Mod/Fem/InitGui.py
 FreeCAD/Mod/Fem/ObjectsFem.py
@@ -1010,7 +1014,6 @@ FreeCAD/Mod/Path/PathScripts/PathAdaptive.py
 FreeCAD/Mod/Path/PathScripts/PathAdaptiveGui.py
 FreeCAD/Mod/Path/PathScripts/PathAreaOp.py
 FreeCAD/Mod/Path/PathScripts/PathArray.py
-FreeCAD/Mod/Path/PathScripts/PathCamoticsGui.py
 FreeCAD/Mod/Path/PathScripts/PathCircularHoleBase.py
 FreeCAD/Mod/Path/PathScripts/PathCircularHoleBaseGui.py
 FreeCAD/Mod/Path/PathScripts/PathComment.py
@@ -1121,9 +1124,6 @@ FreeCAD/Mod/Path/PathScripts/PathVcarveGui.py
 FreeCAD/Mod/Path/PathScripts/PathWaterline.py
 FreeCAD/Mod/Path/PathScripts/PathWaterlineGui.py
 FreeCAD/Mod/Path/PathScripts/PostUtils.py
-FreeCAD/Mod/Path/PathScripts/PostUtilsArguments.py
-FreeCAD/Mod/Path/PathScripts/PostUtilsExport.py
-FreeCAD/Mod/Path/PathScripts/PostUtilsParse.py
 FreeCAD/Mod/Path/PathScripts/__init__.py
 FreeCAD/Mod/Path/PathScripts/drillableLib.py
 FreeCAD/Mod/Path/PathScripts/post/KineticNCBeamicon2_post.py
@@ -1146,11 +1146,6 @@ FreeCAD/Mod/Path/PathScripts/post/nccad_post.py
 FreeCAD/Mod/Path/PathScripts/post/opensbp_post.py
 FreeCAD/Mod/Path/PathScripts/post/opensbp_pre.py
 FreeCAD/Mod/Path/PathScripts/post/philips_post.py
-FreeCAD/Mod/Path/PathScripts/post/refactored_centroid_post.py
-FreeCAD/Mod/Path/PathScripts/post/refactored_grbl_post.py
-FreeCAD/Mod/Path/PathScripts/post/refactored_linuxcnc_post.py
-FreeCAD/Mod/Path/PathScripts/post/refactored_mach3_mach4_post.py
-FreeCAD/Mod/Path/PathScripts/post/refactored_test_post.py
 FreeCAD/Mod/Path/PathScripts/post/rml_post.py
 FreeCAD/Mod/Path/PathScripts/post/rrf_post.py
 FreeCAD/Mod/Path/PathScripts/post/slic3r_pre.py
@@ -1158,10 +1153,6 @@ FreeCAD/Mod/Path/PathScripts/post/smoothie_post.py
 FreeCAD/Mod/Path/PathScripts/post/uccnc_post.py
 FreeCAD/Mod/Path/PathTests/Drilling_1.FCStd
 FreeCAD/Mod/Path/PathTests/PathTestUtils.py
-FreeCAD/Mod/Path/PathTests/TestCentroidPost.py
-FreeCAD/Mod/Path/PathTests/TestGrblPost.py
-FreeCAD/Mod/Path/PathTests/TestLinuxCNCPost.py
-FreeCAD/Mod/Path/PathTests/TestMach3Mach4Post.py
 FreeCAD/Mod/Path/PathTests/TestPathAdaptive.py
 FreeCAD/Mod/Path/PathTests/TestPathCore.py
 FreeCAD/Mod/Path/PathTests/TestPathDeburr.py
@@ -1192,26 +1183,19 @@ FreeCAD/Mod/Path/PathTests/TestPathTooltable.py
 FreeCAD/Mod/Path/PathTests/TestPathUtil.py
 FreeCAD/Mod/Path/PathTests/TestPathVcarve.py
 FreeCAD/Mod/Path/PathTests/TestPathVoronoi.py
-FreeCAD/Mod/Path/PathTests/TestRefactoredCentroidPost.py
-FreeCAD/Mod/Path/PathTests/TestRefactoredGrblPost.py
-FreeCAD/Mod/Path/PathTests/TestRefactoredLinuxCNCPost.py
-FreeCAD/Mod/Path/PathTests/TestRefactoredMach3Mach4Post.py
-FreeCAD/Mod/Path/PathTests/TestRefactoredTestPost.py
 FreeCAD/Mod/Path/PathTests/Tools/Bit/test-path-tool-bit-bit-00.fctb
 FreeCAD/Mod/Path/PathTests/Tools/Library/test-path-tool-bit-library-00.fctl
 FreeCAD/Mod/Path/PathTests/Tools/Shape/test-path-tool-bit-shape-00.fcstd
 FreeCAD/Mod/Path/PathTests/__init__.py
 FreeCAD/Mod/Path/PathTests/boxtest.fcstd
-FreeCAD/Mod/Path/PathTests/boxtest1.fcstd
-FreeCAD/Mod/Path/PathTests/drill_test1.FCStd
 FreeCAD/Mod/Path/PathTests/test-path-tool-bit-bit-00.fctb
 FreeCAD/Mod/Path/PathTests/test-path-tool-bit-library-00.fctl
 FreeCAD/Mod/Path/PathTests/test-path-tool-bit-shape-00.fcstd
 FreeCAD/Mod/Path/PathTests/test_adaptive.fcstd
 FreeCAD/Mod/Path/PathTests/test_centroid_00.ngc
-FreeCAD/Mod/Path/PathTests/test_filenaming.fcstd
 FreeCAD/Mod/Path/PathTests/test_geomop.fcstd
 FreeCAD/Mod/Path/PathTests/test_holes00.fcstd
+FreeCAD/Mod/Path/PathTests/test_linuxcnc_00.ngc
 FreeCAD/Mod/Path/TestPathApp.py
 FreeCAD/Mod/Path/Tools/Bit/45degree_chamfer.fctb
 FreeCAD/Mod/Path/Tools/Bit/5mm-thread-cutter.fctb
@@ -1236,8 +1220,6 @@ FreeCAD/Mod/Path/Tools/Shape/v-bit.fcstd
 FreeCAD/Mod/Plot/Plot.py
 FreeCAD/Mod/Points/Init.py
 FreeCAD/Mod/Points/InitGui.py
-FreeCAD/Mod/Points/pointscommands/__init__.py
-FreeCAD/Mod/Points/pointscommands/commands.py
 FreeCAD/Mod/Raytracing/Init.py
 FreeCAD/Mod/Raytracing/InitGui.py
 FreeCAD/Mod/Raytracing/RaytracingExample.py
@@ -1293,16 +1275,13 @@ FreeCAD/Mod/Surface/Init.py
 FreeCAD/Mod/Surface/InitGui.py
 FreeCAD/Mod/TechDraw/Init.py
 FreeCAD/Mod/TechDraw/InitGui.py
-FreeCAD/Mod/TechDraw/TDTest/DrawHatchTest.py
-FreeCAD/Mod/TechDraw/TDTest/DrawProjectionGroupTest.py
-FreeCAD/Mod/TechDraw/TDTest/DrawViewAnnotationTest.py
-FreeCAD/Mod/TechDraw/TDTest/DrawViewBalloonTest.py
-FreeCAD/Mod/TechDraw/TDTest/DrawViewDimensionTest.py
-FreeCAD/Mod/TechDraw/TDTest/DrawViewImageTest.py
-FreeCAD/Mod/TechDraw/TDTest/DrawViewPartTest.py
-FreeCAD/Mod/TechDraw/TDTest/DrawViewSectionTest.py
-FreeCAD/Mod/TechDraw/TDTest/DrawViewSymbolTest.py
-FreeCAD/Mod/TechDraw/TDTest/TechDrawTestUtilities.py
+FreeCAD/Mod/TechDraw/TDTest/DHatchTest.py
+FreeCAD/Mod/TechDraw/TDTest/DProjGroupTest.py
+FreeCAD/Mod/TechDraw/TDTest/DVAnnoSymImageTest.py
+FreeCAD/Mod/TechDraw/TDTest/DVBalloonTest.py
+FreeCAD/Mod/TechDraw/TDTest/DVDimensionTest.py
+FreeCAD/Mod/TechDraw/TDTest/DVPartTest.py
+FreeCAD/Mod/TechDraw/TDTest/DVSectionTest.py
 FreeCAD/Mod/TechDraw/TDTest/TestHatch.svg
 FreeCAD/Mod/TechDraw/TDTest/TestImage.png
 FreeCAD/Mod/TechDraw/TDTest/TestSymbol.svg
@@ -1351,6 +1330,8 @@ FreeCAD/bin/FreeCAD
 FreeCAD/bin/FreeCADCmd
 FreeCAD/include/E57Format/E57Export.h
 FreeCAD/lib/DraftUtils.so
+FreeCAD/lib/Drawing.so
+FreeCAD/lib/DrawingGui.so
 FreeCAD/lib/Fem.so
 FreeCAD/lib/FemGui.so
 FreeCAD/lib/FreeCAD.so
@@ -1417,12 +1398,10 @@ FreeCAD/share/Gui/PreferencePackTemplates/Draft_Colors.cfg
 FreeCAD/share/Gui/PreferencePackTemplates/Editor_Colors.cfg
 FreeCAD/share/Gui/PreferencePackTemplates/Editor_Font.cfg
 FreeCAD/share/Gui/PreferencePackTemplates/Main_window_layout.cfg
-FreeCAD/share/Gui/PreferencePackTemplates/Part_Colors.cfg
 FreeCAD/share/Gui/PreferencePackTemplates/Path_Colors.cfg
 FreeCAD/share/Gui/PreferencePackTemplates/Sketcher_Colors.cfg
 FreeCAD/share/Gui/PreferencePackTemplates/Start_Colors.cfg
 FreeCAD/share/Gui/PreferencePackTemplates/TechDraw_Colors.cfg
-FreeCAD/share/Gui/PreferencePackTemplates/View.cfg
 FreeCAD/share/Gui/PreferencePackTemplates/Window_Colors.cfg
 FreeCAD/share/Gui/PreferencePacks/FreeCAD Classic Colors/FreeCAD Classic Colors.cfg
 FreeCAD/share/Gui/PreferencePacks/package.xml
@@ -1521,6 +1500,43 @@ FreeCAD/share/Mod/Arch/Presets/profiles.csv
 FreeCAD/share/Mod/Arch/Presets/pset_definitions.csv
 FreeCAD/share/Mod/Arch/Resources/icons/ArchWorkbench.svg
 FreeCAD/share/Mod/Draft/Resources/icons/DraftWorkbench.svg
+FreeCAD/share/Mod/Drawing/Resources/icons/DrawingWorkbench.svg
+FreeCAD/share/Mod/Drawing/Templates/A0_Landscape_ISO7200.dxf
+FreeCAD/share/Mod/Drawing/Templates/A0_Landscape_ISO7200.svg
+FreeCAD/share/Mod/Drawing/Templates/A0_Landscape_plain.dxf
+FreeCAD/share/Mod/Drawing/Templates/A0_Landscape_plain.svg
+FreeCAD/share/Mod/Drawing/Templates/A0_Portrait_plain.dxf
+FreeCAD/share/Mod/Drawing/Templates/A0_Portrait_plain.svg
+FreeCAD/share/Mod/Drawing/Templates/A1_Landscape_ISO7200.dxf
+FreeCAD/share/Mod/Drawing/Templates/A1_Landscape_ISO7200.svg
+FreeCAD/share/Mod/Drawing/Templates/A1_Landscape_plain.dxf
+FreeCAD/share/Mod/Drawing/Templates/A1_Landscape_plain.svg
+FreeCAD/share/Mod/Drawing/Templates/A1_Portrait_plain.dxf
+FreeCAD/share/Mod/Drawing/Templates/A1_Portrait_plain.svg
+FreeCAD/share/Mod/Drawing/Templates/A2_Landscape_ISO7200.dxf
+FreeCAD/share/Mod/Drawing/Templates/A2_Landscape_ISO7200.svg
+FreeCAD/share/Mod/Drawing/Templates/A2_Landscape_plain.dxf
+FreeCAD/share/Mod/Drawing/Templates/A2_Landscape_plain.svg
+FreeCAD/share/Mod/Drawing/Templates/A2_Portrait_plain.dxf
+FreeCAD/share/Mod/Drawing/Templates/A2_Portrait_plain.svg
+FreeCAD/share/Mod/Drawing/Templates/A3_Landscape.dxf
+FreeCAD/share/Mod/Drawing/Templates/A3_Landscape.svg
+FreeCAD/share/Mod/Drawing/Templates/A3_Landscape_ISO7200.dxf
+FreeCAD/share/Mod/Drawing/Templates/A3_Landscape_ISO7200.svg
+FreeCAD/share/Mod/Drawing/Templates/A3_Landscape_plain.dxf
+FreeCAD/share/Mod/Drawing/Templates/A3_Landscape_plain.svg
+FreeCAD/share/Mod/Drawing/Templates/A3_Portrait_plain.dxf
+FreeCAD/share/Mod/Drawing/Templates/A3_Portrait_plain.svg
+FreeCAD/share/Mod/Drawing/Templates/A4_Landscape.dxf
+FreeCAD/share/Mod/Drawing/Templates/A4_Landscape.svg
+FreeCAD/share/Mod/Drawing/Templates/A4_Landscape_ISO7200.dxf
+FreeCAD/share/Mod/Drawing/Templates/A4_Landscape_ISO7200.svg
+FreeCAD/share/Mod/Drawing/Templates/A4_Landscape_plain.dxf
+FreeCAD/share/Mod/Drawing/Templates/A4_Landscape_plain.svg
+FreeCAD/share/Mod/Drawing/Templates/A4_Portrait_ISO7200.dxf
+FreeCAD/share/Mod/Drawing/Templates/A4_Portrait_ISO7200.svg
+FreeCAD/share/Mod/Drawing/Templates/A4_Portrait_plain.dxf
+FreeCAD/share/Mod/Drawing/Templates/A4_Portrait_plain.svg
 FreeCAD/share/Mod/Fem/Resources/icons/FemWorkbench.svg
 FreeCAD/share/Mod/Image/Resources/icons/ImageWorkbench.svg
 FreeCAD/share/Mod/Import/DxfPlate/blocks10.rub
@@ -1556,10 +1572,12 @@ FreeCAD/share/Mod/Material/StandardMaterial/Aluminum-Generic.FCMat
 FreeCAD/share/Mod/Material/StandardMaterial/CalculiX-Steel.FCMat
 FreeCAD/share/Mod/Material/StandardMaterial/Concrete-EN-C35_45.FCMat
 FreeCAD/share/Mod/Material/StandardMaterial/Concrete-Generic.FCMat
+FreeCAD/share/Mod/Material/StandardMaterial/Copper-Generic.FCMat
 FreeCAD/share/Mod/Material/StandardMaterial/Glass-E-GlassFibre.FCMat
 FreeCAD/share/Mod/Material/StandardMaterial/Glass-Generic.FCMat
 FreeCAD/share/Mod/Material/StandardMaterial/Glass-S2-GlassFibre.FCMat
 FreeCAD/share/Mod/Material/StandardMaterial/Graphite.FCMat
+FreeCAD/share/Mod/Material/StandardMaterial/Invar-Generic.FCMat
 FreeCAD/share/Mod/Material/StandardMaterial/None.FCMat
 FreeCAD/share/Mod/Material/StandardMaterial/PA6-Generic.FCMat
 FreeCAD/share/Mod/Material/StandardMaterial/PET-Generic.FCMat