app-accessibility/simon: Fix build w/ opencv3, bug 558534

Package-Manager: portage-2.2.24

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 (file)
index 0000000..b6a7d33
--- /dev/null
+++ b/app-accessibility/simon/files/simon-0.4.1-opencv-include.patch
@@ -0,0 +1,20 @@
+From: Peter Grasch <me@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 b2b9c344428d3e746205a8799ba732a5a99dceb0..d713e97c7fda8679ea490cd9c63ab1726507d723 100644 (file)
--- 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=(