- disable tests (fail on builders only)

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

diff --git a/plugins-path.patch b/plugins-path.patch
index 4603c0eeec8381ab8072fd842c2c6685e04e0ad0..6a30d65b0c60a2f7bec9c65e0cabf4197eb69232 100644 (file)
--- a/plugins-path.patch
+++ b/plugins-path.patch
@@ -1,21 +1,20 @@
---- Uranium-2.5.0/CMakeLists.txt~      2017-05-13 23:51:30.000000000 +0200
-+++ Uranium-2.5.0/CMakeLists.txt       2017-05-13 23:56:38.423247507 +0200
-@@ -64,6 +64,6 @@
+--- 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/uranium)
+-install(DIRECTORY plugins DESTINATION lib${LIB_SUFFIX}/uranium)
 +install(DIRECTORY plugins DESTINATION ${CMAKE_INSTALL_DATADIR}/uranium)
  
  include(CPackConfig.cmake)
---- Uranium-2.5.0/UM/Application.py~   2017-04-13 15:03:28.000000000 +0200
-+++ Uranium-2.5.0/UM/Application.py    2017-05-14 11:25:56.345442852 +0200
-@@ -95,7 +95,7 @@
+--- 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 = PluginRegistry.getInstance()
- 
--        self._plugin_registry.addPluginLocation(os.path.join(Application.getInstallPrefix(), "lib", "uranium"))
-+        self._plugin_registry.addPluginLocation(os.path.join(Application.getInstallPrefix(), "share", "uranium"))
+         self._plugin_registry.addPluginLocation(os.path.join(self._app_install_dir, UraniumLibraryDir, "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(Application.getInstallPrefix(), "Resources", "uranium", "plugins"))
-         self._plugin_registry.addPluginLocation(os.path.join(Application.getInstallPrefix(), "Resources", self.getApplicationName(), "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"))