summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Exner2021-01-28 22:50:14 +0100
committerFelix Exner2021-01-30 11:18:27 +0100
commit17b6cee519533b3aa9a4be72f575a388f67c5e97 (patch)
tree809716a10be6ba11edc36d3cfb3693aab7908955
parent5ca78f793538f7c8ccbee8aacd1347b8b7a3a406 (diff)
downloadaur-17b6cee519533b3aa9a4be72f575a388f67c5e97.tar.gz
Removing boost-signal patch
This isn't needed anymore, as we switched to boost1.69 and it doesn't work with the updated version
-rw-r--r--.SRCINFO4
-rw-r--r--CMakeLists-signal.patch11
-rw-r--r--PKGBUILD13
3 files changed, 4 insertions, 24 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 05d78b8c8e32..710c12545fbe 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = ros-melodic-tf2
pkgdesc = ROS - tf2 is the second generation of the transform library, which lets the user keep track of multiple coordinate frames over time.
pkgver = 0.6.6
- pkgrel = 2
+ pkgrel = 3
url = https://www.wiki.ros.org/tf2
arch = any
license = BSD
@@ -17,9 +17,7 @@ pkgbase = ros-melodic-tf2
depends = ros-melodic-geometry-msgs
depends = console-bridge
source = ros-melodic-tf2-0.6.6.tar.gz::https://github.com/ros/geometry2/archive/0.6.6.tar.gz
- source = CMakeLists-signal.patch
sha256sums = 4955f3ca30d194b0e0842f59b97a72d0e933908c20c56c8c374c152ab02568d1
- sha256sums = 878047021778a148cac5a2a6f04e8ee45df593f294022db053d42bc7e5692dbd
pkgname = ros-melodic-tf2
diff --git a/CMakeLists-signal.patch b/CMakeLists-signal.patch
deleted file mode 100644
index b948e26aced1..000000000000
--- a/CMakeLists-signal.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt.old 2019-05-24 23:35:56.152546901 -0400
-+++ CMakeLists.txt 2019-05-24 23:36:06.709213096 -0400
-@@ -3,7 +3,7 @@
-
- find_package(console_bridge REQUIRED)
- find_package(catkin REQUIRED COMPONENTS geometry_msgs rostime tf2_msgs)
--find_package(Boost REQUIRED COMPONENTS signals system thread)
-+find_package(Boost REQUIRED COMPONENTS system thread)
-
- catkin_package(
- INCLUDE_DIRS include
diff --git a/PKGBUILD b/PKGBUILD
index 3b1fe3af38cf..8dcc78a38c15 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ url='https://www.wiki.ros.org/tf2'
pkgname='ros-melodic-tf2'
pkgver='0.6.6'
arch=('any')
-pkgrel=2
+pkgrel=3
license=('BSD')
ros_makedepends=(
@@ -35,15 +35,8 @@ depends=(
)
_dir="geometry2-${pkgver}/tf2"
-source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros/geometry2/archive/${pkgver}.tar.gz"
- CMakeLists-signal.patch)
-sha256sums=('4955f3ca30d194b0e0842f59b97a72d0e933908c20c56c8c374c152ab02568d1'
- '878047021778a148cac5a2a6f04e8ee45df593f294022db053d42bc7e5692dbd')
-
-prepare() {
- cd "${srcdir}/${_dir}"
- patch -uN CMakeLists.txt "${srcdir}/CMakeLists-signal.patch" || return 1
-}
+source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros/geometry2/archive/${pkgver}.tar.gz")
+sha256sums=('4955f3ca30d194b0e0842f59b97a72d0e933908c20c56c8c374c152ab02568d1')
build() {
# Use ROS environment variables.