Update to noetic and patch CMake version

ROS metapackages have not officially been released for noetic, so this
is an unofficial version.

1 files changed, 19 insertions, 18 deletions

diff --git a/PKGBUILD b/PKGBUILD
index a97af82cd13e..b1998bbfd7a5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,14 +3,14 @@
 pkgdesc="ROS - A metapackage which extends ros_core and includes other basic non-robot tools like actionlib, dynamic reconfigure, nodelets, and pluginlib."
 url='https://wiki.ros.org/ros_base'
 
-pkgname='ros-melodic-ros-base'
+pkgname='ros-noetic-ros-base'
 pkgver='1.4.1'
 arch=('any')
-pkgrel=2
+pkgrel=1
 license=('BSD')
 
 ros_makedepends=(
-	ros-melodic-catkin
+	ros-noetic-catkin
 )
 
 makedepends=(
@@ -20,11 +20,11 @@ makedepends=(
 )
 
 ros_depends=(
-	ros-melodic-bond-core
-	ros-melodic-nodelet-core
-	ros-melodic-dynamic-reconfigure
-	ros-melodic-ros-core
-	ros-melodic-actionlib
+	ros-noetic-bond-core
+	ros-noetic-nodelet-core
+	ros-noetic-dynamic-reconfigure
+	ros-noetic-ros-core
+	ros-noetic-actionlib
 )
 
 depends=(
@@ -32,30 +32,31 @@ depends=(
 )
 
 _dir="metapackages-${pkgver}/ros_base"
-source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros/metapackages/archive/${pkgver}.tar.gz")
-sha256sums=('ef1df96c61c9762555174cc1a0e21e05149f74909d27044be0cd10aa065747a1')
+source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros/metapackages/archive/${pkgver}.tar.gz"
+        "https://patch-diff.githubusercontent.com/raw/ros/metapackages/pull/31.patch")
+sha256sums=('ef1df96c61c9762555174cc1a0e21e05149f74909d27044be0cd10aa065747a1'
+            'a8648852cff7b2740c5fe523b78309557b7f58e5c010e71a94c341b8cbfd5ba2')
+
+prepare() {
+    cd ${srcdir}/${_dir}/..
+    patch -p1 < ${srcdir}/31.patch
+}
 
 build() {
 	# Use ROS environment variables.
 	source /usr/share/ros-build-tools/clear-ros-env.sh
-	[ -f /opt/ros/melodic/setup.bash ] && source /opt/ros/melodic/setup.bash
+	[ -f /opt/ros/noetic/setup.bash ] && source /opt/ros/noetic/setup.bash
 
 	# Create the build directory.
 	[ -d ${srcdir}/build ] || mkdir ${srcdir}/build
 	cd ${srcdir}/build
 
-	# Fix Python2/Python3 conflicts.
-	/usr/share/ros-build-tools/fix-python-scripts.sh -v 3 ${srcdir}/${_dir}
-
 	# Build the project.
 	cmake ${srcdir}/${_dir} \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCATKIN_BUILD_BINARY_PACKAGE=ON \
-		-DCMAKE_INSTALL_PREFIX=/opt/ros/melodic \
+		-DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
 		-DPYTHON_EXECUTABLE=/usr/bin/python3 \
-		-DPYTHON_INCLUDE_DIR=/usr/include/python3.7m \
-		-DPYTHON_LIBRARY=/usr/lib/libpython3.7m.so \
-		-DPYTHON_BASENAME=.cpython-37m \
 		-DSETUPTOOLS_DEB_LAYOUT=OFF
 	make
 }