pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
freecad: Update to 1.0.2
Module Name: pkgsrc-wip
Committed By: Paul Ripke <stix%stix.id.au@localhost>
Pushed By: stix
Date: Wed Aug 6 20:37:10 2025 +1000
Changeset: 9d301c0902fc4770a57dd60ffd2cab79fe48549a
Modified Files:
freecad/Makefile
freecad/PLIST
freecad/distinfo
Removed Files:
freecad/patches/patch-src_3rdParty_salomesmesh_src_SMDS_SMDS__UnstructuredGrid.cpp
Log Message:
freecad: Update to 1.0.2
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9d301c0902fc4770a57dd60ffd2cab79fe48549a
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
freecad/Makefile | 2 +-
freecad/PLIST | 198 +++++++++++----------
freecad/distinfo | 7 +-
...salomesmesh_src_SMDS_SMDS__UnstructuredGrid.cpp | 64 -------
4 files changed, 105 insertions(+), 166 deletions(-)
diffs:
diff --git a/freecad/Makefile b/freecad/Makefile
index ab3869de7e..9f5e04eb25 100644
--- a/freecad/Makefile
+++ b/freecad/Makefile
@@ -1,6 +1,6 @@
# $NetBSD$
-VERSION= 1.0.0
+VERSION= 1.0.2
DISTNAME= freecad_source
PKGNAME= freecad-${VERSION}
CATEGORIES= cad
diff --git a/freecad/PLIST b/freecad/PLIST
index 91e3e764b5..843a40451f 100644
--- a/freecad/PLIST
+++ b/freecad/PLIST
@@ -1597,6 +1597,7 @@ Mod/TechDraw/TDTest/DrawViewSymbolTest.py
Mod/TechDraw/TDTest/TechDrawTestUtilities.py
Mod/TechDraw/TDTest/TestHatch.svg
Mod/TechDraw/TDTest/TestImage.png
+Mod/TechDraw/TDTest/TestNonAsciiSymbol.svg
Mod/TechDraw/TDTest/TestSymbol.svg
Mod/TechDraw/TDTest/TestTemplate.svg
Mod/TechDraw/TDTest/__init__.py
@@ -1634,6 +1635,7 @@ include/OndselSolver/ASMTAllowRotation.h
include/OndselSolver/ASMTAngleJoint.h
include/OndselSolver/ASMTAnimationParameters.h
include/OndselSolver/ASMTAssembly.h
+include/OndselSolver/ASMTAtPointJoint.h
include/OndselSolver/ASMTCompoundJoint.h
include/OndselSolver/ASMTConeConeContact.h
include/OndselSolver/ASMTConstantGravity.h
@@ -1649,6 +1651,7 @@ include/OndselSolver/ASMTFixedJoint.h
include/OndselSolver/ASMTForceTorque.h
include/OndselSolver/ASMTGearJoint.h
include/OndselSolver/ASMTGeneralMotion.h
+include/OndselSolver/ASMTInLineJoint.h
include/OndselSolver/ASMTInPlaneJoint.h
include/OndselSolver/ASMTItem.h
include/OndselSolver/ASMTItemIJ.h
@@ -2011,6 +2014,7 @@ ${PYSITELIB}/freecad/partdesign.py
${PYSITELIB}/freecad/project_utility.py
${PYSITELIB}/freecad/sketcher.py
${PYSITELIB}/freecad/utils.py
+${PYSITELIB}/freecad/utils_zip.py
qt6/plugins/designer/libFreeCAD_widgets.so
share/3Dconnexion/3DConnexion.xml
share/Gui/PreferencePackTemplates/Arch_Colors.cfg
@@ -2034,98 +2038,46 @@ share/Gui/PreferencePacks/FreeCAD Light/FreeCAD Light.cfg
share/Gui/PreferencePacks/package.xml
share/Gui/Stylesheets/FreeCAD Dark.qss
share/Gui/Stylesheets/FreeCAD Light.qss
-share/Gui/Stylesheets/images_classic/Arrow-double-LeftRight-black.png
-share/Gui/Stylesheets/images_classic/Arrow-double-LeftRight-blue.png
-share/Gui/Stylesheets/images_classic/Arrow-double-LeftRight-darkgray.png
-share/Gui/Stylesheets/images_classic/Arrow-double-LeftRight-lightgray.png
-share/Gui/Stylesheets/images_classic/Arrow-double-LeftRight-white.png
-share/Gui/Stylesheets/images_classic/Arrow-double-UpDown-black.png
-share/Gui/Stylesheets/images_classic/Arrow-double-UpDown-blue.png
-share/Gui/Stylesheets/images_classic/Arrow-double-UpDown-darkgray.png
-share/Gui/Stylesheets/images_classic/Arrow-double-UpDown-lightgray.png
-share/Gui/Stylesheets/images_classic/Arrow-double-UpDown-white.png
-share/Gui/Stylesheets/images_classic/Arrow-down-black.png
-share/Gui/Stylesheets/images_classic/Arrow-down-blue.png
-share/Gui/Stylesheets/images_classic/Arrow-down-darkgray.png
-share/Gui/Stylesheets/images_classic/Arrow-down-lightgray.png
-share/Gui/Stylesheets/images_classic/Arrow-down-white.png
-share/Gui/Stylesheets/images_classic/Arrow-left-black.png
-share/Gui/Stylesheets/images_classic/Arrow-left-blue.png
-share/Gui/Stylesheets/images_classic/Arrow-left-darkgray.png
-share/Gui/Stylesheets/images_classic/Arrow-left-lightgray.png
-share/Gui/Stylesheets/images_classic/Arrow-left-white.png
-share/Gui/Stylesheets/images_classic/Arrow-leftDown-black.png
-share/Gui/Stylesheets/images_classic/Arrow-leftDown-blue.png
-share/Gui/Stylesheets/images_classic/Arrow-leftDown-darkgray.png
-share/Gui/Stylesheets/images_classic/Arrow-leftDown-lightgray.png
-share/Gui/Stylesheets/images_classic/Arrow-leftDown-white.png
-share/Gui/Stylesheets/images_classic/Arrow-right-black.png
-share/Gui/Stylesheets/images_classic/Arrow-right-blue.png
-share/Gui/Stylesheets/images_classic/Arrow-right-darkgray.png
-share/Gui/Stylesheets/images_classic/Arrow-right-lightgray.png
-share/Gui/Stylesheets/images_classic/Arrow-right-white.png
-share/Gui/Stylesheets/images_classic/Arrow-rightDown-black.png
-share/Gui/Stylesheets/images_classic/Arrow-rightDown-blue.png
-share/Gui/Stylesheets/images_classic/Arrow-rightDown-darkgray.png
-share/Gui/Stylesheets/images_classic/Arrow-rightDown-lightgray.png
-share/Gui/Stylesheets/images_classic/Arrow-rightDown-white.png
-share/Gui/Stylesheets/images_classic/Arrow-up-black.png
-share/Gui/Stylesheets/images_classic/Arrow-up-blue.png
-share/Gui/Stylesheets/images_classic/Arrow-up-darkgray.png
-share/Gui/Stylesheets/images_classic/Arrow-up-lightgray.png
-share/Gui/Stylesheets/images_classic/Arrow-up-white.png
-share/Gui/Stylesheets/images_classic/Close-DarkRed.png
-share/Gui/Stylesheets/images_classic/Close-lightgray.png
-share/Gui/Stylesheets/images_classic/Hmovetoolbar-black.png
-share/Gui/Stylesheets/images_classic/Hmovetoolbar-blue.png
-share/Gui/Stylesheets/images_classic/Hmovetoolbar-darkgray.png
-share/Gui/Stylesheets/images_classic/Hmovetoolbar-lightgray.png
-share/Gui/Stylesheets/images_classic/Hmovetoolbar-white.png
-share/Gui/Stylesheets/images_classic/Hsepartoolbar-black.png
-share/Gui/Stylesheets/images_classic/Hsepartoolbar-blue.png
-share/Gui/Stylesheets/images_classic/Hsepartoolbar-darkgray.png
-share/Gui/Stylesheets/images_classic/Hsepartoolbar-lightgray.png
-share/Gui/Stylesheets/images_classic/Hsepartoolbar-white.png
-share/Gui/Stylesheets/images_classic/Qsint_header_FoldOver_Blue-Blue.png
-share/Gui/Stylesheets/images_classic/Qsint_header_FoldOver_Blue-dark.png
-share/Gui/Stylesheets/images_classic/Qsint_header_FoldOver_Blue-light.png
-share/Gui/Stylesheets/images_classic/Qsint_header_Fold_Blue-Blue.png
-share/Gui/Stylesheets/images_classic/Qsint_header_Fold_Blue-dark.png
-share/Gui/Stylesheets/images_classic/Qsint_header_Fold_Blue-light.png
-share/Gui/Stylesheets/images_classic/Qsint_header_UnFoldOver_Blue-Blue.png
-share/Gui/Stylesheets/images_classic/Qsint_header_UnfoldOver_Blue-dark.png
-share/Gui/Stylesheets/images_classic/Qsint_header_UnfoldOver_Blue-light.png
-share/Gui/Stylesheets/images_classic/Qsint_header_Unfold_Blue-Blue.png
-share/Gui/Stylesheets/images_classic/Qsint_header_Unfold_Blue-dark.png
-share/Gui/Stylesheets/images_classic/Qsint_header_Unfold_Blue-light.png
-share/Gui/Stylesheets/images_classic/Qsint_header_fold_black.png
-share/Gui/Stylesheets/images_classic/Qsint_header_fold_darkgray.png
-share/Gui/Stylesheets/images_classic/Qsint_header_fold_lightgray.png
-share/Gui/Stylesheets/images_classic/Qsint_header_fold_white.png
-share/Gui/Stylesheets/images_classic/Qsint_header_unfold_black.png
-share/Gui/Stylesheets/images_classic/Qsint_header_unfold_darkgray.png
-share/Gui/Stylesheets/images_classic/Qsint_header_unfold_lightgray.png
-share/Gui/Stylesheets/images_classic/Qsint_header_unfold_white.png
-share/Gui/Stylesheets/images_classic/Radio-checked-black.png
-share/Gui/Stylesheets/images_classic/Radio-checked-blue.png
-share/Gui/Stylesheets/images_classic/Radio-checked-darkgray.png
-share/Gui/Stylesheets/images_classic/Radio-checked-lightgray.png
-share/Gui/Stylesheets/images_classic/Radio-checked-white.png
-share/Gui/Stylesheets/images_classic/Radio-unchecked-black.png
-share/Gui/Stylesheets/images_classic/Radio-unchecked-blue.png
-share/Gui/Stylesheets/images_classic/Radio-unchecked-darkgray.png
-share/Gui/Stylesheets/images_classic/Radio-unchecked-lightgray.png
-share/Gui/Stylesheets/images_classic/Radio-unchecked-white.png
-share/Gui/Stylesheets/images_classic/Vmovetoolbar-black.png
-share/Gui/Stylesheets/images_classic/Vmovetoolbar-blue.png
-share/Gui/Stylesheets/images_classic/Vmovetoolbar-darkgray.png
-share/Gui/Stylesheets/images_classic/Vmovetoolbar-lightgray.png
-share/Gui/Stylesheets/images_classic/Vmovetoolbar-white.png
-share/Gui/Stylesheets/images_classic/Vsepartoolbar-black.png
-share/Gui/Stylesheets/images_classic/Vsepartoolbar-blue.png
-share/Gui/Stylesheets/images_classic/Vsepartoolbar-darkgray.png
-share/Gui/Stylesheets/images_classic/Vsepartoolbar-lightgray.png
-share/Gui/Stylesheets/images_classic/Vsepartoolbar-white.png
+share/Gui/Stylesheets/images_classic/arrow-double-leftright-black.png
+share/Gui/Stylesheets/images_classic/arrow-double-leftright-blue.png
+share/Gui/Stylesheets/images_classic/arrow-double-leftright-darkgray.png
+share/Gui/Stylesheets/images_classic/arrow-double-leftright-lightgray.png
+share/Gui/Stylesheets/images_classic/arrow-double-leftright-white.png
+share/Gui/Stylesheets/images_classic/arrow-double-updown-black.png
+share/Gui/Stylesheets/images_classic/arrow-double-updown-blue.png
+share/Gui/Stylesheets/images_classic/arrow-double-updown-darkgray.png
+share/Gui/Stylesheets/images_classic/arrow-double-updown-lightgray.png
+share/Gui/Stylesheets/images_classic/arrow-double-updown-white.png
+share/Gui/Stylesheets/images_classic/arrow-down-black.png
+share/Gui/Stylesheets/images_classic/arrow-down-blue.png
+share/Gui/Stylesheets/images_classic/arrow-down-darkgray.png
+share/Gui/Stylesheets/images_classic/arrow-down-lightgray.png
+share/Gui/Stylesheets/images_classic/arrow-down-white.png
+share/Gui/Stylesheets/images_classic/arrow-left-black.png
+share/Gui/Stylesheets/images_classic/arrow-left-blue.png
+share/Gui/Stylesheets/images_classic/arrow-left-darkgray.png
+share/Gui/Stylesheets/images_classic/arrow-left-lightgray.png
+share/Gui/Stylesheets/images_classic/arrow-left-white.png
+share/Gui/Stylesheets/images_classic/arrow-leftdown-black.png
+share/Gui/Stylesheets/images_classic/arrow-leftdown-blue.png
+share/Gui/Stylesheets/images_classic/arrow-leftdown-darkgray.png
+share/Gui/Stylesheets/images_classic/arrow-leftdown-lightgray.png
+share/Gui/Stylesheets/images_classic/arrow-leftdown-white.png
+share/Gui/Stylesheets/images_classic/arrow-right-black.png
+share/Gui/Stylesheets/images_classic/arrow-right-blue.png
+share/Gui/Stylesheets/images_classic/arrow-right-darkgray.png
+share/Gui/Stylesheets/images_classic/arrow-right-lightgray.png
+share/Gui/Stylesheets/images_classic/arrow-right-white.png
+share/Gui/Stylesheets/images_classic/arrow-rightdown-black.png
+share/Gui/Stylesheets/images_classic/arrow-rightdown-blue.png
+share/Gui/Stylesheets/images_classic/arrow-rightdown-darkgray.png
+share/Gui/Stylesheets/images_classic/arrow-rightdown-lightgray.png
+share/Gui/Stylesheets/images_classic/arrow-rightdown-white.png
+share/Gui/Stylesheets/images_classic/arrow-up-black.png
+share/Gui/Stylesheets/images_classic/arrow-up-blue.png
+share/Gui/Stylesheets/images_classic/arrow-up-darkgray.png
+share/Gui/Stylesheets/images_classic/arrow-up-lightgray.png
+share/Gui/Stylesheets/images_classic/arrow-up-white.png
share/Gui/Stylesheets/images_classic/autohide-black.png
share/Gui/Stylesheets/images_classic/autohide-blue.png
share/Gui/Stylesheets/images_classic/autohide-darkgray.png
@@ -2139,16 +2091,16 @@ share/Gui/Stylesheets/images_classic/check-mark-blue.png
share/Gui/Stylesheets/images_classic/check-mark-darkgray.png
share/Gui/Stylesheets/images_classic/check-mark-lightgray.png
share/Gui/Stylesheets/images_classic/check-mark-white.png
-share/Gui/Stylesheets/images_classic/checkbox-Empty-black.png
-share/Gui/Stylesheets/images_classic/checkbox-Empty-blue.png
-share/Gui/Stylesheets/images_classic/checkbox-Empty-darkgray.png
-share/Gui/Stylesheets/images_classic/checkbox-Empty-lightgray.png
-share/Gui/Stylesheets/images_classic/checkbox-Empty-white.png
share/Gui/Stylesheets/images_classic/checkbox-checked-black.png
share/Gui/Stylesheets/images_classic/checkbox-checked-blue.png
share/Gui/Stylesheets/images_classic/checkbox-checked-darkgray.png
share/Gui/Stylesheets/images_classic/checkbox-checked-lightgray.png
share/Gui/Stylesheets/images_classic/checkbox-checked-white.png
+share/Gui/Stylesheets/images_classic/checkbox-empty-black.png
+share/Gui/Stylesheets/images_classic/checkbox-empty-blue.png
+share/Gui/Stylesheets/images_classic/checkbox-empty-darkgray.png
+share/Gui/Stylesheets/images_classic/checkbox-empty-lightgray.png
+share/Gui/Stylesheets/images_classic/checkbox-empty-white.png
share/Gui/Stylesheets/images_classic/checkbox-indeterminate-black.png
share/Gui/Stylesheets/images_classic/checkbox-indeterminate-blue.png
share/Gui/Stylesheets/images_classic/checkbox-indeterminate-darkgray.png
@@ -2158,6 +2110,8 @@ share/Gui/Stylesheets/images_classic/close-black.png
share/Gui/Stylesheets/images_classic/close-blue.png
share/Gui/Stylesheets/images_classic/close-darkerred.png
share/Gui/Stylesheets/images_classic/close-darkgray.png
+share/Gui/Stylesheets/images_classic/close-darkred.png
+share/Gui/Stylesheets/images_classic/close-lightgray.png
share/Gui/Stylesheets/images_classic/close-lightred.png
share/Gui/Stylesheets/images_classic/close-red.png
share/Gui/Stylesheets/images_classic/close-white.png
@@ -2176,6 +2130,16 @@ share/Gui/Stylesheets/images_classic/float-blue.png
share/Gui/Stylesheets/images_classic/float-darkgray.png
share/Gui/Stylesheets/images_classic/float-lightgray.png
share/Gui/Stylesheets/images_classic/float-white.png
+share/Gui/Stylesheets/images_classic/hmovetoolbar-black.png
+share/Gui/Stylesheets/images_classic/hmovetoolbar-blue.png
+share/Gui/Stylesheets/images_classic/hmovetoolbar-darkgray.png
+share/Gui/Stylesheets/images_classic/hmovetoolbar-lightgray.png
+share/Gui/Stylesheets/images_classic/hmovetoolbar-white.png
+share/Gui/Stylesheets/images_classic/hsepartoolbar-black.png
+share/Gui/Stylesheets/images_classic/hsepartoolbar-blue.png
+share/Gui/Stylesheets/images_classic/hsepartoolbar-darkgray.png
+share/Gui/Stylesheets/images_classic/hsepartoolbar-lightgray.png
+share/Gui/Stylesheets/images_classic/hsepartoolbar-white.png
share/Gui/Stylesheets/images_classic/indeterminate-mark-black.png
share/Gui/Stylesheets/images_classic/indeterminate-mark-blue.png
share/Gui/Stylesheets/images_classic/indeterminate-mark-darkgray.png
@@ -2196,6 +2160,36 @@ share/Gui/Stylesheets/images_classic/overlay-blue.png
share/Gui/Stylesheets/images_classic/overlay-lightgray.png
share/Gui/Stylesheets/images_classic/overlay-white.png
share/Gui/Stylesheets/images_classic/overlay_lighter.png
+share/Gui/Stylesheets/images_classic/qsint_header_fold_black.png
+share/Gui/Stylesheets/images_classic/qsint_header_fold_blue-blue.png
+share/Gui/Stylesheets/images_classic/qsint_header_fold_blue-dark.png
+share/Gui/Stylesheets/images_classic/qsint_header_fold_blue-light.png
+share/Gui/Stylesheets/images_classic/qsint_header_fold_darkgray.png
+share/Gui/Stylesheets/images_classic/qsint_header_fold_lightgray.png
+share/Gui/Stylesheets/images_classic/qsint_header_fold_white.png
+share/Gui/Stylesheets/images_classic/qsint_header_foldover_blue-blue.png
+share/Gui/Stylesheets/images_classic/qsint_header_foldover_blue-dark.png
+share/Gui/Stylesheets/images_classic/qsint_header_foldover_blue-light.png
+share/Gui/Stylesheets/images_classic/qsint_header_unfold_black.png
+share/Gui/Stylesheets/images_classic/qsint_header_unfold_blue-blue.png
+share/Gui/Stylesheets/images_classic/qsint_header_unfold_blue-dark.png
+share/Gui/Stylesheets/images_classic/qsint_header_unfold_blue-light.png
+share/Gui/Stylesheets/images_classic/qsint_header_unfold_darkgray.png
+share/Gui/Stylesheets/images_classic/qsint_header_unfold_lightgray.png
+share/Gui/Stylesheets/images_classic/qsint_header_unfold_white.png
+share/Gui/Stylesheets/images_classic/qsint_header_unfoldover_blue-blue.png
+share/Gui/Stylesheets/images_classic/qsint_header_unfoldover_blue-dark.png
+share/Gui/Stylesheets/images_classic/qsint_header_unfoldover_blue-light.png
+share/Gui/Stylesheets/images_classic/radio-checked-black.png
+share/Gui/Stylesheets/images_classic/radio-checked-blue.png
+share/Gui/Stylesheets/images_classic/radio-checked-darkgray.png
+share/Gui/Stylesheets/images_classic/radio-checked-lightgray.png
+share/Gui/Stylesheets/images_classic/radio-checked-white.png
+share/Gui/Stylesheets/images_classic/radio-unchecked-black.png
+share/Gui/Stylesheets/images_classic/radio-unchecked-blue.png
+share/Gui/Stylesheets/images_classic/radio-unchecked-darkgray.png
+share/Gui/Stylesheets/images_classic/radio-unchecked-lightgray.png
+share/Gui/Stylesheets/images_classic/radio-unchecked-white.png
share/Gui/Stylesheets/images_classic/sizegrip-black.png
share/Gui/Stylesheets/images_classic/sizegrip-blue.png
share/Gui/Stylesheets/images_classic/sizegrip-darkgray.png
@@ -2227,6 +2221,16 @@ share/Gui/Stylesheets/images_classic/undock-black.png
share/Gui/Stylesheets/images_classic/undock-blue.png
share/Gui/Stylesheets/images_classic/undock-darkgray.png
share/Gui/Stylesheets/images_classic/undock-white.png
+share/Gui/Stylesheets/images_classic/vmovetoolbar-black.png
+share/Gui/Stylesheets/images_classic/vmovetoolbar-blue.png
+share/Gui/Stylesheets/images_classic/vmovetoolbar-darkgray.png
+share/Gui/Stylesheets/images_classic/vmovetoolbar-lightgray.png
+share/Gui/Stylesheets/images_classic/vmovetoolbar-white.png
+share/Gui/Stylesheets/images_classic/vsepartoolbar-black.png
+share/Gui/Stylesheets/images_classic/vsepartoolbar-blue.png
+share/Gui/Stylesheets/images_classic/vsepartoolbar-darkgray.png
+share/Gui/Stylesheets/images_classic/vsepartoolbar-lightgray.png
+share/Gui/Stylesheets/images_classic/vsepartoolbar-white.png
share/Gui/Stylesheets/images_dark-light/Hmovetoolbar_dark.svg
share/Gui/Stylesheets/images_dark-light/Hmovetoolbar_light.svg
share/Gui/Stylesheets/images_dark-light/Hsepartoolbar_dark.svg
diff --git a/freecad/distinfo b/freecad/distinfo
index 09d70c70de..3f6c5c2421 100644
--- a/freecad/distinfo
+++ b/freecad/distinfo
@@ -1,7 +1,6 @@
$NetBSD$
-BLAKE2s (freecad-1.0.0/freecad_source.tar.gz) = 46df6583750a869930bef177258973571f111862831a1a9fd6de0ae525f884fd
-SHA512 (freecad-1.0.0/freecad_source.tar.gz) = c3e4af7e247814afba5aeb18fb4ac8b4c799bf6a4dad84757efd72b8ca60717ad5fc7f75d4350a021c2b67aa1c90d3938d868adf0cb993386232068d4a5fb5cb
-Size (freecad-1.0.0/freecad_source.tar.gz) = 97174172 bytes
-SHA1 (patch-src_3rdParty_salomesmesh_src_SMDS_SMDS__UnstructuredGrid.cpp) = d449416af9191d94feff9aa15b43704311238e62
+BLAKE2s (freecad-1.0.2/freecad_source.tar.gz) = 70d2feca68ab0fa2119665c6b082b7d84e5974d31a71ba36e17ddd15bb0a2e9f
+SHA512 (freecad-1.0.2/freecad_source.tar.gz) = bc27d6dc31786d99609b6998f2e7e4bdcb58096a97cab9f959678e170e5734899b2b170a700e6376136add3130ffdf05c5ebbda155382d8f54ba8d0812790b96
+Size (freecad-1.0.2/freecad_source.tar.gz) = 97214151 bytes
SHA1 (patch-src_App_Application.cpp) = 5a86b727878e77cd5ce7f0634b0d8802e71204ed
diff --git a/freecad/patches/patch-src_3rdParty_salomesmesh_src_SMDS_SMDS__UnstructuredGrid.cpp b/freecad/patches/patch-src_3rdParty_salomesmesh_src_SMDS_SMDS__UnstructuredGrid.cpp
deleted file mode 100644
index 87c778a504..0000000000
--- a/freecad/patches/patch-src_3rdParty_salomesmesh_src_SMDS_SMDS__UnstructuredGrid.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-$NetBSD$
-
-Fix build for vtk 9.4:
-https://github.com/FreeCAD/FreeCAD/commit/3b502359353e2a74dee8a8bcfed5750b69f32cdc
-
---- src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp.orig 2025-04-10 08:44:05.488258553 +0000
-+++ src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
-@@ -32,6 +32,7 @@
- #include <vtkDoubleArray.h>
- #include <vtkIdTypeArray.h>
- #include <vtkUnsignedCharArray.h>
-+#include <vtkVersionMacros.h>
-
- #include <list>
- #include <climits>
-@@ -249,14 +250,16 @@ void SMDS_UnstructuredGrid::compactGrid(
- }
- }
-
-- if (this->FaceLocations)
-+ vtkIdTypeArray* thisFaceLocations = GetFaceLocations();
-+ vtkIdTypeArray* thisFaces = GetFaces();
-+ if (thisFaceLocations)
- {
- vtkIdTypeArray *newFaceLocations = vtkIdTypeArray::New();
- newFaceLocations->Initialize();
- newFaceLocations->Allocate(newTypes->GetSize());
- vtkIdTypeArray *newFaces = vtkIdTypeArray::New();
- newFaces->Initialize();
-- newFaces->Allocate(this->Faces->GetSize());
-+ newFaces->Allocate(thisFaces->GetSize());
- for (int i = 0; i < oldCellSize; i++)
- {
- if (this->Types->GetValue(i) == VTK_EMPTY_CELL)
-@@ -265,16 +268,16 @@ void SMDS_UnstructuredGrid::compactGrid(
- if (newTypes->GetValue(newCellId) == VTK_POLYHEDRON)
- {
- newFaceLocations->InsertNextValue(newFaces->GetMaxId()+1);
-- int oldFaceLoc = this->FaceLocations->GetValue(i);
-- int nCellFaces = this->Faces->GetValue(oldFaceLoc++);
-+ int oldFaceLoc = thisFaceLocations->GetValue(i);
-+ int nCellFaces = thisFaces->GetValue(oldFaceLoc++);
- newFaces->InsertNextValue(nCellFaces);
- for (int n=0; n<nCellFaces; n++)
- {
-- int nptsInFace = this->Faces->GetValue(oldFaceLoc++);
-+ int nptsInFace = thisFaces->GetValue(oldFaceLoc++);
- newFaces->InsertNextValue(nptsInFace);
- for (int k=0; k<nptsInFace; k++)
- {
-- int oldpt = this->Faces->GetValue(oldFaceLoc++);
-+ int oldpt = thisFaces->GetValue(oldFaceLoc++);
- newFaces->InsertNextValue(idNodesOldToNew[oldpt]);
- }
- }
-@@ -292,7 +295,7 @@ void SMDS_UnstructuredGrid::compactGrid(
- }
- else
- {
-- this->SetCells(newTypes, newLocations, newConnectivity, FaceLocations, Faces);
-+ this->SetCells(newTypes, newLocations, newConnectivity, thisFaceLocations, thisFaces);
- }
-
- newPoints->Delete();
Home |
Main Index |
Thread Index |
Old Index