summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO20
-rw-r--r--PKGBUILD29
2 files changed, 21 insertions, 28 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1c77bd25b3d6..c1ba7e872dde 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-rqt-gui-py
+pkgbase = ros-noetic-rqt-gui-py
pkgdesc = ROS - rqt_gui_py enables GUI plugins to use the Python client library for ROS.
pkgver = 0.5.0
pkgrel = 2
@@ -7,15 +7,15 @@ pkgbase = ros-melodic-rqt-gui-py
license = BSD
makedepends = cmake
makedepends = ros-build-tools
- makedepends = ros-melodic-qt-gui
- makedepends = ros-melodic-rqt-gui
- makedepends = ros-melodic-rospy
- makedepends = ros-melodic-catkin
- depends = ros-melodic-qt-gui
- depends = ros-melodic-rqt-gui
- depends = ros-melodic-rospy
- source = ros-melodic-rqt-gui-py-0.5.0.tar.gz::https://github.com/ros-visualization/rqt/archive/0.5.0.tar.gz
+ makedepends = ros-noetic-qt-gui
+ makedepends = ros-noetic-rqt-gui
+ makedepends = ros-noetic-rospy
+ makedepends = ros-noetic-catkin
+ depends = ros-noetic-qt-gui
+ depends = ros-noetic-rqt-gui
+ depends = ros-noetic-rospy
+ source = ros-noetic-rqt-gui-py-0.5.0.tar.gz::https://github.com/ros-visualization/rqt/archive/0.5.0.tar.gz
sha256sums = 3f62f90db254e111483b9a7cb9d486d0bf07c863b2a987808dc3636ee7004c22
-pkgname = ros-melodic-rqt-gui-py
+pkgname = ros-noetic-rqt-gui-py
diff --git a/PKGBUILD b/PKGBUILD
index 3cd28c1bcfc0..fd1a369de7bc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgdesc="ROS - rqt_gui_py enables GUI plugins to use the Python client library for ROS."
url='https://wiki.ros.org/rqt_gui_py'
-pkgname='ros-melodic-rqt-gui-py'
+pkgname='ros-noetic-rqt-gui-py'
pkgver='0.5.0'
_pkgver_patch=0
arch=('any')
@@ -11,10 +11,10 @@ pkgrel=2
license=('BSD')
ros_makedepends=(
- ros-melodic-qt-gui
- ros-melodic-rqt-gui
- ros-melodic-rospy
- ros-melodic-catkin
+ ros-noetic-qt-gui
+ ros-noetic-rqt-gui
+ ros-noetic-rospy
+ ros-noetic-catkin
)
makedepends=(
@@ -24,9 +24,9 @@ makedepends=(
)
ros_depends=(
- ros-melodic-qt-gui
- ros-melodic-rqt-gui
- ros-melodic-rospy
+ ros-noetic-qt-gui
+ ros-noetic-rqt-gui
+ ros-noetic-rospy
)
depends=(
@@ -40,24 +40,17 @@ sha256sums=('3f62f90db254e111483b9a7cb9d486d0bf07c863b2a987808dc3636ee7004c22')
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
}