Fix compile with GCC 4.4 wrt #269320, thanks to Jose daLuz and Victor Ostorga.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 29 insertions, 7 deletions

diff --git a/app-text/tesseract/ChangeLog b/app-text/tesseract/ChangeLog
index 32aaad27f2c7..47999f2992f7 100644
--- a/app-text/tesseract/ChangeLog
+++ b/app-text/tesseract/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/tesseract
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tesseract/ChangeLog,v 1.18 2009/04/14 20:47:29 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tesseract/ChangeLog,v 1.19 2009/05/11 16:59:59 ssuominen Exp $
+
+  11 May 2009; Samuli Suominen <ssuominen@gentoo.org> tesseract-2.03.ebuild,
+  +files/tesseract-2.03-gcc44.patch:
+  Fix compile with GCC 4.4 wrt #269320, thanks to Jose daLuz and Victor
+  Ostorga.
 
   14 Apr 2009; Brent Baude <ranger@gentoo.org> tesseract-2.03.ebuild:
   Marking tesseract-2.03 ppc64 for bug 245230
diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest
index e2ab855c3303..226ffc80cb91 100644
--- a/app-text/tesseract/Manifest
+++ b/app-text/tesseract/Manifest
@@ -2,6 +2,7 @@ AUX includes.patch 1187 RMD160 13e56bbac2ef091c2426a19e490817810fa9156c SHA1 d07
 AUX tesseract-1.0.xterm-path.patch 629 RMD160 bcfd96f1ee65420c9a20260f67b52d3968bed6a4 SHA1 f1e88fb8dcb275b7ada4ca89a09069efa1f12c2c SHA256 14d0ea0dbfa35f8b457da1c568af95c01a5401392f1fc92f3f30f1b1146cd88a
 AUX tesseract-1.03-globals.patch 1820 RMD160 9f5863bba626d16dd15178d713ab71f6ea929a96 SHA1 a78f1328766395da015079beec202d7ed67d4554 SHA256 395fd24d9093223968a9e91b648771c87eb23d602b026f0cc0436909afa16424
 AUX tesseract-1.04b-globals.patch 1715 RMD160 13cc5d76a733df65d7a659b5f60b5f9e69596433 SHA1 2cb9f4eb4dc2a1e096e9b98d246da98a786e88a0 SHA256 8aca3a7384ada2c55649bfc87f802d86e24af23a22d930a1c453f88dd3ce3b0a
+AUX tesseract-2.03-gcc44.patch 420 RMD160 38f09469efaabce25f4b9cbbff7eb2676fb11f9b SHA1 1671cbbba1d349f371a517622e990ee071064079 SHA256 7a5b8540c520e294f0611448996b8b5bfa7e2609c97993de2d550b69b2a32f8f
 DIST tesseract-1.03.tar.gz 2828351 RMD160 21a3fa31ed3c2232e33c5ebf43321c4feba735d1 SHA1 086df31165a5b467aae96f7076b2dee86dce6583 SHA256 75033707378f01e5f6e67b90e050ac385ad5bf29ab81d9063acfc791a163d971
 DIST tesseract-1.04b.tar.gz 2899276 RMD160 5e9c70d4435a59157f0af6503a57b02a4a74350e SHA1 263a65e462ed864c4da115cdcb3f3e78613de485 SHA256 4dcbddbed71b1b27f7260413dd5d1498b835954128192acb0ab93c0d835c1c0c
 DIST tesseract-2.00.deu.tar.gz 1373777 RMD160 c7e6755e94084114fb1a1be8e9308c8dddd2fdda SHA1 d8d89e2681421a144f3a1ec61ee0c530686f5096 SHA256 6083f16373689ef55651f4dd7773426ab4c32a12ebf7f398af982ac2971fe404
@@ -18,6 +19,6 @@ DIST tesseract-2.03.tar.gz 1075509 RMD160 7519e7f4d876444bd3264d599dbf423e224433
 EBUILD tesseract-1.03-r1.ebuild 1314 RMD160 62fccd623b9d1eb845c6942dd16e004af3128250 SHA1 cf9d1a4a8aa38135551cb4c9bc0dad50c8a5e616 SHA256 f93a37937aa9655a8607374d9a3db8c8811301441208b5e6f67b118d523bcb9f
 EBUILD tesseract-1.04b.ebuild 859 RMD160 a0a0355ca36a5c36eb62b877ee0b0bfbc4e5bd16 SHA1 9e8bc49b1a020c9ebd69ef9ea0d0e5262e2a149a SHA256 39c221b70fa25371a947faa24f9995e0f373f7290fec81f0d7f6fd4d38737d7e
 EBUILD tesseract-2.00.ebuild 1564 RMD160 72edcb099c9b4fe26dbf2c7e439f3d1d0960a45e SHA1 b9d509d37e95111a0f23631fcf65267d58c6b5de SHA256 f5879732f007bfc3fb173c747148dc73ea050fc66e489d9b22e87e12d7f5d1f2
-EBUILD tesseract-2.03.ebuild 2025 RMD160 1cd897abfde6ecff920c3a5c4ca398891d1306b3 SHA1 e85ab3200f2ebf66da02feca1e541dc83d1551a3 SHA256 7f512b64ecef5f916aa89222e41bb53382e966024a11ac7ed7eb35b8350bf8b1
-MISC ChangeLog 2945 RMD160 75c92e29ad08591f462de4b9e8e9acdbe268a1a4 SHA1 add35e08020d09a11b1a6696214bc4652718c2d7 SHA256 16561caad57f19034a248e5bcf139651627726ed37f32dc5de48683b1202dde4
+EBUILD tesseract-2.03.ebuild 2064 RMD160 7b33ee14a13533b029e8a8487075730714061af6 SHA1 532f20f4b5b892a7a77b4f1b82a015921fe0f258 SHA256 5802ac4a41d40a94cc1c494c9013f082ce089197dd9f20ed966c08b3bd4c32cd
+MISC ChangeLog 3146 RMD160 b1fc80d6809fc394bc87b335999341b26dc15e63 SHA1 5faff82642f0b0a8bcb63035e7b6b7fa139d3daf SHA256 578efea842c90d11618f30e73306a87898a81a04f1d4831080fb8f0bd1eb190d
 MISC metadata.xml 486 RMD160 a822519d57f956abde805856cb6efcf7168bb7a7 SHA1 e9d1b325f4a1e2fc4bc34211c31addde8e60ab95 SHA256 f42a3773900c016a5453b563b46aabb1cdac673dfa88f5553edf609b588ea3fa
diff --git a/app-text/tesseract/files/tesseract-2.03-gcc44.patch b/app-text/tesseract/files/tesseract-2.03-gcc44.patch
new file mode 100644
index 000000000000..e1524d987e6b
--- /dev/null
+++ b/app-text/tesseract/files/tesseract-2.03-gcc44.patch
@@ -0,0 +1,15 @@
+diff -NrU5 tesseract-2.03.orig/viewer/svutil.cpp tesseract-2.03/viewer/svutil.cpp
+--- tesseract-2.03.orig/viewer/svutil.cpp	2009-05-11 16:27:37.000000000 -0600
++++ tesseract-2.03/viewer/svutil.cpp	2009-05-11 16:33:40.000000000 -0600
+@@ -36,10 +36,11 @@
+ #endif
+ #endif
+ 
+ #include <iostream>
+ #include <string.h>
++#include <cstdio>
+ #include <stdlib.h>
+ 
+ const int kBufferSize = 65536;
+ const int kMaxMsgSize = 4096;
+ 
diff --git a/app-text/tesseract/tesseract-2.03.ebuild b/app-text/tesseract/tesseract-2.03.ebuild
index 922066f2b257..dbf736bba4d9 100644
--- a/app-text/tesseract/tesseract-2.03.ebuild
+++ b/app-text/tesseract/tesseract-2.03.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tesseract/tesseract-2.03.ebuild,v 1.6 2009/04/14 20:47:29 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tesseract/tesseract-2.03.ebuild,v 1.7 2009/05/11 16:59:59 ssuominen Exp $
 
 inherit eutils
 
@@ -25,14 +25,15 @@ linguas_es linguas_pt linguas_vi"
 
 DEPEND="tiff? ( media-libs/tiff )"
 
-S="${WORKDIR}/${P}"
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
 	# Includes for gcc 4.3
-	epatch "${FILESDIR}/includes.patch" || die
+	epatch "${FILESDIR}"/includes.patch
+
+	# Includes for gcc 4.4
+	epatch "${FILESDIR}"/${P}-gcc44.patch
 
 	# Move language files
 	mv -f "${WORKDIR}"/tessdata/* tessdata/