commit: 0cad19d769d7c1e9b0e521bd1c5d3a442464b0c1 Author: Piotr Karbowski <slashbeast <AT> gentoo <DOT> org> AuthorDate: Sat Aug 27 19:41:01 2022 +0000 Commit: Piotr Karbowski <slashbeast <AT> gentoo <DOT> org> CommitDate: Sat Aug 27 19:42:25 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cad19d7
media-gfx/superslicer: 2.5.59.0-r1 revbump Fixes gcodeviewer symlink and no longer installs bundled angelscript into system. Closes: https://bugs.gentoo.org/865457 Signed-off-by: Piotr Karbowski <slashbeast <AT> gentoo.org> ...2.5.59.0-dont-install-bundled-angelscript.patch | 53 ++++++++++++++++++++++ ...erslicer-2.5.59.0-fix-gcodeviewer-symlink.patch | 11 +++++ ....59.0.ebuild => superslicer-2.5.59.0-r1.ebuild} | 2 + 3 files changed, 66 insertions(+) diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.0-dont-install-bundled-angelscript.patch b/media-gfx/superslicer/files/superslicer-2.5.59.0-dont-install-bundled-angelscript.patch new file mode 100644 index 000000000000..603a96ac67a5 --- /dev/null +++ b/media-gfx/superslicer/files/superslicer-2.5.59.0-dont-install-bundled-angelscript.patch @@ -0,0 +1,53 @@ +diff --git a/src/angelscript/CMakeLists.txt b/src/angelscript/CMakeLists.txt +index fed80a0ad..a65d9f8d5 100644 +--- a/src/angelscript/CMakeLists.txt ++++ b/src/angelscript/CMakeLists.txt +@@ -202,48 +202,3 @@ endif() + + # Don't override the default runtime output path to avoid conflicts when building for multiple target platforms + #set(RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin) +- +-#See https://cmake.org/cmake/help/latest/manual/cmake-packages.7.html#creating-packages for a detailed explanation about this part +-install(TARGETS ${ANGELSCRIPT_LIBRARY_NAME} EXPORT AngelscriptTargets +- RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib +- ARCHIVE DESTINATION lib +- INCLUDES DESTINATION include +-) +- +-install(FILES +- ${CMAKE_CURRENT_SOURCE_DIR}/include/angelscript.h +- DESTINATION include +- COMPONENT Devel +-) +- +-include(CMakePackageConfigHelpers) +-write_basic_package_version_file( +- "${CMAKE_CURRENT_BINARY_DIR}/Angelscript/AngelscriptConfigVersion.cmake" +- VERSION ${PROJECT_VERSION} +- COMPATIBILITY AnyNewerVersion +-) +- +-export(EXPORT AngelscriptTargets +- FILE "${CMAKE_CURRENT_BINARY_DIR}/Angelscript/AngelscriptTargets.cmake" +- NAMESPACE Angelscript:: +-) +-configure_file(cmake/AngelscriptConfig.cmake +- "${CMAKE_CURRENT_BINARY_DIR}/Angelscript/AngelscriptConfig.cmake" +- COPYONLY +-) +- +-set(ConfigPackageLocation lib/cmake/Angelscript) +-install(EXPORT AngelscriptTargets +- FILE AngelscriptTargets.cmake +- NAMESPACE Angelscript:: +- DESTINATION ${ConfigPackageLocation} +-) +-install( +- FILES +- cmake/AngelscriptConfig.cmake +- "${CMAKE_CURRENT_BINARY_DIR}/Angelscript/AngelscriptConfigVersion.cmake" +- DESTINATION ${ConfigPackageLocation} +- COMPONENT Devel +-) +- diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.0-fix-gcodeviewer-symlink.patch b/media-gfx/superslicer/files/superslicer-2.5.59.0-fix-gcodeviewer-symlink.patch new file mode 100644 index 000000000000..5a5c9960cc00 --- /dev/null +++ b/media-gfx/superslicer/files/superslicer-2.5.59.0-fix-gcodeviewer-symlink.patch @@ -0,0 +1,11 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 9aae6dc11..75835903e 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -299,5 +299,5 @@ else () + install(TARGETS Slic3r RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") + + # Install the symlink for gcodeviewer +- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink slic3r ${GCODEVIEWER_APP_CMD} WORKING_DIRECTORY \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})") ++ install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${SLIC3R_APP_CMD} ${GCODEVIEWER_APP_CMD} WORKING_DIRECTORY \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})") + endif () diff --git a/media-gfx/superslicer/superslicer-2.5.59.0.ebuild b/media-gfx/superslicer/superslicer-2.5.59.0-r1.ebuild similarity index 94% rename from media-gfx/superslicer/superslicer-2.5.59.0.ebuild rename to media-gfx/superslicer/superslicer-2.5.59.0-r1.ebuild index 3024d92b17a4..ebd207c8f2d7 100644 --- a/media-gfx/superslicer/superslicer-2.5.59.0.ebuild +++ b/media-gfx/superslicer/superslicer-2.5.59.0-r1.ebuild @@ -58,6 +58,8 @@ PATCHES=( "${FILESDIR}/${P}-cereal.patch" "${FILESDIR}/${P}-boost.patch" "${FILESDIR}/${P}-missing-includes.patch" + "${FILESDIR}/${P}-dont-install-bundled-angelscript.patch" + "${FILESDIR}/${P}-fix-gcodeviewer-symlink.patch" ) S="${WORKDIR}/${MY_PN}-${PV}"
