[ros-gazebo-ros-pkgs] 01/01: Added patches to solve search plugins

[Leopold Palomo-Avellaneda]

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

lepalom-guest pushed a commit to branch master
in repository ros-gazebo-ros-pkgs.

commit 0fe0b95c3750ee1a5ed6b1975c906fc627c58c66
Author: Leopold Palomo-Avellaneda <leo at alaxarxa.net>
Date:   Tue Nov 8 17:25:07 2016 +0100

    Added patches to solve search plugins
---
 .../patches/0002-Add-Debian-specific-SONAMEs.patch |  2 +-
 .../0005-Delete-pass-location-of-plugins.patch     | 31 ++++++++++++++++++++
 .../0006-Delete-pass-location-of-plugins.patch     | 25 ++++++++++++++++
 debian/patches/0007-Drop-find-plugins.patch        | 33 ++++++++++++++++++++++
 debian/patches/series                              |  3 ++
 5 files changed, 93 insertions(+), 1 deletion(-)

diff --git a/debian/patches/0002-Add-Debian-specific-SONAMEs.patch b/debian/patches/0002-Add-Debian-specific-SONAMEs.patch
index 3a06490..55506c8 100644
--- a/debian/patches/0002-Add-Debian-specific-SONAMEs.patch
+++ b/debian/patches/0002-Add-Debian-specific-SONAMEs.patch
@@ -7,7 +7,7 @@ Subject: Add Debian specific SONAMEs
  1 file changed, 32 insertions(+), 1 deletion(-)
 
 diff --git a/gazebo_plugins/CMakeLists.txt b/gazebo_plugins/CMakeLists.txt
-index 2a6a14b..e804522 100644
+index 2a6a14b..5ea021c 100644
 --- a/gazebo_plugins/CMakeLists.txt
 +++ b/gazebo_plugins/CMakeLists.txt
 @@ -154,10 +154,12 @@ target_link_libraries(hokuyo_node
diff --git a/debian/patches/0005-Delete-pass-location-of-plugins.patch b/debian/patches/0005-Delete-pass-location-of-plugins.patch
new file mode 100644
index 0000000..70e1dec
--- /dev/null
+++ b/debian/patches/0005-Delete-pass-location-of-plugins.patch
@@ -0,0 +1,31 @@
+From: Leopold Palomo-Avellaneda <leo at alaxarxa.net>
+Date: Tue, 8 Nov 2016 15:42:22 +0100
+Subject: Delete pass location of plugins
+
+---
+ gazebo_ros/scripts/gzserver | 12 ------------
+ 1 file changed, 12 deletions(-)
+
+diff --git a/gazebo_ros/scripts/gzserver b/gazebo_ros/scripts/gzserver
+index 883ad94..ce0ff5d 100755
+--- a/gazebo_ros/scripts/gzserver
++++ b/gazebo_ros/scripts/gzserver
+@@ -10,18 +10,6 @@ if [ $(uname) = "Darwin" ]; then
+     EXT=dylib
+ fi
+ 
+-# add ros path plugin if it does not already exist in the passed in arguments
+-if [ `expr "$final" : ".*libgazebo_ros_paths_plugin\.$EXT.*"` -eq 0 ]
+-then
+-    final="$final -s `catkin_find --first-only libgazebo_ros_paths_plugin.$EXT`"
+-fi
+-
+-# add ros api plugin if it does not already exist in the passed in arguments
+-if [ `expr "$final" : ".*libgazebo_ros_api_plugin\.$EXT.*"` -eq 0 ]
+-then
+-    final="$final -s `catkin_find --first-only libgazebo_ros_api_plugin.$EXT`"
+-fi
+-
+ setup_path=$(pkg-config --variable=prefix gazebo)/share/gazebo/
+ 
+ # source setup.sh, but keep local modifications to GAZEBO_MASTER_URI
diff --git a/debian/patches/0006-Delete-pass-location-of-plugins.patch b/debian/patches/0006-Delete-pass-location-of-plugins.patch
new file mode 100644
index 0000000..c97c6cc
--- /dev/null
+++ b/debian/patches/0006-Delete-pass-location-of-plugins.patch
@@ -0,0 +1,25 @@
+From: Leopold Palomo-Avellaneda <leo at alaxarxa.net>
+Date: Tue, 8 Nov 2016 15:42:57 +0100
+Subject: Delete pass location of plugins
+
+---
+ gazebo_ros/scripts/gzclient | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/gazebo_ros/scripts/gzclient b/gazebo_ros/scripts/gzclient
+index 0dab137..54a4e7e 100755
+--- a/gazebo_ros/scripts/gzclient
++++ b/gazebo_ros/scripts/gzclient
+@@ -10,12 +10,6 @@ if [ $(uname) = "Darwin" ]; then
+     EXT=dylib
+ fi
+ 
+-# add ros plugin if does not exist
+-if [ `expr "$final" : ".*libgazebo_ros_paths_plugin\.$EXT.*"` -eq 0 ]
+-then
+-    final="$final -g `catkin_find --first-only libgazebo_ros_paths_plugin.$EXT`"
+-fi
+-
+ setup_path=$(pkg-config --variable=prefix gazebo)/share/gazebo/
+ 
+ # source setup.sh, but keep local modifications to GAZEBO_MASTER_URI
diff --git a/debian/patches/0007-Drop-find-plugins.patch b/debian/patches/0007-Drop-find-plugins.patch
new file mode 100644
index 0000000..276e83c
--- /dev/null
+++ b/debian/patches/0007-Drop-find-plugins.patch
@@ -0,0 +1,33 @@
+From: Leopold Palomo-Avellaneda <leo at alaxarxa.net>
+Date: Tue, 8 Nov 2016 16:30:30 +0100
+Subject: Drop find plugins
+
+---
+ gazebo_ros/scripts/gazebo | 14 +-------------
+ 1 file changed, 1 insertion(+), 13 deletions(-)
+
+diff --git a/gazebo_ros/scripts/gazebo b/gazebo_ros/scripts/gazebo
+index 392dac7..f439e5f 100755
+--- a/gazebo_ros/scripts/gazebo
++++ b/gazebo_ros/scripts/gazebo
+@@ -12,19 +12,7 @@ if [ $(uname) = "Darwin" ]; then
+     SIGNAL=INT
+ fi
+ 
+-# add ros path plugin if it does not already exist in the passed in arguments
+-if [ `expr "$final" : ".*libgazebo_ros_paths_plugin\.$EXT.*"` -eq 0 ]
+-then
+-    final="$final -s `catkin_find --first-only libgazebo_ros_paths_plugin.$EXT`"
+-fi
+-
+-# add ros api plugin if it does not already exist in the passed in arguments
+-if [ `expr "$final" : ".*libgazebo_ros_api_plugin\.$EXT.*"` -eq 0 ]
+-then
+-    final="$final -s `catkin_find --first-only libgazebo_ros_api_plugin.$EXT`"
+-fi
+-
+-client_final="-g `catkin_find --first-only libgazebo_ros_paths_plugin.$EXT`"
++client_final="-g libgazebo_ros_paths_plugin.$EXT"
+ 
+ setup_path=$(pkg-config --variable=prefix gazebo)/share/gazebo/
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 544f9f1..142f5fe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,6 @@
 0002-Add-Debian-specific-SONAMEs.patch
 0003-Add-Debian-specific-SONAMEs.patch
 0004-Add-Debian-specific-SONAMEs.patch
+0005-Delete-pass-location-of-plugins.patch
+0006-Delete-pass-location-of-plugins.patch
+0007-Drop-find-plugins.patch

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