gentoo resync : 07.08.2021

4 files changed, 67 insertions, 3 deletions

diff --git a/dev-ros/pcl_ros/Manifest b/dev-ros/pcl_ros/Manifest
index 528574068c64..9f46917ee2db 100644
--- a/dev-ros/pcl_ros/Manifest
+++ b/dev-ros/pcl_ros/Manifest
@@ -1,5 +1,6 @@
+AUX pcl.patch 2215 BLAKE2B ff38d380d743c69de3c7377c52af5df23cb89ccb7011b12b34f921fa1a3bf10ec3ec72e8c8b7fe1ade282a8b926467895198db8c6545ba33b0434dbcdd533bba SHA512 82cc5101f2545262f966acfa238b2d630a31da621840beabb670ba3ab9a988a4a29d80c81739fff259d98004579e3fe1f0a3221fd6253f7cfed94bf0024e395b
 AUX tests.patch 526 BLAKE2B 6a4c015707096bea03a5921387286a70289e8933ff75300aee8f070fec7a2870932e35f5b4a4ddbe2131611716c2493b99ed63f93fa34880c36fd918a04eb158 SHA512 fdcba450c84e92aaa5f7263b02f118d4d3832725cd3aa30b218f3ff1af4439406ae930ccba8c601b757173572d99a26c12a670b33ad7600e71695a165461459d
 DIST perception_pcl-1.7.2.tar.gz 81897 BLAKE2B 692f000337090c7a2354bf9626d391aa0fe390041042718e7dde7335c750137e7e1b6f939728ad1e2af3411e535ba63b42bc17f74b3535e38628f2b6c1c87036 SHA512 228b1d7d589bfd1460e8c58448b0d9257e86c1796b009853aeceeb1da20d8f46462d8c273a95804003ce3c43326c6575553d19b319aa9effcef4854347d5c3f9
-EBUILD pcl_ros-1.7.2-r1.ebuild 1035 BLAKE2B 965a9c0d963c84e4d7391af07cfdad5c21f08cdeeb782807cf4c7ae7e33d1841f06d6d1a680794f42657c13bfdade9db38db25a53055fa41fdb3ff96acb3e6c7 SHA512 ebc4f6eca8b9c9e899417fb27b0f7eca004015d5a3a88f03b578ec9b182ac8ca5c65cb18352f6294544ab19dc8fe03cd8bd70d8e8ec6fec1297b49bcfb7f8e81
-EBUILD pcl_ros-9999.ebuild 1035 BLAKE2B 965a9c0d963c84e4d7391af07cfdad5c21f08cdeeb782807cf4c7ae7e33d1841f06d6d1a680794f42657c13bfdade9db38db25a53055fa41fdb3ff96acb3e6c7 SHA512 ebc4f6eca8b9c9e899417fb27b0f7eca004015d5a3a88f03b578ec9b182ac8ca5c65cb18352f6294544ab19dc8fe03cd8bd70d8e8ec6fec1297b49bcfb7f8e81
+EBUILD pcl_ros-1.7.2-r1.ebuild 1219 BLAKE2B 202836a530955dd41a4e6cc62b7a85a9f086d7a11d741ef7c0877939fa3e32da648315aa715b2762e2932489cf7348ed97115ae3b4d76533a73860a84ca29550 SHA512 b42b4c26000a31c78ce98b57c2ec9770ed2627447b99a121d58f3f08bc940cecdd923e4c784d29543f9b1c361e7b6c5bcc3cc4e4a772e1015dca62eb6b443ddf
+EBUILD pcl_ros-9999.ebuild 1195 BLAKE2B 6e8600e3aa5583c00092d01a2be8011aae8ac50c47666a0115aa2cabc315af0bb8454229bdd1a8487ed6d9cf7a3284c28165ed94dcd5da487076d07f7090f983 SHA512 95a1295ff0d50a4ea60dae18174d4b620254308359f4d9a84ef78f11f22d90b9449f694cecd3a7c0a7dd1d6e82d2d337fa6f5fd98b63a1312907aa01049100f8
 MISC metadata.xml 343 BLAKE2B c3702e4ed6c355b81fed82f2cf5bcc1ad37082d134130f55ff5a7b4ce3eba79e758ac6dae129b0e76dc9f0171caa52d04a4b428a286458a4a8052a054c6b5d0d SHA512 43909c26691d29a183729bab2d2e9a9639d779a5b23816705064083d11275e687097e8da8c33d952312a1eaeed42a24d4a0bfd74a9ccae08a199acec0ca4a585
diff --git a/dev-ros/pcl_ros/files/pcl.patch b/dev-ros/pcl_ros/files/pcl.patch
new file mode 100644
index 000000000000..6847fff9c4ce
--- /dev/null
+++ b/dev-ros/pcl_ros/files/pcl.patch
@@ -0,0 +1,51 @@
+From bd21be2cb8ec6ad70a282c61b14aa9dd43edf9ff Mon Sep 17 00:00:00 2001
+From: Markus Vieth <39675748+mvieth@users.noreply.github.com>
+Date: Mon, 21 Jun 2021 19:42:58 +0200
+Subject: [PATCH] Use complete namespace for traits members (#330)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This prevents errors like this: error: ‘name’ is not a member of ‘pcl::detail::traits’; did you mean ‘pcl::traits::name’?
+The error appears for newer PCL versions (everything after commit https://github.com/PointCloudLibrary/pcl/commit/d39d3d3300746b952997e5bd2742dac7482aa5ab), but this change should also be fully compatible with older PCL versions.
+---
+ pcl_ros/include/pcl_ros/point_cloud.h | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/include/pcl_ros/point_cloud.h b/pcl_ros/include/pcl_ros/point_cloud.h
+index 93df7365..3c57f298 100644
+--- a/include/pcl_ros/point_cloud.h
++++ b/include/pcl_ros/point_cloud.h
+@@ -23,19 +23,19 @@ namespace pcl
+ 
+       template<typename U> void operator() ()
+       {
+-        const char* name = traits::name<PointT, U>::value;
++        const char* name = pcl::traits::name<PointT, U>::value;
+         std::uint32_t name_length = strlen(name);
+         stream_.next(name_length);
+         if (name_length > 0)
+           memcpy(stream_.advance(name_length), name, name_length);
+ 
+-        std::uint32_t offset = traits::offset<PointT, U>::value;
++        std::uint32_t offset = pcl::traits::offset<PointT, U>::value;
+         stream_.next(offset);
+ 
+-        std::uint8_t datatype = traits::datatype<PointT, U>::value;
++        std::uint8_t datatype = pcl::traits::datatype<PointT, U>::value;
+         stream_.next(datatype);
+ 
+-        std::uint32_t count = traits::datatype<PointT, U>::size;
++        std::uint32_t count = pcl::traits::datatype<PointT, U>::size;
+         stream_.next(count);
+       }
+ 
+@@ -49,7 +49,7 @@ namespace pcl
+ 
+       template<typename U> void operator() ()
+       {
+-        std::uint32_t name_length = strlen(traits::name<PointT, U>::value);
++        std::uint32_t name_length = strlen(pcl::traits::name<PointT, U>::value);
+         length += name_length + 13;
+       }
+ 
diff --git a/dev-ros/pcl_ros/pcl_ros-1.7.2-r1.ebuild b/dev-ros/pcl_ros/pcl_ros-1.7.2-r1.ebuild
index 8dc162b3fa11..274b509a8358 100644
--- a/dev-ros/pcl_ros/pcl_ros-1.7.2-r1.ebuild
+++ b/dev-ros/pcl_ros/pcl_ros-1.7.2-r1.ebuild
@@ -42,4 +42,10 @@ DEPEND="${RDEPEND}
 		dev-cpp/gtest
 	)
 "
-PATCHES=( "${FILESDIR}/tests.patch" )
+PATCHES=( "${FILESDIR}/tests.patch" "${FILESDIR}/pcl.patch" )
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/pcl_ros/pcl_ros-9999.ebuild b/dev-ros/pcl_ros/pcl_ros-9999.ebuild
index 8dc162b3fa11..ca03876062f6 100644
--- a/dev-ros/pcl_ros/pcl_ros-9999.ebuild
+++ b/dev-ros/pcl_ros/pcl_ros-9999.ebuild
@@ -43,3 +43,9 @@ DEPEND="${RDEPEND}
 	)
 "
 PATCHES=( "${FILESDIR}/tests.patch" )
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
+	ros-catkin_src_test
+}