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 B24AB1395E2 for ; Mon, 28 Nov 2016 15:11:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E0088E0B5B; Mon, 28 Nov 2016 15:11:35 +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 B85D6E0B5B for ; Mon, 28 Nov 2016 15:11:35 +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 CDF48341586 for ; Mon, 28 Nov 2016 15:11:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C702824AE for ; Mon, 28 Nov 2016 15:11:31 +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: <1480345468.2701f4e2ecddcdce15248edf2f4d66936b3187ef.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ros/pluginlib/, dev-ros/pluginlib/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ros/pluginlib/files/gentoo.patch dev-ros/pluginlib/pluginlib-1.10.4-r1.ebuild dev-ros/pluginlib/pluginlib-1.10.4.ebuild dev-ros/pluginlib/pluginlib-9999.ebuild X-VCS-Directories: dev-ros/pluginlib/ dev-ros/pluginlib/files/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: 2701f4e2ecddcdce15248edf2f4d66936b3187ef X-VCS-Branch: master Date: Mon, 28 Nov 2016 15:11:31 +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: 5efe6726-8e18-400d-8b9e-a847c15dcbb9 X-Archives-Hash: 9f65dc666cc2d378e4687ce1966007ad commit: 2701f4e2ecddcdce15248edf2f4d66936b3187ef Author: Alexis Ballier gentoo org> AuthorDate: Mon Nov 28 15:04:16 2016 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Mon Nov 28 15:04:28 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2701f4e2 dev-ros/pluginlib: look for package.xml in ros_packages too for plugins. Package-Manager: portage-2.3.2 dev-ros/pluginlib/files/gentoo.patch | 34 ++++++++++++++++++++++ ...ib-1.10.4.ebuild => pluginlib-1.10.4-r1.ebuild} | 1 + dev-ros/pluginlib/pluginlib-9999.ebuild | 1 + 3 files changed, 36 insertions(+) diff --git a/dev-ros/pluginlib/files/gentoo.patch b/dev-ros/pluginlib/files/gentoo.patch new file mode 100644 index 00000000..6737f76 --- /dev/null +++ b/dev-ros/pluginlib/files/gentoo.patch @@ -0,0 +1,34 @@ +Find package.xml in ros_packages/package_name too as we moved it here. + +Index: pluginlib-1.10.4/include/pluginlib/class_loader_imp.h +=================================================================== +--- pluginlib-1.10.4.orig/include/pluginlib/class_loader_imp.h ++++ pluginlib-1.10.4/include/pluginlib/class_loader_imp.h +@@ -444,6 +444,7 @@ namespace pluginlib + std::string package_name; + boost::filesystem::path p(plugin_xml_file_path); + boost::filesystem::path parent = p.parent_path(); ++ boost::filesystem::path basename = p.filename(); + + //Figure out exactly which package the passed XML file is exported by. + while (true) +@@ -453,6 +454,11 @@ namespace pluginlib + std::string package_file_path = (boost::filesystem::path(parent / "package.xml")).string(); + return(extractPackageNameFromPackageXML(package_file_path)); + } ++ else if(boost::filesystem::exists(parent / "ros_packages" / basename / "package.xml")) ++ { ++ std::string package_file_path = (boost::filesystem::path(parent / "ros_packages" / basename / "package.xml")).string(); ++ return(extractPackageNameFromPackageXML(package_file_path)); ++ } + else if (boost::filesystem::exists(parent / "manifest.xml")) + { + #if BOOST_FILESYSTEM_VERSION >= 3 +@@ -470,6 +476,7 @@ namespace pluginlib + } + + //Recursive case - hop one folder up ++ basename = parent.filename(); + parent = parent.parent_path().string(); + + //Base case - reached root and cannot find what we're looking for diff --git a/dev-ros/pluginlib/pluginlib-1.10.4.ebuild b/dev-ros/pluginlib/pluginlib-1.10.4-r1.ebuild similarity index 93% rename from dev-ros/pluginlib/pluginlib-1.10.4.ebuild rename to dev-ros/pluginlib/pluginlib-1.10.4-r1.ebuild index 2791a4d..a96bdae 100644 --- a/dev-ros/pluginlib/pluginlib-1.10.4.ebuild +++ b/dev-ros/pluginlib/pluginlib-1.10.4-r1.ebuild @@ -25,3 +25,4 @@ RDEPEND=" " DEPEND="${RDEPEND} test? ( dev-cpp/gtest )" +PATCHES=( "${FILESDIR}/gentoo.patch" ) diff --git a/dev-ros/pluginlib/pluginlib-9999.ebuild b/dev-ros/pluginlib/pluginlib-9999.ebuild index 2791a4d..a96bdae 100644 --- a/dev-ros/pluginlib/pluginlib-9999.ebuild +++ b/dev-ros/pluginlib/pluginlib-9999.ebuild @@ -25,3 +25,4 @@ RDEPEND=" " DEPEND="${RDEPEND} test? ( dev-cpp/gtest )" +PATCHES=( "${FILESDIR}/gentoo.patch" )