changed source to official release and patched the signal issue

3 files changed, 45 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7e00d41979e1..a6e06af5ac57 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -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.6
-	pkgrel = 1
+	pkgrel = 2
 	url = http://ros.org/wiki/laser_assembler
 	arch = any
 	license = BSD
@@ -25,8 +25,10 @@ pkgbase = ros-melodic-laser-assembler
 	depends = ros-melodic-message-runtime
 	depends = ros-melodic-sensor-msgs
 	depends = ros-melodic-pluginlib
-	source = ros-melodic-laser-assembler-1.7.6-0.tar.gz::https://github.com/ros-gbp/laser_assembler-release/archive/release/melodic/laser_assembler/1.7.6-0.tar.gz
-	sha256sums = e9f578692846ccaf041da048fcfcef51d1a421a2869c94d2970541af319d3823
+	source = ros-melodic-laser-assembler-1.7.6.tar.gz::https://github.com/ros-perception/laser_assembler/archive/1.7.6.tar.gz
+	source = CMakeLists-signal.patch
+	sha256sums = f9b5c23f7eac7406dd3d0e4a095864335b18a25611fd28f3279763339d7bd94f
+	sha256sums = 1c050096b3e5edf41da7ef88db915f5690f5b6903e7d46c65a1655204f49039c
 
 pkgname = ros-melodic-laser-assembler
 
diff --git a/CMakeLists-signal.patch b/CMakeLists-signal.patch
new file mode 100644
index 000000000000..8c9ab136e76a
--- /dev/null
+++ b/CMakeLists-signal.patch
@@ -0,0 +1,29 @@
+--- 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
diff --git a/PKGBUILD b/PKGBUILD
index bfbb0f95dacb..01e773208348 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,9 +5,8 @@ url='http://ros.org/wiki/laser_assembler'
 
 pkgname='ros-melodic-laser-assembler'
 pkgver='1.7.6'
-_pkgver_patch=0
 arch=('any')
-pkgrel=1
+pkgrel=2
 license=('BSD')
 
 ros_makedepends=(
@@ -44,9 +43,16 @@ depends=(
 	${ros_depends[@]}
 )
 
-_dir="laser_assembler-release-release-melodic-laser_assembler-${pkgver}-${_pkgver_patch}"
-source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/laser_assembler-release/archive/release/melodic/laser_assembler/${pkgver}-${_pkgver_patch}.tar.gz")
-sha256sums=('e9f578692846ccaf041da048fcfcef51d1a421a2869c94d2970541af319d3823')
+_dir="laser_assembler-${pkgver}"
+source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros-perception/laser_assembler/archive/${pkgver}.tar.gz"
+  CMakeLists-signal.patch)
+sha256sums=('f9b5c23f7eac7406dd3d0e4a095864335b18a25611fd28f3279763339d7bd94f'
+            '1c050096b3e5edf41da7ef88db915f5690f5b6903e7d46c65a1655204f49039c')
+
+prepare() {
+  cd "${srcdir}/${_dir}"
+  patch -uN CMakeLists.txt ../../CMakeLists-signal.patch || return 1
+}
 
 build() {
 	# Use ROS environment variables.