git: b2cdcb9d933b - main - cad/freecad: update to 1.0rc2

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Christoph Moench-Tegeder <cmt_at_FreeBSD.org>
Date: Tue, 24 Sep 2024 18:16:21 UTC
The branch main has been updated by cmt:

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

commit b2cdcb9d933b7f3772ebad589d7bde7e57e1749b
Author:     Christoph Moench-Tegeder <cmt@FreeBSD.org>
AuthorDate: 2024-09-24 18:15:50 +0000
Commit:     Christoph Moench-Tegeder <cmt@FreeBSD.org>
CommitDate: 2024-09-24 18:15:50 +0000

    cad/freecad: update to 1.0rc2
    
    Release Notes (WIP):
      https://wiki.freecad.org/Release_notes_1.0
---
 cad/freecad/Makefile                               |  2 +-
 cad/freecad/distinfo                               |  6 ++--
 ...h-src_3rdParty_libE57Format_src_CheckedFile.cpp | 34 ----------------------
 cad/freecad/files/patch-src_Mod_Gui_StartView.cpp  | 25 ----------------
 .../patch-src_Mod_Material_Gui_CMakeLists.txt      | 22 --------------
 .../patch-src_Mod_MeshPart_App_CMakeLists.txt      | 12 --------
 .../patch-src_Tools_plugins_widget_CMakeLists.txt  | 21 -------------
 cad/freecad/pkg-plist                              |  8 +++++
 8 files changed, 12 insertions(+), 118 deletions(-)

diff --git a/cad/freecad/Makefile b/cad/freecad/Makefile
index 359a0b15a99d..1bb0e7659b25 100644
--- a/cad/freecad/Makefile
+++ b/cad/freecad/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	FreeCAD
-DISTVERSION=	1.0rc1
+DISTVERSION=	1.0rc2
 CATEGORIES=	cad
 
 MAINTAINER=	cmt@FreeBSD.org
diff --git a/cad/freecad/distinfo b/cad/freecad/distinfo
index f426020c92f9..fd8a608f335e 100644
--- a/cad/freecad/distinfo
+++ b/cad/freecad/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1726945270
-SHA256 (FreeCAD-FreeCAD-1.0rc1_GH0.tar.gz) = 33ad59dcd268557cab14053987aefafb22c70b47e43c0d19a955762b0f4d7c03
-SIZE (FreeCAD-FreeCAD-1.0rc1_GH0.tar.gz) = 88552055
+TIMESTAMP = 1727129744
+SHA256 (FreeCAD-FreeCAD-1.0rc2_GH0.tar.gz) = 4ed61d1a91039e5ad465bc19313bc95422d93b52b0135c63b628e59778d29512
+SIZE (FreeCAD-FreeCAD-1.0rc2_GH0.tar.gz) = 88511772
diff --git a/cad/freecad/files/patch-src_3rdParty_libE57Format_src_CheckedFile.cpp b/cad/freecad/files/patch-src_3rdParty_libE57Format_src_CheckedFile.cpp
deleted file mode 100644
index 231d9cf2cd56..000000000000
--- a/cad/freecad/files/patch-src_3rdParty_libE57Format_src_CheckedFile.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
---- src/3rdParty/libE57Format/src/CheckedFile.cpp.orig	2024-03-20 18:17:18 UTC
-+++ src/3rdParty/libE57Format/src/CheckedFile.cpp
-@@ -25,6 +25,11 @@
-  * DEALINGS IN THE SOFTWARE.
-  */
- 
-+// convenience for all the BSDs
-+#if defined( __FreeBSD__) || defined( __NetBSD__) || defined( __OpenBSD__)
-+#define __BSD
-+#endif
-+
- #if defined( _WIN32 )
- #if defined( _MSC_VER )
- #include <codecvt>
-@@ -47,6 +52,10 @@
- #elif defined( __APPLE__ )
- #include <sys/types.h>
- #include <unistd.h>
-+#elif defined( __BSD )
-+#include <sys/stat.h>
-+#include <sys/types.h>
-+#include <unistd.h>
- #else
- #error "no supported OS platform defined"
- #endif
-@@ -483,7 +492,7 @@ uint64_t CheckedFile::lseek64( int64_t offset, int whe
- #endif
- #elif defined( __linux__ )
-    int64_t result = ::lseek64( fd_, offset, whence );
--#elif defined( __APPLE__ )
-+#elif defined( __APPLE__ ) || defined ( __BSD )
-    int64_t result = ::lseek( fd_, offset, whence );
- #else
- #error "no supported OS platform defined"
diff --git a/cad/freecad/files/patch-src_Mod_Gui_StartView.cpp b/cad/freecad/files/patch-src_Mod_Gui_StartView.cpp
deleted file mode 100644
index bb054fec6995..000000000000
--- a/cad/freecad/files/patch-src_Mod_Gui_StartView.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-commit 0946c6880def66bc0c611dad37140da3f126a6c3
-Author: wmayer <wmayer@freecad.org>
-Date:   Wed Sep 11 16:53:08 2024 +0200
-
-    StartPage: Make sure to pass a container widget to the QScrollArea
-    
-    Fixes #16047: FreeBSD: Segfault in StartView::firstStartWidgetDismissed
-
-diff --git src/Mod/Start/Gui/StartView.cpp src/Mod/Start/Gui/StartView.cpp
-index 4667c8db72..086cec7c35 100644
---- src/Mod/Start/Gui/StartView.cpp
-+++ src/Mod/Start/Gui/StartView.cpp
-@@ -117,7 +117,11 @@ StartView::StartView(QWidget* parent)
- 
-     // First start page
-     auto firstStartScrollArea = gsl::owner<QScrollArea*>(new QScrollArea());
--    auto firstStartRegion = gsl::owner<QHBoxLayout*>(new QHBoxLayout(firstStartScrollArea));
-+    auto firstStartScrollWidget = gsl::owner<QWidget*>(new QWidget(firstStartScrollArea));
-+    firstStartScrollArea->setWidget(firstStartScrollWidget);
-+    firstStartScrollArea->setWidgetResizable(true);
-+
-+    auto firstStartRegion = gsl::owner<QHBoxLayout*>(new QHBoxLayout(firstStartScrollWidget));
-     firstStartRegion->addStretch();
-     auto firstStartWidget = gsl::owner<FirstStartWidget*>(new FirstStartWidget(this));
-     connect(firstStartWidget,
diff --git a/cad/freecad/files/patch-src_Mod_Material_Gui_CMakeLists.txt b/cad/freecad/files/patch-src_Mod_Material_Gui_CMakeLists.txt
deleted file mode 100644
index e1d90495ffcb..000000000000
--- a/cad/freecad/files/patch-src_Mod_Material_Gui_CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-commit 448306c93760c0304ab1f74ff1fc4173c542fd60
-Author: Christoph Moench-Tegeder <cmt@burggraben.net>
-Date:   Sun Sep 22 01:40:21 2024 +0200
-
-    fix installation path
-
-diff --git src/Mod/Material/Gui/CMakeLists.txt src/Mod/Material/Gui/CMakeLists.txt
-index a33c503e90..e9804543d1 100644
---- src/Mod/Material/Gui/CMakeLists.txt
-+++ src/Mod/Material/Gui/CMakeLists.txt
-@@ -169,9 +169,9 @@ SET_PYTHON_PREFIX_SUFFIX(MatGui)
- 
- fc_copy_sources(MatGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Material" ${MatGuiIcon_SVG})
- fc_copy_sources(MatGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Material" ${MatGuiImages})
--fc_copy_sources(MatGui "${CMAKE_BINARY_DIR}/Mod/Material" ${Material_Ui_Files})
-+fc_copy_sources(MatGui "${CMAKE_BINARY_DIR}/Mod/Material" ${Material_Ui_Files})
- 
- INSTALL(TARGETS MatGui DESTINATION ${CMAKE_INSTALL_LIBDIR})
- INSTALL(FILES ${MatGuiIcon_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/Material/Resources/icons")
- INSTALL(FILES ${MatGuiImages} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/Material/Resources/images")
--INSTALL(FILES ${Material_Ui_Files} DESTINATION "${CMAKE_BINARY_DIR}/Mod/Material/Resources/ui")
-+INSTALL(FILES ${Material_Ui_Files} DESTINATION "Mod/Material/Resources/ui")
diff --git a/cad/freecad/files/patch-src_Mod_MeshPart_App_CMakeLists.txt b/cad/freecad/files/patch-src_Mod_MeshPart_App_CMakeLists.txt
deleted file mode 100644
index 308c93026b33..000000000000
--- a/cad/freecad/files/patch-src_Mod_MeshPart_App_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git src/Mod/MeshPart/App/CMakeLists.txt src/Mod/MeshPart/App/CMakeLists.txt
-index 11a84e1a13..d78fc8a197 100644
---- src/Mod/MeshPart/App/CMakeLists.txt
-+++ src/Mod/MeshPart/App/CMakeLists.txt
-@@ -19,6 +19,7 @@ include_directories(
-     ${SMESH_INCLUDE_DIR}
-     ${VTK_INCLUDE_DIRS}
-     ${EIGEN3_INCLUDE_DIR}
-+    ${pybind11_INCLUDE_DIR}
- )
- 
- 
diff --git a/cad/freecad/files/patch-src_Tools_plugins_widget_CMakeLists.txt b/cad/freecad/files/patch-src_Tools_plugins_widget_CMakeLists.txt
deleted file mode 100644
index 3471c5ec4e69..000000000000
--- a/cad/freecad/files/patch-src_Tools_plugins_widget_CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 22eb8cc0f4ffcc6e1e283d2d325b043f0f9fb625
-Author: Christoph Moench-Tegeder <cmt@burggraben.net>
-Date:   Sat Sep 21 21:58:31 2024 +0200
-
-    fix CMAKE CMP0153
-    
-    use execute_process() instead of exec_program()
-
-diff --git src/Tools/plugins/widget/CMakeLists.txt src/Tools/plugins/widget/CMakeLists.txt
-index d909c156a1..9052694f28 100644
---- src/Tools/plugins/widget/CMakeLists.txt
-+++ src/Tools/plugins/widget/CMakeLists.txt
-@@ -57,7 +57,7 @@ target_compile_options(FreeCAD_widgets PRIVATE ${COMPILE_OPTIONS})
- 
- # Get the install location of a plugin to determine the path to designer plguins
- get_target_property(QMAKE_EXECUTABLE Qt${FREECAD_QT_MAJOR_VERSION}::qmake LOCATION)
--exec_program(${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_PLUGINS" RETURN_VALUE return_code OUTPUT_VARIABLE DEFAULT_QT_PLUGINS_DIR )
-+execute_process(COMMAND ${QMAKE_EXECUTABLE} "-query" "QT_INSTALL_PLUGINS" RESULT_VARIABLE return_code OUTPUT_VARIABLE DEFAULT_QT_PLUGINS_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
- set(DESIGNER_PLUGIN_LOCATION ${DEFAULT_QT_PLUGINS_DIR}/designer CACHE PATH "Path where the plugin will be installed to")
- 
- if (NOT IS_SUB_PROJECT)
diff --git a/cad/freecad/pkg-plist b/cad/freecad/pkg-plist
index 2639d7bd9011..9277bc25a0fa 100644
--- a/cad/freecad/pkg-plist
+++ b/cad/freecad/pkg-plist
@@ -850,6 +850,7 @@ FreeCAD/Mod/Fem/Resources/ui/MeshBoundaryLayer.ui
 FreeCAD/Mod/Fem/Resources/ui/MeshGmsh.ui
 FreeCAD/Mod/Fem/Resources/ui/MeshGroup.ui
 FreeCAD/Mod/Fem/Resources/ui/MeshGroupXDMFExport.ui
+FreeCAD/Mod/Fem/Resources/ui/MeshNetgen.ui
 FreeCAD/Mod/Fem/Resources/ui/MeshRegion.ui
 FreeCAD/Mod/Fem/Resources/ui/ResultHints.ui
 FreeCAD/Mod/Fem/Resources/ui/ResultShow.ui
@@ -979,6 +980,7 @@ FreeCAD/Mod/Fem/femmesh/femmesh2mesh.py
 FreeCAD/Mod/Fem/femmesh/gmshtools.py
 FreeCAD/Mod/Fem/femmesh/meshsetsgetter.py
 FreeCAD/Mod/Fem/femmesh/meshtools.py
+FreeCAD/Mod/Fem/femmesh/netgentools.py
 FreeCAD/Mod/Fem/femobjects/__init__.py
 FreeCAD/Mod/Fem/femobjects/base_femelement.py
 FreeCAD/Mod/Fem/femobjects/base_femmeshelement.py
@@ -1006,6 +1008,7 @@ FreeCAD/Mod/Fem/femobjects/mesh_boundarylayer.py
 FreeCAD/Mod/Fem/femobjects/mesh_gmsh.py
 FreeCAD/Mod/Fem/femobjects/mesh_group.py
 FreeCAD/Mod/Fem/femobjects/mesh_region.py
+FreeCAD/Mod/Fem/femobjects/mesh_netgen.py
 FreeCAD/Mod/Fem/femobjects/mesh_result.py
 FreeCAD/Mod/Fem/femobjects/result_mechanical.py
 FreeCAD/Mod/Fem/femobjects/solver_ccxtools.py
@@ -1095,6 +1098,7 @@ FreeCAD/Mod/Fem/femsolver/z88/solver.py
 FreeCAD/Mod/Fem/femsolver/z88/tasks.py
 FreeCAD/Mod/Fem/femsolver/z88/writer.py
 FreeCAD/Mod/Fem/femtaskpanels/__init__.py
+FreeCAD/Mod/Fem/femtaskpanels/base_femmeshtaskpanel.py
 FreeCAD/Mod/Fem/femtaskpanels/base_femtaskpanel.py
 FreeCAD/Mod/Fem/femtaskpanels/task_constraint_bodyheatsource.py
 FreeCAD/Mod/Fem/femtaskpanels/task_constraint_centrif.py
@@ -1115,6 +1119,7 @@ FreeCAD/Mod/Fem/femtaskpanels/task_material_reinforced.py
 FreeCAD/Mod/Fem/femtaskpanels/task_mesh_boundarylayer.py
 FreeCAD/Mod/Fem/femtaskpanels/task_mesh_gmsh.py
 FreeCAD/Mod/Fem/femtaskpanels/task_mesh_group.py
+FreeCAD/Mod/Fem/femtaskpanels/task_mesh_netgen.py
 FreeCAD/Mod/Fem/femtaskpanels/task_mesh_region.py
 FreeCAD/Mod/Fem/femtaskpanels/task_result_mechanical.py
 FreeCAD/Mod/Fem/femtaskpanels/task_solver_ccxtools.py
@@ -1280,6 +1285,7 @@ FreeCAD/Mod/Fem/femviewprovider/view_material_reinforced.py
 FreeCAD/Mod/Fem/femviewprovider/view_mesh_boundarylayer.py
 FreeCAD/Mod/Fem/femviewprovider/view_mesh_gmsh.py
 FreeCAD/Mod/Fem/femviewprovider/view_mesh_group.py
+FreeCAD/Mod/Fem/femviewprovider/view_mesh_netgen.py
 FreeCAD/Mod/Fem/femviewprovider/view_mesh_region.py
 FreeCAD/Mod/Fem/femviewprovider/view_mesh_result.py
 FreeCAD/Mod/Fem/femviewprovider/view_result_mechanical.py
@@ -1542,6 +1548,7 @@ FreeCAD/Mod/Spreadsheet/Init.py
 FreeCAD/Mod/Spreadsheet/InitGui.py
 FreeCAD/Mod/Spreadsheet/TestSpreadsheet.py
 FreeCAD/Mod/Spreadsheet/importXLSX.py
+FreeCAD/Mod/Spreadsheet/test_importXLSX.py
 %%WEBENGINE%%FreeCAD/Mod/Start/Init.py
 %%WEBENGINE%%FreeCAD/Mod/Start/InitGui.py
 %%WEBENGINE%%FreeCAD/Mod/Start/StartMigrator.py
@@ -2622,6 +2629,7 @@ bin/freecad-thumbnailer
 %%PYTHON_SITELIBDIR%%/freecad/UiTools.py
 %%PYTHON_SITELIBDIR%%/freecad/__init__.py
 %%PYTHON_SITELIBDIR%%/freecad/freecad_doc.py
+%%PYTHON_SITELIBDIR%%/freecad/module_io.py
 %%PYTHON_SITELIBDIR%%/freecad/part.py
 %%PYTHON_SITELIBDIR%%/freecad/partdesign.py
 %%PYTHON_SITELIBDIR%%/freecad/project_utility.py