From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B2D12138330 for ; Fri, 14 Oct 2016 13:04:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 63C4DE0782; Fri, 14 Oct 2016 13:04:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3A475E0782 for ; Fri, 14 Oct 2016 13:04:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AA32C341056 for ; Fri, 14 Oct 2016 13:04:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9678A300 for ; Fri, 14 Oct 2016 13:04:17 +0000 (UTC) From: "Alexis Ballier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexis Ballier" Message-ID: <1476450254.78c02e67b9ed68ec6ae1b1b083e7ee4ef115e757.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ros/rosserial_server/files/, dev-ros/rosserial_server/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ros/rosserial_server/files/boost162.patch dev-ros/rosserial_server/rosserial_server-0.7.4.ebuild X-VCS-Directories: dev-ros/rosserial_server/ dev-ros/rosserial_server/files/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: 78c02e67b9ed68ec6ae1b1b083e7ee4ef115e757 X-VCS-Branch: master Date: Fri, 14 Oct 2016 13:04:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: af79340f-aad7-443c-9fcd-1947779c875f X-Archives-Hash: 74f62c988916aac4607ba776020b207a commit: 78c02e67b9ed68ec6ae1b1b083e7ee4ef115e757 Author: Alexis Ballier gentoo org> AuthorDate: Fri Oct 14 13:04:08 2016 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Fri Oct 14 13:04:14 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78c02e67 dev-ros/rosserial_server: backport upstream patch to build with boost 1.62, bug #594830 Package-Manager: portage-2.3.2 dev-ros/rosserial_server/files/boost162.patch | 61 ++++++++++++++++++++++ .../rosserial_server/rosserial_server-0.7.4.ebuild | 1 + 2 files changed, 62 insertions(+) diff --git a/dev-ros/rosserial_server/files/boost162.patch b/dev-ros/rosserial_server/files/boost162.patch new file mode 100644 index 00000000..d644d40 --- /dev/null +++ b/dev-ros/rosserial_server/files/boost162.patch @@ -0,0 +1,61 @@ +commit f8a46f3142444c854233a85f7a5ec7b91b5378a6 +Author: Malte Splietker +Date: Wed Oct 5 04:26:00 2016 +0200 + + Fixing build errors for boost >=1.60 (#226) (#250) + + Signed-off-by: Malte Splietker + +diff --git a/rosserial_server/include/rosserial_server/session.h b/rosserial_server/include/rosserial_server/session.h +index 86b9baa..ebd109a 100644 +--- a/rosserial_server/include/rosserial_server/session.h ++++ b/rosserial_server/include/rosserial_server/session.h +@@ -499,7 +499,7 @@ private: + boost::asio::deadline_timer ros_spin_timer_; + std::string require_param_name_; + +- std::map > callbacks_; ++ std::map > callbacks_; + std::map publishers_; + std::map subscribers_; + std::map services_; +diff --git a/rosserial_server/include/rosserial_server/topic_handlers.h b/rosserial_server/include/rosserial_server/topic_handlers.h +index 666f3fc..2f367c3 100644 +--- a/rosserial_server/include/rosserial_server/topic_handlers.h ++++ b/rosserial_server/include/rosserial_server/topic_handlers.h +@@ -93,7 +93,7 @@ typedef boost::shared_ptr PublisherPtr; + class Subscriber { + public: + Subscriber(ros::NodeHandle& nh, rosserial_msgs::TopicInfo& topic_info, +- boost::function buffer)> write_fn) ++ boost::function& buffer)> write_fn) + : write_fn_(write_fn) { + ros::SubscribeOptions opts; + opts.init( +@@ -119,7 +119,7 @@ private: + } + + ros::Subscriber subscriber_; +- boost::function buffer)> write_fn_; ++ boost::function& buffer)> write_fn_; + }; + + typedef boost::shared_ptr SubscriberPtr; +@@ -127,7 +127,7 @@ typedef boost::shared_ptr SubscriberPtr; + class ServiceClient { + public: + ServiceClient(ros::NodeHandle& nh, rosserial_msgs::TopicInfo& topic_info, +- boost::function buffer, const uint16_t topic_id)> write_fn) ++ boost::function& buffer, const uint16_t topic_id)> write_fn) + : write_fn_(write_fn) { + topic_id_ = -1; + if (!service_info_service_.isValid()) { +@@ -185,7 +185,7 @@ private: + topic_tools::ShapeShifter response_message_; + ros::ServiceClient service_client_; + static ros::ServiceClient service_info_service_; +- boost::function buffer, const uint16_t topic_id)> write_fn_; ++ boost::function& buffer, const uint16_t topic_id)> write_fn_; + std::string service_md5_; + std::string request_message_md5_; + std::string response_message_md5_; diff --git a/dev-ros/rosserial_server/rosserial_server-0.7.4.ebuild b/dev-ros/rosserial_server/rosserial_server-0.7.4.ebuild index 5ff8dba..dcba1b4 100644 --- a/dev-ros/rosserial_server/rosserial_server-0.7.4.ebuild +++ b/dev-ros/rosserial_server/rosserial_server-0.7.4.ebuild @@ -21,3 +21,4 @@ RDEPEND=" dev-libs/boost:=[threads] " DEPEND="${RDEPEND}" +PATCHES=( "${FILESDIR}/boost162.patch" )