summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD15
-rw-r--r--include_QSet.patch11
3 files changed, 8 insertions, 28 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 186fd143ca1f..4f32b91547f0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = ros-noetic-rqt-image-view
pkgdesc = ROS - rqt_image_view provides a GUI plugin for displaying images using image_transport.
- pkgver = 0.4.13
- pkgrel = 4
+ pkgver = 0.4.15
+ pkgrel = 1
url = https://wiki.ros.org/rqt_image_view
arch = i686
arch = x86_64
@@ -25,10 +25,8 @@ pkgbase = ros-noetic-rqt-image-view
depends = ros-noetic-rqt-gui
depends = ros-noetic-sensor-msgs
depends = ros-noetic-image-transport
- source = ros-noetic-rqt-image-view-0.4.13.tar.gz::https://github.com/ros-visualization/rqt_image_view/archive/0.4.13.tar.gz
- source = include_QSet.patch
- sha256sums = e24e26dc98404966cc827a4e576a3c7465d82076095d1831eb9da49d3a97c4d5
- sha256sums = c6a8079a952d8ee9560d190e27f124f53c0e78b4d80ec46bbe06ae36f1de85b7
+ source = ros-noetic-rqt-image-view-0.4.15.tar.gz::https://github.com/ros-visualization/rqt_image_view/archive/0.4.15.tar.gz
+ sha256sums = 2e74e544e5ec12d846b2a692c02e306b240ac2814a9b2974121f2061a519fd9d
pkgname = ros-noetic-rqt-image-view
diff --git a/PKGBUILD b/PKGBUILD
index 371bafa3d09e..b0fc9ae5d4b7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,9 +2,9 @@ pkgdesc="ROS - rqt_image_view provides a GUI plugin for displaying images using
url='https://wiki.ros.org/rqt_image_view'
pkgname='ros-noetic-rqt-image-view'
-pkgver='0.4.13'
+pkgver='0.4.15'
arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
-pkgrel=4
+pkgrel=1
license=('BSD')
ros_makedepends=(
@@ -38,15 +38,8 @@ depends=(
)
_dir="rqt_image_view-${pkgver}"
-source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros-visualization/rqt_image_view/archive/${pkgver}.tar.gz"
- "include_QSet.patch")
-sha256sums=('e24e26dc98404966cc827a4e576a3c7465d82076095d1831eb9da49d3a97c4d5'
- 'c6a8079a952d8ee9560d190e27f124f53c0e78b4d80ec46bbe06ae36f1de85b7')
-
-prepare() {
- cd ${srcdir}/${_dir}
- patch --forward --strip=1 --input="${srcdir}/include_QSet.patch"
-}
+source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros-visualization/rqt_image_view/archive/${pkgver}.tar.gz")
+sha256sums=('2e74e544e5ec12d846b2a692c02e306b240ac2814a9b2974121f2061a519fd9d')
build() {
# Use ROS environment variables.
diff --git a/include_QSet.patch b/include_QSet.patch
deleted file mode 100644
index fe330db4e20c..000000000000
--- a/include_QSet.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff '--color=auto' --unified --recursive --text rqt_image_view-0.4.13/include/rqt_image_view/image_view.h rqt_image_view-0.4.13.new/include/rqt_image_view/image_view.h
---- rqt_image_view-0.4.13/include/rqt_image_view/image_view.h 2018-05-03 00:27:26.000000000 +0200
-+++ rqt_image_view-0.4.13/include/rqt_image_view/image_view.h 2020-01-09 07:57:04.907081398 +0100
-@@ -51,6 +51,7 @@
- #include <QString>
- #include <QSize>
- #include <QWidget>
-+#include <QSet>
-
- #include <vector>
-