[update] cad/opencascade

Update cad/opencascade from 7.8.1 -> 7.9.3

Tested with kicad 9.0.6 on amd64



diff --git Makefile Makefile
index 1712f0abc69..020f0343c10 100644
--- Makefile
+++ Makefile
@@ -1,9 +1,8 @@
COMMENT = platform for 3D CAD, CAM, and CAE
DPB_PROPERTIES = parallel

-V = 7.8.1
+V = 7.9.3
DISTNAME = opencascade-${V}
-REVISION = 1

.for LIB in TKBO TKBRep TKBin TKBinL TKBinTObj TKBinXCAF TKBool TKCAF TKCDF \
TKDCAF TKDE TKDECascade TKDEGLTF TKDEIGES TKDEOBJ TKDEPLY TKDESTEP \
@@ -29,10 +28,9 @@ WANTLIB += ${MODTK_WANTLIB} ${COMPILER_LIBCXX} GL X11 c execinfo fontconfig
WANTLIB += freetype m

# See https://dev.opencascade.org/content/packaging-again-debian
-SITES = https://git.dev.opencascade.org/gitweb/
-DISTQUERY = ?p=occt.git;a=snapshot;h=refs/tags/V${V:S/./_/g};sf=tgz
-DISTFILES = ${DISTNAME}${EXTRACT_SUFX}{${DISTQUERY}}
-WRKDIST = ${WRKDIR}/occt-V${V:S/./_/g}
+SITES = https://github.com/Open-Cascade-SAS/OCCT/archive/refs/tags/
+DISTFILES = V${V:S/./_/g}${EXTRACT_SUFX}
+WRKDIST = ${WRKDIR}/OCCT-${V:S/./_/g}

COMPILER = base-clang ports-gcc
MODULES = devel/cmake \
@@ -82,10 +80,6 @@ pre-configure:
${WRKSRC}/adm/templates/*.sh*
sed -i "s,custom\.sh,occt_custom\.sh,g" \
${WRKSRC}/adm/templates/*.sh*
- sed -i "s,env\.sh,occt_env\.sh,g" \
- ${WRKSRC}/gen*
- sed -i "s,custom\.sh,occt_custom\.sh,g" \
- ${WRKSRC}/gen*
sed -i "s,env\.,occt_env\.,g" \
${WRKSRC}/CMakeLists.txt
sed -i "s,custom\.,occt_custom\.,g" \
diff --git distinfo distinfo
index 3d0fb2a0ce4..c441f902582 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (opencascade-7.8.1.tar.gz) = M/K9tn4/auRp8/qBbPujRSmiOpy3Nr+YoysgPYUxxSM=
-SIZE (opencascade-7.8.1.tar.gz) = 48427425
+SHA256 (V7_9_3.tar.gz) = Xs8JTsaxLVQT37hR2MNZDDVAWK7lVuMuQIvfv4w1fVc=
+SIZE (V7_9_3.tar.gz) = 48586815
diff --git patches/patch-CMakeLists_txt patches/patch-CMakeLists_txt
index 90d57f9db32..70018e6eb55 100644
--- patches/patch-CMakeLists_txt
+++ patches/patch-CMakeLists_txt
@@ -1,19 +1,14 @@
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -1031,12 +1031,12 @@ else()
+@@ -1101,8 +1101,8 @@ else()
endif()

- # change custom.bat/sh
--if (EXISTS "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}")
+ # validating custom.bat/sh for changes
+-if (EXISTS "${CMAKE_BINARY_DIR}/custom.${SCRIPT_EXT}" AND EXISTS "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}")
- file (READ "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" CUSTOM_CONTENT)
-+if (EXISTS "${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}")
++if (EXISTS "${CMAKE_BINARY_DIR}/custom.${SCRIPT_EXT}" AND EXISTS "${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}")
+ file (READ "${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" CUSTOM_CONTENT)
-
- set (CUSTOM_CONTENT "${CUSTOM_CONTENT} ${ADDITIONAL_CUSTOM_CONTENT}")
-
-- file (WRITE "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" "${CUSTOM_CONTENT}")
-+ file (WRITE "${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" "${CUSTOM_CONTENT}")
- else()
- OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.${SCRIPT_EXT}.main" "custom.${SCRIPT_EXT}" "custom.${SCRIPT_EXT}" "${INSTALL_DIR_SCRIPT}")
- endif()
+ string(FIND "${CUSTOM_CONTENT}" "${ADDITIONAL_CUSTOM_CONTENT}" pos)
+ if (pos EQUAL -1)
+ set (CUSTOM_CONTENT "${CUSTOM_CONTENT} ${ADDITIONAL_CUSTOM_CONTENT}")
diff --git patches/patch-adm_cmake_occt_csf_cmake patches/patch-adm_cmake_occt_csf_cmake
index e4fa4a5f84e..046db96bd07 100644
--- patches/patch-adm_cmake_occt_csf_cmake
+++ patches/patch-adm_cmake_occt_csf_cmake
@@ -1,7 +1,7 @@
Index: adm/cmake/occt_csf.cmake
--- adm/cmake/occt_csf.cmake.orig
+++ adm/cmake/occt_csf.cmake
-@@ -134,7 +134,7 @@ else()
+@@ -153,7 +153,7 @@ else()
set (CSF_OpenGlesLibs "EGL GLESv2")
set (CSF_androidlog "log")
elseif (UNIX)
@@ -10,7 +10,7 @@ Index: adm/cmake/occt_csf.cmake
if (USE_XLIB)
set (CSF_OpenGlLibs "GL")
set (CSF_XwLibs "X11")
-@@ -142,7 +142,6 @@ else()
+@@ -161,7 +161,6 @@ else()
set (CSF_OpenGlLibs "GL EGL")
endif()
set (CSF_OpenGlesLibs "EGL GLESv2")
diff --git patches/patch-adm_cmake_occt_macros_cmake patches/patch-adm_cmake_occt_macros_cmake
deleted file mode 100644
index fe1c845ac8e..00000000000
--- patches/patch-adm_cmake_occt_macros_cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: adm/cmake/occt_macros.cmake
---- adm/cmake/occt_macros.cmake.orig
-+++ adm/cmake/occt_macros.cmake
-@@ -592,7 +592,7 @@ macro (OCCT_UPDATE_TARGET_FILE)
-
- install (CODE
- "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWERCASE)
-- file (GLOB ALL_OCCT_TARGET_FILES \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
-+ file (GLOB ALL_OCCT_TARGET_FILES \"\$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
- foreach(TARGET_FILENAME \${ALL_OCCT_TARGET_FILES})
- file (STRINGS \"\${TARGET_FILENAME}\" TARGET_FILE_CONTENT)
- file (REMOVE \"\${TARGET_FILENAME}\")
diff --git patches/patch-adm_cmake_occt_toolkit_cmake patches/patch-adm_cmake_occt_toolkit_cmake
index 6350ce47a4e..a7f40fbc0fe 100644
--- patches/patch-adm_cmake_occt_toolkit_cmake
+++ patches/patch-adm_cmake_occt_toolkit_cmake
@@ -1,13 +1,13 @@
Index: adm/cmake/occt_toolkit.cmake
--- adm/cmake/occt_toolkit.cmake.orig
+++ adm/cmake/occt_toolkit.cmake
-@@ -450,6 +450,11 @@ if (APPLE)
+@@ -251,6 +251,11 @@ if (APPLE)
endif()
endif()

+if (CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
+ find_package (Backtrace REQUIRED)
-+ target_link_libraries (${PROJECT_NAME} ${Backtrace_LIBRARIES})
++ target_link_libraries (${PROJECT_NAME} PUBLIC ${Backtrace_LIBRARIES})
+endif()
+
# Update list of used VTK libraries if OpenGL2 Rendering BackEnd is used.
diff --git patches/patch-adm_genproj_tcl patches/patch-adm_genproj_tcl
deleted file mode 100644
index 7491bf80da3..00000000000
--- patches/patch-adm_genproj_tcl
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: adm/genproj.tcl
---- adm/genproj.tcl.orig
-+++ adm/genproj.tcl
-@@ -1516,7 +1516,7 @@ proc osutils:csfList { theOS theCsfLibsMap theCsfFrmsM
- if { "$theOS" == "qnx" } {
- # CSF_ThreadLibs - pthread API is part of libc on QNX
- } else {
-- set aLibsMap(CSF_ThreadLibs) "pthread rt"
-+ set aLibsMap(CSF_ThreadLibs) "pthread"
- if { "$::HAVE_TK" == "true" } {
- set aLibsMap(CSF_TclTkLibs) "tk8.6"
- }
diff --git patches/patch-adm_qmake_OccToolkit_pri patches/patch-adm_qmake_OccToolkit_pri
deleted file mode 100644
index 3957d65d970..00000000000
--- patches/patch-adm_qmake_OccToolkit_pri
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: adm/qmake/OccToolkit.pri
---- adm/qmake/OccToolkit.pri.orig
-+++ adm/qmake/OccToolkit.pri
-@@ -59,7 +59,7 @@ win32 {
- CSF_TclTkLibs = -framework Tk
- } else {
- CSF_dl = -ldl
-- CSF_ThreadLibs = -lpthread -lrt
-+ CSF_ThreadLibs = -lpthread
- CSF_OpenGlesLibs = -lEGL -lGLESv2
- CSF_TclTkLibs = -ltk8.6
- HAVE_XLIB {
diff --git patches/patch-adm_templates_env_install_sh_in patches/patch-adm_templates_env_install_sh_in
index fba4e5ad446..102c289fd59 100644
--- patches/patch-adm_templates_env_install_sh_in
+++ patches/patch-adm_templates_env_install_sh_in
@@ -1,12 +1,12 @@
Index: adm/templates/env.install.sh.in
--- adm/templates/env.install.sh.in.orig
+++ adm/templates/env.install.sh.in
-@@ -4,7 +4,7 @@ aScriptPath=${BASH_SOURCE%/*}; if [ -d "${aScriptPath}
-
- # ----- For compatibility with external application using CASROOT -----
- if [ "${CASROOT}" == "" ]; then
-- export CASROOT="@INSTALL_DIR@"
-+ export CASROOT="@INSTALL_DIR@/share/opencascade"
+@@ -13,7 +13,7 @@ if [ "${CASROOT}" == "" ]; then
+ export CASROOT=$(cd "$aScriptPath/.." && pwd)
+ else
+ # Keep current location
+- export CASROOT="${aScriptPath}"
++ export CASROOT="${aScriptPath}/share/opencascade"
+ fi
+ cd ${aCurrentPath}
fi
-
- # ----- Define path to 3rdparty products -----
diff --git patches/patch-src_BRepMesh_delabella_cpp patches/patch-src_BRepMesh_delabella_cpp
index 0082e8dde83..d15094e2e4c 100644
--- patches/patch-src_BRepMesh_delabella_cpp
+++ patches/patch-src_BRepMesh_delabella_cpp
@@ -3,9 +3,9 @@ Index: src/BRepMesh/delabella.cpp
+++ src/BRepMesh/delabella.cpp
@@ -36,7 +36,9 @@ SOFTWARE.
#if (defined(__APPLE__))
- #include <malloc/malloc.h>
+ #include <malloc/malloc.h>
#else
--#include <malloc.h>
+- #include <malloc.h>
+ #ifndef __OpenBSD__
+ #include <malloc.h>
+