Add patch contributed by David Watzke <david@watzke.cz> to fix build errors on some systems (fixes bug #168193)

(Portage version: 2.1.2-r12)

3 files changed, 55 insertions, 3 deletions

diff --git a/app-text/tesseract/ChangeLog b/app-text/tesseract/ChangeLog
index 324939e60e18..d4ac92bbb3f0 100644
--- a/app-text/tesseract/ChangeLog
+++ b/app-text/tesseract/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/tesseract
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tesseract/ChangeLog,v 1.6 2007/02/26 18:42:49 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tesseract/ChangeLog,v 1.7 2007/03/01 14:39:41 chutzpah Exp $
+
+  01 Mar 2007; Patrick McLean <chutzpah@gentoo.org>
+  +files/tesseract-1.03-globals.patch, tesseract-1.03-r1.ebuild:
+  Add patch contributed by David Watzke <david@watzke.cz> to fix build errors
+  on some systems (fixes bug #168193)
 
   26 Feb 2007; Michael Cummings <mcummings@gentoo.org>
   tesseract-1.03-r1.ebuild:
diff --git a/app-text/tesseract/files/tesseract-1.03-globals.patch b/app-text/tesseract/files/tesseract-1.03-globals.patch
new file mode 100644
index 000000000000..fdbd140e6667
--- /dev/null
+++ b/app-text/tesseract/files/tesseract-1.03-globals.patch
@@ -0,0 +1,46 @@
+diff -ru tesseract-1.03~/ccutil/getopt.h tesseract-1.03/ccutil/getopt.h
+--- tesseract-1.03~/ccutil/getopt.h	2007-02-24 00:24:36.000000000 +0100
++++ tesseract-1.03/ccutil/getopt.h	2007-02-24 00:24:42.000000000 +0100
+@@ -20,9 +20,6 @@
+ #include          "host.h"
+ #include          "notdll.h"     //must be last include
+ 
+-extern int optind;
+-extern char *optarg;
+-
+ int getopt (                     //parse args
+ INT32 argc,                      //arg count
+ char *argv[],                    //args
+diff -ru tesseract-1.03~/ccmain/tfacep.h tesseract-1.03/ccmain/tfacep.h
+--- tesseract-1.03~/ccmain/tfacep.h	2006-06-17 00:17:03.000000000 +0200
++++ tesseract-1.03/ccmain/tfacep.h	2007-02-24 00:12:20.000000000 +0100
+@@ -103,7 +103,6 @@
+   //extern int                                    enable_assoc;
+   //extern int                                    chop_enable;
+   //extern int                                    permute_only_top;
+-  extern int display_ratings;
+ 
+ };
+ 
+diff -ru tesseract-1.03~/training/cnTraining.cpp tesseract-1.03/training/cnTraining.cpp
+--- tesseract-1.03~/training/cnTraining.cpp	2006-10-20 00:25:38.000000000 +0200
++++ tesseract-1.03/training/cnTraining.cpp	2007-02-24 00:17:46.000000000 +0100
+@@ -29,6 +29,7 @@
+ #include "emalloc.h"
+ #include "featdefs.h"
+ #include "getopt.h"
++#include "globals.h"
+ #include "ocrfeatures.h"
+ #include "general.h"
+ #include "clusttool.h"
+diff -ru tesseract-1.03~/training/mfTraining.cpp tesseract-1.03/training/mfTraining.cpp
+--- tesseract-1.03~/training/mfTraining.cpp	2007-02-01 04:09:21.000000000 +0100
++++ tesseract-1.03/training/mfTraining.cpp	2007-02-24 00:18:18.000000000 +0100
+@@ -31,6 +31,7 @@
+ #include "emalloc.h"
+ #include "featdefs.h"
+ #include "getopt.h"
++#include "globals.h"
+ #include "ocrfeatures.h"
+ #include "general.h"
+ #include "clusttool.h"
diff --git a/app-text/tesseract/tesseract-1.03-r1.ebuild b/app-text/tesseract/tesseract-1.03-r1.ebuild
index 86c0ff37d9bc..2a7b1a2adf0f 100644
--- a/app-text/tesseract/tesseract-1.03-r1.ebuild
+++ b/app-text/tesseract/tesseract-1.03-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tesseract/tesseract-1.03-r1.ebuild,v 1.4 2007/02/26 18:42:49 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tesseract/tesseract-1.03-r1.ebuild,v 1.5 2007/03/01 14:39:41 chutzpah Exp $
 
 inherit eutils multilib
 
@@ -20,7 +20,8 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	epatch "${FILESDIR}"/tesseract-1.0.xterm-path.patch
+	epatch "${FILESDIR}"/${PN}-1.0.xterm-path.patch
+	epatch "${FILESDIR}"/${P}-globals.patch
 }
 
 src_compile() {