add gtest src path patch

2 files changed, 13 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b2b61265a49f..def451020f42 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ros-noetic-catkin
 	pkgdesc = ROS - Low-level build system macros and infrastructure for ROS.
 	pkgver = 0.8.6
-	pkgrel = 1
+	pkgrel = 2
 	url = https://wiki.ros.org/catkin
 	arch = any
 	license = BSD
@@ -17,7 +17,9 @@ pkgbase = ros-noetic-catkin
 	depends = python
 	depends = ros-build-tools
 	source = ros-noetic-catkin-0.8.6.tar.gz::https://github.com/ros/catkin/archive/0.8.6.tar.gz
+	source = gtest-path.patch::https://patch-diff.githubusercontent.com/raw/ros/catkin/pull/1105.patch
 	sha256sums = 1a88c99fb0a1bcfe6848cbf9778f1dff8c2587219b09eb56189b38c52c30a486
+	sha256sums = 06513dce4a9ebde7f80e46cd6e5758488e65d8936616f2563a755fbf9e7dcb39
 
 pkgname = ros-noetic-catkin
 
diff --git a/PKGBUILD b/PKGBUILD
index a7c79632cd30..445494a3cc92 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ url='https://wiki.ros.org/catkin'
 pkgname='ros-noetic-catkin'
 pkgver='0.8.6'
 arch=('any')
-pkgrel=1
+pkgrel=2
 license=('BSD')
 
 ros_makedepends=(
@@ -33,8 +33,15 @@ depends=(
 )
 
 _dir="catkin-${pkgver}"
-source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros/catkin/archive/${pkgver}.tar.gz")
-sha256sums=('1a88c99fb0a1bcfe6848cbf9778f1dff8c2587219b09eb56189b38c52c30a486')
+source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros/catkin/archive/${pkgver}.tar.gz"
+        "gtest-path.patch"::"https://patch-diff.githubusercontent.com/raw/ros/catkin/pull/1105.patch")
+sha256sums=('1a88c99fb0a1bcfe6848cbf9778f1dff8c2587219b09eb56189b38c52c30a486'
+            '06513dce4a9ebde7f80e46cd6e5758488e65d8936616f2563a755fbf9e7dcb39')
+
+prepare() {
+    cd "$srcdir/$_dir"
+    patch --forward --strip=1 --input="${srcdir}/gtest-path.patch"
+}
 
 build() {
 	# Use ROS environment variables.