upgpkg: ros-noetic-octomap 1.9.8-1

2 files changed, 17 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1fc14e73087c..0336f01c08d8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ros-noetic-octomap
 	pkgdesc = ROS - The OctoMap library implements a 3D occupancy grid mapping approach, providing data structures and mapping algorithms in C++.
-	pkgver = 1.9.6
-	pkgrel = 5
+	pkgver = 1.9.8
+	pkgrel = 1
 	url = http://octomap.github.io
 	arch = any
 	license = BSD
@@ -9,8 +9,9 @@ pkgbase = ros-noetic-octomap
 	makedepends = ros-build-tools
 	depends = ros-noetic-catkin
 	options = staticlibs
-	source = ros-noetic-octomap-1.9.6.tar.gz::https://github.com/OctoMap/octomap/archive/v1.9.6.tar.gz
-	sha256sums = 0f88c1c024f0d29ab74c7fb9f6ebfdddc8be725087372c6c4d8878be95831eb6
+	source = ros-noetic-octomap-1.9.8.tar.gz::https://github.com/OctoMap/octomap/archive/v1.9.8.tar.gz
+	source = iterator.patch::https://patch-diff.githubusercontent.com/raw/OctoMap/octomap/pull/373.patch
+	sha256sums = 417af6da4e855e9a83b93458aa98b01a2c88f880088baad2b59d323ce162586e
+	sha256sums = SKIP
 
 pkgname = ros-noetic-octomap
-
diff --git a/PKGBUILD b/PKGBUILD
index 6524d791ca7e..14e005e49ede 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,9 +4,9 @@ pkgdesc="ROS - The OctoMap library implements a 3D occupancy grid mapping approa
 url='http://octomap.github.io'
 
 pkgname='ros-noetic-octomap'
-pkgver='1.9.6'
+pkgver='1.9.8'
 arch=('any')
-pkgrel=5
+pkgrel=1
 license=('BSD')
 options=('staticlibs')
 
@@ -18,8 +18,15 @@ ros_depends=(ros-noetic-catkin)
 depends=(${ros_depends[@]})
 
 _dir="octomap-${pkgver}/octomap"
-source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/OctoMap/octomap/archive/v${pkgver}.tar.gz")
-sha256sums=('0f88c1c024f0d29ab74c7fb9f6ebfdddc8be725087372c6c4d8878be95831eb6')
+source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/OctoMap/octomap/archive/v${pkgver}.tar.gz"
+        "iterator.patch::https://patch-diff.githubusercontent.com/raw/OctoMap/octomap/pull/373.patch")
+sha256sums=('417af6da4e855e9a83b93458aa98b01a2c88f880088baad2b59d323ce162586e'
+            'SKIP')
+
+prepare() {
+  cd "$srcdir/octomap-${pkgver}"
+  patch -Np1 -i "$srcdir/iterator.patch"
+}
 
 build() {
   # Use ROS environment variables