fix for console_bridge v1

3 files changed, 68 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7faf66f71863..4b5ae421f806 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = urdfdom
 	pkgdesc = The URDF (U-Robot Description Format) library provides core data structures and a simple XML parsers for populating the class data structures from an URDF file.
 	pkgver = 1.0.4
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/ros/urdfdom
 	arch = i686
 	arch = x86_64
@@ -11,7 +11,9 @@ pkgbase = urdfdom
 	depends = console-bridge
 	depends = urdfdom-headers
 	source = urdfdom-1.0.4.tar.gz::https://github.com/ros/urdfdom/archive/1.0.4.tar.gz
+	source = https://github.com/ros/urdfdom/pull/141.patch
 	sha256sums = 8f3d56b0cbc4b84436d8baf4c8346cd2ee7ffb257bba5ddd9892c41bf516edc4
+	sha256sums = fc50cc69d0be8eab567b73f13376769b026255baac2d97d50a5f10ca5a6189e5
 
 pkgname = urdfdom
 
diff --git a/141.patch b/141.patch
new file mode 100644
index 000000000000..79712d765637
--- /dev/null
+++ b/141.patch
@@ -0,0 +1,53 @@
+From b9e828fea104e23bd52e936e15d51d2ce7f44fae Mon Sep 17 00:00:00 2001
+From: Steve Peters <scpeters@openrobotics.org>
+Date: Wed, 27 May 2020 12:27:44 -0700
+Subject: [PATCH 1/2] Find console_bridge 1.0 if 0.3 is not found
+
+Signed-off-by: Steve Peters <scpeters@openrobotics.org>
+---
+ CMakeLists.txt | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 92762f1..87d0ce6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -41,7 +41,10 @@ if (NOT MSVC)
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ endif()
+ 
+-find_package(console_bridge 0.3 REQUIRED)
++find_package(console_bridge 0.3 QUIET)
++if (NOT console_bridge_FOUND)
++  find_package(console_bridge 1.0 REQUIRED)
++endif()
+ include_directories(SYSTEM ${console_bridge_INCLUDE_DIRS})
+ link_directories(${console_bridge_LIBRARY_DIRS})
+ 
+
+From b18a97b4bb2767de29c014b5d84941f5adade29f Mon Sep 17 00:00:00 2001
+From: Steven Peters <scpeters@openrobotics.org>
+Date: Wed, 27 May 2020 15:40:27 -0700
+Subject: [PATCH 2/2] just drop explicit version requirement
+
+Signed-off-by: Steve Peters <scpeters@openrobotics.org>
+---
+ CMakeLists.txt | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 87d0ce6..f0d115d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -41,10 +41,7 @@ if (NOT MSVC)
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ endif()
+ 
+-find_package(console_bridge 0.3 QUIET)
+-if (NOT console_bridge_FOUND)
+-  find_package(console_bridge 1.0 REQUIRED)
+-endif()
++find_package(console_bridge REQUIRED)
+ include_directories(SYSTEM ${console_bridge_INCLUDE_DIRS})
+ link_directories(${console_bridge_LIBRARY_DIRS})
+ 
diff --git a/PKGBUILD b/PKGBUILD
index 5a7d1fea9969..39930cc7b70d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,15 +3,24 @@
 
 pkgname=urdfdom
 pkgver=1.0.4
-pkgrel=2
+pkgrel=3
 pkgdesc="The URDF (U-Robot Description Format) library provides core data structures and a simple XML parsers for populating the class data structures from an URDF file."
 arch=('i686' 'x86_64')
 url="https://github.com/ros/$pkgname"
 license=('BSD')
 depends=('tinyxml' 'console-bridge' 'urdfdom-headers')
 makedepends=('cmake')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/ros/$pkgname/archive/$pkgver.tar.gz")
-sha256sums=('8f3d56b0cbc4b84436d8baf4c8346cd2ee7ffb257bba5ddd9892c41bf516edc4')
+source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz"
+    $url/pull/141.patch)
+sha256sums=('8f3d56b0cbc4b84436d8baf4c8346cd2ee7ffb257bba5ddd9892c41bf516edc4'
+    'fc50cc69d0be8eab567b73f13376769b026255baac2d97d50a5f10ca5a6189e5')
+
+prepare() {
+    cd "$pkgbase-$pkgver"
+
+    # ref https://github.com/ros/urdfdom/pull/141
+    patch -p1 -i "$srcdir/141.patch"
+}
 
 build() {
     cd "$pkgname-$pkgver"