Release 4 (by relup.sh)

[packages/python3-Uranium.git] / plugins-path.patch

diff --git a/plugins-path.patch b/plugins-path.patch
index 6a30d65b0c60a2f7bec9c65e0cabf4197eb69232..d0ea734c94dd41e1188e9d64da5ced4b55aa956d 100644 (file)
--- a/plugins-path.patch
+++ b/plugins-path.patch
@@ -1,20 +1,25 @@
---- Uranium-3.5.1/CMakeLists.txt~      2018-11-04 14:15:43.000000000 +0100
-+++ Uranium-3.5.1/CMakeLists.txt       2018-11-04 14:16:18.346958842 +0100
-@@ -55,6 +55,6 @@
- install(FILES ${CMAKE_SOURCE_DIR}/cmake/UraniumTranslationTools.cmake
-         DESTINATION ${CMAKE_INSTALL_DATADIR}/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/Modules/ )
- install(DIRECTORY resources DESTINATION ${CMAKE_INSTALL_DATADIR}/uranium)
--install(DIRECTORY plugins DESTINATION lib${LIB_SUFFIX}/uranium)
-+install(DIRECTORY plugins DESTINATION ${CMAKE_INSTALL_DATADIR}/uranium)
+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:
  
- include(CPackConfig.cmake)
---- 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 @@
-         self._plugin_registry = PluginRegistry(self)  #type: PluginRegistry
- 
-         self._plugin_registry.addPluginLocation(os.path.join(self._app_install_dir, UraniumLibraryDir, "uranium"))
+         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"))
+-        self._plugin_registry.addPluginLocation(os.path.join(self._app_install_dir, "lib32", "uranium"))
++        self._plugin_registry.addPluginLocation(os.path.join(self._app_install_dir, "libx32", "uranium"))
 +        self._plugin_registry.addPluginLocation(os.path.join(self._app_install_dir, "share", "uranium"))
          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
+                 )