diff options
Diffstat (limited to 'cad/freecad-devel/files')
7 files changed, 124 insertions, 0 deletions
diff --git a/cad/freecad-devel/files/newVersion.sh b/cad/freecad-devel/files/newVersion.sh new file mode 100644 index 000000000000..539d54f191f4 --- /dev/null +++ b/cad/freecad-devel/files/newVersion.sh @@ -0,0 +1,33 @@ +#!/bin/sh + +CURDIR=`pwd` +WRKDIR=`pwd`/work +#mkdir -p "${WRKDIR}" + +if [ \! -d "${CURDIR}/freecad-repo" ]; then + git clone https://github.com/FreeCAD/FreeCAD -b main "${CURDIR}/freecad-repo"; +else + cd "${CURDIR}/freecad-repo" + # git pull https://github.com/FreeCAD/FreeCAD; + git pull +fi + +cd "${CURDIR}/freecad-repo" +GIT_SRC_HASH=`git log -n 1 --pretty=format:"%H"`; +GIT_SRC_DATE=`git log -n 1 --date=iso-local -n 1 --pretty=format:"%cd" | \ + cut -c '1-19' | sed -e 's,-,,g' -e 's,:,,g' -e 's, ,,g'` +GIT_SRC_DATE2=`git log -n 1 --date=iso-local -n 1 --pretty=format:"%cd" --date=format-local:'%Y.%m.%d' | \ + 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_ADDONMGR_HASH=`git ls-tree HEAD src/Mod/AddonManager/ | awk '{print $3}'` + +echo "$GIT_SRC_HASH, $GIT_SRC_DATE" +echo "GIT_SRC_HASH= ${GIT_SRC_HASH}" > ${CURDIR}/Makefile.git_rev +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_ADDONMGR_HASH= ${GIT_ADDONMGR_HASH}" >> ${CURDIR}/Makefile.git_rev diff --git a/cad/freecad-devel/files/patch-cMake_FindOCC.cmake b/cad/freecad-devel/files/patch-cMake_FindOCC.cmake new file mode 100644 index 000000000000..4498270ec31b --- /dev/null +++ b/cad/freecad-devel/files/patch-cMake_FindOCC.cmake @@ -0,0 +1,10 @@ +--- cMake/FindOCC.cmake.orig 2025-07-21 02:26:03 UTC ++++ cMake/FindOCC.cmake +@@ -109,6 +109,7 @@ if (OCC_FOUND) + TKPrim + TKHLR + TKFeat ++ TKExpress + ) + if (OCC_VERSION_STRING VERSION_GREATER_EQUAL 7.9.0) + list(APPEND OCC_LIBRARIES TKExpress) diff --git a/cad/freecad-devel/files/patch-cMake_FreeCAD__Helpers_SetGlobalCompilerAndLinkerSettings.cmake b/cad/freecad-devel/files/patch-cMake_FreeCAD__Helpers_SetGlobalCompilerAndLinkerSettings.cmake new file mode 100644 index 000000000000..51bce51f26df --- /dev/null +++ b/cad/freecad-devel/files/patch-cMake_FreeCAD__Helpers_SetGlobalCompilerAndLinkerSettings.cmake @@ -0,0 +1,11 @@ +--- cMake/FreeCAD_Helpers/SetGlobalCompilerAndLinkerSettings.cmake.orig 2025-04-17 06:38:38 UTC ++++ cMake/FreeCAD_Helpers/SetGlobalCompilerAndLinkerSettings.cmake +@@ -103,4 +103,8 @@ macro(SetGlobalCompilerAndLinkerSettings) + endif() + endif(MINGW) + ++# Enable the Topological Naming Problem mitigation code ++add_compile_options(-DFC_USE_TNP_FIX) ++ ++ + endmacro(SetGlobalCompilerAndLinkerSettings) diff --git a/cad/freecad-devel/files/patch-src_App_ApplicationDirectories.cpp b/cad/freecad-devel/files/patch-src_App_ApplicationDirectories.cpp new file mode 100644 index 000000000000..6fe8aeda6539 --- /dev/null +++ b/cad/freecad-devel/files/patch-src_App_ApplicationDirectories.cpp @@ -0,0 +1,10 @@ +--- src/App/ApplicationDirectories.cpp.orig 2025-09-10 20:44:18 UTC ++++ src/App/ApplicationDirectories.cpp +@@ -33,6 +33,7 @@ + + #if defined(FC_OS_LINUX) || defined(FC_OS_MACOSX) || defined(FC_OS_BSD) + #include <pwd.h> ++#include <sys/sysctl.h> + #endif + + #include <Base/FileInfo.h> diff --git a/cad/freecad-devel/files/patch-src_Gui_CMakeLists.txt b/cad/freecad-devel/files/patch-src_Gui_CMakeLists.txt new file mode 100644 index 000000000000..c0700d18c931 --- /dev/null +++ b/cad/freecad-devel/files/patch-src_Gui_CMakeLists.txt @@ -0,0 +1,32 @@ +--- src/Gui/CMakeLists.txt.orig 2025-09-10 18:14:29 UTC ++++ src/Gui/CMakeLists.txt +@@ -107,7 +107,7 @@ else(MSVC) + set(FreeCADGui_LIBS + FreeCADApp + ${Boost_LIBRARIES} +- ${OPENGL_gl_LIBRARY} ++ ${OPENGL_gl_LIBRARY} -L${CMAKE_INSTALL_PREFIX}/lib + ${3DCONNEXION_LINKFLAGS} + ) + endif(MSVC) +@@ -1528,13 +1528,13 @@ else(WIN32) + INSTALL(TARGETS FreeCADGui + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ) +- INSTALL(FILES Icons/freecad-icon-16.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/16x16/apps RENAME org.freecad.FreeCAD.png) +- INSTALL(FILES Icons/freecad-icon-32.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/32x32/apps RENAME org.freecad.FreeCAD.png) +- INSTALL(FILES Icons/freecad-icon-48.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/48x48/apps RENAME org.freecad.FreeCAD.png) +- INSTALL(FILES Icons/freecad-icon-64.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/64x64/apps RENAME org.freecad.FreeCAD.png) +- INSTALL(FILES Icons/freecad.svg DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps RENAME org.freecad.FreeCAD.svg) +- INSTALL(FILES Icons/freecad.svg DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pixmaps) +- INSTALL(FILES Icons/freecad-doc.svg DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/mimetypes RENAME application-x-extension-fcstd.svg) ++ INSTALL(FILES Icons/freecad-icon-16.png DESTINATION ${XDG_DATADIR}/icons/hicolor/16x16/apps RENAME org.freecad.FreeCAD.png) ++ INSTALL(FILES Icons/freecad-icon-32.png DESTINATION ${XDG_DATADIR}/icons/hicolor/32x32/apps RENAME org.freecad.FreeCAD.png) ++ INSTALL(FILES Icons/freecad-icon-48.png DESTINATION ${XDG_DATADIR}/icons/hicolor/48x48/apps RENAME org.freecad.FreeCAD.png) ++ INSTALL(FILES Icons/freecad-icon-64.png DESTINATION ${XDG_DATADIR}/icons/hicolor/64x64/apps RENAME org.freecad.FreeCAD.png) ++ INSTALL(FILES Icons/freecad.svg DESTINATION ${XDG_DATADIR}/icons/hicolor/scalable/apps RENAME org.freecad.FreeCAD.svg) ++ INSTALL(FILES Icons/freecad.svg DESTINATION ${XDG_DATADIR}/pixmaps) ++ INSTALL(FILES Icons/freecad-doc.svg DESTINATION ${XDG_DATADIR}/icons/hicolor/scalable/mimetypes RENAME application-x-extension-fcstd.svg) + endif(WIN32) + + set(FreeCADGui_Scripts diff --git a/cad/freecad-devel/files/patch-src_Mod_MeshPart_App_CMakeLists.txt b/cad/freecad-devel/files/patch-src_Mod_MeshPart_App_CMakeLists.txt new file mode 100644 index 000000000000..70119a30b46c --- /dev/null +++ b/cad/freecad-devel/files/patch-src_Mod_MeshPart_App_CMakeLists.txt @@ -0,0 +1,18 @@ +--- src/Mod/MeshPart/App/CMakeLists.txt.orig 2025-03-24 09:50:06 UTC ++++ src/Mod/MeshPart/App/CMakeLists.txt +@@ -14,6 +14,7 @@ include_directories( + include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/src ++ ${pybind11_INCLUDE_DIR} + ) + + target_include_directories( +@@ -22,6 +23,7 @@ target_include_directories( + PUBLIC + ${SMESH_INCLUDE_DIR} + ${VTK_INCLUDE_DIRS} ++ ${pybind11_INCLUDE_DIR} + ) + + target_include_directories( diff --git a/cad/freecad-devel/files/patch-src_Mod_TechDraw_App_CMakeLists.txt b/cad/freecad-devel/files/patch-src_Mod_TechDraw_App_CMakeLists.txt new file mode 100644 index 000000000000..012f752b2331 --- /dev/null +++ b/cad/freecad-devel/files/patch-src_Mod_TechDraw_App_CMakeLists.txt @@ -0,0 +1,10 @@ +--- src/Mod/TechDraw/App/CMakeLists.txt.orig 2025-03-24 09:38:26 UTC ++++ src/Mod/TechDraw/App/CMakeLists.txt +@@ -24,6 +24,7 @@ include_directories( + ${QtCore_INCLUDE_DIR} + ${QtGui_INCLUDE_DIR} + ${QtWidgets_INCLUDE_DIRS} ++ ${pybind11_INCLUDE_DIR} + ) + + list(APPEND TechDrawLIBS |