Update package and patch includes

Updates the package and adds missing includes. The missing includes will also be proposed upstream.

3 files changed, 38 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 62361107714e..a1f3e145ee03 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ros-melodic-libfranka
 	pkgdesc = C++ library for Franka Emika research robots
-	pkgver = 0.7.1
-	pkgrel = 1
+	pkgver = 0.8.0
+	pkgrel = 2
 	url = http://wiki.ros.org/libfranka
 	arch = i686
 	arch = x86_64
@@ -15,8 +15,10 @@ pkgbase = ros-melodic-libfranka
 	makedepends = ros-melodic-catkin
 	depends = eigen
 	depends = poco
-	source = ros-melodic-libfranka-0.7.1.tar.gz::https://github.com/frankaemika/libfranka-release/archive/release/melodic/libfranka/0.7.1.tar.gz
-	sha256sums = 508c192bfad0db8758f76bda1d6a6bc64164bbc747fb25372a55313cafd9a5b7
+	source = ros-melodic-libfranka-0.8.0.tar.gz::https://github.com/frankaemika/libfranka-release/archive/release/melodic/libfranka/0.8.0.tar.gz
+	source = missing_includes.patch
+	sha256sums = b62cdc54d52fe734976b24438cd199a2ab6d4a2fc1a6424f6faa7a951a033d06
+	sha256sums = e4438f5cbd3227832905ee8830e692a50a74d8f43c29d1d687163c45469cc998
 
 pkgname = ros-melodic-libfranka
 
diff --git a/PKGBUILD b/PKGBUILD
index 98494075f35f..e187aaef1a44 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,9 +2,9 @@ pkgdesc="C++ library for Franka Emika research robots "
 url="http://wiki.ros.org/libfranka"
 
 pkgname='ros-melodic-libfranka'
-pkgver='0.7.1'
+pkgver='0.8.0'
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
-pkgrel=1
+pkgrel=2
 license=('Apache')
 
 ros_makedepends=(ros-melodic-roscpp ros-melodic-catkin)
@@ -14,8 +14,15 @@ ros_depends=()
 depends=('eigen' 'poco' ${ros_depends[@]})
 
 _dir="libfranka-release-release-melodic-libfranka"
-source=("ros-melodic-libfranka-$pkgver.tar.gz::https://github.com/frankaemika/libfranka-release/archive/release/melodic/libfranka/$pkgver.tar.gz")
-sha256sums=("508c192bfad0db8758f76bda1d6a6bc64164bbc747fb25372a55313cafd9a5b7")
+source=("ros-melodic-libfranka-$pkgver.tar.gz::https://github.com/frankaemika/libfranka-release/archive/release/melodic/libfranka/$pkgver.tar.gz"
+missing_includes.patch)
+sha256sums=('b62cdc54d52fe734976b24438cd199a2ab6d4a2fc1a6424f6faa7a951a033d06'
+            'e4438f5cbd3227832905ee8830e692a50a74d8f43c29d1d687163c45469cc998')
+
+prepare() {
+  cd ${srcdir}/${_dir}
+  patch --forward --strip=0  --input=${srcdir}/missing_includes.patch || return 1
+}
 
 build() {
 	# Use ROS environment variables
@@ -29,6 +36,7 @@ build() {
 	# Build project
 	cmake ${srcdir}/${_dir} \
 	      -DCATKIN_BUILD_BINARY_PACKAGE=ON \
+	      -DCATKIN_ENABLE_TESTING=0 \
 	      -DCMAKE_INSTALL_PREFIX=/opt/ros/melodic \
 	      -DPYTHON_EXECUTABLE=/usr/bin/python3 \
 	      -DSETUPTOOLS_DEB_LAYOUT=OFF
diff --git a/missing_includes.patch b/missing_includes.patch
new file mode 100644
index 000000000000..7589f5a920e6
--- /dev/null
+++ b/missing_includes.patch
@@ -0,0 +1,20 @@
+--- include/franka/control_tools.h.orig	2020-06-30 11:14:02.000000000 +0200
++++ include/franka/control_tools.h	2020-09-01 15:32:56.174242519 +0200
+@@ -4,6 +4,7 @@
+ 
+ #include <array>
+ #include <cmath>
++#include <string>
+ 
+ /**
+  * @file control_tools.h
+--- src/control_types.cpp.orig	2020-06-30 11:14:02.000000000 +0200
++++ src/control_types.cpp	2020-09-01 15:32:56.177575858 +0200
+@@ -1,6 +1,7 @@
+ // Copyright (c) 2017 Franka Emika GmbH
+ // Use of this source code is governed by the Apache-2.0 license, see LICENSE
+ #include <type_traits>
++#include <stdexcept>
+ 
+ #include <franka/control_types.h>
+