commit: 3ffe920c7daee95c45cbdd9dc4d4ac1f22f27e25 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> AuthorDate: Thu Dec 17 22:34:27 2015 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Sun Dec 27 16:47:49 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ffe920c
app-accessibility/simon: Fix build w/ opencv3, bug 558534 Package-Manager: portage-2.2.24 .../simon/files/simon-0.4.1-opencv-include.patch | 20 ++++++++++++++++++++ app-accessibility/simon/simon-0.4.1.ebuild | 11 ++++++----- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/app-accessibility/simon/files/simon-0.4.1-opencv-include.patch b/app-accessibility/simon/files/simon-0.4.1-opencv-include.patch new file mode 100644 index 0000000..b6a7d33 --- /dev/null +++ b/app-accessibility/simon/files/simon-0.4.1-opencv-include.patch @@ -0,0 +1,20 @@ +From: Peter Grasch <m...@bedahr.org> +Date: Sat, 25 Jul 2015 08:45:03 +0000 +Subject: Adding OpenCV include directories to include path +X-Git-Url: http://quickgit.kde.org/?p=simon.git&a=commitdiff&h=b4e663e5cc36511b15ef20865c723182cd3d88c9 +--- +Adding OpenCV include directories to include path +--- + + +--- a/cmake/FindOpenCV.cmake ++++ b/cmake/FindOpenCV.cmake +@@ -61,6 +61,7 @@ + + ## Include the standard CMake script + include("${OpenCV_DIR}/OpenCVConfig.cmake") ++ include_directories(${OpenCV_INCLUDE_DIRS}) + + ## Search for a specific version + set(CVLIB_SUFFIX "${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}") + diff --git a/app-accessibility/simon/simon-0.4.1.ebuild b/app-accessibility/simon/simon-0.4.1.ebuild index b2b9c34..d713e97 100644 --- a/app-accessibility/simon/simon-0.4.1.ebuild +++ b/app-accessibility/simon/simon-0.4.1.ebuild @@ -51,11 +51,12 @@ DEPEND="${RDEPEND} virtual/pkgconfig nls? ( sys-devel/gettext )" -src_prepare() { - epatch "${FILESDIR}"/${P}-libdir.patch \ - "${FILESDIR}"/${P}-linguas.patch \ - "${FILESDIR}"/${P}-sphinx.patch -} +PATCHES=( + "${FILESDIR}"/${P}-libdir.patch + "${FILESDIR}"/${P}-linguas.patch + "${FILESDIR}"/${P}-sphinx.patch + "${FILESDIR}"/${P}-opencv-include.patch +) src_configure() { local mycmakeargs=(