diff options
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 17 | ||||
| -rw-r--r-- | console_bridge_dep.patch | 22 |
3 files changed, 41 insertions, 8 deletions
@@ -1,8 +1,6 @@ -# Generated by mksrcinfo v8 -# Thu Mar 24 01:58:34 UTC 2016 pkgbase = ros-indigo-cpp-common pkgdesc = ROS - cpp_common contains C++ code for doing things that are not necessarily ROS related, but are useful for multiple packages. - pkgver = 0.5.7 + pkgver = 0.5.8 pkgrel = 1 url = http://www.ros.org/wiki/cpp_common arch = any @@ -14,8 +12,10 @@ pkgbase = ros-indigo-cpp-common makedepends = console-bridge depends = boost depends = console-bridge - source = ros-indigo-cpp-common-0.5.7-0.tar.gz::https://github.com/ros-gbp/roscpp_core-release/archive/release/indigo/cpp_common/0.5.7-0.tar.gz - sha256sums = 83a1bdfe7d1a3b768641b16d9c50e2e22c099708f72f49af982df46d4ba47680 + source = ros-indigo-cpp-common-0.5.8-0.tar.gz::https://github.com/ros-gbp/roscpp_core-release/archive/release/indigo/cpp_common/0.5.8-0.tar.gz + source = console_bridge_dep.patch + sha256sums = 3747d00068ba03da4df78944abf0f55c28007d6a30c805884ec5fb01b16b418b + sha256sums = a627969418dd0577059c984b3cb999a7ed1173394b1f26022be1c347fec84923 pkgname = ros-indigo-cpp-common @@ -1,10 +1,11 @@ +# Maintainer: jerry73204 <jerry73204 at gmail dot com> # Script generated with import_catkin_packages.py # For more information: https://github.com/bchretien/arch-ros-stacks pkgdesc="ROS - cpp_common contains C++ code for doing things that are not necessarily ROS related, but are useful for multiple packages." url='http://www.ros.org/wiki/cpp_common' pkgname='ros-indigo-cpp-common' -pkgver='0.5.7' +pkgver='0.5.8' _pkgver_patch=0 arch=('any') pkgrel=1 @@ -29,8 +30,18 @@ depends=(${ros_depends[@]} # Tarball version (faster download) _dir="roscpp_core-release-release-indigo-cpp_common-${pkgver}-${_pkgver_patch}" -source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/roscpp_core-release/archive/release/indigo/cpp_common/${pkgver}-${_pkgver_patch}.tar.gz") -sha256sums=('83a1bdfe7d1a3b768641b16d9c50e2e22c099708f72f49af982df46d4ba47680') +source=( + "${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/roscpp_core-release/archive/release/indigo/cpp_common/${pkgver}-${_pkgver_patch}.tar.gz" + 'console_bridge_dep.patch' +) +sha256sums=('3747d00068ba03da4df78944abf0f55c28007d6a30c805884ec5fb01b16b418b' + 'a627969418dd0577059c984b3cb999a7ed1173394b1f26022be1c347fec84923') + +prepare () { + cd ${srcdir}/${_dir} + patch -Np1 -i ${srcdir}/console_bridge_dep.patch + # sed -i 's/logError/CONSOLE_BRIDGE_logError/g' ${srcdir}/${_dir}/src/header.cpp +} build() { # Use ROS environment variables diff --git a/console_bridge_dep.patch b/console_bridge_dep.patch new file mode 100644 index 000000000000..215ae521a43a --- /dev/null +++ b/console_bridge_dep.patch @@ -0,0 +1,22 @@ +diff --git a/src/header.cpp b/src/header.cpp +index b001129..4a25b78 100644 +--- a/src/header.cpp ++++ b/src/header.cpp +@@ -79,7 +79,7 @@ bool Header::parse(uint8_t* buffer, uint32_t size, std::string& error_msg) + if (len > 1000000) + { + error_msg = "Received an invalid TCPROS header. Each element must be prepended by a 4-byte length."; +- logError("%s", error_msg.c_str()); ++ CONSOLE_BRIDGE_logError("%s", error_msg.c_str()); + + return false; + } +@@ -93,7 +93,7 @@ bool Header::parse(uint8_t* buffer, uint32_t size, std::string& error_msg) + if (eqpos == string::npos) + { + error_msg = "Received an invalid TCPROS header. Each line must have an equals sign."; +- logError("%s", error_msg.c_str()); ++ CONSOLE_BRIDGE_logError("%s", error_msg.c_str()); + + return false; + } |