summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD4
-rw-r--r--boost_tr1.patch18
3 files changed, 14 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a46ef2f39b01..b2571d4aef1b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Wed Nov 22 21:41:15 UTC 2017
+# Thu Nov 23 11:32:45 UTC 2017
pkgbase = ros-kinetic-rospack
pkgdesc = ROS - ROS Package Tool.
pkgver = 2.4.4
- pkgrel = 1
+ pkgrel = 2
url = http://wiki.ros.org/rospack
arch = any
license = BSD
@@ -25,7 +25,7 @@ pkgbase = ros-kinetic-rospack
source = ros-kinetic-rospack-2.4.4-0.tar.gz::https://github.com/ros-gbp/rospack-release/archive/release/kinetic/rospack/2.4.4-0.tar.gz
source = boost_tr1.patch
sha256sums = 149f27ece8b24235aaea6ed37ab49d89ec00dad1fa77843ac93fb6836fccf3b4
- sha256sums = 0d80fbe8ac777673eb7df2807ddd976b6ff4f5cfc866937c6c60bb19e017f7e8
+ sha256sums = 1e2ca2b01f6e978de06139c9ceadf770b196fd07fd99a2f0e923130920cadc46
pkgname = ros-kinetic-rospack
diff --git a/PKGBUILD b/PKGBUILD
index a118256b5c75..da5986808134 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ pkgname='ros-kinetic-rospack'
pkgver='2.4.4'
_pkgver_patch=0
arch=('any')
-pkgrel=1
+pkgrel=2
license=('BSD')
ros_makedepends=(ros-kinetic-cmake-modules
@@ -40,7 +40,7 @@ _dir="rospack-release-release-kinetic-rospack-${pkgver}-${_pkgver_patch}"
source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/rospack-release/archive/release/kinetic/rospack/${pkgver}-${_pkgver_patch}.tar.gz"
boost_tr1.patch)
sha256sums=('149f27ece8b24235aaea6ed37ab49d89ec00dad1fa77843ac93fb6836fccf3b4'
- '0d80fbe8ac777673eb7df2807ddd976b6ff4f5cfc866937c6c60bb19e017f7e8')
+ '1e2ca2b01f6e978de06139c9ceadf770b196fd07fd99a2f0e923130920cadc46')
prepare() {
cd ${srcdir}
diff --git a/boost_tr1.patch b/boost_tr1.patch
index a8efb1342114..d7478c3899ba 100644
--- a/boost_tr1.patch
+++ b/boost_tr1.patch
@@ -1,6 +1,6 @@
-diff -aur a/rospack-release-release-kinetic-rospack-2.3.3-0/include/rospack/rospack.h src/rospack-release-release-kinetic-rospack-2.3.3-0/include/rospack/rospack.h
---- a/rospack-release-release-kinetic-rospack-2.3.3-0/include/rospack/rospack.h 2017-09-22 21:21:03.468974889 -0700
-+++ src/rospack-release-release-kinetic-rospack-2.3.3-0/include/rospack/rospack.h 2017-09-22 21:33:54.286579268 -0700
+diff -aur a/rospack-release-release-kinetic-rospack-2.4.4-0/include/rospack/rospack.h src/rospack-release-release-kinetic-rospack-2.4.4-0/include/rospack/rospack.h
+--- a/rospack-release-release-kinetic-rospack-2.4.4-0/include/rospack/rospack.h 2017-09-22 21:21:03.468974889 -0700
++++ src/rospack-release-release-kinetic-rospack-2.4.4-0/include/rospack/rospack.h 2017-09-22 21:33:54.286579268 -0700
@@ -105,8 +105,8 @@
#ifndef ROSPACK_ROSPACK_H
#define ROSPACK_ROSPACK_H
@@ -41,9 +41,9 @@ diff -aur a/rospack-release-release-kinetic-rospack-2.3.3-0/include/rospack/rosp
std::vector<Stackage*>& deps,
bool get_indented_deps,
std::vector<std::string>& indented_deps,
-diff -aur a/rospack-release-release-kinetic-rospack-2.3.3-0/src/rospack.cpp src/rospack-release-release-kinetic-rospack-2.3.3-0/src/rospack.cpp
---- a/rospack-release-release-kinetic-rospack-2.3.3-0/src/rospack.cpp 2017-09-22 21:21:03.468974889 -0700
-+++ src/rospack-release-release-kinetic-rospack-2.3.3-0/src/rospack.cpp 2017-09-22 21:34:45.542366683 -0700
+diff -aur a/rospack-release-release-kinetic-rospack-2.4.4-0/src/rospack.cpp src/rospack-release-release-kinetic-rospack-2.4.4-0/src/rospack.cpp
+--- a/rospack-release-release-kinetic-rospack-2.4.4-0/src/rospack.cpp 2017-09-22 21:21:03.468974889 -0700
++++ src/rospack-release-release-kinetic-rospack-2.4.4-0/src/rospack.cpp 2017-09-22 21:34:45.542366683 -0700
@@ -258,7 +258,7 @@
void Rosstackage::clearStackages()
@@ -197,9 +197,9 @@ diff -aur a/rospack-release-release-kinetic-rospack-2.3.3-0/src/rospack.cpp src/
it != stackages_.end();
++it)
fprintf(cache, "%s\n", it->second->path_.c_str());
-diff -aur a/rospack-release-release-kinetic-rospack-2.3.3-0/src/utils.cpp src/rospack-release-release-kinetic-rospack-2.3.3-0/src/utils.cpp
---- a/rospack-release-release-kinetic-rospack-2.3.3-0/src/utils.cpp 2017-09-22 21:21:03.468974889 -0700
-+++ src/rospack-release-release-kinetic-rospack-2.3.3-0/src/utils.cpp 2017-09-22 21:34:18.212835473 -0700
+diff -aur a/rospack-release-release-kinetic-rospack-2.4.4-0/src/utils.cpp src/rospack-release-release-kinetic-rospack-2.4.4-0/src/utils.cpp
+--- a/rospack-release-release-kinetic-rospack-2.4.4-0/src/utils.cpp 2017-09-22 21:21:03.468974889 -0700
++++ src/rospack-release-release-kinetic-rospack-2.4.4-0/src/utils.cpp 2017-09-22 21:34:18.212835473 -0700
@@ -28,7 +28,7 @@
#include <string>
#include <vector>