diff --git a/cad/freecad/Makefile b/cad/freecad/Makefile index c4e79075928c..722c12aaab37 100644 --- a/cad/freecad/Makefile +++ b/cad/freecad/Makefile @@ -1,79 +1,83 @@ PORTNAME= FreeCAD DISTVERSION= 0.19.2 -PORTREVISION= 2 +PORTREVISION= 3 # use these for bugfixes/snapshots # DISTVERSION= 0.18-16093 # git rev-list --count # DISTVERSIONSUFFIX= -g690774c0e CATEGORIES= cad +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES= 0cfea3fee3e7848bbf043d2b1a19f6405d7ebe25.patch:-p1 + MAINTAINER= cmt@FreeBSD.org COMMENT= General purpose 3D CAD modeller LICENSE= LGPL20+ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= pyside_tool.py:devel/pyside2-tools@${PY_FLAVOR} \ ${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib@${PY_FLAVOR} \ swig:devel/swig LIB_DEPENDS= libexpat.so:textproc/expat2 \ libfreetype.so:print/freetype2 \ ${PY_BOOST} \ libpyside2.cpython-${PYTHON_SUFFIX}${PYTHON_ABIVER}.so:devel/pyside2@${PY_FLAVOR} \ libCoin.so:graphics/Coin \ libpng.so:graphics/png \ libtiff.so:graphics/tiff \ - libvtkFiltersTexture-8.2.so:math/vtk8 \ + libvtksys-${VTK_VER}.so:math/vtk${VTK_VER:R} \ libTKernel.so:cad/opencascade \ libxerces-c.so:textproc/xerces-c3 \ libboost_thread.so:devel/boost-libs \ libarea.so:devel/libarea \ libmed.so:french/med \ libmpi.so:net/openmpi \ libshiboken2.cpython-${PYTHON_SUFFIX}${PYTHON_ABIVER}.so:devel/shiboken2@${PY_FLAVOR} \ libhdf5.so:science/hdf5 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pivy>0:graphics/py-pivy@${PY_FLAVOR} \ ${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib@${PY_FLAVOR} USES= dos2unix compiler:c++17-lang cmake gl eigen:3 fortran jpeg \ localbase:ldflags pkgconfig python:3.7+ localbase qt:5 xorg USE_GITHUB= yes USE_XORG= ice sm x11 xext xt USE_GL= gl glu USE_QT= buildtools concurrent core gui network opengl printsupport \ qmake_build svg webkit widgets xml xmlpatterns USE_LDCONFIG= yes +VTK_VER= 9.0 + DOS2UNIX_GLOB= *.txt *.h *.cpp *.py *.qss *.csv *.pov *.stp *.ui *.wrl *.WRL CMAKE_ARGS+= -DOCC_INCLUDE_DIR="${LOCALBASE}/include/OpenCASCADE" \ -DOPENMPI_INCLUDE_DIRS="${LOCALBASE}/mpi/openmpi/include" \ -DBUILD_QT5="ON" \ -DPYTHON_LIBRARY="${PYTHONBASE}/lib/libpython${PYTHON_VER}${PYTHON_ABIVER}.so" \ -DPYTHON_INCLUDE_DIR="${PYTHON_INCLUDEDIR}" \ -DPYTHON_PACKAGES_PATH="${PYTHON_SITELIBDIR}" \ -DPYTHON_EXECUTABLE="${PYTHON_CMD}" \ -DBUILD_ASSEMBLY="OFF" -DBUILD_FLAT_MESH="ON" \ -DPYSIDE2RCCBINARY="${RCC}" \ -DPYSIDE2UICBINARY="${UIC}" \ - -DVTK_DIR:PATH=${LOCALBASE}/lib/vtk-8.2/cmake/vtk-8.2 \ -DBUILD_ENABLE_CXX_STD=C++17 CMAKE_INSTALL_PREFIX= ${PREFIX}/${PORTNAME} OPTIONS_DEFINE= COLLADA COLLADA_DESC= Install pycollada for Collada files import COLLADA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycollada>0:graphics/py-pycollada@${PY_FLAVOR} DESKTOP_ENTRIES=${PORTNAME} "" "${PREFIX}/FreeCAD/data/freecad.svg" \ ${PORTNAME} "Graphics;Engineering;" false post-patch: @${REINPLACE_CMD} -e '/self\.rev/s/Unknown/${DISTVERSION:C/.*-//}/' \ ${WRKSRC}/src/Tools/SubWCRev.py post-install: ${LN} -s ../${PORTNAME}/bin/FreeCAD ${STAGEDIR}${LOCALBASE}/bin/FreeCAD ${LN} -s ../${PORTNAME}/bin/FreeCADCmd ${STAGEDIR}${LOCALBASE}/bin/FreeCADCmd .include diff --git a/cad/freecad/distinfo b/cad/freecad/distinfo index 9c0a49aae4b7..0d679a782f99 100644 --- a/cad/freecad/distinfo +++ b/cad/freecad/distinfo @@ -1,3 +1,5 @@ TIMESTAMP = 1619964737 SHA256 (FreeCAD-FreeCAD-0.19.2_GH0.tar.gz) = 47e39e3d6fcafe6e0c68923fb1b86acda16986268e5e6011694057b940139fba SIZE (FreeCAD-FreeCAD-0.19.2_GH0.tar.gz) = 296987961 +SHA256 (0cfea3fee3e7848bbf043d2b1a19f6405d7ebe25.patch) = 71a2ad3bc210281d151add9e73beab78eaa1cc6d94bf97db865b4171f8d56d4d +SIZE (0cfea3fee3e7848bbf043d2b1a19f6405d7ebe25.patch) = 34604 diff --git a/cad/freecad/files/patch-cMake_FreeCAD__Helpers_SetupSalomeSMESH.cmake b/cad/freecad/files/patch-cMake_FreeCAD__Helpers_SetupSalomeSMESH.cmake new file mode 100644 index 000000000000..2b3bc745c000 --- /dev/null +++ b/cad/freecad/files/patch-cMake_FreeCAD__Helpers_SetupSalomeSMESH.cmake @@ -0,0 +1,40 @@ +--- cMake/FreeCAD_Helpers/SetupSalomeSMESH.cmake.orig 2021-04-15 09:17:08 UTC ++++ cMake/FreeCAD_Helpers/SetupSalomeSMESH.cmake +@@ -12,24 +12,24 @@ macro(SetupSalomeSMESH) + + #if we use smesh we definitely also need vtk, no matter of external or internal smesh + set (VTK_COMPONENTS +- vtkCommonCore +- vtkCommonDataModel +- vtkFiltersVerdict +- vtkIOXML +- vtkFiltersCore +- vtkFiltersGeneral +- vtkIOLegacy +- vtkFiltersExtraction +- vtkFiltersSources +- vtkFiltersGeometry ++ CommonCore ++ tkCommonDataModel ++ tkFiltersVerdict ++ tkIOXML ++ tkFiltersCore ++ tkFiltersGeneral ++ tkIOLegacy ++ tkFiltersExtraction ++ tkFiltersSources ++ tkFiltersGeometry + ) + + # check which modules are available + if(UNIX OR WIN32) +- find_package(VTK COMPONENTS vtkCommonCore REQUIRED NO_MODULE) +- list(APPEND VTK_COMPONENTS vtkIOMPIParallel vtkParallelMPI vtkhdf5 vtkFiltersParallelDIY2 vtkRenderingCore vtkInteractionStyle vtkRenderingFreeType vtkRenderingOpenGL2) ++ find_package(VTK COMPONENTS CommonCore REQUIRED NO_MODULE) ++ list(APPEND VTK_COMPONENTS IOMPIParallel ParallelMPI hdf5 FiltersParallelDIY2 RenderingCore InteractionStyle RenderingFreeType RenderingOpenGL2) + foreach(_module ${VTK_COMPONENTS}) +- list (FIND VTK_MODULES_ENABLED ${_module} _index) ++ list (FIND VTK_AVAILABLE_COMPONENTS ${_module} _index) + if (${_index} GREATER -1) + list(APPEND AVAILABLE_VTK_COMPONENTS ${_module}) + endif() diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile index 5b163334736f..3ff291a6a28c 100644 --- a/cad/opencascade/Makefile +++ b/cad/opencascade/Makefile @@ -1,153 +1,153 @@ # Created by: Thierry Thomas PORTNAME= opencascade PORTVERSION= 7.5.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= cad science MASTER_SITES= LOCAL/thierry MAINTAINER= thierry@FreeBSD.org COMMENT= Open CASCADE Technology, 3D modeling & numerical simulation LICENSE= OCTPL LICENSE_NAME= LGPL21 with exception LICENSE_FILE= ${WRKSRC}/OCCT_LGPL_EXCEPTION.txt LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BUILD_DEPENDS= rapidjson>0:devel/rapidjson \ ${LOCALBASE}/lib/qt5/bin/qmake:devel/qt5-qmake \ ${LOCALBASE}/lib/qt5/bin/moc:devel/qt5-buildtools LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ - libvtksys-${VTKVER}.so:math/vtk8 \ - libfreetype.so:print/freetype2 + libfreetype.so:print/freetype2 \ + libvtksys-${VTKVER}.so:math/vtk${VTKVER:R} RUN_DEPENDS= bash:shells/bash # Check ${WRKSRC}/dox/overview/overview.md # and ${WRKSRC}/dox/dev_guides/building USES= alias:10 cmake compiler:c++14-lang dos2unix \ gl python qt:5 shebangfix tk tar:tgz xorg USE_XORG= ice sm x11 xext xi xmu xt -USE_GL= gl glu +USE_GL= egl gl glesv2 glu DOS2UNIX_FILES= adm/templates/* SHEBANG_FILES= adm/templates/*.sh \ adm/templates/*.sh.in \ adm/templates/*.sh.main \ adm/genconf.tcl \ adm/start.tcl \ gendoc ENVSH= adm/templates/env.sh -VTKVER= 8.2 +VTKVER= 9.0 OPTIONS_DEFINE= DOCS DOXYGEN FFMPEG VIS VIS_DESC= Build Visualizazion module (requires OpenGL, freetype, ftgl) OPTIONS_DEFAULT=FFMPEG VIS OPTIONS_SUB= yes REINPLACE_ARGS= -i "" CFLAGS+= -I${LOCALBASE}/include CMAKE_ARGS+= -DINSTALL_DIR=${OCCROOT} \ -DINSTALL_DIR_INCLUDE=${PREFIX}/include/OpenCASCADE \ -DINSTALL_DIR_LIB=${PREFIX}/lib \ -DINSTALL_DIR_CMAKE=${PREFIX}/lib/cmake \ -DINSTALL_DIR_DATA=${OCCROOT}/data \ -DINSTALL_DIR_RESOURCE=${OCCROOT}/resources \ -DINSTALL_DIR_SAMPLES=${OCCROOT}/samples \ -DINSTALL_DIR_TESTS=${OCCROOT}/tests \ -DINSTALL_TEST_CASES:BOOL=ON \ -DUSE_TBB:BOOL=OFF \ -DUSE_RAPIDJSON:BOOL=ON \ -DUSE_VTK:BOOL=ON \ - -DVTK_DIR:PATH=${LOCALBASE}/lib/vtk-${VTKVER}/cmake/vtk-${VTKVER} + -D3RDPARTY_VTK_INCLUDE_DIR:PATH=${LOCALBASE}/include/vtk-${VTKVER} # TODO: TBB to be replaced by onetbb later #CMAKE_ARGS+= -DUSE_EIGEN:BOOL=ON -DUSE_TBB:BOOL=ON #USES+= eigen:3 #LIB_DEPENDS+= libtbb.so:devel/tbb USE_LDCONFIG= yes LOCCROOT= OpenCAS OCCROOT= ${PREFIX}/${LOCCROOT} PLIST_SUB= OCCROOT="${LOCCROOT}" BITS=${BITS} CC=${CHOSEN_COMPILER_TYPE} \ VE=${PORTVERSION:R:R} VER=${PORTVERSION} FFMPEG_CMAKE_ON= -DUSE_FFMPEG:BOOL=ON FFMPEG_CMAKE_OFF= -DUSE_FFMPEG:BOOL=OFF FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg VIS_CMAKE_ON= -DUSE_FREEIMAGE:BOOL=ON \ -DUSE_FREETYPE:BOOL=ON \ -DUSE_GLES2:BOOL=ON \ -D3RDPARTY_FREETYPE_DIR=${LOCALBASE} VIS_CMAKE_OFF= -DUSE_FREEIMAGE:BOOL=OFF \ -DUSE_FREETYPE:BOOL=OFF \ -DUSE_GLES2:BOOL=OFF VIS_LIB_DEPENDS= libftgl.so:graphics/ftgl \ libfreeimageplus.so:graphics/freeimage VIS_USE= GL=glesv2 DOXYGEN_IMPLIES= DOCS DOXYGEN_USE= TEX=latex:build DOXYGEN_BUILD_DEPENDS= bash:shells/bash \ doxygen:devel/doxygen \ dot:graphics/graphviz \ pdftex:print/tex-basic-engines \ inkscape:graphics/inkscape DOXYGEN_RUN_DEPENDS= ${LOCALBASE}/www/MathJax/MathJax.js:www/mathjax .include .if ${ARCH} == "i386" BITS= 32 .else BITS= 64 .endif pre-everything:: @${ECHO_MSG} @${ECHO_MSG} "Warning: to build OpenCascade, you should have at least" @${ECHO_MSG} "2.6 Gb of free disk space in build area!" @${ECHO_MSG} pre-patch: ${REINPLACE_CMD} 's|||' \ ${WRKSRC}/src/BRepMesh/delabella.cpp\ ${WRKSRC}/src/OSD/OSD_MemInfo.cxx pre-configure: ${REINPLACE_CMD} -e 's|tclsh|${TCLSH}|' ${WRKSRC}/gendoc ${REINPLACE_CMD} -e 's|/usr/bin/|${LOCALBASE}/bin/|' ${WRKSRC}/adm/genconfdeps.tcl ${GREP} -rl x86_64 ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \ -e 's|x86_64|amd64|' .for es in ${ENVSH} ${REINPLACE_CMD} -e 's|lin|bsd|' ${WRKSRC}/${es} .endfor post-build-DOXYGEN-on: (cd ${WRKSRC} && ./gendoc -overview) post-install: ${MV} ${STAGEDIR}${OCCROOT}/bin/DRAWEXE-${PORTVERSION} ${STAGEDIR}${PREFIX}/bin/DRAWEXE (cd ${STAGEDIR}${PREFIX}/bin && \ ${LN} -sf DRAWEXE ${STAGEDIR}${OCCROOT}/bin/DRAWEXE) post-install-DOXYGEN-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/doc/overview && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) ${RM} -r ${STAGEDIR}${DOCSDIR}/latex ${RM} ${STAGEDIR}${DOCSDIR}/html/build_upgrade_building_3rdparty.html.bak .if defined(MAINTAINER_MODE) regression-test: install ${RM} -rf /tmp/testOCC ${MKDIR} /tmp/testOCC bash -c "\ cd ${OCCROOT} && . ${OCCROOT}/bin/env.sh && \ CSF_TestScriptsPath=${OCCROOT}/tests \ CSF_TestDataPath=${OCCROOT}/data \ DRAWEXE -f ${FILESDIR}/regtest " .endif .include diff --git a/cad/opencascade/files/patch-adm_cmake_occt__csf.cmake b/cad/opencascade/files/patch-adm_cmake_occt__csf.cmake index 904f6ae7d25a..0a8b0fdb286e 100644 --- a/cad/opencascade/files/patch-adm_cmake_occt__csf.cmake +++ b/cad/opencascade/files/patch-adm_cmake_occt__csf.cmake @@ -1,9 +1,10 @@ ---- adm/cmake/occt_csf.cmake.orig 2018-05-25 19:13:23 UTC +--- adm/cmake/occt_csf.cmake.orig 2020-11-03 14:49:43 UTC +++ adm/cmake/occt_csf.cmake -@@ -116,6 +116,5 @@ if (WIN32) +@@ -124,7 +124,6 @@ else() set (CSF_OpenGlLibs "GL") endif() set (CSF_XwLibs "X11 Xext Xmu Xi") - set (CSF_dl "dl") + set (CSF_fontconfig "fontconfig") endif() endif() diff --git a/cad/opencascade/files/patch-adm_cmake_occt__macros.cmake b/cad/opencascade/files/patch-adm_cmake_occt__macros.cmake index f4128a3ddc7d..d56ea8699ddf 100644 --- a/cad/opencascade/files/patch-adm_cmake_occt__macros.cmake +++ b/cad/opencascade/files/patch-adm_cmake_occt__macros.cmake @@ -1,20 +1,20 @@ ---- adm/cmake/occt_macros.cmake.orig 2018-05-25 19:13:23 UTC +--- adm/cmake/occt_macros.cmake.orig 2020-11-03 14:49:43 UTC +++ adm/cmake/occt_macros.cmake -@@ -53,7 +53,7 @@ macro (OCCT_MAKE_OS_WITH_BITNESS) +@@ -47,7 +47,7 @@ macro (OCCT_MAKE_OS_WITH_BITNESS) elseif(APPLE) set (OS_WITH_BIT "mac${COMPILER_BITNESS}") else() - set (OS_WITH_BIT "lin${COMPILER_BITNESS}") + set (OS_WITH_BIT "bsd${COMPILER_BITNESS}") endif() endmacro() -@@ -337,7 +337,7 @@ macro (COLLECT_AND_INSTALL_OCCT_HEADER_F +@@ -336,7 +336,7 @@ macro (COLLECT_AND_INSTALL_OCCT_HEADER_FILES ROOT_TARG configure_file ("${TEMPLATE_HEADER_PATH}" "${ROOT_TARGET_OCCT_DIR}/${OCCT_INSTALL_DIR_PREFIX}/${HEADER_FILE_NAME}" @ONLY) endforeach() - install (FILES ${OCCT_HEADER_FILES_COMPLETE} DESTINATION "${INSTALL_DIR}/${OCCT_INSTALL_DIR_PREFIX}") + install (FILES ${OCCT_HEADER_FILES_COMPLETE} DESTINATION "${INSTALL_DIR_INCLUDE}") string(TIMESTAMP CURRENT_TIME "%H:%M:%S") message (STATUS "Info: \(${CURRENT_TIME}\) Checking headers in inc folder...") diff --git a/cad/opencascade/files/patch-adm_templates_OpenCASCADEConfig.cmake.in b/cad/opencascade/files/patch-adm_templates_OpenCASCADEConfig.cmake.in index 06c2689a20e8..b84b8b2d32c5 100644 --- a/cad/opencascade/files/patch-adm_templates_OpenCASCADEConfig.cmake.in +++ b/cad/opencascade/files/patch-adm_templates_OpenCASCADEConfig.cmake.in @@ -1,19 +1,19 @@ ---- adm/templates/OpenCASCADEConfig.cmake.in.orig 2017-12-27 14:54:08 UTC +--- adm/templates/OpenCASCADEConfig.cmake.in.orig 2021-06-26 15:04:30 UTC +++ adm/templates/OpenCASCADEConfig.cmake.in -@@ -31,11 +31,11 @@ if (OpenCASCADE_INSTALL_PREFIX MATCHES " +@@ -36,11 +36,11 @@ if (OpenCASCADE_INSTALL_PREFIX MATCHES "/libs/${CMAKE_ endif() # Set OpenCASCADE paths to headers, binaries, libraries, resources, tests, samples, data -set (OpenCASCADE_BINARY_DIR "${OpenCASCADE_INSTALL_PREFIX}/@INSTALL_DIR_BIN@") -set (OpenCASCADE_LIBRARY_DIR "${OpenCASCADE_INSTALL_PREFIX}/@INSTALL_DIR_LIB@") -set (OpenCASCADE_SCRIPT_DIR "${OpenCASCADE_INSTALL_PREFIX}/@INSTALL_DIR_SCRIPT@") -set (OpenCASCADE_INCLUDE_DIR "${OpenCASCADE_INSTALL_PREFIX}/@INSTALL_DIR_INCLUDE@") -set (OpenCASCADE_RESOURCE_DIR "${OpenCASCADE_INSTALL_PREFIX}/@INSTALL_DIR_RESOURCE@") +set (OpenCASCADE_BINARY_DIR "@INSTALL_DIR_BIN@") +set (OpenCASCADE_LIBRARY_DIR "@INSTALL_DIR_LIB@") +set (OpenCASCADE_SCRIPT_DIR "@INSTALL_DIR_SCRIPT@") +set (OpenCASCADE_INCLUDE_DIR "@INSTALL_DIR_INCLUDE@") +set (OpenCASCADE_RESOURCE_DIR "@INSTALL_DIR_RESOURCE@") # The C and C++ flags added by OpenCASCADE to the cmake-configured flags. set (OpenCASCADE_C_FLAGS "@CMAKE_C_FLAGS@") diff --git a/cad/opencascade/files/patch-adm_templates_custom.install.sh.in b/cad/opencascade/files/patch-adm_templates_custom.install.sh.in index 7994fab5deff..ac764e67831a 100644 --- a/cad/opencascade/files/patch-adm_templates_custom.install.sh.in +++ b/cad/opencascade/files/patch-adm_templates_custom.install.sh.in @@ -1,25 +1,25 @@ ---- adm/templates/custom.install.sh.in.orig 2017-12-27 14:54:08 UTC +--- adm/templates/custom.install.sh.in.orig 2021-06-26 15:04:30 UTC +++ adm/templates/custom.install.sh.in -@@ -21,14 +21,14 @@ if [ "$1" == "@BIN_LETTER@" ]; then +@@ -20,14 +20,14 @@ if [ "$1" == "@BIN_LETTER@" ]; then export TCL_VERSION_WITH_DOT="@3RDPARTY_TCL_LIBRARY_VERSION_WITH_DOT@" export TK_VERSION_WITH_DOT="@3RDPARTY_TK_LIBRARY_VERSION_WITH_DOT@" - export CSF_OCCTBinPath="${CASROOT}/@INSTALL_DIR_BIN@" - export CSF_OCCTLibPath="${CASROOT}/@INSTALL_DIR_LIB@" - export CSF_OCCTIncludePath="${CASROOT}/@INSTALL_DIR_INCLUDE@" - export CSF_OCCTResourcePath="${CASROOT}/@INSTALL_DIR_RESOURCE@" - export CSF_OCCTDataPath="${CASROOT}/@INSTALL_DIR_DATA@" - export CSF_OCCTSamplesPath="${CASROOT}/@INSTALL_DIR_SAMPLES@" - export CSF_OCCTTestsPath="${CASROOT}/@INSTALL_DIR_TESTS@" - export CSF_OCCTDocPath="${CASROOT}/@INSTALL_DIR_DOC@" + export CSF_OCCTBinPath="@INSTALL_DIR_BIN@" + export CSF_OCCTLibPath="@INSTALL_DIR_LIB@" + export CSF_OCCTIncludePath="@INSTALL_DIR_INCLUDE@" + export CSF_OCCTResourcePath="@INSTALL_DIR_RESOURCE@" + export CSF_OCCTDataPath="@INSTALL_DIR_DATA@" + export CSF_OCCTSamplesPath="@INSTALL_DIR_SAMPLES@" + export CSF_OCCTTestsPath="@INSTALL_DIR_TESTS@" + export CSF_OCCTDocPath="@INSTALL_DIR_DOC@" fi fi diff --git a/cad/opencascade/files/patch-src_DrawResources_CheckCommands.tcl b/cad/opencascade/files/patch-src_DrawResources_CheckCommands.tcl index ed30fa375382..20df73cb3858 100644 --- a/cad/opencascade/files/patch-src_DrawResources_CheckCommands.tcl +++ b/cad/opencascade/files/patch-src_DrawResources_CheckCommands.tcl @@ -1,62 +1,59 @@ ---- src/DrawResources/CheckCommands.tcl.orig 2018-05-25 19:13:38 UTC +--- src/DrawResources/CheckCommands.tcl.orig 2020-11-03 14:49:56 UTC +++ src/DrawResources/CheckCommands.tcl -@@ -1036,6 +1036,7 @@ help checkplatform { +@@ -1053,6 +1053,7 @@ help checkplatform { -windows : return 1 if current platform is 'Windows', overwise return 0 -linux : return 1 if current platform is 'Linux', overwise return 0 -osx : return 1 if current platform is 'MacOS X', overwise return 0 + -freebsd : return 1 if current platform is 'FreeBSD', overwise return 0 Only one option can be used at once. If no option is given, procedure will return the name of current platform. -@@ -1044,9 +1045,11 @@ proc checkplatform {args} { +@@ -1061,9 +1062,11 @@ proc checkplatform {args} { set check_for_windows false set check_for_linux false set check_for_macosx false + set check_for_freebsd false set options {{"-windows" check_for_windows 0} {"-linux" check_for_linux 0} + {"-freebsd" check_for_freebsd 0} {"-osx" check_for_macosx 0}} _check_args ${args} ${options} "checkplatform" -@@ -1055,17 +1058,19 @@ proc checkplatform {args} { +@@ -1072,17 +1075,19 @@ proc checkplatform {args} { set current_platform Windows } elseif { $::tcl_platform(os) == "Linux" } { set current_platform Linux + } elseif { $::tcl_platform(os) == "FreeBSD" } { + set current_platform FreeBSD } elseif { $::tcl_platform(os) == "Darwin" } { set current_platform MacOS } # no args are given - if { !${check_for_windows} && !${check_for_linux} && !${check_for_macosx}} { + if { !${check_for_windows} && !${check_for_linux} && !${check_for_macosx} && !${check_for_freebsd}} { return ${current_platform} } # check usage of proc checkplatform - if { [expr [string is true ${check_for_windows}] + [string is true ${check_for_linux}] + [string is true ${check_for_macosx}] ] > 1} { + if { [expr [string is true ${check_for_windows}] + [string is true ${check_for_linux}] + [string is true ${check_for_macosx}] + [string is true ${check_for_freebsd}] ] > 1} { error "Error: wrong usage of command checkplatform, only single option can be used at once" } -@@ -1074,11 +1079,16 @@ proc checkplatform {args} { +@@ -1091,8 +1096,13 @@ proc checkplatform {args} { return 1 } - # checking for Mac OS X platforms + # checking for Linux platforms if { ${check_for_linux} && ${current_platform} == "Linux" } { - return 1 - } - -+ # checking for FreeBSD platforms -+ if { ${check_for_freebsd} && ${current_platform} == "FreeBSD" } { + return 1 + } + - # checking for Mac OS X platforms - if { ${check_for_macosx} && ${current_platform} == "MacOS" } { ++ # checking for FreeBSD platforms ++ if { ${check_for_freebsd} && ${current_platform} == "FreeBSD" } { return 1 + } + diff --git a/cad/opencascade/files/patch-src_IVtkDraw_IVtkDraw.cxx b/cad/opencascade/files/patch-src_IVtkDraw_IVtkDraw.cxx new file mode 100644 index 000000000000..3184727b086b --- /dev/null +++ b/cad/opencascade/files/patch-src_IVtkDraw_IVtkDraw.cxx @@ -0,0 +1,15 @@ +--- src/IVtkDraw/IVtkDraw.cxx.orig 2020-11-03 14:50:01 UTC ++++ src/IVtkDraw/IVtkDraw.cxx +@@ -36,6 +36,12 @@ + #include + #include + ++// Preventing naming collisions between ++// GLX and VTK versions 9.0 and above ++#ifdef AllValues ++#undef AllValues ++#endif ++ + #include + #include + #include diff --git a/cad/opencascade/files/patch-src_IVtkDraw_IVtkDraw__Interactor.cxx b/cad/opencascade/files/patch-src_IVtkDraw_IVtkDraw__Interactor.cxx new file mode 100644 index 000000000000..290e6a0bbc53 --- /dev/null +++ b/cad/opencascade/files/patch-src_IVtkDraw_IVtkDraw__Interactor.cxx @@ -0,0 +1,16 @@ +--- src/IVtkDraw/IVtkDraw_Interactor.cxx.orig 2020-11-03 14:50:01 UTC ++++ src/IVtkDraw/IVtkDraw_Interactor.cxx +@@ -20,6 +20,13 @@ + #include + #else + #include ++ ++// Preventing naming collisions between ++// GLX and VTK versions 9.0 and above ++#ifdef AllValues ++#undef AllValues ++#endif ++ + #include + #include + #endif diff --git a/cad/opencascade/files/patch-src_Standard_Standard__CString.cxx b/cad/opencascade/files/patch-src_Standard_Standard__CString.cxx index a6755f655f11..a8162b9e0c23 100644 --- a/cad/opencascade/files/patch-src_Standard_Standard__CString.cxx +++ b/cad/opencascade/files/patch-src_Standard_Standard__CString.cxx @@ -1,11 +1,11 @@ ---- src/Standard/Standard_CString.cxx.orig 2017-08-30 13:28:31 UTC +--- src/Standard/Standard_CString.cxx.orig 2020-11-03 14:50:08 UTC +++ src/Standard/Standard_CString.cxx -@@ -81,7 +81,7 @@ Standard_Integer HashCodes (const Standa +@@ -83,7 +83,7 @@ Standard_Integer HashCodes (const Standard_CString the // strtod, strtol, strtoll functions. For other system with locale-depended // implementations problems may appear if "C" locale is not set explicitly. #if !defined(__ANDROID__) && !defined(__QNX__) && !defined(__MINGW32__) - #error System does not support xlocale. Import/export could be broken if C locale did not specified by application. + #warning System does not support xlocale. Import/export could be broken if C locale did not specified by application. #endif #define strtod_l(thePtr, theNextPtr, theLocale) strtod(thePtr, theNextPtr) #endif