[ros-ros-comm] 09/10: Add patch for system libb64

[Jochen Sprickerhof]

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

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

commit 61824b5ad3199a82319670fd34fab96a822efba7
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Tue Aug 15 17:49:59 2017 +0200

    Add patch for system libb64
---
 debian/patches/0006-Use-system-libb64.patch | 38 +++++++++++++++++++++++++++++
 debian/patches/series                       |  1 +
 2 files changed, 39 insertions(+)

diff --git a/debian/patches/0006-Use-system-libb64.patch b/debian/patches/0006-Use-system-libb64.patch
new file mode 100644
index 0000000..29bf1bd
--- /dev/null
+++ b/debian/patches/0006-Use-system-libb64.patch
@@ -0,0 +1,38 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Tue, 15 Aug 2017 17:48:58 +0200
+Subject: Use system libb64
+
+---
+ utilities/xmlrpcpp/CMakeLists.txt | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/utilities/xmlrpcpp/CMakeLists.txt b/utilities/xmlrpcpp/CMakeLists.txt
+index ae79cc3..f9d523a 100644
+--- a/utilities/xmlrpcpp/CMakeLists.txt
++++ b/utilities/xmlrpcpp/CMakeLists.txt
+@@ -17,7 +17,6 @@ catkin_package(
+ 
+ include_directories(
+   include
+-  libb64/include
+   ${catkin_INCLUDE_DIRS}
+ )
+ link_directories(${catkin_LIBRARY_DIRS})
+@@ -36,8 +35,6 @@ add_library(xmlrpcpp
+   src/XmlRpcSource.cpp
+   src/XmlRpcUtil.cpp
+   src/XmlRpcValue.cpp
+-  libb64/src/cdecode.c
+-  libb64/src/cencode.c
+ )
+ set_target_properties(xmlrpcpp PROPERTIES VERSION ${xmlrpcpp_VERSION} SOVERSION "1d")
+ 
+@@ -45,6 +42,8 @@ if(WIN32)
+   target_link_libraries(xmlrpcpp ws2_32)
+ endif()
+ 
++target_link_libraries(xmlrpcpp b64)
++
+ install(DIRECTORY include/${PROJECT_NAME}
+   DESTINATION ${CATKIN_GLOBAL_INCLUDE_DESTINATION}
+   FILES_MATCHING PATTERN "*.h")
diff --git a/debian/patches/series b/debian/patches/series
index f49d041..1981c29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0003-Add-default-ROS_MASTER_URI.patch
 0004-Fix-executable-not-elf-or-script.patch
 0005-Add-defaults-to-roswtf.patch
+0006-Use-system-libb64.patch

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