summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFiras Zaidan2019-09-24 14:03:26 +0200
committerFiras Zaidan2019-09-24 14:03:26 +0200
commite513471e6fa15b2a3821299039b6bc069b871ad1 (patch)
treeaea879ad6e382151d5016f849d37168db9a6f72d
parent97532ce6d666e963f1ac7c28e8b342499901d33e (diff)
downloadaur-ros-kinetic-fake-localization.tar.gz
Fix missing boost signals library removed in boost 1.69
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD13
-rw-r--r--boost-signals.patch12
3 files changed, 25 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d8af0659871c..9fa432a95d36 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = ros-kinetic-fake-localization
pkgdesc = ROS - A ROS node that simply forwards odometry information.
pkgver = 1.14.2
- pkgrel = 1
+ pkgrel = 2
url = http://wiki.ros.org/fake_localization
arch = any
license = BSD
@@ -24,7 +24,9 @@ pkgbase = ros-kinetic-fake-localization
depends = ros-kinetic-tf
depends = ros-kinetic-message-filters
source = ros-kinetic-fake-localization-1.14.2-0.tar.gz::https://github.com/ros-gbp/navigation-release/archive/release/kinetic/fake_localization/1.14.2-0.tar.gz
+ source = boost-signals.patch
sha256sums = 03d6633f9bf6e69a26f672b0e26d5f9d9bd94a9e13a1190a3f9f7b74a1364956
+ sha256sums = 628f535fb481bfbe278af66fdee58511c85db117b4f084a3100e57125a7acfbe
pkgname = ros-kinetic-fake-localization
diff --git a/PKGBUILD b/PKGBUILD
index c84c9d093d04..94aff571f7da 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ pkgname='ros-kinetic-fake-localization'
pkgver='1.14.2'
_pkgver_patch=0
arch=('any')
-pkgrel=1
+pkgrel=2
license=('BSD')
ros_makedepends=(ros-kinetic-rospy
@@ -38,8 +38,15 @@ depends=(${ros_depends[@]})
# Tarball version (faster download)
_dir="navigation-release-release-kinetic-fake_localization-${pkgver}-${_pkgver_patch}"
-source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/navigation-release/archive/release/kinetic/fake_localization/${pkgver}-${_pkgver_patch}.tar.gz")
-sha256sums=('03d6633f9bf6e69a26f672b0e26d5f9d9bd94a9e13a1190a3f9f7b74a1364956')
+source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/navigation-release/archive/release/kinetic/fake_localization/${pkgver}-${_pkgver_patch}.tar.gz"
+ boost-signals.patch)
+sha256sums=('03d6633f9bf6e69a26f672b0e26d5f9d9bd94a9e13a1190a3f9f7b74a1364956'
+ '628f535fb481bfbe278af66fdee58511c85db117b4f084a3100e57125a7acfbe')
+
+prepare() {
+ cd "${srcdir}/${_dir}"
+ patch -i "${srcdir}/boost-signals.patch" # https://bitbucket.org/osrf/gazebo/issues/2577/boost-signals-library-removed-in-boost-169
+}
build() {
# Use ROS environment variables
diff --git a/boost-signals.patch b/boost-signals.patch
new file mode 100644
index 000000000000..a1acdc7733ba
--- /dev/null
+++ b/boost-signals.patch
@@ -0,0 +1,12 @@
+--- CMakeLists.txt 2019-09-23 15:58:44.273534387 +0800
++++ CMakeLists.txt.patch 2019-09-23 15:59:23.280408275 +0800
+@@ -14,7 +14,7 @@
+ )
+
+
+-find_package(Boost REQUIRED COMPONENTS signals)
++find_package(Boost REQUIRED COMPONENTS)
+
+ catkin_package(
+ CATKIN_DEPENDS
+