[ros-robot-model] 03/04: update patches

[Jochen Sprickerhof]

This is an automated email from the git hooks/post-receive script.

jspricke pushed a commit to branch master
in repository ros-robot-model.

commit 8fcda2856a7dff739342188ca4ede37b9826e881
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Fri Nov 4 10:51:12 2016 +0100

    update patches
---
 .../0002-Add-Debian-specific-SOVERSION.patch       |  4 ++--
 ...urdf-ShredPtr-instead-of-boost-shared_ptr.patch |  6 ++---
 debian/patches/0004-Add-missing-namespaces.patch   | 25 +++++++++++++++++++
 ...-Remove-unneeded-dependency-on-libpcrecpp.patch | 28 ----------------------
 debian/patches/series                              |  2 +-
 5 files changed, 31 insertions(+), 34 deletions(-)

diff --git a/debian/patches/0002-Add-Debian-specific-SOVERSION.patch b/debian/patches/0002-Add-Debian-specific-SOVERSION.patch
index 379f507..8b1c7e2 100644
--- a/debian/patches/0002-Add-Debian-specific-SOVERSION.patch
+++ b/debian/patches/0002-Add-Debian-specific-SOVERSION.patch
@@ -46,10 +46,10 @@ index 43b96b7..dd6e6d6 100644
  add_executable(check_kdl_parser src/check_kdl_parser.cpp )
  target_link_libraries(check_kdl_parser ${PROJECT_NAME})
 diff --git a/urdf/CMakeLists.txt b/urdf/CMakeLists.txt
-index ae7437e..1a5c582 100644
+index e65181f..0c004cc 100644
 --- a/urdf/CMakeLists.txt
 +++ b/urdf/CMakeLists.txt
-@@ -34,6 +34,7 @@ link_directories(${catkin_LIBRARY_DIRS})
+@@ -43,6 +43,7 @@ link_directories(${catkin_LIBRARY_DIRS} ${Boost_LIBRARY_DIRS})
  
  add_library(${PROJECT_NAME} src/model.cpp src/rosconsole_bridge.cpp)
  target_link_libraries(${PROJECT_NAME} ${TinyXML_LIBRARIES} ${catkin_LIBRARIES} ${urdfdom_LIBRARIES})
diff --git a/debian/patches/0003-Use-urdf-ShredPtr-instead-of-boost-shared_ptr.patch b/debian/patches/0003-Use-urdf-ShredPtr-instead-of-boost-shared_ptr.patch
index 87d55a7..542dd69 100644
--- a/debian/patches/0003-Use-urdf-ShredPtr-instead-of-boost-shared_ptr.patch
+++ b/debian/patches/0003-Use-urdf-ShredPtr-instead-of-boost-shared_ptr.patch
@@ -461,7 +461,7 @@ index e6bfebe..fc1a720 100644
  };
  
 diff --git a/kdl_parser/src/kdl_parser.cpp b/kdl_parser/src/kdl_parser.cpp
-index 7031247..78b6b5e 100644
+index 9777320..a262364 100644
 --- a/kdl_parser/src/kdl_parser.cpp
 +++ b/kdl_parser/src/kdl_parser.cpp
 @@ -64,7 +64,7 @@ Frame toKdl(urdf::Pose p)
@@ -508,7 +508,7 @@ index a721056..69f96b8 100644
    // necessary for COLLADA compatibility
    if( IsColladaData(xml_string) ) {
 diff --git a/urdf/test/test_robot_model_parser.cpp b/urdf/test/test_robot_model_parser.cpp
-index 5e16980..034a09f 100644
+index f6286a5..81f90af 100644
 --- a/urdf/test/test_robot_model_parser.cpp
 +++ b/urdf/test/test_robot_model_parser.cpp
 @@ -54,7 +54,7 @@ public:
@@ -541,7 +541,7 @@ index 5e16980..034a09f 100644
    EXPECT_EQ(robot.getName(), robot_name);
 -  boost::shared_ptr<const urdf::Link> root = robot.getRoot();
 +  urdf::LinkConstSharedPtr root = robot.getRoot();
-   ASSERT_TRUE(root);
+   ASSERT_TRUE(static_cast<bool>(root));
    EXPECT_EQ(root->name, root_name);
  
 diff --git a/urdf_parser_plugin/include/urdf_parser_plugin/parser.h b/urdf_parser_plugin/include/urdf_parser_plugin/parser.h
diff --git a/debian/patches/0004-Add-missing-namespaces.patch b/debian/patches/0004-Add-missing-namespaces.patch
new file mode 100644
index 0000000..0646b74
--- /dev/null
+++ b/debian/patches/0004-Add-missing-namespaces.patch
@@ -0,0 +1,25 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Fri, 4 Nov 2016 22:54:54 +0100
+Subject: Add missing namespaces
+
+---
+ urdf/urdfdom_compatibility.h.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/urdf/urdfdom_compatibility.h.in b/urdf/urdfdom_compatibility.h.in
+index eddbc38..ffb1e6d 100644
+--- a/urdf/urdfdom_compatibility.h.in
++++ b/urdf/urdfdom_compatibility.h.in
+@@ -75,9 +75,9 @@ URDF_TYPEDEF_CLASS_POINTER(ModelInterface);
+ 
+ #else // urdfdom <= 0.4
+ 
+-typedef std::shared_ptr<ModelInterface> ModelInterfaceSharedPtr;
+-typedef std::shared_ptr<const ModelInterface> ModelInterfaceConstSharedPtr;
+-typedef std::weak_ptr<ModelInterface> ModelInterfaceWeakPtr;
++typedef std::shared_ptr<urdf::ModelInterface> ModelInterfaceSharedPtr;
++typedef std::shared_ptr<const urdf::ModelInterface> ModelInterfaceConstSharedPtr;
++typedef std::weak_ptr<urdf::ModelInterface> ModelInterfaceWeakPtr;
+ 
+ #endif // urdfdom > 0.4
+ 
diff --git a/debian/patches/0004-Remove-unneeded-dependency-on-libpcrecpp.patch b/debian/patches/0004-Remove-unneeded-dependency-on-libpcrecpp.patch
deleted file mode 100644
index 466dcdc..0000000
--- a/debian/patches/0004-Remove-unneeded-dependency-on-libpcrecpp.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
-Date: Tue, 20 Sep 2016 18:51:04 +0200
-Subject: Remove unneeded dependency on libpcrecpp
-
----
- urdf/CMakeLists.txt | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/urdf/CMakeLists.txt b/urdf/CMakeLists.txt
-index 1a5c582..d2e3524 100644
---- a/urdf/CMakeLists.txt
-+++ b/urdf/CMakeLists.txt
-@@ -10,14 +10,11 @@ find_package(catkin REQUIRED COMPONENTS
- 
- find_package(TinyXML REQUIRED)
- 
--find_package(PkgConfig)
--pkg_check_modules(libpcrecpp libpcrecpp)
--
- catkin_package(
-   LIBRARIES ${PROJECT_NAME}
-   INCLUDE_DIRS include ${TinyXML_INLCLUDE_DIRS}
-   CATKIN_DEPENDS rosconsole_bridge roscpp
--  DEPENDS urdfdom_headers urdfdom Boost pcrecpp
-+  DEPENDS urdfdom_headers urdfdom Boost
- )
- 
- include_directories(SYSTEM ${Boost_INCLUDE_DIR})
diff --git a/debian/patches/series b/debian/patches/series
index 9652d33..9ad3ce0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
 0001-Add-CMakeLists.txt.patch
 0002-Add-Debian-specific-SOVERSION.patch
 0003-Use-urdf-ShredPtr-instead-of-boost-shared_ptr.patch
-0004-Remove-unneeded-dependency-on-libpcrecpp.patch
+0004-Add-missing-namespaces.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-robot-model.git