| 1 |
commit: e83a9211a4011102af0257b50b0fea3b18a41ba0 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 28 11:20:09 2017 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 28 11:26:51 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e83a9211 |
| 7 |
|
| 8 |
dev-ros/rqt_gui: Strip ros_packages/ from plugin.xml search path |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
dev-ros/rqt_gui/files/gentoo.patch | 15 +++++++++++++++ |
| 13 |
.../{rqt_gui-9999.ebuild => rqt_gui-0.3.2-r1.ebuild} | 1 + |
| 14 |
dev-ros/rqt_gui/rqt_gui-9999.ebuild | 1 + |
| 15 |
3 files changed, 17 insertions(+) |
| 16 |
|
| 17 |
diff --git a/dev-ros/rqt_gui/files/gentoo.patch b/dev-ros/rqt_gui/files/gentoo.patch |
| 18 |
new file mode 100644 |
| 19 |
index 0000000000..abdc30a8cc |
| 20 |
--- /dev/null |
| 21 |
+++ b/dev-ros/rqt_gui/files/gentoo.patch |
| 22 |
@@ -0,0 +1,15 @@ |
| 23 |
+Index: rqt_gui/src/rqt_gui/ros_plugin_provider.py |
| 24 |
+=================================================================== |
| 25 |
+--- rqt_gui.orig/src/rqt_gui/ros_plugin_provider.py |
| 26 |
++++ rqt_gui/src/rqt_gui/ros_plugin_provider.py |
| 27 |
+@@ -109,6 +109,10 @@ class RosPluginProvider(PluginProvider): |
| 28 |
+ def _parse_plugin_xml(self, package_name, plugin_xml): |
| 29 |
+ plugin_descriptors = [] |
| 30 |
+ |
| 31 |
++ # Gentoo: strip ros_packages to get the real path. |
| 32 |
++ if not os.path.isfile(plugin_xml): |
| 33 |
++ plugin_xml = plugin_xml.replace('ros_packages/', '') |
| 34 |
++ |
| 35 |
+ if not os.path.isfile(plugin_xml): |
| 36 |
+ qCritical('RosPluginProvider._parse_plugin_xml() plugin file "%s" in package "%s" not found' % (plugin_xml, package_name)) |
| 37 |
+ return plugin_descriptors |
| 38 |
|
| 39 |
diff --git a/dev-ros/rqt_gui/rqt_gui-9999.ebuild b/dev-ros/rqt_gui/rqt_gui-0.3.2-r1.ebuild |
| 40 |
similarity index 92% |
| 41 |
copy from dev-ros/rqt_gui/rqt_gui-9999.ebuild |
| 42 |
copy to dev-ros/rqt_gui/rqt_gui-0.3.2-r1.ebuild |
| 43 |
index 8d01cc5e18..1ba3c35e10 100644 |
| 44 |
--- a/dev-ros/rqt_gui/rqt_gui-9999.ebuild |
| 45 |
+++ b/dev-ros/rqt_gui/rqt_gui-0.3.2-r1.ebuild |
| 46 |
@@ -18,3 +18,4 @@ IUSE="" |
| 47 |
|
| 48 |
RDEPEND=">=dev-ros/qt_gui-0.3.0[${PYTHON_USEDEP}]" |
| 49 |
DEPEND="${RDEPEND}" |
| 50 |
+PATCHES=( "${FILESDIR}/gentoo.patch" ) |
| 51 |
|
| 52 |
diff --git a/dev-ros/rqt_gui/rqt_gui-9999.ebuild b/dev-ros/rqt_gui/rqt_gui-9999.ebuild |
| 53 |
index 8d01cc5e18..1ba3c35e10 100644 |
| 54 |
--- a/dev-ros/rqt_gui/rqt_gui-9999.ebuild |
| 55 |
+++ b/dev-ros/rqt_gui/rqt_gui-9999.ebuild |
| 56 |
@@ -18,3 +18,4 @@ IUSE="" |
| 57 |
|
| 58 |
RDEPEND=">=dev-ros/qt_gui-0.3.0[${PYTHON_USEDEP}]" |
| 59 |
DEPEND="${RDEPEND}" |
| 60 |
+PATCHES=( "${FILESDIR}/gentoo.patch" ) |
Archives