Use python 3 to build

2 files changed, 37 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1db1d62c36d3..753751c61ffb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,20 @@
 pkgbase = ros-melodic-tf2-sensor-msgs
-	pkgdesc = ROS - Small lib to transform sensor_msgs with tf.
+	pkgdesc = ROS - Small lib to transform sensor_msgs with tf. Most notably, PointCloud2
 	pkgver = 0.6.5
-	pkgrel = 1
-	url = https://www.wiki.ros.org/tf2_ros
+	pkgrel = 2
+	url = https://wiki.ros.org/tf2_sensor_msgs
 	arch = any
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
+	makedepends = eigen3
 	makedepends = ros-melodic-catkin
-	makedepends = ros-melodic-tf2-ros
-	makedepends = ros-melodic-tf2
-	makedepends = ros-melodic-sensor-msgs
 	makedepends = ros-melodic-cmake-modules
-	makedepends = eigen3
-	depends = ros-melodic-python-orocos-kdl
-	depends = ros-melodic-tf2-ros
-	depends = ros-melodic-tf2
 	depends = ros-melodic-sensor-msgs
+	depends = ros-melodic-tf2
+	depends = ros-melodic-tf2-ros
+	depends = ros-melodic-python-orocos-kdl
 	depends = ros-melodic-rospy
-	depends = eigen3
 	source = ros-melodic-tf2-sensor-msgs-0.6.5.tar.gz::https://github.com/ros/geometry2/archive/0.6.5.tar.gz
 	sha256sums = 9a1268621518fc22afd7b12ef1cf30e6901a57b054535924d1d74fd5d267773a
 
diff --git a/PKGBUILD b/PKGBUILD
index f634034c0960..6d5874f82f4d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,39 +1,39 @@
-# Script generated with import_catkin_packages.py
-# For more information: https://github.com/bchretien/arch-ros-stacks
-pkgdesc="ROS - Small lib to transform sensor_msgs with tf."
-url='https://www.wiki.ros.org/tf2_ros'
+# Script generated with import_catkin_packages.py.
+# For more information: https://github.com/bchretien/arch-ros-stacks.
+pkgdesc="ROS - Small lib to transform sensor_msgs with tf. Most notably,
+PointCloud2"
+url='https://wiki.ros.org/tf2_sensor_msgs'
 
 pkgname='ros-melodic-tf2-sensor-msgs'
 pkgver='0.6.5'
-_pkgver_patch=0
 arch=('any')
-pkgrel=1
+pkgrel=2
 license=('BSD')
 
-ros_makedepends=(ros-melodic-catkin
-  ros-melodic-tf2-ros
-  ros-melodic-tf2
-  ros-melodic-sensor-msgs
-  ros-melodic-cmake-modules)
-makedepends=('cmake' 'ros-build-tools'
+ros_makedepends=(
+  ros-melodic-catkin
+  ros-melodic-cmake-modules
+)
+
+makedepends=(
+  'cmake'
+  'ros-build-tools'
+  'eigen3'
   ${ros_makedepends[@]}
-  eigen3)
+)
 
-ros_depends=(ros-melodic-python-orocos-kdl
-  ros-melodic-tf2-ros
-  ros-melodic-tf2
+ros_depends=(
   ros-melodic-sensor-msgs
-  ros-melodic-rospy)
-depends=(${ros_depends[@]}
-  eigen3)
+  ros-melodic-tf2
+  ros-melodic-tf2-ros
+  ros-melodic-python-orocos-kdl
+  ros-melodic-rospy
+)
 
-# Git version (e.g. for debugging)
-# _tag=release/melodic/tf2_sensor_msgs/${pkgver}-${_pkgver_patch}
-# _dir=${pkgname}
-# source=("${_dir}"::"git+https://github.com/ros-gbp/geometry2-release.git"#tag=${_tag})
-# sha256sums=('SKIP')
+depends=(
+  ${ros_depends[@]}
+)
 
-# Tarball version (faster download)
 _dir="geometry2-${pkgver}/tf2_sensor_msgs"
 source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros/geometry2/archive/${pkgver}.tar.gz")
 sha256sums=('9a1268621518fc22afd7b12ef1cf30e6901a57b054535924d1d74fd5d267773a')
@@ -48,17 +48,17 @@ build() {
   cd ${srcdir}/build
 
   # Fix Python2/Python3 conflicts
-  /usr/share/ros-build-tools/fix-python-scripts.sh -v 2 ${srcdir}/${_dir}
+  /usr/share/ros-build-tools/fix-python-scripts.sh -v 3 ${srcdir}/${_dir}
 
   # Build project
   cmake ${srcdir}/${_dir} \
         -DCMAKE_BUILD_TYPE=Release \
         -DCATKIN_BUILD_BINARY_PACKAGE=ON \
         -DCMAKE_INSTALL_PREFIX=/opt/ros/melodic \
-        -DPYTHON_EXECUTABLE=/usr/bin/python2 \
-        -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
-        -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
-        -DPYTHON_BASENAME=-python2.7 \
+        -DPYTHON_EXECUTABLE=/usr/bin/python3 \
+        -DPYTHON_INCLUDE_DIR=/usr/include/python3.7m \
+        -DPYTHON_LIBRARY=/usr/lib/libpython3.7m.so \
+        -DPYTHON_BASENAME=.cpython-37m \
         -DSETUPTOOLS_DEB_LAYOUT=OFF
   make
 }