diff options
author | Gonçalo Camelo Neves Pereira | 2018-09-26 13:30:10 +0200 |
---|---|---|
committer | Gonçalo Camelo Neves Pereira | 2018-09-26 13:30:10 +0200 |
commit | 5832d35c901cc17d03a6692914a973344067064f (patch) | |
tree | 34c64b8781e62992f83280d9daf9f573e51096e3 | |
parent | 996c21bfc3780934e81c0041af5ff0d3164c2ac0 (diff) | |
download | aur-5832d35c901cc17d03a6692914a973344067064f.tar.gz |
Update
-rw-r--r-- | .SRCINFO | 12 | ||||
-rw-r--r-- | PKGBUILD | 105 |
2 files changed, 51 insertions, 66 deletions
@@ -7,18 +7,18 @@ pkgbase = ros-melodic-qt-gui-cpp license = BSD makedepends = cmake makedepends = ros-build-tools - makedepends = ros-melodic-python-qt-binding + makedepends = ros-melodic-pluginlib makedepends = ros-melodic-catkin + makedepends = ros-melodic-python-qt-binding makedepends = ros-melodic-cmake-modules - makedepends = ros-melodic-pluginlib makedepends = tinyxml - makedepends = pkg-config makedepends = qt5-base - depends = ros-melodic-qt-gui + makedepends = pkg-config depends = ros-melodic-pluginlib + depends = ros-melodic-qt-gui depends = tinyxml - source = ros-melodic-qt-gui-cpp::git+https://github.com/ros-gbp/qt_gui_core-release.git - sha256sums = SKIP + source = ros-melodic-qt-gui-cpp-0.3.11-0.tar.gz::https://github.com/ros-gbp/qt_gui_core-release/archive/release/melodic/qt_gui_cpp/0.3.11-0.tar.gz + sha256sums = fbbba01e82d3c63dfeab0fdc9caac8916de97295a8e8c08e715dc965e69dc545 pkgname = ros-melodic-qt-gui-cpp @@ -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 - qt_gui_cpp provides the foundation for C++-bindings for qt_gui and creates bindings for every generator available." url='http://ros.org/wiki/qt_gui_cpp' @@ -10,73 +10,58 @@ arch=('any') pkgrel=1 license=('BSD') -ros_makedepends=( - ros-melodic-python-qt-binding - ros-melodic-catkin - ros-melodic-cmake-modules - ros-melodic-pluginlib -) +ros_makedepends=(ros-melodic-pluginlib + ros-melodic-catkin + ros-melodic-python-qt-binding + ros-melodic-cmake-modules) +makedepends=('cmake' 'ros-build-tools' + ${ros_makedepends[@]} + tinyxml + qt5-base + pkg-config) -makedepends=( - 'cmake' - 'ros-build-tools' - ${ros_makedepends[@]} - tinyxml - pkg-config - qt5-base -) +ros_depends=(ros-melodic-pluginlib + ros-melodic-qt-gui) +depends=(${ros_depends[@]} + tinyxml) -ros_depends=( - ros-melodic-qt-gui - ros-melodic-pluginlib -) +# Git version (e.g. for debugging) +# _tag=release/melodic/qt_gui_cpp/${pkgver}-${_pkgver_patch} +# _dir=${pkgname} +# source=("${_dir}"::"git+https://github.com/ros-gbp/qt_gui_core-release.git"#tag=${_tag}) +# sha256sums=('SKIP') -depends=( - ${ros_depends[@]} - tinyxml -) - -_dir=${pkgname} -source=("${_dir}"::"git+https://github.com/ros-gbp/qt_gui_core-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="qt_gui_core-release-release-melodic-qt_gui_cpp-${pkgver}-${_pkgver_patch}" +source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/qt_gui_core-release/archive/release/melodic/qt_gui_cpp/${pkgver}-${_pkgver_patch}.tar.gz") +sha256sums=('fbbba01e82d3c63dfeab0fdc9caac8916de97295a8e8c08e715dc965e69dc545') 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 } |