| 1 |
commit: d2b13688e2aec80b26063c676c549e524d0dea5e |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Dec 4 21:46:40 2017 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Dec 4 21:46:40 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2b13688 |
| 7 |
|
| 8 |
dev-ros/pluginlib: bump to 1.11.2 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.16, Repoman-2.3.6 |
| 11 |
|
| 12 |
dev-ros/pluginlib/Manifest | 3 ++- |
| 13 |
dev-ros/pluginlib/files/catkin_prefix_path2.patch | 15 +++++++++++++++ |
| 14 |
.../{pluginlib-9999.ebuild => pluginlib-1.11.2.ebuild} | 2 +- |
| 15 |
dev-ros/pluginlib/pluginlib-9999.ebuild | 2 +- |
| 16 |
4 files changed, 19 insertions(+), 3 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-ros/pluginlib/Manifest b/dev-ros/pluginlib/Manifest |
| 19 |
index ccb761bb5d6..c6a0a36a4c5 100644 |
| 20 |
--- a/dev-ros/pluginlib/Manifest |
| 21 |
+++ b/dev-ros/pluginlib/Manifest |
| 22 |
@@ -1 +1,2 @@ |
| 23 |
-DIST pluginlib-1.11.1.tar.gz 21621 SHA256 bee838a9e62c8e889e8354f6ec5c76493f3aa6df5d19c30110068c82feb927c0 SHA512 1bafbc35334a482b2fc08afb7c1ed53ddbc579b121b728b96893c8b82a7070d9ecd8e6e6cffa54b3539def84db9dac79fe59feb93b2de6b8f113e0bfc10a8c00 WHIRLPOOL 1d05ddb55c800e0272e6c203804fdd0cdc966a6213df55a999e2ab5f14ff157ec84654d6155a1de77cdd15821776ad51918e0fa1072efbc1c08e539dd10ebce3 |
| 24 |
+DIST pluginlib-1.11.1.tar.gz 21621 BLAKE2B 911cc5bb5752e74d90b6d2dc61cb67367fc69a3e375ef827fea49a0e0d4367f0bba6923960e7112c9ed5909b8e50738b2178a5c04d20abe4b8716559e5ebe0e1 SHA512 1bafbc35334a482b2fc08afb7c1ed53ddbc579b121b728b96893c8b82a7070d9ecd8e6e6cffa54b3539def84db9dac79fe59feb93b2de6b8f113e0bfc10a8c00 |
| 25 |
+DIST pluginlib-1.11.2.tar.gz 22844 BLAKE2B 3f3090b2b41754c0989cbc2c0f31333cf404aca00c481c3062955b01274b1cddb76eef41a0bce9a01058b461a293d42beae7c9337e8780d1e9503968196f0a98 SHA512 579aeb2ae82d6607c62007a5be6ccc402856c135e69a500d530ce5569c4f77526a63fee8b948db997db2face37bdac929b58911b5245c6ad641d19af055e46c0 |
| 26 |
|
| 27 |
diff --git a/dev-ros/pluginlib/files/catkin_prefix_path2.patch b/dev-ros/pluginlib/files/catkin_prefix_path2.patch |
| 28 |
new file mode 100644 |
| 29 |
index 00000000000..12e759c6321 |
| 30 |
--- /dev/null |
| 31 |
+++ b/dev-ros/pluginlib/files/catkin_prefix_path2.patch |
| 32 |
@@ -0,0 +1,15 @@ |
| 33 |
+Honour CATKIN_PREFIX_PATH at runtime instead of ROS' hack to use CMAKE_PREFIX_PATH. |
| 34 |
+ |
| 35 |
+Index: pluginlib-1.11.2/include/pluginlib/class_loader_imp.hpp |
| 36 |
+=================================================================== |
| 37 |
+--- pluginlib-1.11.2.orig/include/pluginlib/class_loader_imp.hpp |
| 38 |
++++ pluginlib-1.11.2/include/pluginlib/class_loader_imp.hpp |
| 39 |
+@@ -68,7 +68,7 @@ namespace |
| 40 |
+ std::vector<std::string> catkinFindLib() |
| 41 |
+ { |
| 42 |
+ std::vector<std::string> lib_paths; |
| 43 |
+- const char * env = std::getenv("CMAKE_PREFIX_PATH"); |
| 44 |
++ const char * env = std::getenv("CATKIN_PREFIX_PATH"); |
| 45 |
+ if (env) { |
| 46 |
+ std::string env_catkin_prefix_paths(env); |
| 47 |
+ std::vector<std::string> catkin_prefix_paths; |
| 48 |
|
| 49 |
diff --git a/dev-ros/pluginlib/pluginlib-9999.ebuild b/dev-ros/pluginlib/pluginlib-1.11.2.ebuild |
| 50 |
similarity index 91% |
| 51 |
copy from dev-ros/pluginlib/pluginlib-9999.ebuild |
| 52 |
copy to dev-ros/pluginlib/pluginlib-1.11.2.ebuild |
| 53 |
index 730a3b5305d..d72ce338bb9 100644 |
| 54 |
--- a/dev-ros/pluginlib/pluginlib-9999.ebuild |
| 55 |
+++ b/dev-ros/pluginlib/pluginlib-1.11.2.ebuild |
| 56 |
@@ -24,4 +24,4 @@ RDEPEND=" |
| 57 |
" |
| 58 |
DEPEND="${RDEPEND} |
| 59 |
test? ( dev-cpp/gtest )" |
| 60 |
-PATCHES=( "${FILESDIR}/catkin_prefix_path.patch" ) |
| 61 |
+PATCHES=( "${FILESDIR}/catkin_prefix_path2.patch" ) |
| 62 |
|
| 63 |
diff --git a/dev-ros/pluginlib/pluginlib-9999.ebuild b/dev-ros/pluginlib/pluginlib-9999.ebuild |
| 64 |
index 730a3b5305d..d72ce338bb9 100644 |
| 65 |
--- a/dev-ros/pluginlib/pluginlib-9999.ebuild |
| 66 |
+++ b/dev-ros/pluginlib/pluginlib-9999.ebuild |
| 67 |
@@ -24,4 +24,4 @@ RDEPEND=" |
| 68 |
" |
| 69 |
DEPEND="${RDEPEND} |
| 70 |
test? ( dev-cpp/gtest )" |
| 71 |
-PATCHES=( "${FILESDIR}/catkin_prefix_path.patch" ) |
| 72 |
+PATCHES=( "${FILESDIR}/catkin_prefix_path2.patch" ) |
Archives