Update to 1.15.4 and noetic

2 files changed, 54 insertions, 57 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fd98de9593c9..7f7b5e9cb408 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
-pkgbase = ros-melodic-roscpp
+pkgbase = ros-noetic-roscpp
 	pkgdesc = ROS - roscpp is a C++ implementation of ROS.
-	pkgver = 1.14.3
-	pkgrel = 2
+	pkgver = 1.15.4
+	pkgrel = 1
 	url = https://github.com/ros/ros_comm
 	arch = i686
 	arch = x86_64
@@ -11,30 +11,30 @@ pkgbase = ros-melodic-roscpp
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-xmlrpcpp
-	makedepends = ros-melodic-roscpp-traits
-	makedepends = ros-melodic-catkin
-	makedepends = ros-melodic-rosgraph-msgs
-	makedepends = ros-melodic-message-generation
-	makedepends = ros-melodic-cpp-common
-	makedepends = ros-melodic-std-msgs
-	makedepends = ros-melodic-rosconsole
-	makedepends = ros-melodic-roscpp-serialization
-	makedepends = ros-melodic-rostime
-	makedepends = ros-melodic-roslang
+	makedepends = ros-noetic-xmlrpcpp
+	makedepends = ros-noetic-roscpp-traits
+	makedepends = ros-noetic-catkin
+	makedepends = ros-noetic-rosgraph-msgs
+	makedepends = ros-noetic-message-generation
+	makedepends = ros-noetic-cpp-common
+	makedepends = ros-noetic-std-msgs
+	makedepends = ros-noetic-rosconsole
+	makedepends = ros-noetic-roscpp-serialization
+	makedepends = ros-noetic-rostime
+	makedepends = ros-noetic-roslang
 	makedepends = pkg-config
-	depends = ros-melodic-rostime
-	depends = ros-melodic-xmlrpcpp
-	depends = ros-melodic-roscpp-traits
-	depends = ros-melodic-rosgraph-msgs
-	depends = ros-melodic-cpp-common
-	depends = ros-melodic-std-msgs
-	depends = ros-melodic-rosconsole
-	depends = ros-melodic-roscpp-serialization
-	depends = ros-melodic-message-runtime
-	conflicts = ros-melodic-roscpp-git
-	source = ros-melodic-roscpp-1.14.3.tar.gz::https://github.com/ros/ros_comm/archive/1.14.3.tar.gz
-	sha256sums = 3e49bef96b8a0f9684e5c4f1736d171e9c8842a3979d5d3c6442b53698e8167f
+	depends = ros-noetic-rostime
+	depends = ros-noetic-xmlrpcpp
+	depends = ros-noetic-roscpp-traits
+	depends = ros-noetic-rosgraph-msgs
+	depends = ros-noetic-cpp-common
+	depends = ros-noetic-std-msgs
+	depends = ros-noetic-rosconsole
+	depends = ros-noetic-roscpp-serialization
+	depends = ros-noetic-message-runtime
+	conflicts = ros-noetic-roscpp-git
+	source = ros-noetic-roscpp-1.15.4.tar.gz::https://github.com/ros/ros_comm/archive/1.15.4.tar.gz
+	sha256sums = d5c96a81e0c8554b77666bca5dcc68e03083a761a117038ff9b65f9643751c9e
 
-pkgname = ros-melodic-roscpp
+pkgname = ros-noetic-roscpp
 
diff --git a/PKGBUILD b/PKGBUILD
index fa97762923be..2ddadd5ed86d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,24 +3,24 @@
 pkgdesc="ROS - roscpp is a C++ implementation of ROS."
 url='https://github.com/ros/ros_comm'
 
-pkgname='ros-melodic-roscpp'
-pkgver='1.14.3'
+pkgname='ros-noetic-roscpp'
+pkgver='1.15.4'
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
-pkgrel=2
+pkgrel=1
 license=('BSD')
 
 ros_makedepends=(
-	ros-melodic-xmlrpcpp
-	ros-melodic-roscpp-traits
-	ros-melodic-catkin
-	ros-melodic-rosgraph-msgs
-	ros-melodic-message-generation
-	ros-melodic-cpp-common
-	ros-melodic-std-msgs
-	ros-melodic-rosconsole
-	ros-melodic-roscpp-serialization
-	ros-melodic-rostime
-	ros-melodic-roslang
+	ros-noetic-xmlrpcpp
+	ros-noetic-roscpp-traits
+	ros-noetic-catkin
+	ros-noetic-rosgraph-msgs
+	ros-noetic-message-generation
+	ros-noetic-cpp-common
+	ros-noetic-std-msgs
+	ros-noetic-rosconsole
+	ros-noetic-roscpp-serialization
+	ros-noetic-rostime
+	ros-noetic-roslang
 )
 
 makedepends=(
@@ -31,15 +31,15 @@ makedepends=(
 )
 
 ros_depends=(
-	ros-melodic-rostime
-	ros-melodic-xmlrpcpp
-	ros-melodic-roscpp-traits
-	ros-melodic-rosgraph-msgs
-	ros-melodic-cpp-common
-	ros-melodic-std-msgs
-	ros-melodic-rosconsole
-	ros-melodic-roscpp-serialization
-	ros-melodic-message-runtime
+	ros-noetic-rostime
+	ros-noetic-xmlrpcpp
+	ros-noetic-roscpp-traits
+	ros-noetic-rosgraph-msgs
+	ros-noetic-cpp-common
+	ros-noetic-std-msgs
+	ros-noetic-rosconsole
+	ros-noetic-roscpp-serialization
+	ros-noetic-message-runtime
 )
 
 depends=(
@@ -47,25 +47,22 @@ depends=(
 )
 
 conflicts=(
-	'ros-melodic-roscpp-git'
+	'ros-noetic-roscpp-git'
 )
 
 _dir="ros_comm-${pkgver}/clients/roscpp"
 source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros/ros_comm/archive/${pkgver}.tar.gz")
-sha256sums=('3e49bef96b8a0f9684e5c4f1736d171e9c8842a3979d5d3c6442b53698e8167f')
+sha256sums=('d5c96a81e0c8554b77666bca5dcc68e03083a761a117038ff9b65f9643751c9e')
 
 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}
-
 	#Workaround for boost signals
 	sed -i 's/signals//g' ${srcdir}/${_dir}/CMakeLists.txt
 
@@ -73,7 +70,7 @@ build() {
 	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 \
 		-DSETUPTOOLS_DEB_LAYOUT=OFF
 	make