aboutsummaryrefslogtreecommitdiff
path: root/devel/ros-rx/files
diff options
context:
space:
mode:
Diffstat (limited to 'devel/ros-rx/files')
-rw-r--r--devel/ros-rx/files/patch-312511
-rw-r--r--devel/ros-rx/files/patch-312681
-rw-r--r--devel/ros-rx/files/patch-312710
-rw-r--r--devel/ros-rx/files/patch-312866
-rw-r--r--devel/ros-rx/files/patch-317211
-rw-r--r--devel/ros-rx/files/patch-317310
-rw-r--r--devel/ros-rx/files/patch-core_roscpp_src_libros_CMakeLists.txt17
-rw-r--r--devel/ros-rx/files/patch-core_roscpp_src_libros_network.cpp12
-rw-r--r--devel/ros-rx/files/patch-gtest43
-rw-r--r--devel/ros-rx/files/pkg-message.in12
10 files changed, 0 insertions, 273 deletions
diff --git a/devel/ros-rx/files/patch-3125 b/devel/ros-rx/files/patch-3125
deleted file mode 100644
index 6def8d3fffff..000000000000
--- a/devel/ros-rx/files/patch-3125
+++ /dev/null
@@ -1,11 +0,0 @@
---- core/rosconsole/include/ros/console.h.orig 2010-03-13 03:03:10.000000000 +0100
-+++ core/rosconsole/include/ros/console.h 2010-11-03 22:46:51.000000000 +0100
-@@ -105,7 +105,7 @@
- */
- void initialize();
-
--struct FilterBase;
-+class FilterBase;
- /**
- * \brief Don't call this directly. Use the ROS_LOG() macro instead.
- * @param level Logging level
diff --git a/devel/ros-rx/files/patch-3126 b/devel/ros-rx/files/patch-3126
deleted file mode 100644
index e7a55c86d173..000000000000
--- a/devel/ros-rx/files/patch-3126
+++ /dev/null
@@ -1,81 +0,0 @@
---- core/roscpp/include/ros/subscribe_options.h.orig 2010-05-11 23:23:34.000000000 +0200
-+++ core/roscpp/include/ros/subscribe_options.h 2010-10-28 00:53:16.000000000 +0200
-@@ -80,7 +80,7 @@
- template<class P>
- void initByFullCallbackType(const std::string& _topic, uint32_t _queue_size,
- const boost::function<void (P)>& _callback,
-- const boost::function<boost::shared_ptr<typename ParameterAdapter<P>::Message>(void)>& factory_fn = defaultMessageCreateFunction<typename ParameterAdapter<P>::Message>)
-+ boost::function<boost::shared_ptr<typename ParameterAdapter<P>::Message>(void)> factory_fn = defaultMessageCreateFunction<typename ParameterAdapter<P>::Message>)
- {
- typedef typename ParameterAdapter<P>::Message MessageType;
- topic = _topic;
-@@ -101,7 +101,7 @@
- template<class M>
- void init(const std::string& _topic, uint32_t _queue_size,
- const boost::function<void (const boost::shared_ptr<M const>&)>& _callback,
-- const boost::function<boost::shared_ptr<M>(void)>& factory_fn = defaultMessageCreateFunction<M>)
-+ boost::function<boost::shared_ptr<M>(void)> factory_fn = defaultMessageCreateFunction<M>)
- {
- typedef typename ParameterAdapter<M>::Message MessageType;
- topic = _topic;
---- core/roscpp/include/ros/service_callback_helper.h.orig 2010-02-18 23:22:20.000000000 +0100
-+++ core/roscpp/include/ros/service_callback_helper.h 2010-10-28 01:05:35.000000000 +0200
-@@ -165,7 +165,7 @@
- typedef boost::function<RequestPtr()> ReqCreateFunction;
- typedef boost::function<ResponsePtr()> ResCreateFunction;
-
-- ServiceCallbackHelperT(const Callback& callback, const ReqCreateFunction& create_req = defaultServiceCreateFunction<RequestType>, const ResCreateFunction& create_res = defaultServiceCreateFunction<ResponseType>)
-+ ServiceCallbackHelperT(const Callback& callback, ReqCreateFunction create_req = defaultServiceCreateFunction<RequestType>, ResCreateFunction create_res = defaultServiceCreateFunction<ResponseType>)
- : callback_(callback)
- , create_req_(create_req)
- , create_res_(create_res)
---- core/roscpp/include/ros/topic_manager.h.orig 2010-02-18 23:22:20.000000000 +0100
-+++ core/roscpp/include/ros/topic_manager.h 2010-11-03 22:48:40.000000000 +0100
-@@ -42,8 +42,8 @@
- {
-
- class Message;
--class SubscribeOptions;
--class AdvertiseOptions;
-+struct SubscribeOptions;
-+struct AdvertiseOptions;
-
- class TopicManager;
- typedef boost::shared_ptr<TopicManager> TopicManagerPtr;
---- core/roscpp/include/ros/message_event.h.orig 2010-07-13 04:08:40.000000000 +0200
-+++ core/roscpp/include/ros/message_event.h 2010-11-03 22:50:05.000000000 +0100
-@@ -93,7 +93,7 @@
- nonconst_need_copy_ = nonconst_need_copy;
- }
-
-- MessageEvent(const MessageEvent<void const>& rhs, const CreateFunction& create)
-+ MessageEvent(const MessageEvent<void const>& rhs, CreateFunction create)
- {
- init(boost::const_pointer_cast<Message>(boost::static_pointer_cast<ConstMessage>(rhs.getMessage())), rhs.getConnectionHeaderPtr(), rhs.getReceiptTime(), rhs.nonConstWillCopy(), create);
- }
-@@ -116,12 +116,12 @@
- init(message, getConnectionHeader(message.get()), receipt_time, true, ros::defaultMessageCreateFunction<Message>);
- }
-
-- MessageEvent(const ConstMessagePtr& message, const boost::shared_ptr<M_string>& connection_header, ros::Time receipt_time, bool nonconst_need_copy, const CreateFunction& create)
-+ MessageEvent(const ConstMessagePtr& message, const boost::shared_ptr<M_string>& connection_header, ros::Time receipt_time, bool nonconst_need_copy, CreateFunction create)
- {
- init(message, connection_header, receipt_time, nonconst_need_copy, create);
- }
-
-- void init(const ConstMessagePtr& message, const boost::shared_ptr<M_string>& connection_header, ros::Time receipt_time, bool nonconst_need_copy, const CreateFunction& create)
-+ void init(const ConstMessagePtr& message, const boost::shared_ptr<M_string>& connection_header, ros::Time receipt_time, bool nonconst_need_copy, CreateFunction create)
- {
- message_ = message;
- connection_header_ = connection_header;
---- core/roscpp/include/ros/transport_publisher_link.h.orig 2010-03-16 19:38:21.000000000 +0100
-+++ core/roscpp/include/ros/transport_publisher_link.h 2010-11-03 22:50:31.000000000 +0100
-@@ -41,7 +41,7 @@
- class Connection;
- typedef boost::shared_ptr<Connection> ConnectionPtr;
-
--class WallTimerEvent;
-+struct WallTimerEvent;
-
- /**
- * \brief Handles a connection to a single publisher on a given topic. Receives messages from a publisher
diff --git a/devel/ros-rx/files/patch-3127 b/devel/ros-rx/files/patch-3127
deleted file mode 100644
index a4fc560713f2..000000000000
--- a/devel/ros-rx/files/patch-3127
+++ /dev/null
@@ -1,10 +0,0 @@
---- core/roslib/include/ros/serialization.h.orig 2010-04-22 03:40:40.000000000 +0200
-+++ core/roslib/include/ros/serialization.h 2010-11-03 22:51:34.000000000 +0100
-@@ -37,6 +37,7 @@
- #include "macros.h"
-
- #include <vector>
-+#include <cstring>
-
- #include <boost/array.hpp>
- #include <boost/call_traits.hpp>
diff --git a/devel/ros-rx/files/patch-3128 b/devel/ros-rx/files/patch-3128
deleted file mode 100644
index 208f3907ca80..000000000000
--- a/devel/ros-rx/files/patch-3128
+++ /dev/null
@@ -1,66 +0,0 @@
---- core/message_filters/include/message_filters/synchronizer.h.orig 2010-03-16 01:10:42.000000000 +0100
-+++ core/message_filters/include/message_filters/synchronizer.h 2010-11-03 22:52:18.000000000 +0100
-@@ -357,7 +357,7 @@
- template<int i>
- void cb(const typename mpl::at_c<Events, i>::type& evt)
- {
-- add<i>(evt);
-+ this->add<i>(evt);
- }
-
- uint32_t queue_size_;
---- core/message_filters/include/message_filters/chain.h.orig 2010-04-23 19:40:54.000000000 +0200
-+++ core/message_filters/include/message_filters/chain.h 2010-11-03 22:52:42.000000000 +0100
-@@ -234,7 +234,7 @@
-
- void lastFilterCB(const EventType& evt)
- {
-- signalMessage(evt);
-+ this->signalMessage(evt);
- }
-
- struct FilterInfo
---- core/message_filters/include/message_filters/cache.h.orig 2010-04-23 19:40:54.000000000 +0200
-+++ core/message_filters/include/message_filters/cache.h 2010-11-03 22:53:01.000000000 +0100
-@@ -152,7 +152,7 @@
-
- }
-
-- signalMessage(evt);
-+ this->signalMessage(evt);
- }
-
- /**
---- core/message_filters/include/message_filters/subscriber.h.orig 2010-04-23 19:40:54.000000000 +0200
-+++ core/message_filters/include/message_filters/subscriber.h 2010-11-03 22:53:21.000000000 +0100
-@@ -202,7 +202,7 @@
-
- void cb(const EventType& e)
- {
-- signalMessage(e);
-+ this->signalMessage(e);
- }
-
- ros::Subscriber sub_;
---- core/message_filters/include/message_filters/pass_through.h.orig 2010-03-15 23:46:55.000000000 +0100
-+++ core/message_filters/include/message_filters/pass_through.h 2010-11-03 22:54:26.000000000 +0100
-@@ -75,7 +75,7 @@
-
- void add(const EventType& evt)
- {
-- signalMessage(evt);
-+ this->signalMessage(evt);
- }
-
- private:
---- core/message_filters/include/message_filters/time_sequencer.h.orig 2010-02-18 23:22:20.000000000 +0100
-+++ core/message_filters/include/message_filters/time_sequencer.h 2010-11-03 22:54:50.000000000 +0100
-@@ -208,7 +208,7 @@
- typename V_Message::iterator end = to_call.end();
- for (; it != end; ++it)
- {
-- signalMessage(*it);
-+ this->signalMessage(*it);
- }
- }
- }
diff --git a/devel/ros-rx/files/patch-3172 b/devel/ros-rx/files/patch-3172
deleted file mode 100644
index 67f7aea1d982..000000000000
--- a/devel/ros-rx/files/patch-3172
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/rosmsg/src/rosmsg.py.orig 2010-08-13 02:20:15.000000000 +0200
-+++ tools/rosmsg/src/rosmsg.py 2010-12-03 18:54:32.000000000 +0100
-@@ -81,7 +81,7 @@
- return val
-
- def make_find_command(path):
-- if os.uname()[0] == 'Darwin':
-+ if os.uname()[0] in ['Darwin', 'FreeBSD']:
- return ["find", "-E", path]
- else:
- return ["find", path, "-regextype", "posix-egrep"]
diff --git a/devel/ros-rx/files/patch-3173 b/devel/ros-rx/files/patch-3173
deleted file mode 100644
index d4c813de1c8b..000000000000
--- a/devel/ros-rx/files/patch-3173
+++ /dev/null
@@ -1,10 +0,0 @@
---- tools/rosbash/rosbash.orig 2010-06-28 22:22:33.000000000 +0200
-+++ tools/rosbash/rosbash 2010-12-03 19:52:43.000000000 +0100
-@@ -1,6 +1,6 @@
-
- function _rossed {
-- if [[ `uname` == Darwin ]]; then
-+ if [[ `uname` == Darwin || `uname` == FreeBSD ]]; then
- sed -E "$@"
- else
- sed -r "$@"
diff --git a/devel/ros-rx/files/patch-core_roscpp_src_libros_CMakeLists.txt b/devel/ros-rx/files/patch-core_roscpp_src_libros_CMakeLists.txt
deleted file mode 100644
index e5089b396aa8..000000000000
--- a/devel/ros-rx/files/patch-core_roscpp_src_libros_CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
---- core/roscpp/src/libros/CMakeLists.txt.orig 2010-03-13 00:27:34.000000000 +0100
-+++ core/roscpp/src/libros/CMakeLists.txt 2010-12-03 18:53:09.000000000 +0100
-@@ -2,9 +2,12 @@
- include(CheckFunctionExists)
-
- # Not everybody has <ifaddrs.h> (e.g., embedded arm-linux)
--CHECK_INCLUDE_FILES(ifaddrs.h HAVE_IFADDRS_H)
-+#XXX ugly hack, should update the tests themselves
-+#CHECK_INCLUDE_FILES(ifaddrs.h HAVE_IFADDRS_H)
-+set(HAVE_IFADDRS_H true)
- # Not everybody has trunc (e.g., Windows, embedded arm-linux)
--CHECK_FUNCTION_EXISTS(trunc HAVE_TRUNC)
-+#CHECK_FUNCTION_EXISTS(trunc HAVE_TRUNC)
-+set(HAVE_TRUNC true)
-
- # Output test results to config.h
- CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
diff --git a/devel/ros-rx/files/patch-core_roscpp_src_libros_network.cpp b/devel/ros-rx/files/patch-core_roscpp_src_libros_network.cpp
deleted file mode 100644
index e256a239ecc1..000000000000
--- a/devel/ros-rx/files/patch-core_roscpp_src_libros_network.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- core/roscpp/src/libros/network.cpp.orig 2010-07-21 01:48:07.000000000 +0200
-+++ core/roscpp/src/libros/network.cpp 2010-12-03 20:18:21.000000000 +0100
-@@ -34,6 +34,9 @@
- #include <ros/assert.h>
-
- #include <netinet/in.h>
-+#ifdef HAVE_IFADDRS_H
-+ #include <sys/types.h>
-+#endif
- #include <sys/socket.h>
- #include <netdb.h>
-
diff --git a/devel/ros-rx/files/patch-gtest b/devel/ros-rx/files/patch-gtest
deleted file mode 100644
index 43356d6bcff3..000000000000
--- a/devel/ros-rx/files/patch-gtest
+++ /dev/null
@@ -1,43 +0,0 @@
---- 3rdparty/gtest/Makefile.orig 2010-10-25 08:35:45.000000000 +0200
-+++ 3rdparty/gtest/Makefile 2010-10-27 21:24:06.000000000 +0200
-@@ -1,9 +1,9 @@
- all: gtest
-
--TARBALL = build/gtest-1.3.0.tar.gz
-+TARBALL = build/gtest-1.5.0.tar.gz
- TARBALL_URL = http://pr.willowgarage.com/downloads/gtest-1.3.0.tar.gz
--SOURCE_DIR = build/gtest-1.3.0
--MD5SUM_FILE = gtest-1.3.0.tar.gz.md5sum
-+SOURCE_DIR = build/gtest-1.5.0
-+MD5SUM_FILE = gtest-1.5.0.tar.gz.md5sum
- include $(shell rospack find mk)/download_unpack_build.mk
-
- # gtest's death test appears to hang when gtest is compiled with Bullseye's
-@@ -17,7 +17,7 @@
- endif
-
- gtest: $(SOURCE_DIR)/unpacked
-- cd $(SOURCE_DIR) && PATH=$(NEWPATH) ./configure --prefix=$(CURDIR)/gtest
-+ cd $(SOURCE_DIR) && PATH=$(NEWPATH) CXXFLAGS="$(CXXFLAGS) -DGTEST_HAS_TR1_TUPLE=0" ./configure --prefix=$(CURDIR)/gtest
- cd $(SOURCE_DIR) && PATH=$(NEWPATH) make install
- touch gtest
-
---- core/rosbuild/public.cmake.orig 2010-10-25 08:35:45.000000000 +0200
-+++ core/rosbuild/public.cmake 2010-10-28 11:40:56.000000000 +0200
-@@ -419,7 +419,7 @@
- include_directories(${_gtest_PACKAGE_PATH}/gtest/include)
- link_directories(${_gtest_PACKAGE_PATH}/gtest/lib)
- set(_gtest_LIBRARIES -lgtest)
-- set(_gtest_CFLAGS_OTHER "")
-+ set(_gtest_CFLAGS_OTHER "-DGTEST_HAS_TR1_TUPLE=0")
- set(_gtest_LDFLAGS_OTHER "-Wl,-rpath,${_gtest_PACKAGE_PATH}/gtest/lib")
-
- #
---- /dev/null 2010-11-01 00:11:00.000000000 +0100
-+++ 3rdparty/gtest/gtest-1.5.0.tar.gz.md5sum 2010-11-01 00:12:51.000000000 +0100
-@@ -0,0 +1 @@
-+7e27f5f3b79dd1ce9092e159cdbd0635 gtest-1.5.0.tar.gz
---- 3rdparty/gtest/gtest-1.3.0.tar.gz.md5sum 2010-05-11 00:43:08.000000000 +0200
-+++ /dev/null 2010-11-01 00:52:23.000000000 +0100
-@@ -1 +0,0 @@
--714e9c00c0616ea72ba076c6c5f401d2 gtest-1.3.0.tar.gz
diff --git a/devel/ros-rx/files/pkg-message.in b/devel/ros-rx/files/pkg-message.in
deleted file mode 100644
index df2c8ad19e21..000000000000
--- a/devel/ros-rx/files/pkg-message.in
+++ /dev/null
@@ -1,12 +0,0 @@
-To use ROS, add these variables to your environment:
-ROS_MASTER_URI <HTTP address of the host running roscore>:11311
-ROS_ROOT %%PREFIX%%/ros/ros
-ROS_PACKAGE_PATH %%PREFIX%%/ros/stacks:/my_other_ROS_directory
-PYTHONPATH ${ROS_ROOT}/core/roslib/src
-
-If you intend to build software with ROS:
-CPATH %%LOCALBASE%%/include
-EXTRA_CMAKE_FLAGS -DwxWidgets_CONFIG_EXECUTABLE=%%WX_CONFIG%%
-LIBRARY_PATH %%LOCALBASE%%/lib
-MAKE %%LOCALBASE%%/bin/gmake
-ROS_BOOST_ROOT %%LOCALBASE%%
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 10:58:47 +0000