summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD16
-rw-r--r--include_qset.patch12
3 files changed, 29 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 303167b1b367..d9cec7111f84 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Thu Dec 22 04:07:53 UTC 2016
pkgbase = ros-kinetic-rqt-image-view
pkgdesc = ROS - rqt_image_view provides a GUI plugin for displaying images using image_transport.
- pkgver = 0.4.3
- pkgrel = 1
+ pkgver = 0.4.13
+ pkgrel = 2
url = http://ros.org/wiki/rqt_image_view
arch = any
license = BSD
@@ -22,8 +20,10 @@ pkgbase = ros-kinetic-rqt-image-view
depends = ros-kinetic-rqt-gui-cpp
depends = ros-kinetic-sensor-msgs
depends = ros-kinetic-image-transport
- source = ros-kinetic-rqt-image-view-0.4.3-0.tar.gz::https://github.com/ros-gbp/rqt_common_plugins-release/archive/release/kinetic/rqt_image_view/0.4.3-0.tar.gz
- sha256sums = 0da38516ea47c2f333da37d8c4b0cd29c2931f503b494acfe54c7d1002009b7b
+ source = ros-kinetic-rqt-image-view-0.4.13-0.tar.gz::https://github.com/ros-gbp/rqt_common_plugins-release/archive/release/kinetic/rqt_image_view/0.4.13-0.tar.gz
+ source = include_qset.patch
+ sha256sums = 7e4715a2bcb008f1cfc3f41cef4b64ab73b2919500a2718628c202c6c8696178
+ sha256sums = SKIP
pkgname = ros-kinetic-rqt-image-view
diff --git a/PKGBUILD b/PKGBUILD
index c91a9c7e3cee..f03310617ff1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,10 +4,10 @@ pkgdesc="ROS - rqt_image_view provides a GUI plugin for displaying images using
url='http://ros.org/wiki/rqt_image_view'
pkgname='ros-kinetic-rqt-image-view'
-pkgver='0.4.3'
+pkgver='0.4.13'
_pkgver_patch=0
arch=('any')
-pkgrel=1
+pkgrel=2
license=('BSD')
ros_makedepends=(ros-kinetic-cv-bridge
@@ -35,9 +35,15 @@ depends=(${ros_depends[@]})
# sha256sums=('SKIP')
# Tarball version (faster download)
-_dir="rqt_common_plugins-release-release-kinetic-rqt_image_view-${pkgver}-${_pkgver_patch}"
-source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/rqt_common_plugins-release/archive/release/kinetic/rqt_image_view/${pkgver}-${_pkgver_patch}.tar.gz")
-sha256sums=('0da38516ea47c2f333da37d8c4b0cd29c2931f503b494acfe54c7d1002009b7b')
+_dir="rqt_common_plugins-release-release-kinetic-rqt_image_view"
+source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/rqt_common_plugins-release/archive/release/kinetic/rqt_image_view/${pkgver}-${_pkgver_patch}.tar.gz"
+ "include_qset.patch")
+sha256sums=('7e4715a2bcb008f1cfc3f41cef4b64ab73b2919500a2718628c202c6c8696178'
+ 'SKIP')
+prepare() {
+ cd ${srcdir}/${_dir}
+ patch -Np1 -i ${srcdir}/include_qset.patch
+}
build() {
# Use ROS environment variables
diff --git a/include_qset.patch b/include_qset.patch
new file mode 100644
index 000000000000..154427ec9031
--- /dev/null
+++ b/include_qset.patch
@@ -0,0 +1,12 @@
+*** a/src/rqt_image_view/image_view.cpp
+--- b/src/rqt_image_view/image_view.cpp
+***************
+*** 39,44 ****
+--- 39,45 ----
+ #include <cv_bridge/cv_bridge.h>
+ #include <opencv2/imgproc/imgproc.hpp>
+
++ #include <QSet>
+ #include <QFileDialog>
+ #include <QMessageBox>
+ #include <QPainter>