upd to noetic, cmake vars, python

2 files changed, 19 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ee77caa0a20f..2c26c003693a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-qt-gui-cpp
+pkgbase = ros-noetic-qt-gui-cpp
 	pkgdesc = ROS - qt_gui_cpp provides the foundation for C++-bindings for qt_gui and creates bindings for every generator available.
 	pkgver = 0.4.0
 	pkgrel = 1
@@ -11,20 +11,20 @@ pkgbase = ros-melodic-qt-gui-cpp
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-python-qt-binding
-	makedepends = ros-melodic-cmake-modules
-	makedepends = ros-melodic-catkin
-	makedepends = ros-melodic-pluginlib
+	makedepends = ros-noetic-python-qt-binding
+	makedepends = ros-noetic-cmake-modules
+	makedepends = ros-noetic-catkin
+	makedepends = ros-noetic-pluginlib
 	makedepends = tinyxml
 	makedepends = qt5-base
 	makedepends = pkg-config
-	depends = ros-melodic-qt-gui
-	depends = ros-melodic-pluginlib
+	depends = ros-noetic-qt-gui
+	depends = ros-noetic-pluginlib
 	depends = tinyxml
 	depends = sip
 	depends = python-sip
-	source = ros-melodic-qt-gui-cpp-0.4.0.tar.gz::https://github.com/ros-visualization/qt_gui_core/archive/0.4.0.tar.gz
+	source = ros-noetic-qt-gui-cpp-0.4.0.tar.gz::https://github.com/ros-visualization/qt_gui_core/archive/0.4.0.tar.gz
 	sha256sums = 900dbbe667fe2776b30c833b38359f3beaa3eb22be080c3909a89a8c38dbf6fe
 
-pkgname = ros-melodic-qt-gui-cpp
+pkgname = ros-noetic-qt-gui-cpp
 
diff --git a/PKGBUILD b/PKGBUILD
index 70d368e1c35a..6677a059bdc9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,17 +1,17 @@
 pkgdesc="ROS - qt_gui_cpp provides the foundation for C++-bindings for qt_gui and creates bindings for every generator available."
 url='https://wiki.ros.org/qt_gui_cpp'
 
-pkgname='ros-melodic-qt-gui-cpp'
+pkgname='ros-noetic-qt-gui-cpp'
 pkgver='0.4.0'
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
 pkgrel=1
 license=('BSD')
 
 ros_makedepends=(
-	ros-melodic-python-qt-binding
-	ros-melodic-cmake-modules
-	ros-melodic-catkin
-	ros-melodic-pluginlib
+	ros-noetic-python-qt-binding
+	ros-noetic-cmake-modules
+	ros-noetic-catkin
+	ros-noetic-pluginlib
 )
 
 makedepends=(
@@ -24,8 +24,8 @@ makedepends=(
 )
 
 ros_depends=(
-	ros-melodic-qt-gui
-	ros-melodic-pluginlib
+	ros-noetic-qt-gui
+	ros-noetic-pluginlib
 )
 
 depends=(
@@ -42,21 +42,17 @@ sha256sums=('900dbbe667fe2776b30c833b38359f3beaa3eb22be080c3909a89a8c38dbf6fe')
 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 \
+		-DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
+		-DPYTHON_EXECUTABLE=/usr/bin/python \
 		-DSETUPTOOLS_DEB_LAYOUT=OFF
 
 	make