upgpkg: ros-noetic-libmavconn 1.14.0-1

2 files changed, 17 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0f2711da4983..1a7409b12183 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ros-noetic-libmavconn
 	pkgdesc = ROS - MAVLink communication library.
 	pkgver = 1.14.0
-	pkgrel = 3
+	pkgrel = 1
 	url = https://wiki.ros.org/libmavconn
 	arch = i686
 	arch = x86_64
@@ -19,8 +19,6 @@ pkgbase = ros-noetic-libmavconn
 	depends = boost
 	depends = console-bridge
 	source = ros-noetic-libmavconn-1.14.0.tar.gz::https://github.com/mavlink/mavros/archive/1.14.0.tar.gz
-	source = geographiclib.patch::https://github.com/mavlink/mavros/pull/1775.patch
 	sha256sums = fc067387de1256a7bb2373e3938c242ad79580a16387f7f69be3302a7cb2fe50
-	sha256sums = 6a820e0588c1cfd0f9ebc0230c143fb8f55406ac015238d04584088c37ec1532
 
 pkgname = ros-noetic-libmavconn
diff --git a/PKGBUILD b/PKGBUILD
index e7a89086507c..0bf5c3f11287 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,34 @@
-# Script generated with import_catkin_packages.py
-# For more information: https://github.com/bchretien/arch-ros-stacks
 pkgdesc="ROS - MAVLink communication library."
 url='https://wiki.ros.org/libmavconn'
 
 pkgname='ros-noetic-libmavconn'
 pkgver=1.14.0
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
-pkgrel=3
+pkgrel=1
 license=('GPLv3, LGPLv3, BSD')
 
-ros_makedepends=(ros-noetic-mavlink
-  ros-noetic-catkin)
-makedepends=('cmake' 'ros-build-tools'
+ros_makedepends=(
+  ros-noetic-mavlink
+  ros-noetic-catkin
+)
+makedepends=(
+  cmake
+  ros-build-tools
   ${ros_makedepends[@]}
   boost
-  console-bridge)
+  console-bridge
+)
 
 ros_depends=(ros-noetic-mavlink)
-depends=(${ros_depends[@]}
+depends=(
+  ${ros_depends[@]}
   boost
-  console-bridge)
+  console-bridge
+)
 
 _dir="mavros-${pkgver}/libmavconn"
-source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/mavlink/mavros/archive/${pkgver}.tar.gz"
-        "geographiclib.patch::https://github.com/mavlink/mavros/pull/1775.patch")
-sha256sums=('fc067387de1256a7bb2373e3938c242ad79580a16387f7f69be3302a7cb2fe50'
-            '6a820e0588c1cfd0f9ebc0230c143fb8f55406ac015238d04584088c37ec1532')
-
-prepare() {
-  cd "$srcdir/mavros-${pkgver}"
-  patch -Np1 -i "$srcdir/geographiclib.patch"
-}
+source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/mavlink/mavros/archive/${pkgver}.tar.gz")
+sha256sums=('fc067387de1256a7bb2373e3938c242ad79580a16387f7f69be3302a7cb2fe50')
 
 build() {
   # Use ROS environment variables