| 1 |
commit: 3b613c71f371e689ce74bf5e1e78244f0ef1761e |
| 2 |
Author: D G Turner <digitall <AT> scummvm <DOT> org> |
| 3 |
AuthorDate: Sat Sep 26 13:07:21 2020 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Oct 7 00:34:07 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b613c71 |
| 7 |
|
| 8 |
Revert "dev-python/uranium: remove unused patch(es)" |
| 9 |
|
| 10 |
This reverts commit 9e3189e8fb3c13d834dedbbbce73df7b97b864fe. |
| 11 |
|
| 12 |
Removing these and the associated ebuild for v4.6.1 broke Cura v4.6.1 |
| 13 |
which was the most recent in the portage tree, but only at runtime. |
| 14 |
|
| 15 |
Signed-off-by: David G Turner <digitall <AT> scummvm.org> |
| 16 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 17 |
|
| 18 |
.../files/uranium-4.6.1-fix-install-paths.patch | 32 ++++++++++++++++++++++ |
| 19 |
1 file changed, 32 insertions(+) |
| 20 |
|
| 21 |
diff --git a/dev-python/uranium/files/uranium-4.6.1-fix-install-paths.patch b/dev-python/uranium/files/uranium-4.6.1-fix-install-paths.patch |
| 22 |
new file mode 100644 |
| 23 |
index 00000000000..5777065e9da |
| 24 |
--- /dev/null |
| 25 |
+++ b/dev-python/uranium/files/uranium-4.6.1-fix-install-paths.patch |
| 26 |
@@ -0,0 +1,32 @@ |
| 27 |
+--- Uranium-4.5.0-orig/CMakeLists.txt 2020-03-01 16:26:44.736355687 +0200 |
| 28 |
++++ Uranium-4.5.0/CMakeLists.txt 2020-02-24 17:02:05.000000000 +0200 |
| 29 |
+@@ -12,6 +12,16 @@ |
| 30 |
+ |
| 31 |
+ find_package(PythonInterp 3.5.0 REQUIRED) |
| 32 |
+ |
| 33 |
++if(NOT PYTHON_SITE_PACKAGES_DIR) |
| 34 |
++ if(APPLE OR WIN32) |
| 35 |
++ set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages |
| 36 |
++ CACHE STRING "Directory to install Python bindings to") |
| 37 |
++ else() |
| 38 |
++ set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}/dist-packages CACHE |
| 39 |
++ STRING "Directory to install Python bindings to") |
| 40 |
++ endif() |
| 41 |
++endif() |
| 42 |
++ |
| 43 |
+ # # Checks using pylint |
| 44 |
+ # Note that we use exit 0 here to not mark the build as a failure on check failure |
| 45 |
+ # In addition, the specified pylint configuration uses the spellchecker plugin. This required python-enchant to be installed. |
| 46 |
+@@ -48,10 +58,10 @@ |
| 47 |
+ if(EXISTS /etc/debian_version) |
| 48 |
+ install(DIRECTORY UM DESTINATION lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}/dist-packages) |
| 49 |
+ else() |
| 50 |
+- install(DIRECTORY UM DESTINATION lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) |
| 51 |
++ install(DIRECTORY UM DESTINATION ${PYTHON_SITE_PACKAGES_DIR}) |
| 52 |
+ endif() |
| 53 |
+ install(FILES ${CMAKE_SOURCE_DIR}/cmake/UraniumTranslationTools.cmake |
| 54 |
+- DESTINATION ${CMAKE_INSTALL_DATADIR}/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/Modules/ ) |
| 55 |
++ DESTINATION ${CMAKE_INSTALL_DATADIR}/cmake/Modules/ ) |
| 56 |
+ install(DIRECTORY resources DESTINATION ${CMAKE_INSTALL_DATADIR}/uranium) |
| 57 |
+ |
| 58 |
+ # Detect plugins to install |
Archives