summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGonçalo Camelo Neves Pereira2018-09-26 13:36:09 +0200
committerGonçalo Camelo Neves Pereira2018-09-26 13:36:09 +0200
commitd3e530d69066d015a2a8dd818fbb4b2eccfa100e (patch)
treea0b494915a8faac229dd36305e14a23378958253
parentd5e5d9bb1652e9818764037dc970f0ef3a8a15a9 (diff)
downloadaur-d3e530d69066d015a2a8dd818fbb4b2eccfa100e.tar.gz
Update
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD101
2 files changed, 49 insertions, 64 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f25bbf6e334..3b6b718e522 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -8,15 +8,15 @@ pkgbase = ros-melodic-rqt-reconfigure
makedepends = cmake
makedepends = ros-build-tools
makedepends = ros-melodic-catkin
- depends = ros-melodic-rqt-gui-py
+ depends = ros-melodic-dynamic-reconfigure
+ depends = ros-melodic-rqt-console
depends = ros-melodic-rqt-py-common
+ depends = ros-melodic-rqt-gui-py
+ depends = ros-melodic-rqt-gui
depends = ros-melodic-python-qt-binding
- depends = ros-melodic-dynamic-reconfigure
depends = ros-melodic-rospy
- depends = ros-melodic-rqt-gui
- depends = ros-melodic-rqt-console
- source = ros-melodic-rqt-reconfigure::git+https://github.com/ros-gbp/rqt_reconfigure-release.git
- sha256sums = SKIP
+ source = ros-melodic-rqt-reconfigure-0.4.10-0.tar.gz::https://github.com/ros-gbp/rqt_reconfigure-release/archive/release/melodic/rqt_reconfigure/0.4.10-0.tar.gz
+ sha256sums = 7dfe332ee9d603a0981832a698c817c14b0fa00c3cc0de4ab7a6676c90d598b4
pkgname = ros-melodic-rqt-reconfigure
diff --git a/PKGBUILD b/PKGBUILD
index c52a22a0401..7be912e02a3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -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 - This rqt plugin succeeds former dynamic_reconfigures GUI (reconfigure_gui), and provides the way to view and edit the parameters that are accessible via dynamic_reconfigure."
url='http://wiki.ros.org/rqt_reconfigure'
@@ -10,71 +10,56 @@ 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-dynamic-reconfigure
+ ros-melodic-rqt-console
+ ros-melodic-rqt-py-common
+ ros-melodic-rqt-gui-py
+ ros-melodic-rqt-gui
+ ros-melodic-python-qt-binding
+ ros-melodic-rospy)
+depends=(${ros_depends[@]})
-ros_depends=(
- ros-melodic-rqt-gui-py
- ros-melodic-rqt-py-common
- ros-melodic-python-qt-binding
- ros-melodic-dynamic-reconfigure
- ros-melodic-rospy
- ros-melodic-rqt-gui
- ros-melodic-rqt-console
-)
+# Git version (e.g. for debugging)
+# _tag=release/melodic/rqt_reconfigure/${pkgver}-${_pkgver_patch}
+# _dir=${pkgname}
+# source=("${_dir}"::"git+https://github.com/ros-gbp/rqt_reconfigure-release.git"#tag=${_tag})
+# sha256sums=('SKIP')
-depends=(
- ${ros_depends[@]}
-)
-
-_dir=${pkgname}
-source=("${_dir}"::"git+https://github.com/ros-gbp/rqt_reconfigure-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_reconfigure-release-release-melodic-rqt_reconfigure-${pkgver}-${_pkgver_patch}"
+source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/rqt_reconfigure-release/archive/release/melodic/rqt_reconfigure/${pkgver}-${_pkgver_patch}.tar.gz")
+sha256sums=('7dfe332ee9d603a0981832a698c817c14b0fa00c3cc0de4ab7a6676c90d598b4')
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
}