summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoracxz2020-05-24 12:06:38 -0400
committeracxz2020-05-24 12:06:38 -0400
commita99aed5bbcc5a4b232e70e339b891601463a2db6 (patch)
tree7e0ba6287e1929e1aa6ab94104917a0c50196893
parente809d5d5334f8cd3910608ecf19178efba4d6f76 (diff)
downloadaur-a99aed5bbcc5a4b232e70e339b891601463a2db6.tar.gz
upd to noetic, cmake vars, python
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD16
2 files changed, 11 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3082523c316..9ec8f333137 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-qt-gui
+pkgbase = ros-noetic-qt-gui
pkgdesc = ROS - qt_gui provides the infrastructure for an integrated graphical user interface based on Qt.
pkgver = 0.3.16
pkgrel = 0
@@ -7,14 +7,14 @@ pkgbase = ros-melodic-qt-gui
license = BSD
makedepends = cmake
makedepends = ros-build-tools
- makedepends = ros-melodic-catkin
+ makedepends = ros-noetic-catkin
makedepends = python-pyqt5
makedepends = qt5-base
- depends = ros-melodic-python-qt-binding
+ depends = ros-noetic-python-qt-binding
depends = python-rospkg
depends = tango-icon-theme
- source = ros-melodic-qt-gui-0.3.16.tar.gz::https://github.com/ros-visualization/qt_gui_core/archive/0.3.16.tar.gz
+ source = ros-noetic-qt-gui-0.3.16.tar.gz::https://github.com/ros-visualization/qt_gui_core/archive/0.3.16.tar.gz
sha256sums = efa5ecf7ec22de606b3c0e039f43aacc2f2d79d74d7e17ecceecf2cafd22d128
-pkgname = ros-melodic-qt-gui
+pkgname = ros-noetic-qt-gui
diff --git a/PKGBUILD b/PKGBUILD
index 0073ba21d40..fb31974ec1c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,14 @@
pkgdesc="ROS - qt_gui provides the infrastructure for an integrated graphical user interface based on Qt."
url='https://wiki.ros.org/qt_gui'
-pkgname='ros-melodic-qt-gui'
+pkgname='ros-noetic-qt-gui'
pkgver='0.3.16'
arch=('any')
pkgrel=0
license=('BSD')
ros_makedepends=(
- ros-melodic-catkin
+ ros-noetic-catkin
)
makedepends=(
@@ -20,7 +20,7 @@ makedepends=(
)
ros_depends=(
- ros-melodic-python-qt-binding
+ ros-noetic-python-qt-binding
)
depends=(
@@ -36,21 +36,17 @@ sha256sums=('efa5ecf7ec22de606b3c0e039f43aacc2f2d79d74d7e17ecceecf2cafd22d128')
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
}