Update to version 0.5.17-1

- Also added patch for logWarn/logError changes

1 files changed, 20 insertions, 15 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 3b8a80723efa..2ef51d4ecbd6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,19 +4,16 @@ pkgdesc="ROS - tf2 is the second generation of the transform library, which lets
 url='http://www.ros.org/wiki/tf2'
 
 pkgname='ros-lunar-tf2'
-pkgver='0.5.16'
+pkgver='0.5.17'
 _pkgver_patch=0
 arch=('any')
 pkgrel=1
 license=('BSD')
 
-ros_makedepends=(ros-lunar-rostime
-  ros-lunar-catkin
-  ros-lunar-geometry-msgs
-  ros-lunar-tf2-msgs)
-makedepends=('cmake' 'ros-build-tools'
-  ${ros_makedepends[@]}
-  console-bridge)
+ros_makedepends=(ros-lunar-catkin)
+makedepends=(${ros_makedepends[@]}
+  cmake
+  ros-build-tools)
 
 ros_depends=(ros-lunar-rostime
   ros-lunar-geometry-msgs
@@ -32,8 +29,14 @@ depends=(${ros_depends[@]}
 
 # Tarball version (faster download)
 _dir="geometry2-release-release-lunar-tf2-${pkgver}-${_pkgver_patch}"
-source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/geometry2-release/archive/release/lunar/tf2/${pkgver}-${_pkgver_patch}.tar.gz")
-sha256sums=('5c3731bd35d64a15cc8f935aef430f12424f23eca239f5474df2f036d4ca1d77')
+source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/geometry2-release/archive/release/lunar/tf2/${pkgver}-${_pkgver_patch}.tar.gz" "logError_fix.patch")
+sha256sums=('e839887d44a5d1fa48cce5a287d061a7beb262595b25d6b8e038deca2660f12f'
+            'e3238a399b4e740ffc1f5a67d66fa67d183144f2a2c227251dabe008094ea548')
+
+prepare() {
+  cd "${srcdir}"
+  patch -Np1 -i "logError_fix.patch"
+}
 
 build() {
   # Use ROS environment variables
@@ -41,22 +44,24 @@ build() {
   [ -f /opt/ros/lunar/setup.bash ] && source /opt/ros/lunar/setup.bash
 
   # Create build directory
-  [ -d ${srcdir}/build ] || mkdir ${srcdir}/build
-  cd ${srcdir}/build
+  [ -d "${srcdir}/build" ] || mkdir "${srcdir}/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 2 "${srcdir}/${_dir}"
 
   # Build project
-  cmake ${srcdir}/${_dir} \
+  cmake "${srcdir}/${_dir}" \
         -DCMAKE_BUILD_TYPE=Release \
         -DCATKIN_BUILD_BINARY_PACKAGE=ON \
         -DCMAKE_INSTALL_PREFIX=/opt/ros/lunar \
+        -DCMAKE_PREFIX_PATH=/opt/ros/lunar \
         -DPYTHON_EXECUTABLE=/usr/bin/python2 \
         -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
         -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
         -DPYTHON_BASENAME=-python2.7 \
-        -DSETUPTOOLS_DEB_LAYOUT=OFF
+        -DSETUPTOOLS_DEB_LAYOUT=OFF \
+        -DCATKIN_ENABLE_TESTING=OFF
   make
 }