Hardcode Boost Version to 1.69

3 files changed, 6 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1d58c86bd836..48273dee6aa1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ros-melodic-roscpp
 	pkgdesc = ROS - roscpp is a C++ implementation of ROS.
 	pkgver = 1.14.10
-	pkgrel = 2
+	pkgrel = 4
 	url = https://github.com/ros/ros_comm
 	arch = i686
 	arch = x86_64
@@ -34,9 +34,7 @@ pkgbase = ros-melodic-roscpp
 	depends = ros-melodic-message-runtime
 	conflicts = ros-melodic-roscpp-git
 	source = ros-melodic-roscpp-1.14.10.tar.gz::https://github.com/ros/ros_comm/archive/1.14.10.tar.gz
-	source = boost_fixes.patch
 	sha256sums = b3b75612feb447afe70600e3ba80bf3e356493a058ba8ebf2746e8db0c55165c
-	sha256sums = cf619e6a9082dc0f4d10f01ec773043f1803352b50de58e493534f43c6e063e5
 
 pkgname = ros-melodic-roscpp
 
diff --git a/PKGBUILD b/PKGBUILD
index 0f607f41e1f6..d32d05629060 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,10 @@
-# Script generated with import_catkin_packages.py.
-# For more information: https://github.com/bchretien/arch-ros-stacks.
 pkgdesc="ROS - roscpp is a C++ implementation of ROS."
 url='https://github.com/ros/ros_comm'
 
 pkgname='ros-melodic-roscpp'
 pkgver='1.14.10'
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
-pkgrel=2
+pkgrel=4
 license=('BSD')
 
 ros_makedepends=(
@@ -51,14 +49,11 @@ conflicts=(
 )
 
 _dir="ros_comm-${pkgver}/clients/roscpp"
-source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros/ros_comm/archive/${pkgver}.tar.gz"
-        "boost_fixes.patch")
-sha256sums=('b3b75612feb447afe70600e3ba80bf3e356493a058ba8ebf2746e8db0c55165c'
-            'cf619e6a9082dc0f4d10f01ec773043f1803352b50de58e493534f43c6e063e5')
+source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros/ros_comm/archive/${pkgver}.tar.gz")
+sha256sums=('b3b75612feb447afe70600e3ba80bf3e356493a058ba8ebf2746e8db0c55165c')
 
 prepare() {
   cd "${srcdir}/${_dir}"
-  patch -p0 < ${srcdir}/boost_fixes.patch || return 1
 }
 
 
@@ -74,16 +69,14 @@ build() {
 	# Fix Python2/Python3 conflicts.
 	/usr/share/ros-build-tools/fix-python-scripts.sh -v 3 ${srcdir}/${_dir}
 
-	#Workaround for boost signals
-	sed -i 's/signals//g' ${srcdir}/${_dir}/CMakeLists.txt
-
 	# Build the project.
 	cmake ${srcdir}/${_dir} \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCATKIN_BUILD_BINARY_PACKAGE=ON \
 		-DCMAKE_INSTALL_PREFIX=/opt/ros/melodic \
 		-DPYTHON_EXECUTABLE=/usr/bin/python3 \
-		-DSETUPTOOLS_DEB_LAYOUT=OFF
+		-DSETUPTOOLS_DEB_LAYOUT=OFF \
+		-DBOOST_ROOT=/opt/boost1.69
 	make
 }
 
diff --git a/boost_fixes.patch b/boost_fixes.patch
deleted file mode 100644
index 2e302334c4f7..000000000000
--- a/boost_fixes.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- ./CMakeLists.txt	2020-10-17 02:06:33.000000000 +0200
-+++ ../../../ros_comm-1.14.10_mod/clients/roscpp/CMakeLists.txt	2020-12-09 19:44:33.418660181 +0100
-@@ -75,6 +75,8 @@
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/libros/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
- include_directories(${CMAKE_CURRENT_BINARY_DIR})
- 
-+add_definitions(-DBOOST_BIND_GLOBAL_PLACEHOLDERS)
-+
- add_library(roscpp 
-   src/libros/master.cpp
-   src/libros/network.cpp
-
---- ./include/ros/connection_manager.h	2020-10-17 02:06:33.000000000 +0200
-+++ ../../../ros_comm-1.14.10_mod/clients/roscpp/include/ros/connection_manager.h	2020-12-09 19:57:27.307009573 +0100
-@@ -31,6 +31,7 @@
- 
- #include <boost/thread/mutex.hpp>
- #include <boost/signals2/connection.hpp>
-+#include <boost/bind.hpp>
- 
- namespace ros
- {
-
---- ./include/ros/timer_manager.h	2020-10-17 02:06:33.000000000 +0200
-+++ ../../../ros_comm-1.14.10_mod/clients/roscpp/include/ros/timer_manager.h	2020-12-09 19:55:12.846155520 +0100
-@@ -35,6 +35,7 @@
- #include <boost/thread/thread.hpp>
- #include <boost/thread/mutex.hpp>
- #include <boost/thread/recursive_mutex.hpp>
-+#include <boost/bind.hpp>
- 
- #include "ros/assert.h"
- #include "ros/callback_queue_interface.h"