From 26938919d446af6cbc16a7b69cd8358e7f21d6a3 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Mar 29 2024 22:19:50 +0000 Subject: Update to 7.8.0. --- diff --git a/.gitignore b/.gitignore index c09b408..2a9e468 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /opencascade-7.4.0.tgz /opencascade-7.5.0.tgz /opencascade-7.6.3.tgz +/opencascade-7.8.0.tgz diff --git a/occt-config.patch b/occt-config.patch index dd6ab4b..9e9c66a 100644 --- a/occt-config.patch +++ b/occt-config.patch @@ -1,19 +1,21 @@ -Index: occt-V7_6_3/CMakeLists.txt +Index: occt-V7_8_0/CMakeLists.txt =================================================================== ---- occt-V7_6_3.orig/CMakeLists.txt -+++ occt-V7_6_3/CMakeLists.txt -@@ -1231,6 +1231,7 @@ foreach (OCCT_CONFIGURATION ${CMAKE_CONF - endforeach() - # install OpenCASCADE config file with compile definitions and C/C++ flags ONLY for current configuration - install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWER)") -+set(INSTALL_DIR "\$ENV{DESTDIR}/${INSTALL_DIR}") - install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)") - - foreach (OCCT_MODULE ${OCCT_MODULES}) -Index: occt-V7_6_3/adm/templates/OpenCASCADEConfig.cmake.in +--- occt-V7_8_0.orig/CMakeLists.txt ++++ occt-V7_8_0/CMakeLists.txt +@@ -739,7 +739,8 @@ endif() + if (NOT DEFINED ANDROID AND CAN_USE_TBB) + if (USE_TBB) + add_definitions (-DHAVE_TBB) +- OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/tbb") ++ #OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/tbb") ++ find_package(TBB CONFIG REQUIRED) + else() + OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_TBB") + OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_TBBMALLOC") +Index: occt-V7_8_0/adm/templates/OpenCASCADEConfig.cmake.in =================================================================== ---- occt-V7_6_3.orig/adm/templates/OpenCASCADEConfig.cmake.in -+++ occt-V7_6_3/adm/templates/OpenCASCADEConfig.cmake.in +--- occt-V7_8_0.orig/adm/templates/OpenCASCADEConfig.cmake.in ++++ occt-V7_8_0/adm/templates/OpenCASCADEConfig.cmake.in @@ -27,7 +27,7 @@ get_filename_component (OpenCASCADE_INST if (OpenCASCADE_INSTALL_PREFIX MATCHES "/cmake$") get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH) @@ -23,3 +25,34 @@ Index: occt-V7_6_3/adm/templates/OpenCASCADEConfig.cmake.in get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH) endif() if (OpenCASCADE_INSTALL_PREFIX MATCHES "/libs/${CMAKE_ANDROID_ARCH_ABI}$") +Index: occt-V7_8_0/adm/cmake/tbb.cmake +=================================================================== +--- occt-V7_8_0.orig/adm/cmake/tbb.cmake ++++ occt-V7_8_0/adm/cmake/tbb.cmake +@@ -153,21 +153,21 @@ else () + if ((NOT "${3RDPARTY_TBB_DIR}" STREQUAL "") AND (EXISTS "${3RDPARTY_TBB_DIR}")) + # Find TBB 2021.5 in existing directory. + find_package ( +- TBB 2021.5 ++ TBB + PATHS "${3RDPARTY_TBB_DIR}" NO_DEFAULT_PATH + REQUIRED + CONFIG) + else() +- # Find TBB 2021.5 in system directory. ++ # Find TBB 2021 in system directory. + find_package ( +- TBB 2021.5 ++ TBB + REQUIRED + CONFIG) + endif() + else() +- # Find TBB 2021.5 in system directory. ++ # Find TBB 2021 in system directory. + find_package ( +- TBB 2021.5 ++ TBB + REQUIRED + CONFIG) + endif() diff --git a/opencascade-vtk.patch b/opencascade-vtk.patch index 00e73b4..9e99d06 100644 --- a/opencascade-vtk.patch +++ b/opencascade-vtk.patch @@ -1,6 +1,7 @@ -diff -up opencascade-7.5.0/src/IVtkDraw/IVtkDraw.cxx.vtk opencascade-7.5.0/src/IVtkDraw/IVtkDraw.cxx ---- opencascade-7.5.0/src/IVtkDraw/IVtkDraw.cxx.vtk 2020-11-03 07:50:01.000000000 -0700 -+++ opencascade-7.5.0/src/IVtkDraw/IVtkDraw.cxx 2023-01-12 21:27:51.669725256 -0700 +Index: occt-V7_7_2/src/IVtkDraw/IVtkDraw.cxx +=================================================================== +--- occt-V7_7_2.orig/src/IVtkDraw/IVtkDraw.cxx ++++ occt-V7_7_2/src/IVtkDraw/IVtkDraw.cxx @@ -31,10 +31,8 @@ #include #include @@ -12,7 +13,7 @@ diff -up opencascade-7.5.0/src/IVtkDraw/IVtkDraw.cxx.vtk opencascade-7.5.0/src/I #include #include -@@ -74,6 +72,9 @@ +@@ -75,6 +73,9 @@ #include #include #include @@ -22,9 +23,10 @@ diff -up opencascade-7.5.0/src/IVtkDraw/IVtkDraw.cxx.vtk opencascade-7.5.0/src/I #ifndef _WIN32 #include #include -diff -up opencascade-7.5.0/src/IVtkDraw/IVtkDraw_Interactor.hxx.vtk opencascade-7.5.0/src/IVtkDraw/IVtkDraw_Interactor.hxx ---- opencascade-7.5.0/src/IVtkDraw/IVtkDraw_Interactor.hxx.vtk 2020-11-03 07:50:01.000000000 -0700 -+++ opencascade-7.5.0/src/IVtkDraw/IVtkDraw_Interactor.hxx 2023-01-14 19:16:25.310673547 -0700 +Index: occt-V7_7_2/src/IVtkDraw/IVtkDraw_Interactor.hxx +=================================================================== +--- occt-V7_7_2.orig/src/IVtkDraw/IVtkDraw_Interactor.hxx ++++ occt-V7_7_2/src/IVtkDraw/IVtkDraw_Interactor.hxx @@ -20,16 +20,6 @@ #include #include @@ -60,10 +62,11 @@ diff -up opencascade-7.5.0/src/IVtkDraw/IVtkDraw_Interactor.hxx.vtk opencascade- class vtkWin32RenderWindowInteractor; typedef vtkSmartPointer PSelector; -diff -up occt-V7_6_3/src/IVtkDraw/IVtkDraw_Interactor.cxx.vtk occt-V7_6_3/src/IVtkDraw/IVtkDraw_Interactor.cxx ---- occt-V7_6_3/src/IVtkDraw/IVtkDraw_Interactor.cxx.vtk 2022-07-22 02:53:38.000000000 -0600 -+++ occt-V7_6_3/src/IVtkDraw/IVtkDraw_Interactor.cxx 2023-01-14 21:07:30.367040080 -0700 -@@ -15,21 +15,6 @@ +Index: occt-V7_7_2/src/IVtkDraw/IVtkDraw_Interactor.cxx +=================================================================== +--- occt-V7_7_2.orig/src/IVtkDraw/IVtkDraw_Interactor.cxx ++++ occt-V7_7_2/src/IVtkDraw/IVtkDraw_Interactor.cxx +@@ -15,17 +15,6 @@ // prevent disabling some MSVC warning messages by VTK headers #include @@ -78,14 +81,20 @@ diff -up occt-V7_6_3/src/IVtkDraw/IVtkDraw_Interactor.cxx.vtk occt-V7_6_3/src/IV -#ifdef AllValues -#undef AllValues -#endif -- + + // Resolve name collisions with X11 headers + #ifdef Status +@@ -36,9 +25,6 @@ + #undef Success + #endif + -#include -#include -#endif #include #include #include -@@ -45,6 +30,16 @@ +@@ -54,6 +40,16 @@ #include #include diff --git a/opencascade.spec b/opencascade.spec index dfc079b..5fe5fa8 100644 --- a/opencascade.spec +++ b/opencascade.spec @@ -1,11 +1,11 @@ %global major 7 -%global minor 6 -%global patch 3 +%global minor 8 +%global patch 0 %global ver_under %{major}_%{minor}_%{patch} Name: opencascade -Version: %{major}.%{minor}.%{patch} -Release: 6%{?dist} +Version: 7.8.0 +Release: 1%{?dist} Summary: SDK intended for development of applications dealing with 3D CAD data License: LGPLv2+ with exception @@ -23,7 +23,8 @@ Patch0: occt-config.patch # Support VTK 9.2 - mainly moving X11 headers after vtk ones # https://tracker.dev.opencascade.org/view.php?id=33164 # https://gitlab.kitware.com/vtk/vtk/-/issues/18683 -Patch1: opencascade-vtk.patch +#Patch1: opencascade-vtk.patch +Patch2: occt-install.patch # Utilities @@ -188,7 +189,7 @@ export DESTDIR="%{buildroot}" %cmake_install # Draw binary should not be versioned. -mv %{buildroot}%{_bindir}/DRAWEXE-%{version} \ +mv %{buildroot}%{_bindir}/DRAWEXE-* \ %{buildroot}%{_bindir}/DRAWEXE # Install manpage for DRAWEXE @@ -242,19 +243,20 @@ chmod 0755 %{buildroot}%{_bindir}/*.sh %{_libdir}/libTKShHealing.so.* # Data exchange %{_libdir}/libTKXSBase.so.* -%{_libdir}/libTKSTEPBase.so.* -%{_libdir}/libTKSTEPAttr.so.* -%{_libdir}/libTKSTEP209.so.* -%{_libdir}/libTKSTEP.so.* -%{_libdir}/libTKIGES.so.* +%{_libdir}/libTKDESTEP.so.* +%{_libdir}/libTKDEIGES.so.* %{_libdir}/libTKXCAF.so.* -%{_libdir}/libTKXDEIGES.so.* -%{_libdir}/libTKXDESTEP.so.* -%{_libdir}/libTKSTL.so.* -%{_libdir}/libTKVRML.so.* +%{_libdir}/libTKDE.so.* +%{_libdir}/libTKDECascade.so.* +%{_libdir}/libTKDEGLTF.so.* +%{_libdir}/libTKDEOBJ.so.* +%{_libdir}/libTKDEPLY.so.* +%{_libdir}/libTKDESTL.so.* +%{_libdir}/libTKDEVRML.so.* %{_libdir}/libTKXmlXCAF.so.* %{_libdir}/libTKBinXCAF.so.* %{_libdir}/libTKRWMesh.so.* +%{_libdir}/libTKExpress.so.* %files visualization # Visualization Dependents @@ -290,6 +292,14 @@ chmod 0755 %{buildroot}%{_bindir}/*.sh %{_libdir}/libTKTopTest.so.* %{_libdir}/libTKViewerTest.so.* %{_libdir}/libTKXSDRAW.so.* +%{_libdir}/libTKXSDRAWDE.so.* +%{_libdir}/libTKXSDRAWGLTF.so.* +%{_libdir}/libTKXSDRAWIGES.so.* +%{_libdir}/libTKXSDRAWOBJ.so.* +%{_libdir}/libTKXSDRAWPLY.so.* +%{_libdir}/libTKXSDRAWSTEP.so.* +%{_libdir}/libTKXSDRAWSTL.so.* +%{_libdir}/libTKXSDRAWVRML.so.* %{_libdir}/libTKDCAF.so.* %{_libdir}/libTKXDEDRAW.so.* %{_libdir}/libTKTObjDRAW.so.* @@ -301,12 +311,19 @@ chmod 0755 %{buildroot}%{_bindir}/*.sh %files devel %{_bindir}/*.sh +%{_bindir}/ExpToCasExe* %{_includedir}/opencascade %{_libdir}/*.so %{_libdir}/cmake/opencascade/*.cmake %changelog +* Tue Feb 20 2024 Richard Shaw - 7.8.0-1 +- Update to 7.8.0. + +* Thu Feb 1 2024 Richard Shaw - 7.7.2-1 +- Update to 7.7.0. + * Thu Jan 25 2024 Fedora Release Engineering - 7.6.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 1220cae..ab3766a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (opencascade-7.6.3.tgz) = 0709ea71b7a9c0010a6f1fd988f3a8cdba74ef400dad1b74323c1b0785c60346a48d47ec8be7df7b72682686a3843b3e28c11eef7fec2a3a7b593629a8857eda +SHA512 (opencascade-7.8.0.tgz) = bf119c2963a69dfad58ddef064e3f2df15f6e8fa660db56b4c94a7d69f83eb238ed3ff06b9431b1e758829cd0e3ae6d4757fb68368b8531099499f6dd6c0cb17