upd to noetic, cmake vars, python

2 files changed, 23 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a2d862890fd9..f855e7f64219 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-rqt-console
+pkgbase = ros-noetic-rqt-console
 	pkgdesc = ROS - rqt_console provides a GUI plugin for displaying and filtering ROS messages.
 	pkgver = 0.4.8
 	pkgrel = 2
@@ -7,17 +7,17 @@ pkgbase = ros-melodic-rqt-console
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-catkin
-	depends = ros-melodic-rqt-py-common
-	depends = ros-melodic-rqt-gui-py
-	depends = ros-melodic-rqt-logger-level
-	depends = ros-melodic-python-qt-binding
-	depends = ros-melodic-rqt-gui
-	depends = ros-melodic-rospy
-	depends = ros-melodic-roslib
+	makedepends = ros-noetic-catkin
+	depends = ros-noetic-rqt-py-common
+	depends = ros-noetic-rqt-gui-py
+	depends = ros-noetic-rqt-logger-level
+	depends = ros-noetic-python-qt-binding
+	depends = ros-noetic-rqt-gui
+	depends = ros-noetic-rospy
+	depends = ros-noetic-roslib
 	depends = python-rospkg
-	source = ros-melodic-rqt-console-0.4.8.tar.gz::https://github.com/ros-visualization/rqt_console/archive/0.4.8.tar.gz
+	source = ros-noetic-rqt-console-0.4.8.tar.gz::https://github.com/ros-visualization/rqt_console/archive/0.4.8.tar.gz
 	sha256sums = 8c128f3d09f3baebb0999cb7c28f63689f5e415ee2cab21dc94fc3846a151564
 
-pkgname = ros-melodic-rqt-console
+pkgname = ros-noetic-rqt-console
 
diff --git a/PKGBUILD b/PKGBUILD
index e13a390e9363..c4fc999eac10 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgdesc="ROS - rqt_console provides a GUI plugin for displaying and filtering ROS messages."
 url='https://wiki.ros.org/rqt_console'
 
-pkgname='ros-melodic-rqt-console'
+pkgname='ros-noetic-rqt-console'
 pkgver='0.4.8'
 _pkgver_patch=0
 arch=('any')
@@ -11,7 +11,7 @@ pkgrel=2
 license=('BSD')
 
 ros_makedepends=(
-	ros-melodic-catkin
+	ros-noetic-catkin
 )
 
 makedepends=(
@@ -21,13 +21,13 @@ makedepends=(
 )
 
 ros_depends=(
-	ros-melodic-rqt-py-common
-	ros-melodic-rqt-gui-py
-	ros-melodic-rqt-logger-level
-	ros-melodic-python-qt-binding
-	ros-melodic-rqt-gui
-	ros-melodic-rospy
-	ros-melodic-roslib
+	ros-noetic-rqt-py-common
+	ros-noetic-rqt-gui-py
+	ros-noetic-rqt-logger-level
+	ros-noetic-python-qt-binding
+	ros-noetic-rqt-gui
+	ros-noetic-rospy
+	ros-noetic-roslib
 )
 
 depends=(
@@ -42,24 +42,17 @@ sha256sums=('8c128f3d09f3baebb0999cb7c28f63689f5e415ee2cab21dc94fc3846a151564')
 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 \
-		-DPYTHON_EXECUTABLE=/usr/bin/python3 \
-		-DPYTHON_INCLUDE_DIR=/usr/include/python3.7m \
-		-DPYTHON_LIBRARY=/usr/lib/libpython3.7m.so \
-		-DPYTHON_BASENAME=.cpython-37m \
+		-DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
+		-DPYTHON_EXECUTABLE=/usr/bin/python \
 		-DSETUPTOOLS_DEB_LAYOUT=OFF
 	make
 }