gentoo resync : 14.07.2018

1 files changed, 15 insertions, 0 deletions

diff --git a/dev-ros/rqt_gui/files/gentoo.patch b/dev-ros/rqt_gui/files/gentoo.patch
new file mode 100644
index 000000000000..abdc30a8ccbd
--- /dev/null
+++ b/dev-ros/rqt_gui/files/gentoo.patch
@@ -0,0 +1,15 @@
+Index: rqt_gui/src/rqt_gui/ros_plugin_provider.py
+===================================================================
+--- rqt_gui.orig/src/rqt_gui/ros_plugin_provider.py
++++ rqt_gui/src/rqt_gui/ros_plugin_provider.py
+@@ -109,6 +109,10 @@ class RosPluginProvider(PluginProvider):
+     def _parse_plugin_xml(self, package_name, plugin_xml):
+         plugin_descriptors = []
+ 
++        # Gentoo: strip ros_packages to get the real path.
++        if not os.path.isfile(plugin_xml):
++            plugin_xml = plugin_xml.replace('ros_packages/', '')
++
+         if not os.path.isfile(plugin_xml):
+             qCritical('RosPluginProvider._parse_plugin_xml() plugin file "%s" in package "%s" not found' % (plugin_xml, package_name))
+             return plugin_descriptors