Merge pull request #4 from acxz/master

Changed source to official release and patched the boost signals issue

3 files changed, 36 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 96e5edf811f2..1eeedd9d8c28 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ros-melodic-tf
 	pkgdesc = ROS - tf is a package that lets the user keep track of multiple coordinate frames over time.
 	pkgver = 1.12.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.ros.org/wiki/tf
 	arch = any
 	license = BSD
@@ -28,8 +28,10 @@ pkgbase = ros-melodic-tf
 	depends = ros-melodic-sensor-msgs
 	depends = ros-melodic-geometry-msgs
 	depends = graphviz
-	source = ros-melodic-tf-1.12.0-0.tar.gz::https://github.com/ros-gbp/geometry-release/archive/release/melodic/tf/1.12.0-0.tar.gz
-	sha256sums = 00d706fa94be4c4348556e8985dae8be407e76aae3f767e92dbd35e206f5ab03
+	source = ros-melodic-tf-1.12.0.tar.gz::https://github.com/ros/geometry/archive/1.12.0.tar.gz
+	source = CMakeLists-signal.patch
+	sha256sums = 61a278bdd50e00ea442055d9f70eaf82b5a36916739edca188fa1b71a59507b4
+	sha256sums = ab139685eaa571c7e1b3ef527bb9ef367ba05ab7f859602a5d6ed59359459e2d
 
 pkgname = ros-melodic-tf
 
diff --git a/CMakeLists-signal.patch b/CMakeLists-signal.patch
new file mode 100644
index 000000000000..6c8a1544eb1a
--- /dev/null
+++ b/CMakeLists-signal.patch
@@ -0,0 +1,20 @@
+--- CMakeLists.txt.old	2019-06-11 11:23:56.423205037 -0400
++++ CMakeLists.txt	2019-06-11 11:24:05.666537955 -0400
+@@ -15,7 +15,7 @@
+     std_msgs
+     tf2_ros
+ )
+-find_package(Boost REQUIRED COMPONENTS thread signals system)
++find_package(Boost REQUIRED COMPONENTS thread system)
+ 
+ catkin_python_setup()
+ 
+@@ -110,7 +110,7 @@
+ add_executable(testBroadcaster test/testBroadcaster.cpp)
+ target_link_libraries(testBroadcaster ${PROJECT_NAME})
+ 
+-catkin_add_nosetests(test/testPython.py) 
++catkin_add_nosetests(test/testPython.py)
+ add_executable(tf_speed_test EXCLUDE_FROM_ALL test/speed_test.cpp)
+ target_link_libraries(tf_speed_test ${PROJECT_NAME})
+ 
diff --git a/PKGBUILD b/PKGBUILD
index 15bc3d6065a5..b3eaa38015f8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,9 +5,8 @@ url='http://www.ros.org/wiki/tf'
 
 pkgname='ros-melodic-tf'
 pkgver='1.12.0'
-_pkgver_patch=0
 arch=('any')
-pkgrel=1
+pkgrel=2
 license=('BSD')
 
 ros_makedepends=(
@@ -47,9 +46,16 @@ depends=(
 	graphviz
 )
 
-_dir="geometry-release-release-melodic-tf-${pkgver}-${_pkgver_patch}"
-source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/geometry-release/archive/release/melodic/tf/${pkgver}-${_pkgver_patch}.tar.gz")
-sha256sums=('00d706fa94be4c4348556e8985dae8be407e76aae3f767e92dbd35e206f5ab03')
+_dir="geometry-${pkgver}/tf"
+source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros/geometry/archive/${pkgver}.tar.gz"
+        CMakeLists-signal.patch)
+sha256sums=('61a278bdd50e00ea442055d9f70eaf82b5a36916739edca188fa1b71a59507b4'
+            'ab139685eaa571c7e1b3ef527bb9ef367ba05ab7f859602a5d6ed59359459e2d')
+
+prepare() {
+  cd "${srcdir}/${_dir}"
+  patch -uN CMakeLists.txt ../../CMakeLists-signal.patch || return 1
+}
 
 build() {
 	# Use ROS environment variables.