diff --git a/science/misc/opencascade/cmake-fix-variable.patch b/science/misc/opencascade/cmake-fix-variable.patch deleted file mode 100644 index a59741f3d2..0000000000 --- a/science/misc/opencascade/cmake-fix-variable.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur occt-V7_3_0/adm/templates/OpenCASCADEConfig.cmake.in occt-V7_3_0_new/adm/templates/OpenCASCADEConfig.cmake.in ---- occt-V7_3_0/adm/templates/OpenCASCADEConfig.cmake.in 2018-05-29 12:14:02.000000000 +0200 -+++ occt-V7_3_0.new/adm/templates/OpenCASCADEConfig.cmake.in 2018-05-29 12:14:02.000000000 +0200 -@@ -26,7 +26,7 @@ - if (OpenCASCADE_INSTALL_PREFIX MATCHES "/cmake$") - get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH) - endif() --if (OpenCASCADE_INSTALL_PREFIX MATCHES "/lib$") -+if (OpenCASCADE_INSTALL_PREFIX MATCHES "/lib(64)?$") - get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH) - endif() - diff --git a/science/misc/opencascade/oce-7.5.0-clang.patch b/science/misc/opencascade/files/oce-7.5.0-clang.patch similarity index 100% rename from science/misc/opencascade/oce-7.5.0-clang.patch rename to science/misc/opencascade/files/oce-7.5.0-clang.patch diff --git a/science/misc/opencascade/opencascade-7.5.0-fix_tbb.patch b/science/misc/opencascade/files/opencascade-7.5.0-fix_tbb.patch similarity index 100% rename from science/misc/opencascade/opencascade-7.5.0-fix_tbb.patch rename to science/misc/opencascade/files/opencascade-7.5.0-fix_tbb.patch diff --git a/science/misc/opencascade/opencascade-7.6.0-set-env-correctly.patch b/science/misc/opencascade/files/opencascade-7.6.0-set-env-correctly.patch similarity index 100% rename from science/misc/opencascade/opencascade-7.6.0-set-env-correctly.patch rename to science/misc/opencascade/files/opencascade-7.6.0-set-env-correctly.patch diff --git a/science/misc/opencascade/opencascade-cmake.patch b/science/misc/opencascade/files/opencascade-cmake.patch similarity index 100% rename from science/misc/opencascade/opencascade-cmake.patch rename to science/misc/opencascade/files/opencascade-cmake.patch diff --git a/science/misc/opencascade/fix-install-dir-references.patch b/science/misc/opencascade/fix-install-dir-references.patch deleted file mode 100644 index 0d3c8c8330..0000000000 --- a/science/misc/opencascade/fix-install-dir-references.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -aur occt-V7_1_0/CMakeLists.txt occt-V7_1_0.new/CMakeLists.txt ---- occt-V7_1_0/CMakeLists.txt 2016-11-25 11:50:18.000000000 +0100 -+++ occt-V7_1_0.new/CMakeLists.txt 2017-03-18 08:44:10.406668714 +0100 -@@ -906,7 +906,7 @@ - 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)") --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)") -+install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"\$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)") - - foreach (OCCT_MODULE ${OCCT_MODULES}) - if (BUILD_MODULE_${OCCT_MODULE}) -diff -aur occt-V7_1_0/adm/cmake/occt_macros.cmake occt-V7_1_0.new/adm/cmake/occt_macros.cmake ---- occt-V7_1_0/adm/cmake/occt_macros.cmake 2016-11-25 11:50:18.000000000 +0100 -+++ occt-V7_1_0.new/adm/cmake/occt_macros.cmake 2017-03-18 08:44:10.406668714 +0100 -@@ -558,7 +558,7 @@ - "cmake_policy(PUSH) - cmake_policy(SET CMP0007 NEW) - 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 a/science/misc/opencascade/pspec.xml b/science/misc/opencascade/pspec.xml index 98cc8f2c85..e300b2aed2 100644 --- a/science/misc/opencascade/pspec.xml +++ b/science/misc/opencascade/pspec.xml @@ -81,7 +81,7 @@ 2022-07-30 7.6.3 - Version bump. + Version bump Mustafa Cinasal muscnsl@gmail.com