diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
| commit | d934827bf44b7cfcf6711964418148fa60877668 (patch) | |
| tree | 0625f358789b5e015e49db139cc1dbc9be00428f /media-gfx/cura/files | |
| parent | 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff) | |
gentoo resync : 25.11.2020
Diffstat (limited to 'media-gfx/cura/files')
| -rw-r--r-- | media-gfx/cura/files/cura-3.3.0-fix-install-paths.patch | 37 | ||||
| -rw-r--r-- | media-gfx/cura/files/cura-4.2.1-fix-install-paths.patch | 41 |
2 files changed, 0 insertions, 78 deletions
diff --git a/media-gfx/cura/files/cura-3.3.0-fix-install-paths.patch b/media-gfx/cura/files/cura-3.3.0-fix-install-paths.patch deleted file mode 100644 index 066f9148c4d9..000000000000 --- a/media-gfx/cura/files/cura-3.3.0-fix-install-paths.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- Cura-3.1.0-orig/CMakeLists.txt 2017-12-04 18:05:38.000000000 +0200 -+++ Cura-3.1.0/CMakeLists.txt 2017-12-29 18:11:19.508034087 +0200 -@@ -36,10 +36,20 @@ - - find_package(PythonInterp 3.5.0 REQUIRED) - -+if(NOT PYTHON_SITE_PACKAGES_DIR) -+ if(APPLE OR WIN32) -+ set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages -+ CACHE STRING "Directory to install Python bindings to") -+ else() -+ set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}/dist-packages -+ CACHE STRING "Directory to install Python bindings to") -+ endif() -+endif() -+ - install(DIRECTORY resources - DESTINATION ${CMAKE_INSTALL_DATADIR}/cura) - install(DIRECTORY plugins -- DESTINATION lib${LIB_SUFFIX}/cura) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cura) - if(NOT APPLE AND NOT WIN32) - install(FILES cura_app.py - DESTINATION ${CMAKE_INSTALL_BINDIR} -@@ -53,10 +63,10 @@ - DESTINATION lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}/dist-packages/cura) - else() - install(DIRECTORY cura -- DESTINATION lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages -+ DESTINATION ${PYTHON_SITE_PACKAGES_DIR} - FILES_MATCHING PATTERN *.py) - install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py -- DESTINATION lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/cura) -+ DESTINATION ${PYTHON_SITE_PACKAGES_DIR}/cura) - endif() - install(FILES ${CMAKE_BINARY_DIR}/cura.desktop - DESTINATION ${CMAKE_INSTALL_DATADIR}/applications) diff --git a/media-gfx/cura/files/cura-4.2.1-fix-install-paths.patch b/media-gfx/cura/files/cura-4.2.1-fix-install-paths.patch deleted file mode 100644 index fc10d727d130..000000000000 --- a/media-gfx/cura/files/cura-4.2.1-fix-install-paths.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -urN Cura-4.2.1-orig/CMakeLists.txt Cura-4.2.1/CMakeLists.txt ---- Cura-4.2.1-orig/CMakeLists.txt 2019-07-31 15:34:07.000000000 +0300 -+++ Cura-4.2.1/CMakeLists.txt 2019-08-04 18:39:24.106917187 +0300 -@@ -47,6 +47,15 @@ - find_package(Python3 REQUIRED COMPONENTS Interpreter Development) - endif() - -+if(NOT PYTHON_SITE_PACKAGES_DIR) -+ if(APPLE OR WIN32) -+ set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages -+ CACHE STRING "Directory to install Python bindings to") -+ else() -+ set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}/dist-packages -+ CACHE STRING "Directory to install Python bindings to") -+ endif() -+endif() - - if(NOT ${URANIUM_DIR} STREQUAL "") - set(CMAKE_MODULE_PATH "${URANIUM_DIR}/cmake") -@@ -64,7 +73,7 @@ - install(DIRECTORY resources - DESTINATION ${CMAKE_INSTALL_DATADIR}/cura) - install(DIRECTORY plugins -- DESTINATION lib${LIB_SUFFIX}/cura) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cura) - - if(NOT APPLE AND NOT WIN32) - install(FILES cura_app.py -@@ -79,10 +88,10 @@ - DESTINATION lib${LIB_SUFFIX}/python${Python3_VERSION_MAJOR}/dist-packages/cura) - else() - install(DIRECTORY cura -- DESTINATION lib${LIB_SUFFIX}/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}/site-packages -+ DESTINATION ${PYTHON_SITE_PACKAGES_DIR} - FILES_MATCHING PATTERN *.py) - install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py -- DESTINATION lib${LIB_SUFFIX}/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}/site-packages/cura) -+ DESTINATION ${PYTHON_SITE_PACKAGES_DIR}/cura) - endif() - install(FILES ${CMAKE_BINARY_DIR}/cura.desktop - DESTINATION ${CMAKE_INSTALL_DATADIR}/applications) |