diff options
author | Gonçalo Camelo Neves Pereira | 2018-09-08 15:05:56 +0200 |
---|---|---|
committer | Gonçalo Camelo Neves Pereira | 2018-09-08 15:05:56 +0200 |
commit | 86679dd5cff2642a755bce85c28495c5797cdc3c (patch) | |
tree | 2d78739a3988b73cf3150278ea73cae7ebbcc95c | |
parent | 63c709cdea270a88811a7443667a7c81802bb34f (diff) | |
download | aur-86679dd5cff2642a755bce85c28495c5797cdc3c.tar.gz |
Update!
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | PKGBUILD | 96 |
2 files changed, 58 insertions, 44 deletions
@@ -8,9 +8,9 @@ pkgbase = ros-melodic-webkit-dependency makedepends = cmake makedepends = ros-build-tools makedepends = ros-melodic-catkin - depends = python2-pyqt5 - source = ros-melodic-webkit-dependency-1.1.0-0.tar.gz::https://github.com/ros-gbp/webkit_dependency-release/archive/release/melodic/webkit_dependency/1.1.0-0.tar.gz - sha256sums = a187ab79ea2545b2dec0f48d74af9b4f3875f73ac649c8527e54e9ea6cda0e29 + depends = python-pyqt5 + source = ros-melodic-webkit-dependency::git+https://github.com/ros-gbp/webkit_dependency-release.git + sha256sums = SKIP pkgname = ros-melodic-webkit-dependency @@ -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 encapsulates the WebKit dependency for a specific ROS distribution and its Qt version." url='http://www.ros.org/' @@ -10,51 +10,65 @@ arch=('any') pkgrel=1 license=('BSD') -ros_makedepends=(ros-melodic-catkin) -makedepends=('cmake' 'ros-build-tools' - ${ros_makedepends[@]}) +ros_makedepends=( + ros-melodic-catkin +) -ros_depends=() -depends=(${ros_depends[@]} - python2-pyqt5) +makedepends=( + 'cmake' + 'ros-build-tools' + ${ros_makedepends[@]} +) -# Git version (e.g. for debugging) -# _tag=release/melodic/webkit_dependency/${pkgver}-${_pkgver_patch} -# _dir=${pkgname} -# source=("${_dir}"::"git+https://github.com/ros-gbp/webkit_dependency-release.git"#tag=${_tag}) -# sha256sums=('SKIP') +ros_depends=( +) -# Tarball version (faster download) -_dir="webkit_dependency-release-release-melodic-webkit_dependency-${pkgver}-${_pkgver_patch}" -source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/webkit_dependency-release/archive/release/melodic/webkit_dependency/${pkgver}-${_pkgver_patch}.tar.gz") -sha256sums=('a187ab79ea2545b2dec0f48d74af9b4f3875f73ac649c8527e54e9ea6cda0e29') +depends=( + ${ros_depends[@]} + python-pyqt5 +) + +_dir=${pkgname} +source=("${_dir}"::"git+https://github.com/ros-gbp/webkit_dependency-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 +} 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 - - # 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 2 ${srcdir}/${_dir} - - # Build project - cmake ${srcdir}/${_dir} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCATKIN_BUILD_BINARY_PACKAGE=ON \ - -DCMAKE_INSTALL_PREFIX=/opt/ros/melodic \ - -DPYTHON_EXECUTABLE=/usr/bin/python2 \ - -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \ - -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \ - -DPYTHON_BASENAME=-python2.7 \ - -DSETUPTOOLS_DEB_LAYOUT=OFF - make + # 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 + + # 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 } package() { - cd "${srcdir}/build" - make DESTDIR="${pkgdir}/" install + cd "${srcdir}/build" + make DESTDIR="${pkgdir}/" install } |