| 1 |
commit: 9f224b06d4fcfe719b2881195d4673983884d483 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 23 12:27:56 2017 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 23 12:28:12 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f224b06 |
| 7 |
|
| 8 |
dev-ros/image_view: Backport upstream patch to build with gcc6. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
dev-ros/image_view/files/gcc6.patch | 44 ++++++++++++++++++++++++++++ |
| 13 |
dev-ros/image_view/image_view-1.12.19.ebuild | 3 +- |
| 14 |
2 files changed, 46 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/dev-ros/image_view/files/gcc6.patch b/dev-ros/image_view/files/gcc6.patch |
| 17 |
new file mode 100644 |
| 18 |
index 00000000..8683c0f |
| 19 |
--- /dev/null |
| 20 |
+++ b/dev-ros/image_view/files/gcc6.patch |
| 21 |
@@ -0,0 +1,44 @@ |
| 22 |
+commit 6c2d65452bd5fe62723988a1a570789921900d59 |
| 23 |
+Author: Lukas Bulwahn <lukas.bulwahn@×××××××××××××.de> |
| 24 |
+Date: Fri Sep 30 15:39:47 2016 +0200 |
| 25 |
+ |
| 26 |
+ address gcc6 build error |
| 27 |
+ |
| 28 |
+ With gcc6, compiling fails with `stdlib.h: No such file or directory`, |
| 29 |
+ as including '-isystem /usr/include' breaks with gcc6, cf., |
| 30 |
+ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129. |
| 31 |
+ |
| 32 |
+ This commit addresses this issue for this package in the same way |
| 33 |
+ it was addressed in various other ROS packages. A list of related |
| 34 |
+ commits and pull requests is at: |
| 35 |
+ |
| 36 |
+ https://github.com/ros/rosdistro/issues/12783 |
| 37 |
+ |
| 38 |
+ Signed-off-by: Lukas Bulwahn <lukas.bulwahn@×××××××××××××.de> |
| 39 |
+ |
| 40 |
+diff --git a/image_view/CMakeLists.txt b/image_view/CMakeLists.txt |
| 41 |
+index 78b9eaa..93fabe7 100644 |
| 42 |
+--- a/image_view/CMakeLists.txt |
| 43 |
++++ b/image_view/CMakeLists.txt |
| 44 |
+@@ -8,9 +8,9 @@ catkin_package(CATKIN_DEPENDS dynamic_reconfigure) |
| 45 |
+ find_package(Boost REQUIRED COMPONENTS signals thread) |
| 46 |
+ find_package(OpenCV REQUIRED) |
| 47 |
+ |
| 48 |
+-include_directories(SYSTEM ${Boost_INCLUDE_DIRS} |
| 49 |
+- ${catkin_INCLUDE_DIRS} |
| 50 |
+- ${OpenCV_INCLUDE_DIRS} |
| 51 |
++include_directories(${Boost_INCLUDE_DIRS} |
| 52 |
++ ${catkin_INCLUDE_DIRS} |
| 53 |
++ ${OpenCV_INCLUDE_DIRS} |
| 54 |
+ ) |
| 55 |
+ |
| 56 |
+ # Extra tools |
| 57 |
+@@ -40,7 +40,7 @@ endif() |
| 58 |
+ |
| 59 |
+ find_package(GTK2) |
| 60 |
+ add_definitions(-DHAVE_GTK) |
| 61 |
+-include_directories(SYSTEM ${GTK2_INCLUDE_DIRS}) |
| 62 |
++include_directories(${GTK2_INCLUDE_DIRS}) |
| 63 |
+ |
| 64 |
+ # Nodelet library |
| 65 |
+ add_library(image_view src/nodelets/image_nodelet.cpp src/nodelets/disparity_nodelet.cpp src/nodelets/window_thread.cpp) |
| 66 |
|
| 67 |
diff --git a/dev-ros/image_view/image_view-1.12.19.ebuild b/dev-ros/image_view/image_view-1.12.19.ebuild |
| 68 |
index 5aabd03..1856fbb 100644 |
| 69 |
--- a/dev-ros/image_view/image_view-1.12.19.ebuild |
| 70 |
+++ b/dev-ros/image_view/image_view-1.12.19.ebuild |
| 71 |
@@ -1,4 +1,4 @@ |
| 72 |
-# Copyright 1999-2016 Gentoo Foundation |
| 73 |
+# Copyright 1999-2017 Gentoo Foundation |
| 74 |
# Distributed under the terms of the GNU General Public License v2 |
| 75 |
# $Id$ |
| 76 |
|
| 77 |
@@ -31,3 +31,4 @@ RDEPEND=" |
| 78 |
dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}] |
| 79 |
" |
| 80 |
DEPEND="${RDEPEND}" |
| 81 |
+PATCHES=( "${FILESDIR}/gcc6.patch" ) |
Archives