Removed patch that has been applied upstream

2 files changed, 4 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cb90d4e5bf15..aa412aa15d99 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ros-melodic-roslaunch
 	pkgdesc = ROS - roslaunch is a tool for easily launching multiple ROS nodes locally and remotely via SSH, as well as setting parameters on the Parameter Server.
 	pkgver = 1.14.11
-	pkgrel = 1
+	pkgrel = 2
 	url = https://wiki.ros.org/roslaunch
 	arch = any
 	license = BSD
@@ -19,9 +19,7 @@ pkgbase = ros-melodic-roslaunch
 	depends = python-paramiko
 	depends = python-rospkg
 	source = ros-melodic-roslaunch-1.14.11.tar.gz::https://github.com/ros/ros_comm/archive/1.14.11.tar.gz
-	source = https://patch-diff.githubusercontent.com/raw/ros/ros_comm/pull/2092.patch
 	sha256sums = a7f3cf19059c189d3326d3e35f5795d707fa405fb55e7250353d71e0698410f5
-	sha256sums = ad42681c4249a89f4a0188f8202e73286c4090bbc919a470543af7e8f1b198f4
 
 pkgname = ros-melodic-roslaunch
 
diff --git a/PKGBUILD b/PKGBUILD
index e82179dfd0f9..cfeebb4ec347 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ url='https://wiki.ros.org/roslaunch'
 pkgname='ros-melodic-roslaunch'
 pkgver='1.14.11'
 arch=('any')
-pkgrel=1
+pkgrel=2
 license=('BSD')
 
 ros_makedepends=(
@@ -37,15 +37,8 @@ depends=(
 )
 
 _dir="ros_comm-${pkgver}/tools/roslaunch"
-source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros/ros_comm/archive/${pkgver}.tar.gz"
-        https://patch-diff.githubusercontent.com/raw/ros/ros_comm/pull/2092.patch)
-sha256sums=('a7f3cf19059c189d3326d3e35f5795d707fa405fb55e7250353d71e0698410f5'
-            'ad42681c4249a89f4a0188f8202e73286c4090bbc919a470543af7e8f1b198f4')
-
-prepare() {
-    cd ${srcdir}/ros_comm-${pkgver}
-    patch -p1 < ${srcdir}/2092.patch
-}
+source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros/ros_comm/archive/${pkgver}.tar.gz")
+sha256sums=('a7f3cf19059c189d3326d3e35f5795d707fa405fb55e7250353d71e0698410f5')
 
 build() {
 	# Use ROS environment variables.