git: a346a19ebd9a - main - cad/freecad-devel: Update to 2026.06.22

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Michael Reifenberger <mr_at_FreeBSD.org>
Date: Mon, 22 Jun 2026 19:57:27 UTC
The branch main has been updated by mr:

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

commit a346a19ebd9a2d7023d6085da8c5cd900a7386c2
Author:     Michael Reifenberger <mr@FreeBSD.org>
AuthorDate: 2026-06-22 19:55:27 +0000
Commit:     Michael Reifenberger <mr@FreeBSD.org>
CommitDate: 2026-06-22 19:57:11 +0000

    cad/freecad-devel: Update to 2026.06.22
    
    Use googletest from ports now.
---
 cad/freecad-devel/Makefile                         | 11 ++++----
 cad/freecad-devel/Makefile.git_rev                 |  9 +++----
 cad/freecad-devel/distinfo                         | 12 ++++-----
 cad/freecad-devel/files/newVersion.sh              |  4 +--
 ...patch-cMake_FreeCAD__Helspers_SetupCoin3D.cmake | 29 ----------------------
 .../files/patch-src_App_ApplicationDirectories.cpp |  4 +--
 .../files/patch-src_Gui_CMakeLists.txt             |  8 +++---
 cad/freecad-devel/pkg-plist                        | 18 ++++++++++++++
 8 files changed, 41 insertions(+), 54 deletions(-)

diff --git a/cad/freecad-devel/Makefile b/cad/freecad-devel/Makefile
index 786fb9aa2ed0..cb16448f3dfa 100644
--- a/cad/freecad-devel/Makefile
+++ b/cad/freecad-devel/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	FreeCAD
 DISTVERSION=	r${GIT_SRC_DATE}
-PORTREVISION=	1
+#PORTREVISION=	1
 CATEGORIES=	cad
 PKGNAMESUFFIX=  -devel
 
@@ -14,6 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 CONFLICTS_INSTALL=      freecad # bin/FreeCAD
 
 BUILD_DEPENDS=	doxygen:devel/doxygen \
+		googletest>0:devel/googletest \
 		pybind11-config:devel/py-pybind11@${PY_FLAVOR} \
 		pybind11>0:devel/pybind11 \
 		${PYTHON_PKGNAMEPREFIX}pyside6-tools>0:devel/pyside6-tools@${PY_FLAVOR} \
@@ -52,10 +53,10 @@ USES=		dos2unix compiler:c++20-lang cmake cpe gl eigen:3 fortran gmake jpeg \
 		localbase:ldflags mpi:openmpi pkgconfig python localbase qt:6 xorg \
 		desktop-file-utils shared-mime-info shebangfix
 USE_GITHUB=	yes
-GH_ACCOUNT=	FreeCAD:ondsel google:gtest microsoft:gsl FreeCAD:addonmgr
-GH_PROJECT=	OndselSolver:ondsel googletest:gtest GSL:gsl AddonManager:addonmgr
-GH_TAGNAME=	${GIT_SRC_HASH} ${GIT_ONDSEL_HASH}:ondsel ${GIT_GTEST_HASH}:gtest ${GIT_GSL_HASH}:gsl ${GIT_ADDONMGR_HASH}:addonmgr
-GH_SUBDIR=	src/3rdParty/OndselSolver:ondsel tests/lib:gtest src/3rdParty/GSL:gsl src/Mod/AddonManager:addonmgr
+GH_ACCOUNT=	FreeCAD:ondsel microsoft:gsl FreeCAD:addonmgr
+GH_PROJECT=	OndselSolver:ondsel GSL:gsl AddonManager:addonmgr
+GH_TAGNAME=	${GIT_SRC_HASH} ${GIT_ONDSEL_HASH}:ondsel ${GIT_GSL_HASH}:gsl ${GIT_ADDONMGR_HASH}:addonmgr
+GH_SUBDIR=	src/3rdParty/OndselSolver:ondsel src/3rdParty/GSL:gsl src/Mod/AddonManager:addonmgr
 USE_XORG=	ice sm x11 xext xt
 USE_GL=		gl glu
 USE_QT=		base svg tools
diff --git a/cad/freecad-devel/Makefile.git_rev b/cad/freecad-devel/Makefile.git_rev
index c773f7820ff5..b19119848248 100644
--- a/cad/freecad-devel/Makefile.git_rev
+++ b/cad/freecad-devel/Makefile.git_rev
@@ -1,7 +1,6 @@
-GIT_SRC_HASH=  116c1f75f6d0ff7998229fb6b40f75f7d403891a
-GIT_SRC_DATE=  20260525063126
-GIT_SRC_DATE2=  2026.05.25
-GIT_ONDSEL_HASH= 30e9b64e8bf881d438d4b88834f9ba3674865418
+GIT_SRC_HASH=  6fd91599705ed32ed6a0fd61635af02a6f7ea33c
+GIT_SRC_DATE=  20260622070809
+GIT_SRC_DATE2=  2026.06.22
+GIT_ONDSEL_HASH= 81867f23220157b856f9aba221e2c2be25c6f5ed
 GIT_GSL_HASH= 543d0dd3fe966ddf20e884b44e5fdbf12cb43784
-GIT_GTEST_HASH= f8d7d77c06936315286eb55f8de22cd23c188571
 GIT_ADDONMGR_HASH= d9c593594ae4187d09b3ec9c7989db6c3a22d7a2
diff --git a/cad/freecad-devel/distinfo b/cad/freecad-devel/distinfo
index 6dd0cf9a728d..8d242eb47e7e 100644
--- a/cad/freecad-devel/distinfo
+++ b/cad/freecad-devel/distinfo
@@ -1,10 +1,8 @@
-TIMESTAMP = 1779698848
-SHA256 (FreeCAD-FreeCAD-r20260525063126-116c1f75f6d0ff7998229fb6b40f75f7d403891a_GH0.tar.gz) = 631ea725bd6f154ba35103e056f31c3aeb1fe46a5ee2787dc8471de01572d95e
-SIZE (FreeCAD-FreeCAD-r20260525063126-116c1f75f6d0ff7998229fb6b40f75f7d403891a_GH0.tar.gz) = 93092718
-SHA256 (FreeCAD-OndselSolver-30e9b64e8bf881d438d4b88834f9ba3674865418_GH0.tar.gz) = 77646ca7d8cbc6dc4e8304439be2ff2b9aecf397e6349e63b3b06e65dfed79c3
-SIZE (FreeCAD-OndselSolver-30e9b64e8bf881d438d4b88834f9ba3674865418_GH0.tar.gz) = 4667790
-SHA256 (google-googletest-f8d7d77c06936315286eb55f8de22cd23c188571_GH0.tar.gz) = 7ff5db23de232a39cbb5c9f5143c355885e30ac596161a6b9fc50c4538bfbf01
-SIZE (google-googletest-f8d7d77c06936315286eb55f8de22cd23c188571_GH0.tar.gz) = 868904
+TIMESTAMP = 1782117338
+SHA256 (FreeCAD-FreeCAD-r20260622070809-6fd91599705ed32ed6a0fd61635af02a6f7ea33c_GH0.tar.gz) = 5028b8157aeba357567de201fc7e8278f8c2a9175d2a2bdaa22903dfc9a9e4f5
+SIZE (FreeCAD-FreeCAD-r20260622070809-6fd91599705ed32ed6a0fd61635af02a6f7ea33c_GH0.tar.gz) = 93056847
+SHA256 (FreeCAD-OndselSolver-81867f23220157b856f9aba221e2c2be25c6f5ed_GH0.tar.gz) = 9dcd526a0ab46216267fd370ac622aa907823aa5e54055bf8fffd083e71c88c0
+SIZE (FreeCAD-OndselSolver-81867f23220157b856f9aba221e2c2be25c6f5ed_GH0.tar.gz) = 4667849
 SHA256 (microsoft-GSL-543d0dd3fe966ddf20e884b44e5fdbf12cb43784_GH0.tar.gz) = dd06a9190c02f6c04d008366faabc8947c817f33cbc6a838c5bfc9ad79652410
 SIZE (microsoft-GSL-543d0dd3fe966ddf20e884b44e5fdbf12cb43784_GH0.tar.gz) = 65378
 SHA256 (FreeCAD-AddonManager-d9c593594ae4187d09b3ec9c7989db6c3a22d7a2_GH0.tar.gz) = ba48309682e41e95a7421689fa00bbe971b4dc2f5968b1d7bb6628fc9b941afa
diff --git a/cad/freecad-devel/files/newVersion.sh b/cad/freecad-devel/files/newVersion.sh
index 539d54f191f4..9ecaa85880c1 100644
--- a/cad/freecad-devel/files/newVersion.sh
+++ b/cad/freecad-devel/files/newVersion.sh
@@ -20,7 +20,7 @@ GIT_SRC_DATE2=`git log -n 1 --date=iso-local -n 1 --pretty=format:"%cd" --date=f
     cut -c '1-19' | sed -e 's,-,,g' -e 's,:,,g' -e 's, ,,g'`
 GIT_ONDSEL_HASH=`git ls-tree HEAD src/3rdParty/OndselSolver/ | awk '{print $3}'`
 GIT_GSL_HASH=`git ls-tree HEAD src/3rdParty/GSL/ | awk '{print $3}'`
-GIT_GTEST_HASH=`git ls-tree HEAD tests/lib/ | awk '{print $3}'`
+# GIT_GTEST_HASH=`git ls-tree HEAD tests/lib/ | awk '{print $3}'`
 GIT_ADDONMGR_HASH=`git ls-tree HEAD src/Mod/AddonManager/ | awk '{print $3}'`
 
 echo "$GIT_SRC_HASH, $GIT_SRC_DATE"
@@ -29,5 +29,5 @@ echo "GIT_SRC_DATE=  ${GIT_SRC_DATE}"   >> ${CURDIR}/Makefile.git_rev
 echo "GIT_SRC_DATE2=  ${GIT_SRC_DATE2}"   >> ${CURDIR}/Makefile.git_rev
 echo "GIT_ONDSEL_HASH= ${GIT_ONDSEL_HASH}"   >> ${CURDIR}/Makefile.git_rev
 echo "GIT_GSL_HASH= ${GIT_GSL_HASH}"   >> ${CURDIR}/Makefile.git_rev
-echo "GIT_GTEST_HASH= ${GIT_GTEST_HASH}"   >> ${CURDIR}/Makefile.git_rev
+# echo "GIT_GTEST_HASH= ${GIT_GTEST_HASH}"   >> ${CURDIR}/Makefile.git_rev
 echo "GIT_ADDONMGR_HASH= ${GIT_ADDONMGR_HASH}"   >> ${CURDIR}/Makefile.git_rev
diff --git a/cad/freecad-devel/files/patch-cMake_FreeCAD__Helspers_SetupCoin3D.cmake b/cad/freecad-devel/files/patch-cMake_FreeCAD__Helspers_SetupCoin3D.cmake
deleted file mode 100644
index c77c24f4cff3..000000000000
--- a/cad/freecad-devel/files/patch-cMake_FreeCAD__Helspers_SetupCoin3D.cmake
+++ /dev/null
@@ -1,29 +0,0 @@
-commit 4a5be6da03ed7c56b5e8641ca0812db2243f165d
-Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
-
-    fix COIN3D_MICRO_VERSION regex for coin 4.0.10
-    
-    In cMake/FreeCAD_Helpers/SetupCoin3D.cmake, the version of Coin3D
-    we're builing against is extracted from Coin3D's header files via
-    regexes - but the regex only accepts single digit versions. That
-    might be fine for COIN_MAJOR_VERSION (currently 4 and increasing
-    only rarely) and COIN3D_MINOR_VERSION (which is 0 for some years
-    now), but with the release of Coin3D 4.0.10, we should catch all
-    digits in COIN_MICRO_VERSION (now at 10), else the build against
-    the new Coin3D release fails with
-    : CMake Error at cMake/FreeCAD_Helpers/SetupCoin3D.cmake:79 (message):
-    :   Coin3D version 4.0.1 mismatches Pivy Coin3D 4.0.10.
-
-diff --git cMake/FreeCAD_Helpers/SetupCoin3D.cmake cMake/FreeCAD_Helpers/SetupCoin3D.cmake
-index a026764540..0a4bd7ffdb 100644
---- cMake/FreeCAD_Helpers/SetupCoin3D.cmake
-+++ cMake/FreeCAD_Helpers/SetupCoin3D.cmake
-@@ -29,7 +29,7 @@ macro(SetupCoin3D)
-         set(COIN3D_MAJOR_VERSION "${CMAKE_MATCH_1}")
-         string(REGEX MATCH "define[ \t]+COIN_MINOR_VERSION[ \t]+([0-9?])" _coin3d_minor_version_match "${_coin3d_basic_h}")
-         set(COIN3D_MINOR_VERSION "${CMAKE_MATCH_1}")
--        string(REGEX MATCH "define[ \t]+COIN_MICRO_VERSION[ \t]+([0-9?])" _coin3d_micro_version_match "${_coin3d_basic_h}")
-+        string(REGEX MATCH "define[ \t]+COIN_MICRO_VERSION[ \t]+([0-9?]+)" _coin3d_micro_version_match "${_coin3d_basic_h}")
-         set(COIN3D_MICRO_VERSION "${CMAKE_MATCH_1}")
-         set(COIN3D_VERSION "${COIN3D_MAJOR_VERSION}.${COIN3D_MINOR_VERSION}.${COIN3D_MICRO_VERSION}")
-     ENDIF ()
diff --git a/cad/freecad-devel/files/patch-src_App_ApplicationDirectories.cpp b/cad/freecad-devel/files/patch-src_App_ApplicationDirectories.cpp
index 901faca2ac09..513d674d1c82 100644
--- a/cad/freecad-devel/files/patch-src_App_ApplicationDirectories.cpp
+++ b/cad/freecad-devel/files/patch-src_App_ApplicationDirectories.cpp
@@ -1,6 +1,6 @@
---- src/App/ApplicationDirectories.cpp.orig	2026-01-01 15:27:46 UTC
+--- src/App/ApplicationDirectories.cpp.orig	2026-06-22 10:15:48 UTC
 +++ src/App/ApplicationDirectories.cpp
-@@ -32,6 +32,7 @@
+@@ -33,6 +33,7 @@
  
  #if defined(FC_OS_LINUX) || defined(FC_OS_MACOSX) || defined(FC_OS_BSD)
  #include <pwd.h>
diff --git a/cad/freecad-devel/files/patch-src_Gui_CMakeLists.txt b/cad/freecad-devel/files/patch-src_Gui_CMakeLists.txt
index e3f8052674f2..e71025b7870e 100644
--- a/cad/freecad-devel/files/patch-src_Gui_CMakeLists.txt
+++ b/cad/freecad-devel/files/patch-src_Gui_CMakeLists.txt
@@ -1,15 +1,15 @@
---- src/Gui/CMakeLists.txt.orig	2026-01-01 15:27:46 UTC
+--- src/Gui/CMakeLists.txt.orig	2026-06-22 10:15:48 UTC
 +++ src/Gui/CMakeLists.txt
-@@ -112,7 +112,7 @@ else(MSVC)
-     set(FreeCADGui_LIBS
+@@ -116,7 +116,7 @@ else(MSVC)
          FreeCADApp
+         libfastsignals
          ${Boost_LIBRARIES}
 -        ${OPENGL_gl_LIBRARY}
 +        ${OPENGL_gl_LIBRARY} -L${CMAKE_INSTALL_PREFIX}/lib
          ${3DCONNEXION_LINKFLAGS}
      )
  endif(MSVC)
-@@ -1568,13 +1568,13 @@ else(WIN32)
+@@ -1521,13 +1521,13 @@ else(WIN32)
      INSTALL(TARGETS FreeCADGui
          LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
      )
diff --git a/cad/freecad-devel/pkg-plist b/cad/freecad-devel/pkg-plist
index e77df14b0d81..875ab334e003 100644
--- a/cad/freecad-devel/pkg-plist
+++ b/cad/freecad-devel/pkg-plist
@@ -414,6 +414,7 @@ FreeCAD/Mod/CAM/CAMTests/TestMach3Mach4Post.py
 FreeCAD/Mod/CAM/CAMTests/TestMachine.py
 FreeCAD/Mod/CAM/CAMTests/TestMarlinPost.py
 FreeCAD/Mod/CAM/CAMTests/TestMassoG3Post.py
+FreeCAD/Mod/CAM/CAMTests/TestOpenSBPPost.py
 FreeCAD/Mod/CAM/CAMTests/TestPathAdaptive.py
 FreeCAD/Mod/CAM/CAMTests/TestPathCommandAnnotations.py
 FreeCAD/Mod/CAM/CAMTests/TestPathCore.py
@@ -947,6 +948,7 @@ FreeCAD/Mod/Draft/draftguitools/gui_edit_part_objects.py
 FreeCAD/Mod/Draft/draftguitools/gui_edit_sketcher_objects.py
 FreeCAD/Mod/Draft/draftguitools/gui_ellipses.py
 FreeCAD/Mod/Draft/draftguitools/gui_facebinders.py
+FreeCAD/Mod/Draft/draftguitools/gui_field_locks.py
 FreeCAD/Mod/Draft/draftguitools/gui_fillets.py
 FreeCAD/Mod/Draft/draftguitools/gui_grid.py
 FreeCAD/Mod/Draft/draftguitools/gui_groups.py
@@ -1075,6 +1077,7 @@ FreeCAD/Mod/Draft/drafttests/test_dxf.py
 FreeCAD/Mod/Draft/drafttests/test_import.py
 FreeCAD/Mod/Draft/drafttests/test_import_gui.py
 FreeCAD/Mod/Draft/drafttests/test_import_tools.py
+FreeCAD/Mod/Draft/drafttests/test_manual_input_gui.py
 FreeCAD/Mod/Draft/drafttests/test_modification.py
 FreeCAD/Mod/Draft/drafttests/test_oca.py
 FreeCAD/Mod/Draft/drafttests/test_pivy.py
@@ -1973,6 +1976,9 @@ FreeCAD/Mod/Sketcher/ProfileLib/RegularPolygon.py
 FreeCAD/Mod/Sketcher/ProfileLib/__init__.py
 FreeCAD/Mod/Sketcher/Profiles.py
 FreeCAD/Mod/Sketcher/SketcherExample.py
+FreeCAD/Mod/Sketcher/SketcherTests/GuiTestCase.py
+FreeCAD/Mod/Sketcher/SketcherTests/TestConstraintPreselectionGui.py
+FreeCAD/Mod/Sketcher/SketcherTests/TestExternalFacePreselection.py
 FreeCAD/Mod/Sketcher/SketcherTests/TestOnViewParameterGui.py
 FreeCAD/Mod/Sketcher/SketcherTests/TestPlacementUpdate.py
 FreeCAD/Mod/Sketcher/SketcherTests/TestSketchCarbonCopyReverseMapping.FCStd
@@ -3557,6 +3563,18 @@ FreeCAD/share/Mod/TechDraw/Templates/ISO/localized/ca/A4_Landscape_ISO5457_advan
 FreeCAD/share/Mod/TechDraw/Templates/ISO/localized/ca/A4_Landscape_ISO5457_minimal.svg
 FreeCAD/share/Mod/TechDraw/Templates/ISO/localized/ca/A4_Portrait_ISO5457_advanced.svg
 FreeCAD/share/Mod/TechDraw/Templates/ISO/localized/ca/A4_Portrait_ISO5457_minimal.svg
+FreeCAD/share/Mod/TechDraw/Templates/ISO/localized/cs/A0_Landscape_ISO5457_advanced.svg
+FreeCAD/share/Mod/TechDraw/Templates/ISO/localized/cs/A0_Landscape_ISO5457_minimal.svg
+FreeCAD/share/Mod/TechDraw/Templates/ISO/localized/cs/A1_Landscape_ISO5457_advanced.svg
+FreeCAD/share/Mod/TechDraw/Templates/ISO/localized/cs/A1_Landscape_ISO5457_minimal.svg
+FreeCAD/share/Mod/TechDraw/Templates/ISO/localized/cs/A2_Landscape_ISO5457_advanced.svg
+FreeCAD/share/Mod/TechDraw/Templates/ISO/localized/cs/A2_Landscape_ISO5457_minimal.svg
+FreeCAD/share/Mod/TechDraw/Templates/ISO/localized/cs/A3_Landscape_ISO5457_advanced.svg
+FreeCAD/share/Mod/TechDraw/Templates/ISO/localized/cs/A3_Landscape_ISO5457_minimal.svg
+FreeCAD/share/Mod/TechDraw/Templates/ISO/localized/cs/A4_Landscape_ISO5457_advanced.svg
+FreeCAD/share/Mod/TechDraw/Templates/ISO/localized/cs/A4_Landscape_ISO5457_minimal.svg
+FreeCAD/share/Mod/TechDraw/Templates/ISO/localized/cs/A4_Portrait_ISO5457_advanced.svg
+FreeCAD/share/Mod/TechDraw/Templates/ISO/localized/cs/A4_Portrait_ISO5457_minimal.svg
 FreeCAD/share/Mod/TechDraw/Templates/ISO/localized/de/A0_Landscape_ISO7200_DE.svg
 FreeCAD/share/Mod/TechDraw/Templates/ISO/localized/de/A1_Landscape_ISO7200_DE.svg
 FreeCAD/share/Mod/TechDraw/Templates/ISO/localized/de/A2_Landscape_ISO7200_DE.svg