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 DFEF9139368 for ; Tue, 3 Aug 2021 14:12:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0FE57E0998; Tue, 3 Aug 2021 14:12:38 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CC3CAE0985 for ; Tue, 3 Aug 2021 14:12:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EFC61343C59 for ; Tue, 3 Aug 2021 14:12:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8B7A17A7 for ; Tue, 3 Aug 2021 14:12:34 +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: <1627999940.43acae5fae6ec15456039f9be02ddec40f916b67.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ros/image_cb_detector/, dev-ros/image_cb_detector/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ros/image_cb_detector/files/py3.patch dev-ros/image_cb_detector/image_cb_detector-0.10.15-r1.ebuild dev-ros/image_cb_detector/image_cb_detector-0.10.15.ebuild dev-ros/image_cb_detector/image_cb_detector-9999.ebuild X-VCS-Directories: dev-ros/image_cb_detector/files/ dev-ros/image_cb_detector/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: 43acae5fae6ec15456039f9be02ddec40f916b67 X-VCS-Branch: master Date: Tue, 3 Aug 2021 14:12:34 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b3eddb33-d9d8-477f-b611-7ea07813bbb9 X-Archives-Hash: 807c9cecad861dbc91c22bab9ced909e commit: 43acae5fae6ec15456039f9be02ddec40f916b67 Author: Alexis Ballier gentoo org> AuthorDate: Tue Aug 3 13:46:20 2021 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Tue Aug 3 14:12:20 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43acae5f dev-ros/image_cb_detector: fix python script Closes: https://bugs.gentoo.org/803011 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Alexis Ballier gentoo.org> dev-ros/image_cb_detector/files/py3.patch | 22 ++++++++++++++++++++++ ....ebuild => image_cb_detector-0.10.15-r1.ebuild} | 2 +- .../image_cb_detector-9999.ebuild | 2 +- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dev-ros/image_cb_detector/files/py3.patch b/dev-ros/image_cb_detector/files/py3.patch new file mode 100644 index 00000000000..54475afd66d --- /dev/null +++ b/dev-ros/image_cb_detector/files/py3.patch @@ -0,0 +1,22 @@ +Index: image_cb_detector/src/image_cb_detector/cb_detector.py +=================================================================== +--- image_cb_detector.orig/src/image_cb_detector/cb_detector.py ++++ image_cb_detector/src/image_cb_detector/cb_detector.py +@@ -39,7 +39,7 @@ NAME = 'image_cb_detector_node' + import roslib; roslib.load_manifest(PKG) + + import rospy +-import cv ++import cv2 as cv + import math + + from sensor_msgs.msg import Image +@@ -130,7 +130,7 @@ class ImageCbDetectorNode: + #we need to convert the ros image to an opencv image + try: + image = self.bridge.imgmsg_to_cv(ros_image, "mono8") +- except CvBridgeError, e: ++ except CvBridgeError as e: + rospy.logerror("Error importing image %s" % e) + return + diff --git a/dev-ros/image_cb_detector/image_cb_detector-0.10.15.ebuild b/dev-ros/image_cb_detector/image_cb_detector-0.10.15-r1.ebuild similarity index 91% rename from dev-ros/image_cb_detector/image_cb_detector-0.10.15.ebuild rename to dev-ros/image_cb_detector/image_cb_detector-0.10.15-r1.ebuild index 72b5cebfd88..3cb98fba9da 100644 --- a/dev-ros/image_cb_detector/image_cb_detector-0.10.15.ebuild +++ b/dev-ros/image_cb_detector/image_cb_detector-0.10.15-r1.ebuild @@ -30,4 +30,4 @@ DEPEND="${RDEPEND} dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] " -PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/c11.patch" ) +PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/c11.patch" "${FILESDIR}/py3.patch" ) diff --git a/dev-ros/image_cb_detector/image_cb_detector-9999.ebuild b/dev-ros/image_cb_detector/image_cb_detector-9999.ebuild index 72b5cebfd88..3cb98fba9da 100644 --- a/dev-ros/image_cb_detector/image_cb_detector-9999.ebuild +++ b/dev-ros/image_cb_detector/image_cb_detector-9999.ebuild @@ -30,4 +30,4 @@ DEPEND="${RDEPEND} dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] " -PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/c11.patch" ) +PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/c11.patch" "${FILESDIR}/py3.patch" )