diff options
| author | John Hendy | 2019-10-11 10:54:29 -0500 |
|---|---|---|
| committer | GitHub | 2019-10-11 10:54:29 -0500 |
| commit | 1be7bad445602dbae09a4beceeff61ed8ea443e4 (patch) | |
| tree | c7fe03c6b425dc41d7259e2a9a395013910a83db | |
| parent | ca48979ebcc32f829bde272d4c3b5ca753a506ca (diff) | |
| parent | 1687b557681d1ee766487166731bd1c745ff0cae (diff) | |
| download | aur-1be7bad445602dbae09a4beceeff61ed8ea443e4.tar.gz | |
Merge pull request #6 from acxz/master
update and remove qtlib patch
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | PKGBUILD | 14 |
2 files changed, 7 insertions, 15 deletions
@@ -1,7 +1,7 @@ pkgbase = ros-melodic-rviz pkgdesc = ROS - 3D visualization tool for ROS. - pkgver = 1.13.3 - pkgrel = 2 + pkgver = 1.13.5 + pkgrel = 1 url = https://wiki.ros.org/rviz arch = any license = BSD, Creative Commons @@ -70,8 +70,8 @@ pkgbase = ros-melodic-rviz depends = qt5-base depends = sip depends = python-sip - source = ros-melodic-rviz-1.13.3.tar.gz::https://github.com/ros-visualization/rviz/archive/1.13.3.tar.gz - sha256sums = c9d9f1e64246e61754ca1a44344e6e258026d660bd0d5ec1969b040fc6cbf629 + source = ros-melodic-rviz-1.13.5.tar.gz::https://github.com/ros-visualization/rviz/archive/1.13.5.tar.gz + sha256sums = ec97e11644c10f7d968109d24015a752daf4a20fe463c067c5d6a369c876f3b3 pkgname = ros-melodic-rviz @@ -4,9 +4,9 @@ pkgdesc="ROS - 3D visualization tool for ROS." url='https://wiki.ros.org/rviz' pkgname='ros-melodic-rviz' -pkgver='1.13.3' +pkgver='1.13.5' arch=('any') -pkgrel=2 +pkgrel=1 license=('BSD, Creative Commons') ros_makedepends=( @@ -90,7 +90,7 @@ depends=( _dir="rviz-${pkgver}" source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros-visualization/rviz/archive/${pkgver}.tar.gz") -sha256sums=('c9d9f1e64246e61754ca1a44344e6e258026d660bd0d5ec1969b040fc6cbf629') +sha256sums=('ec97e11644c10f7d968109d24015a752daf4a20fe463c067c5d6a369c876f3b3') build() { # Use ROS environment variables. @@ -118,15 +118,7 @@ build() { -DPYTHON_BASENAME=.cpython-37m \ -DSETUPTOOLS_DEB_LAYOUT=OFF - make || { - # Replace $$[QT_INSTALL_LIBS] with hardcoded /usr/lib/ for proper linking - # Fix courtesy of astier: - # https://aur.archlinux.org/packages/ros-melodic-rviz/#comment-698298 - # Relevant upstream issue: - # https://github.com/ros-visualization/rviz/issues/1382 - sed -i 's/$$\[QT_INSTALL_LIBS\]/\/usr\/lib/' ${srcdir}/build/devel/bin/sip/rviz_sip/Makefile make - } } package() { |