commit 6982f552ea8db986cb68fd3d417382324d5c1e05
Author: Jan Rękorajski <[email protected]>
Date: Wed Mar 3 12:42:29 2021 +0100
- rediff patches
plugins-path.patch | 30 ++++++++++++++++--------------
remove-mypy-test.patch | 7 ++++---
2 files changed, 20 insertions(+), 17 deletions(-)
---
diff --git a/plugins-path.patch b/plugins-path.patch
index cd04d6a..d0ea734 100644
--- a/plugins-path.patch
+++ b/plugins-path.patch
@@ -1,17 +1,7 @@
---- Uranium-3.5.1/cmake/UraniumPluginInstall.cmake~ 2018-11-04
14:15:43.000000000 +0100
-+++ Uranium-3.5.1/cmake/UraniumPluginInstall.cmake 2018-11-04
14:16:18.346958842 +0100
-@@ -55,6 +55,6 @@
- message(STATUS "[+] PLUGIN TO INSTALL: ${_rel_plugin_dir}")
- get_filename_component(_rel_plugin_parent_dir ${_rel_plugin_dir}
DIRECTORY)
- install(DIRECTORY ${_rel_plugin_dir}
-- DESTINATION lib${LIB_SUFFIX}/uranium/${_rel_plugin_parent_dir}
-+ DESTINATION
${CMAKE_INSTALL_DATADIR}/uranium/${_rel_plugin_parent_dir}
- PATTERN "__pycache__" EXCLUDE
- PATTERN "*.qmlc" EXCLUDE
- )
---- Uranium-3.5.1/UM/Application.py~ 2018-10-15 11:44:28.000000000 +0200
-+++ Uranium-3.5.1/UM/Application.py 2018-11-04 14:30:40.963992502 +0100
-@@ -165,6 +165,7 @@
+diff -urNp -x '*.orig' Uranium-4.5.0.org/UM/Application.py
Uranium-4.5.0/UM/Application.py
+--- Uranium-4.5.0.org/UM/Application.py 2020-02-24 16:02:05.000000000
+0100
++++ Uranium-4.5.0/UM/Application.py 2021-03-03 12:41:43.359304943 +0100
+@@ -182,7 +182,8 @@ class Application:
self._plugin_registry.addPluginLocation(os.path.join(self._app_install_dir,
"lib", "uranium"))
self._plugin_registry.addPluginLocation(os.path.join(self._app_install_dir,
"lib64", "uranium"))
@@ -21,3 +11,15 @@
self._plugin_registry.addPluginLocation(os.path.join(os.path.dirname(sys.executable),
"plugins"))
self._plugin_registry.addPluginLocation(os.path.join(self._app_install_dir,
"Resources", "uranium", "plugins"))
self._plugin_registry.addPluginLocation(os.path.join(self._app_install_dir,
"Resources", self._app_name, "plugins"))
+diff -urNp -x '*.orig' Uranium-4.5.0.org/cmake/UraniumPluginInstall.cmake
Uranium-4.5.0/cmake/UraniumPluginInstall.cmake
+--- Uranium-4.5.0.org/cmake/UraniumPluginInstall.cmake 2020-02-24
16:02:05.000000000 +0100
++++ Uranium-4.5.0/cmake/UraniumPluginInstall.cmake 2021-03-03
12:41:43.359304943 +0100
+@@ -84,7 +84,7 @@ foreach(_plugin_json_path ${_plugin_json
+ message(STATUS "[+] PLUGIN TO INSTALL: ${_rel_plugin_dir}")
+ get_filename_component(_rel_plugin_parent_dir ${_rel_plugin_dir}
DIRECTORY)
+ install(DIRECTORY ${_rel_plugin_dir}
+- DESTINATION lib${LIB_SUFFIX}/uranium/${_rel_plugin_parent_dir}
++ DESTINATION
${CMAKE_INSTALL_DATADIR}/uranium/${_rel_plugin_parent_dir}
+ PATTERN "__pycache__" EXCLUDE
+ PATTERN "*.qmlc" EXCLUDE
+ )
diff --git a/remove-mypy-test.patch b/remove-mypy-test.patch
index 4df309e..13e6265 100644
--- a/remove-mypy-test.patch
+++ b/remove-mypy-test.patch
@@ -1,6 +1,7 @@
---- Uranium-3.5.1/cmake/UraniumTests.cmake~ 2018-10-15 11:44:28.000000000
+0200
-+++ Uranium-3.5.1/cmake/UraniumTests.cmake 2018-11-04 13:20:29.843658161
+0100
-@@ -46,9 +46,3 @@
+diff -urNp -x '*.orig' Uranium-4.5.0.org/cmake/UraniumTests.cmake
Uranium-4.5.0/cmake/UraniumTests.cmake
+--- Uranium-4.5.0.org/cmake/UraniumTests.cmake 2020-02-24 16:02:05.000000000
+0100
++++ Uranium-4.5.0/cmake/UraniumTests.cmake 2021-03-03 12:41:43.155972843
+0100
+@@ -48,9 +48,3 @@ foreach(_plugin ${_plugins})
uranium_add_test(NAME pytest-${_plugin_name} DIRECTORY
${_plugin_directory} PYTHONPATH "${CMAKE_SOURCE_DIR}|${_plugin_directory}")
endif()
endforeach()
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/python3-Uranium.git/commitdiff/6982f552ea8db986cb68fd3d417382324d5c1e05
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
