Hardcode Boost Version to 1.69

2 files changed, 7 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3fea6fe39dd8..11307840df08 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ros-melodic-rosserial-server
 	pkgdesc = ROS - A more performance- and stability-oriented server alternative implemented in C++ to rosserial_python.
 	pkgver = 0.8.0
-	pkgrel = 3
+	pkgrel = 4
 	url = https://wiki.ros.org/rosserial_server
 	arch = i686
 	arch = x86_64
@@ -22,7 +22,7 @@ pkgbase = ros-melodic-rosserial-server
 	depends = ros-melodic-roscpp
 	depends = ros-melodic-topic-tools
 	source = ros-melodic-rosserial-server-0.8.0.tar.gz::https://github.com/ros-drivers/rosserial/archive/0.8.0.tar.gz
-	source = fix-boost-1-71.patch::https://patch-diff.githubusercontent.com/raw/ros-drivers/rosserial/pull/468.patch
+	source = fix-boost1.69-1-71.patch::https://patch-diff.githubusercontent.com/raw/ros-drivers/rosserial/pull/468.patch
 	sha256sums = e96cdeb81e1c03fb1c5ad85a740cb0a1a0836c52a24c6a5d97c975084b49d576
 	sha256sums = 750137d86f3d535be30ecdc904e12355c71a7873a780fc686f6e6f133cd2172a
 
diff --git a/PKGBUILD b/PKGBUILD
index d5b74e22b5ae..8c7f81484033 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ url='https://wiki.ros.org/rosserial_server'
 pkgname='ros-melodic-rosserial-server'
 pkgver='0.8.0'
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
-pkgrel=3
+pkgrel=4
 license=('BSD')
 
 ros_makedepends=(
@@ -36,13 +36,13 @@ depends=(
 
 _dir="rosserial-${pkgver}/rosserial_server"
 source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros-drivers/rosserial/archive/${pkgver}.tar.gz"
-        "fix-boost-1-71.patch"::"https://patch-diff.githubusercontent.com/raw/ros-drivers/rosserial/pull/468.patch")
+        "fix-boost1.69-1-71.patch"::"https://patch-diff.githubusercontent.com/raw/ros-drivers/rosserial/pull/468.patch")
 sha256sums=('e96cdeb81e1c03fb1c5ad85a740cb0a1a0836c52a24c6a5d97c975084b49d576'
             '750137d86f3d535be30ecdc904e12355c71a7873a780fc686f6e6f133cd2172a')
 
 prepare() {
     cd "${srcdir}/${_dir}/.."
-    patch -p1 < ${srcdir}/fix-boost-1-71.patch
+    patch -p1 < ${srcdir}/fix-boost1.69-1-71.patch
 }
 
 build() {
@@ -63,7 +63,8 @@ build() {
 		-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
 }