diff options
| author | Oskar Roesler | 2020-08-30 12:44:14 +0200 |
|---|---|---|
| committer | GitHub | 2020-08-30 12:44:14 +0200 |
| commit | 125a600d0adc50ebb598c3a8a6b6deadb514f49f (patch) | |
| tree | bb506c841dd53812a4e94d1b93d02cddd982a7b2 | |
| parent | 2e69f6ffa02de022575d3ad35fd51504c02c163f (diff) | |
| parent | b372e623a4ff9ce111b363bc998203661a50309f (diff) | |
| download | aur-125a600d0adc50ebb598c3a8a6b6deadb514f49f.tar.gz | |
Merge pull request #4 from ros-melodic-arch/remove_patch
Removed patch that has been applied upstream
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | CMakeLists-signal.patch | 29 | ||||
| -rw-r--r-- | PKGBUILD | 13 |
3 files changed, 4 insertions, 42 deletions
@@ -1,7 +1,7 @@ pkgbase = ros-melodic-laser-assembler pkgdesc = ROS - Provides nodes to assemble point clouds from either LaserScan or PointCloud messages. pkgver = 1.7.7 - pkgrel = 3 + pkgrel = 4 url = https://wiki.ros.org/laser_assembler arch = i686 arch = x86_64 @@ -30,9 +30,7 @@ pkgbase = ros-melodic-laser-assembler depends = ros-melodic-sensor-msgs depends = ros-melodic-pluginlib source = ros-melodic-laser-assembler-1.7.7.tar.gz::https://github.com/ros-perception/laser_assembler/archive/1.7.7.tar.gz - source = CMakeLists-signal.patch sha256sums = e6b0c3abbe30006fba4bb78e8c451592835984ef28b39fbdaf843f4943829ee0 - sha256sums = 1c050096b3e5edf41da7ef88db915f5690f5b6903e7d46c65a1655204f49039c pkgname = ros-melodic-laser-assembler diff --git a/CMakeLists-signal.patch b/CMakeLists-signal.patch deleted file mode 100644 index 8c9ab136e76a..000000000000 --- a/CMakeLists-signal.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- CMakeLists.txt.old 2019-06-12 01:28:11.540959018 -0400 -+++ CMakeLists.txt 2019-06-12 01:28:17.900958737 -0400 -@@ -5,13 +5,13 @@ - # Find dependencies - ############################################################################## - --set(THIS_PACKAGE_ROS_DEPS -+set(THIS_PACKAGE_ROS_DEPS - tf sensor_msgs message_filters roscpp laser_geometry filters) - --find_package(catkin REQUIRED COMPONENTS -- ${THIS_PACKAGE_ROS_DEPS} -+find_package(catkin REQUIRED COMPONENTS -+ ${THIS_PACKAGE_ROS_DEPS} - message_generation) --find_package(Boost REQUIRED COMPONENTS system signals) -+find_package(Boost REQUIRED COMPONENTS system) - include_directories(include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}) - - ############################################################################## -@@ -85,7 +85,7 @@ - # Install - ############################################################################## - --install(TARGETS -+install(TARGETS - laser_scan_assembler_srv - laser_scan_assembler - merge_clouds @@ -6,7 +6,7 @@ url='https://wiki.ros.org/laser_assembler' pkgname='ros-melodic-laser-assembler' pkgver='1.7.7' arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h') -pkgrel=3 +pkgrel=4 license=('BSD') ros_makedepends=( @@ -44,15 +44,8 @@ depends=( ) _dir="laser_assembler-${pkgver}" -source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros-perception/laser_assembler/archive/${pkgver}.tar.gz" - CMakeLists-signal.patch) -sha256sums=('e6b0c3abbe30006fba4bb78e8c451592835984ef28b39fbdaf843f4943829ee0' - '1c050096b3e5edf41da7ef88db915f5690f5b6903e7d46c65a1655204f49039c') - -prepare() { - cd "${srcdir}/${_dir}" - patch -uN CMakeLists.txt ../../CMakeLists-signal.patch || return 1 -} +source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros-perception/laser_assembler/archive/${pkgver}.tar.gz") +sha256sums=('e6b0c3abbe30006fba4bb78e8c451592835984ef28b39fbdaf843f4943829ee0') build() { # Use ROS environment variables. |