diff options
author | Gonçalo Camelo Neves Pereira | 2018-09-26 13:34:44 +0200 |
---|---|---|
committer | Gonçalo Camelo Neves Pereira | 2018-09-26 13:34:44 +0200 |
commit | ce17daf503a5be1e9b4bf17b4924ab1d19578b37 (patch) | |
tree | a5fab6d86b11288e6489ca8c83dbd3e75d91fcd7 | |
parent | 484ef9d4090d67092222a6964a459cd9135bd436 (diff) | |
download | aur-ce17daf503a5be1e9b4bf17b4924ab1d19578b37.tar.gz |
Update
-rw-r--r-- | .SRCINFO | 12 | ||||
-rw-r--r-- | PKGBUILD | 103 |
2 files changed, 50 insertions, 65 deletions
@@ -8,16 +8,16 @@ pkgbase = ros-melodic-rqt-console makedepends = cmake makedepends = ros-build-tools makedepends = ros-melodic-catkin - depends = ros-melodic-rqt-gui - depends = ros-melodic-python-qt-binding - depends = ros-melodic-rospy depends = ros-melodic-roslib + depends = ros-melodic-rqt-py-common depends = ros-melodic-rqt-logger-level depends = ros-melodic-rqt-gui-py - depends = ros-melodic-rqt-py-common + depends = ros-melodic-rqt-gui + depends = ros-melodic-python-qt-binding + depends = ros-melodic-rospy depends = python-rospkg - source = ros-melodic-rqt-console::git+https://github.com/ros-gbp/rqt_console-release.git - sha256sums = SKIP + source = ros-melodic-rqt-console-0.4.8-0.tar.gz::https://github.com/ros-gbp/rqt_console-release/archive/release/melodic/rqt_console/0.4.8-0.tar.gz + sha256sums = bd66d6c711910fb8db8804b403bf5cedcce83ecfc82eaa4c12afb5e035a6eeb3 pkgname = ros-melodic-rqt-console @@ -1,5 +1,5 @@ -# Script generated with import_catkin_packages.py. -# For more information: https://github.com/bchretien/arch-ros-stacks. +# Script generated with import_catkin_packages.py +# For more information: https://github.com/bchretien/arch-ros-stacks pkgdesc="ROS - rqt_console provides a GUI plugin for displaying and filtering ROS messages." url='http://wiki.ros.org/rqt_console' @@ -10,72 +10,57 @@ arch=('any') pkgrel=1 license=('BSD') -ros_makedepends=( - ros-melodic-catkin -) +ros_makedepends=(ros-melodic-catkin) +makedepends=('cmake' 'ros-build-tools' + ${ros_makedepends[@]}) -makedepends=( - 'cmake' - 'ros-build-tools' - ${ros_makedepends[@]} -) +ros_depends=(ros-melodic-roslib + ros-melodic-rqt-py-common + ros-melodic-rqt-logger-level + ros-melodic-rqt-gui-py + ros-melodic-rqt-gui + ros-melodic-python-qt-binding + ros-melodic-rospy) +depends=(${ros_depends[@]} + python-rospkg) -ros_depends=( - ros-melodic-rqt-gui - ros-melodic-python-qt-binding - ros-melodic-rospy - ros-melodic-roslib - ros-melodic-rqt-logger-level - ros-melodic-rqt-gui-py - ros-melodic-rqt-py-common -) +# Git version (e.g. for debugging) +# _tag=release/melodic/rqt_console/${pkgver}-${_pkgver_patch} +# _dir=${pkgname} +# source=("${_dir}"::"git+https://github.com/ros-gbp/rqt_console-release.git"#tag=${_tag}) +# sha256sums=('SKIP') -depends=( - ${ros_depends[@]} - python-rospkg -) - -_dir=${pkgname} -source=("${_dir}"::"git+https://github.com/ros-gbp/rqt_console-release.git") -sha256sums=('SKIP') - -prepare() { - cd ${srcdir}/${_dir} - git checkout upstream - _pkgname=$(echo ${pkgname} | sed 's/ros-lunar-//' | sed 's/-/_/g') - - if [ -d ${_pkgname} ]; then - git subtree split -P ${_pkgname} --branch ${_pkgname} - git checkout ${_pkgname} - fi -} +# Tarball version (faster download) +_dir="rqt_console-release-release-melodic-rqt_console-${pkgver}-${_pkgver_patch}" +source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/rqt_console-release/archive/release/melodic/rqt_console/${pkgver}-${_pkgver_patch}.tar.gz") +sha256sums=('bd66d6c711910fb8db8804b403bf5cedcce83ecfc82eaa4c12afb5e035a6eeb3') 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 + # 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 - # Create the build directory. - [ -d ${srcdir}/build ] || mkdir ${srcdir}/build - cd ${srcdir}/build + # Create 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} + # 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 \ - -DSETUPTOOLS_DEB_LAYOUT=OFF - make + # Build 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 \ + -DSETUPTOOLS_DEB_LAYOUT=OFF + make } package() { - cd "${srcdir}/build" - make DESTDIR="${pkgdir}/" install + cd "${srcdir}/build" + make DESTDIR="${pkgdir}/" install } |