diff options
| author |   Michael Perlov <perlovka@gmail.com> | 2018-09-15 17:23:51 +0300 |
|---|---|---|
| committer |   Amy Liffey <amynka@gentoo.org> | 2018-10-27 12:35:48 +0200 |
| commit | 0b00b035e79aed9609ac7e8e921267d75de2ee94 (patch) | |
| tree | 7253ea0e249fd1ab34ca34ca615546ca139301f6 /sci-libs/opencascade/files | |
| parent | x11-drivers/nvidia-drivers: Version 410.73 (diff) | |
| download | gentoo-0b00b035e79aed9609ac7e8e921267d75de2ee94.tar.gz gentoo-0b00b035e79aed9609ac7e8e921267d75de2ee94.tar.bz2 gentoo-0b00b035e79aed9609ac7e8e921267d75de2ee94.zip | |
sci-libs/opencascade: Version bump to 7.3.0
Closes: https://github.com/gentoo/gentoo/pull/9871
Closes: https://bugs.gentoo.org/610362
Signed-off-by: Michael Perlov <perlovka@gmail.com>
Signed-off-by: Amy Liffey <amynka@gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.10
Diffstat (limited to 'sci-libs/opencascade/files')
| -rw-r--r-- | sci-libs/opencascade/files/opencascade-7.3.0-fixed-DESTDIR.patch | 31 | ||||
| -rw-r--r-- | sci-libs/opencascade/files/opencascade-7.3.0-vtk-compat.patch | 13 |
2 files changed, 44 insertions, 0 deletions
diff --git a/sci-libs/opencascade/files/opencascade-7.3.0-fixed-DESTDIR.patch b/sci-libs/opencascade/files/opencascade-7.3.0-fixed-DESTDIR.patch new file mode 100644 index 000000000000..c0a6363e19fd --- /dev/null +++ b/sci-libs/opencascade/files/opencascade-7.3.0-fixed-DESTDIR.patch @@ -0,0 +1,31 @@ +--- a/CMakeLists.txt 2016-11-25 11:50:18.000000000 +0100 ++++ b/CMakeLists.txt 2017-03-18 08:44:10.406668714 +0100 +@@ -885,7 +885,7 @@ if (EXISTS "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}") + + set (CUSTOM_CONTENT "${CUSTOM_CONTENT} ${ADDITIONAL_CUSTOM_CONTENT}") + +- file (WRITE "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" "${CUSTOM_CONTENT}") ++ file (WRITE \"\$ENV{DESTDIR}${INSTALL_DIR}/${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() +@@ -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_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)") + + foreach (OCCT_MODULE ${OCCT_MODULES}) + if (BUILD_MODULE_${OCCT_MODULE}) +--- a/adm/cmake/occt_macros.cmake 2016-11-25 11:50:18.000000000 +0100 ++++ b/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/sci-libs/opencascade/files/opencascade-7.3.0-vtk-compat.patch b/sci-libs/opencascade/files/opencascade-7.3.0-vtk-compat.patch new file mode 100644 index 000000000000..71700a57f1dc --- /dev/null +++ b/sci-libs/opencascade/files/opencascade-7.3.0-vtk-compat.patch @@ -0,0 +1,13 @@ +--- a/src/IVtkVTK/IVtkVTK_ShapeData.cxx 2018-09-15 01:57:25.086783255 +0300 ++++ b/src/IVtkVTK/IVtkVTK_ShapeData.cxx 2018-09-15 01:58:20.877779839 +0300 +@@ -29,6 +29,10 @@ + #pragma warning(pop) + #endif + ++#ifdef vtkGenericDataArray_h ++#define InsertNextTupleValue InsertNextTypedTuple ++#endif ++ + IMPLEMENT_STANDARD_RTTIEXT(IVtkVTK_ShapeData,IVtk_IShapeData) + + //================================================================ |