Fix building with -scrollview (bug 556448)

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 565C32BC)

4 files changed, 51 insertions, 3 deletions

diff --git a/app-text/tesseract/ChangeLog b/app-text/tesseract/ChangeLog
index 80d9ed09fce1..d13b0ac180dd 100644
--- a/app-text/tesseract/ChangeLog
+++ b/app-text/tesseract/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/tesseract
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tesseract/ChangeLog,v 1.61 2015/08/04 08:02:52 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tesseract/ChangeLog,v 1.62 2015/08/05 07:14:51 tomka Exp $
+
+  05 Aug 2015; Thomas Kahle <tomka@gentoo.org>
+  +files/tesseract-3.04.00-fix-scrollview-disabled.patch,
+  tesseract-3.04.00-r1.ebuild, tesseract-3.04.00.ebuild:
+  Fix building with -scrollview (bug 556448)
 
   04 Aug 2015; Thomas Kahle <tomka@gentoo.org> tesseract-3.04.00-r1.ebuild:
   Fix URI and other things (bug 556590)
diff --git a/app-text/tesseract/files/tesseract-3.04.00-fix-scrollview-disabled.patch b/app-text/tesseract/files/tesseract-3.04.00-fix-scrollview-disabled.patch
new file mode 100644
index 000000000000..7523e3b44960
--- /dev/null
+++ b/app-text/tesseract/files/tesseract-3.04.00-fix-scrollview-disabled.patch
@@ -0,0 +1,41 @@
+From 27b8a5cc89898c3f12dae57a58b15efddee9fe18 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zdenko=20Podobn=C3=BD?= <zdenop@gmail.com>
+Date: Thu, 23 Jul 2015 23:14:53 +0200
+Subject: [PATCH] fix GRAPHICS_DISABLED build
+
+---
+ ccstruct/imagedata.cpp | 4 ++++
+ ccstruct/split.cpp     | 5 +++++
+ 2 files changed, 9 insertions(+)
+
+diff --git a/ccstruct/imagedata.cpp b/ccstruct/imagedata.cpp
+index 4016a92..3c244c7 100644
+--- a/ccstruct/imagedata.cpp
++++ b/ccstruct/imagedata.cpp
+@@ -17,6 +17,10 @@
+ // limitations under the License.
+ ///////////////////////////////////////////////////////////////////////
+ 
++// Include automatically generated configuration file if running autoconf.
++#ifdef HAVE_CONFIG_H
++#include "config_auto.h"
++#endif
+ 
+ #include "imagedata.h"
+ 
+diff --git a/ccstruct/split.cpp b/ccstruct/split.cpp
+index 24650d4..6e6ea44 100644
+--- a/ccstruct/split.cpp
++++ b/ccstruct/split.cpp
+@@ -25,6 +25,11 @@
+ /*----------------------------------------------------------------------
+               I n c l u d e s
+ ----------------------------------------------------------------------*/
++// Include automatically generated configuration file if running autoconf.
++#ifdef HAVE_CONFIG_H
++#include "config_auto.h"
++#endif
++
+ #include "split.h"
+ #include "coutln.h"
+ #include "tprintf.h"
diff --git a/app-text/tesseract/tesseract-3.04.00-r1.ebuild b/app-text/tesseract/tesseract-3.04.00-r1.ebuild
index 2be8e0376988..958057a31c7e 100644
--- a/app-text/tesseract/tesseract-3.04.00-r1.ebuild
+++ b/app-text/tesseract/tesseract-3.04.00-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tesseract/tesseract-3.04.00-r1.ebuild,v 1.3 2015/08/04 08:02:52 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tesseract/tesseract-3.04.00-r1.ebuild,v 1.4 2015/08/05 07:14:51 tomka Exp $
 
 EAPI=5
 
@@ -73,6 +73,7 @@ DOCS=(AUTHORS ChangeLog NEWS README ReleaseNotes )
 
 PATCHES=(
 	"${FILESDIR}/tesseract-2.04-gcc47.patch"
+	"${FILESDIR}/${P}-fix-scrollview-disabled.patch"
 )
 
 src_unpack() {
diff --git a/app-text/tesseract/tesseract-3.04.00.ebuild b/app-text/tesseract/tesseract-3.04.00.ebuild
index 9fb747d32b77..dd4542816393 100644
--- a/app-text/tesseract/tesseract-3.04.00.ebuild
+++ b/app-text/tesseract/tesseract-3.04.00.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tesseract/tesseract-3.04.00.ebuild,v 1.2 2015/08/03 15:29:30 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tesseract/tesseract-3.04.00.ebuild,v 1.3 2015/08/05 07:14:51 tomka Exp $
 
 EAPI=5
 
@@ -76,6 +76,7 @@ DOCS=(AUTHORS ChangeLog NEWS README ReleaseNotes )
 
 PATCHES=(
 	"${FILESDIR}/tesseract-2.04-gcc47.patch"
+	"${FILESDIR}/${P}-fix-scrollview-disabled.patch"
 )
 
 src_configure() {