* [gentoo-commits] repo/gentoo:master commit in: dev-ros/roscpp/, dev-ros/roscpp/files/
@ 2020-05-13 14:07 Alexis Ballier
0 siblings, 0 replies; 3+ messages in thread
From: Alexis Ballier @ 2020-05-13 14:07 UTC (permalink / raw
To: gentoo-commits
commit: a483eb034cafe5d1c17cb37bf7017c8c7f5f8df6
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed May 13 12:21:54 2020 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed May 13 14:07:14 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a483eb03
dev-ros/roscpp: fix build with boost 1.73
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
dev-ros/roscpp/files/boost173.patch | 62 +++++++++++++++++++++++++++++++++++++
dev-ros/roscpp/roscpp-1.15.4.ebuild | 1 +
dev-ros/roscpp/roscpp-9999.ebuild | 1 +
3 files changed, 64 insertions(+)
diff --git a/dev-ros/roscpp/files/boost173.patch b/dev-ros/roscpp/files/boost173.patch
new file mode 100644
index 00000000000..d31f8c8ff24
--- /dev/null
+++ b/dev-ros/roscpp/files/boost173.patch
@@ -0,0 +1,62 @@
+Index: roscpp/include/ros/timer_manager.h
+===================================================================
+--- roscpp.orig/include/ros/timer_manager.h
++++ roscpp/include/ros/timer_manager.h
+@@ -349,7 +349,7 @@ int32_t TimerManager<T, D, E>::add(const
+ {
+ boost::mutex::scoped_lock lock(waiting_mutex_);
+ waiting_.push_back(info->handle);
+- waiting_.sort(boost::bind(&TimerManager::waitingCompare, this, _1, _2));
++ waiting_.sort(boost::bind(&TimerManager::waitingCompare, this, boost::placeholders::_1, boost::placeholders::_2));
+ }
+
+ new_timer_ = true;
+@@ -416,7 +416,7 @@ void TimerManager<T, D, E>::schedule(con
+
+ waiting_.push_back(info->handle);
+ // waitingCompare requires a lock on the timers_mutex_
+- waiting_.sort(boost::bind(&TimerManager::waitingCompare, this, _1, _2));
++ waiting_.sort(boost::bind(&TimerManager::waitingCompare, this, boost::placeholders::_1, boost::placeholders::_2));
+ }
+
+ new_timer_ = true;
+@@ -490,7 +490,7 @@ void TimerManager<T, D, E>::setPeriod(in
+ // In this case, let next_expected be updated only in updateNext
+
+ info->period = period;
+- waiting_.sort(boost::bind(&TimerManager::waitingCompare, this, _1, _2));
++ waiting_.sort(boost::bind(&TimerManager::waitingCompare, this, boost::placeholders::_1, boost::placeholders::_2));
+ }
+
+ new_timer_ = true;
+Index: roscpp/src/libros/connection_manager.cpp
+===================================================================
+--- roscpp.orig/src/libros/connection_manager.cpp
++++ roscpp/src/libros/connection_manager.cpp
+@@ -66,7 +66,7 @@ void ConnectionManager::start()
+ tcpserver_transport_ = boost::make_shared<TransportTCP>(&poll_manager_->getPollSet());
+ if (!tcpserver_transport_->listen(network::getTCPROSPort(),
+ MAX_TCPROS_CONN_QUEUE,
+- boost::bind(&ConnectionManager::tcprosAcceptConnection, this, _1)))
++ boost::bind(&ConnectionManager::tcprosAcceptConnection, this, boost::placeholders::_1)))
+ {
+ ROS_FATAL("Listen on port [%d] failed", network::getTCPROSPort());
+ ROS_BREAK();
+@@ -142,7 +142,7 @@ void ConnectionManager::addConnection(co
+ boost::mutex::scoped_lock lock(connections_mutex_);
+
+ connections_.insert(conn);
+- conn->addDropListener(boost::bind(&ConnectionManager::onConnectionDropped, this, _1));
++ conn->addDropListener(boost::bind(&ConnectionManager::onConnectionDropped, this, boost::placeholders::_1));
+ }
+
+ void ConnectionManager::onConnectionDropped(const ConnectionPtr& conn)
+@@ -190,7 +190,7 @@ void ConnectionManager::tcprosAcceptConn
+ ConnectionPtr conn(boost::make_shared<Connection>());
+ addConnection(conn);
+
+- conn->initialize(transport, true, boost::bind(&ConnectionManager::onConnectionHeaderReceived, this, _1, _2));
++ conn->initialize(transport, true, boost::bind(&ConnectionManager::onConnectionHeaderReceived, this, boost::placeholders::_1, boost::placeholders::_2));
+ }
+
+ bool ConnectionManager::onConnectionHeaderReceived(const ConnectionPtr& conn, const Header& header)
diff --git a/dev-ros/roscpp/roscpp-1.15.4.ebuild b/dev-ros/roscpp/roscpp-1.15.4.ebuild
index 033a2eb87fd..8863bf3d38b 100644
--- a/dev-ros/roscpp/roscpp-1.15.4.ebuild
+++ b/dev-ros/roscpp/roscpp-1.15.4.ebuild
@@ -27,3 +27,4 @@ RDEPEND="
dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
"
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/boost173.patch" )
diff --git a/dev-ros/roscpp/roscpp-9999.ebuild b/dev-ros/roscpp/roscpp-9999.ebuild
index 033a2eb87fd..8863bf3d38b 100644
--- a/dev-ros/roscpp/roscpp-9999.ebuild
+++ b/dev-ros/roscpp/roscpp-9999.ebuild
@@ -27,3 +27,4 @@ RDEPEND="
dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
"
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/boost173.patch" )
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ros/roscpp/, dev-ros/roscpp/files/
@ 2020-07-08 17:30 Alexis Ballier
0 siblings, 0 replies; 3+ messages in thread
From: Alexis Ballier @ 2020-07-08 17:30 UTC (permalink / raw
To: gentoo-commits
commit: 07b9b85785dd24fc6175a7da64519bc7b4dc2803
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 8 17:12:34 2020 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Jul 8 17:30:19 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07b9b857
dev-ros/roscpp: Remove old
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
dev-ros/roscpp/Manifest | 2 --
dev-ros/roscpp/files/boost.patch | 26 --------------------------
dev-ros/roscpp/roscpp-1.14.3-r1.ebuild | 30 ------------------------------
dev-ros/roscpp/roscpp-1.15.4.ebuild | 30 ------------------------------
4 files changed, 88 deletions(-)
diff --git a/dev-ros/roscpp/Manifest b/dev-ros/roscpp/Manifest
index e7119a998e0..5d86517495e 100644
--- a/dev-ros/roscpp/Manifest
+++ b/dev-ros/roscpp/Manifest
@@ -1,3 +1 @@
-DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
diff --git a/dev-ros/roscpp/files/boost.patch b/dev-ros/roscpp/files/boost.patch
deleted file mode 100644
index 1d509a8ab6c..00000000000
--- a/dev-ros/roscpp/files/boost.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 41f18edc9f2f0b1ef304ea25f148bd56a6bf3d70
-Author: Maarten de Vries <maarten@de-vri.es>
-Date: Thu Jan 31 00:58:29 2019 +0100
-
- Remove signals from find_package(Boost COMPONENTS ...) (#1580)
-
- The packages use signals2, not signals. Only boost libraries with
- compiled code should be passed to find_package(Boost COMPONENTS ...),
- and the signals2 library has always been header only.
-
- Boost 1.69 has removed the deprecated signals library, so the otherwise
- useless but harmless `signals` component now breaks the build.
-
-diff --git a/clients/roscpp/CMakeLists.txt b/clients/roscpp/CMakeLists.txt
-index a5d354ea6..8f462df2c 100644
---- a/clients/roscpp/CMakeLists.txt
-+++ b/clients/roscpp/CMakeLists.txt
-@@ -22,7 +22,7 @@ list(GET roscpp_VERSION_LIST 2 roscpp_VERSION_PATCH)
-
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/ros/common.h.in ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_INCLUDE_DESTINATION}/ros/common.h)
-
--find_package(Boost REQUIRED COMPONENTS chrono filesystem signals system)
-+find_package(Boost REQUIRED COMPONENTS chrono filesystem system)
-
- include_directories(include ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_INCLUDE_DESTINATION}/ros ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
-
diff --git a/dev-ros/roscpp/roscpp-1.14.3-r1.ebuild b/dev-ros/roscpp/roscpp-1.14.3-r1.ebuild
deleted file mode 100644
index 9f927d9f390..00000000000
--- a/dev-ros/roscpp/roscpp-1.14.3-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=clients/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/cpp_common
- dev-ros/rosconsole
- dev-ros/roscpp_serialization
- dev-ros/roscpp_traits
- dev-ros/rostime
- dev-ros/xmlrpcpp
- dev-libs/boost:=
- dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/boost.patch" )
diff --git a/dev-ros/roscpp/roscpp-1.15.4.ebuild b/dev-ros/roscpp/roscpp-1.15.4.ebuild
deleted file mode 100644
index 8863bf3d38b..00000000000
--- a/dev-ros/roscpp/roscpp-1.15.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=clients/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/cpp_common
- dev-ros/rosconsole
- dev-ros/roscpp_serialization
- dev-ros/roscpp_traits
- dev-ros/rostime
- dev-ros/xmlrpcpp
- dev-libs/boost:=
- dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/boost173.patch" )
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ros/roscpp/, dev-ros/roscpp/files/
@ 2020-10-20 12:44 Alexis Ballier
0 siblings, 0 replies; 3+ messages in thread
From: Alexis Ballier @ 2020-10-20 12:44 UTC (permalink / raw
To: gentoo-commits
commit: 1eeb2abb5f35ed6f637ba3c34da1502da4a9c57d
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 20 11:42:52 2020 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Oct 20 12:44:02 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1eeb2abb
dev-ros/roscpp: Remove old
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
dev-ros/roscpp/Manifest | 2 --
dev-ros/roscpp/files/boost173.patch | 62 -------------------------------------
dev-ros/roscpp/roscpp-1.15.7.ebuild | 30 ------------------
dev-ros/roscpp/roscpp-1.15.8.ebuild | 30 ------------------
4 files changed, 124 deletions(-)
diff --git a/dev-ros/roscpp/Manifest b/dev-ros/roscpp/Manifest
index e01f0dcf16b..556c43ecfa6 100644
--- a/dev-ros/roscpp/Manifest
+++ b/dev-ros/roscpp/Manifest
@@ -1,3 +1 @@
-DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
-DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
diff --git a/dev-ros/roscpp/files/boost173.patch b/dev-ros/roscpp/files/boost173.patch
deleted file mode 100644
index d31f8c8ff24..00000000000
--- a/dev-ros/roscpp/files/boost173.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Index: roscpp/include/ros/timer_manager.h
-===================================================================
---- roscpp.orig/include/ros/timer_manager.h
-+++ roscpp/include/ros/timer_manager.h
-@@ -349,7 +349,7 @@ int32_t TimerManager<T, D, E>::add(const
- {
- boost::mutex::scoped_lock lock(waiting_mutex_);
- waiting_.push_back(info->handle);
-- waiting_.sort(boost::bind(&TimerManager::waitingCompare, this, _1, _2));
-+ waiting_.sort(boost::bind(&TimerManager::waitingCompare, this, boost::placeholders::_1, boost::placeholders::_2));
- }
-
- new_timer_ = true;
-@@ -416,7 +416,7 @@ void TimerManager<T, D, E>::schedule(con
-
- waiting_.push_back(info->handle);
- // waitingCompare requires a lock on the timers_mutex_
-- waiting_.sort(boost::bind(&TimerManager::waitingCompare, this, _1, _2));
-+ waiting_.sort(boost::bind(&TimerManager::waitingCompare, this, boost::placeholders::_1, boost::placeholders::_2));
- }
-
- new_timer_ = true;
-@@ -490,7 +490,7 @@ void TimerManager<T, D, E>::setPeriod(in
- // In this case, let next_expected be updated only in updateNext
-
- info->period = period;
-- waiting_.sort(boost::bind(&TimerManager::waitingCompare, this, _1, _2));
-+ waiting_.sort(boost::bind(&TimerManager::waitingCompare, this, boost::placeholders::_1, boost::placeholders::_2));
- }
-
- new_timer_ = true;
-Index: roscpp/src/libros/connection_manager.cpp
-===================================================================
---- roscpp.orig/src/libros/connection_manager.cpp
-+++ roscpp/src/libros/connection_manager.cpp
-@@ -66,7 +66,7 @@ void ConnectionManager::start()
- tcpserver_transport_ = boost::make_shared<TransportTCP>(&poll_manager_->getPollSet());
- if (!tcpserver_transport_->listen(network::getTCPROSPort(),
- MAX_TCPROS_CONN_QUEUE,
-- boost::bind(&ConnectionManager::tcprosAcceptConnection, this, _1)))
-+ boost::bind(&ConnectionManager::tcprosAcceptConnection, this, boost::placeholders::_1)))
- {
- ROS_FATAL("Listen on port [%d] failed", network::getTCPROSPort());
- ROS_BREAK();
-@@ -142,7 +142,7 @@ void ConnectionManager::addConnection(co
- boost::mutex::scoped_lock lock(connections_mutex_);
-
- connections_.insert(conn);
-- conn->addDropListener(boost::bind(&ConnectionManager::onConnectionDropped, this, _1));
-+ conn->addDropListener(boost::bind(&ConnectionManager::onConnectionDropped, this, boost::placeholders::_1));
- }
-
- void ConnectionManager::onConnectionDropped(const ConnectionPtr& conn)
-@@ -190,7 +190,7 @@ void ConnectionManager::tcprosAcceptConn
- ConnectionPtr conn(boost::make_shared<Connection>());
- addConnection(conn);
-
-- conn->initialize(transport, true, boost::bind(&ConnectionManager::onConnectionHeaderReceived, this, _1, _2));
-+ conn->initialize(transport, true, boost::bind(&ConnectionManager::onConnectionHeaderReceived, this, boost::placeholders::_1, boost::placeholders::_2));
- }
-
- bool ConnectionManager::onConnectionHeaderReceived(const ConnectionPtr& conn, const Header& header)
diff --git a/dev-ros/roscpp/roscpp-1.15.7.ebuild b/dev-ros/roscpp/roscpp-1.15.7.ebuild
deleted file mode 100644
index 8863bf3d38b..00000000000
--- a/dev-ros/roscpp/roscpp-1.15.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=clients/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/cpp_common
- dev-ros/rosconsole
- dev-ros/roscpp_serialization
- dev-ros/roscpp_traits
- dev-ros/rostime
- dev-ros/xmlrpcpp
- dev-libs/boost:=
- dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/boost173.patch" )
diff --git a/dev-ros/roscpp/roscpp-1.15.8.ebuild b/dev-ros/roscpp/roscpp-1.15.8.ebuild
deleted file mode 100644
index 8863bf3d38b..00000000000
--- a/dev-ros/roscpp/roscpp-1.15.8.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=clients/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/cpp_common
- dev-ros/rosconsole
- dev-ros/roscpp_serialization
- dev-ros/roscpp_traits
- dev-ros/rostime
- dev-ros/xmlrpcpp
- dev-libs/boost:=
- dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/boost173.patch" )
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-10-20 12:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-13 14:07 [gentoo-commits] repo/gentoo:master commit in: dev-ros/roscpp/, dev-ros/roscpp/files/ Alexis Ballier
-- strict thread matches above, loose matches on Subject: below --
2020-07-08 17:30 Alexis Ballier
2020-10-20 12:44 Alexis Ballier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox