diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2012-06-04 11:40:10 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2012-06-04 11:40:10 +0000 |
| commit | 05be35d62bc6cb5cb1b349874ab6fd587fe308cb (patch) | |
| tree | f2033bbb417e7eb082313b678070211a74eb631e /app-text | |
| parent | Stable for x86, wrt bug #418341 (diff) | |
| download | gentoo-2-05be35d62bc6cb5cb1b349874ab6fd587fe308cb.tar.gz gentoo-2-05be35d62bc6cb5cb1b349874ab6fd587fe308cb.tar.bz2 gentoo-2-05be35d62bc6cb5cb1b349874ab6fd587fe308cb.zip | |
Include fix for gcc47, #413937
(Portage version: 2.2.0_alpha109/cvs/Linux x86_64)
Diffstat (limited to 'app-text')
| -rw-r--r-- | app-text/tesseract/ChangeLog | 8 | ||||
| -rw-r--r-- | app-text/tesseract/files/tesseract-2.04-gcc47.patch | 10 | ||||
| -rw-r--r-- | app-text/tesseract/tesseract-2.04-r1.ebuild | 9 |
3 files changed, 22 insertions, 5 deletions
diff --git a/app-text/tesseract/ChangeLog b/app-text/tesseract/ChangeLog index 28b0edb20f64..a0b954a10707 100644 --- a/app-text/tesseract/ChangeLog +++ b/app-text/tesseract/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/tesseract -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/tesseract/ChangeLog,v 1.29 2010/11/20 11:37:09 armin76 Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/tesseract/ChangeLog,v 1.30 2012/06/04 11:40:10 jlec Exp $ + + 04 Jun 2012; Justin Lecher <jlec@gentoo.org> tesseract-2.04-r1.ebuild, + +files/tesseract-2.04-gcc47.patch: + Include fix for gcc47, #413937 20 Nov 2010; Raúl Porcel <armin76@gentoo.org> tesseract-2.04-r1.ebuild: Add ~arm wrt #345735 diff --git a/app-text/tesseract/files/tesseract-2.04-gcc47.patch b/app-text/tesseract/files/tesseract-2.04-gcc47.patch new file mode 100644 index 000000000000..afc560a8dc4a --- /dev/null +++ b/app-text/tesseract/files/tesseract-2.04-gcc47.patch @@ -0,0 +1,10 @@ +--- ./viewer/svutil.cpp.ori 2012-04-28 01:59:58.441072997 +0200 ++++ ./viewer/svutil.cpp 2012-04-28 02:00:35.085467955 +0200 +@@ -37,6 +37,7 @@ + #include <signal.h> + #include <stdlib.h> + #include <string.h> ++#include <unistd.h> + #include <netdb.h> + #include <sys/socket.h> + #ifdef __linux__ diff --git a/app-text/tesseract/tesseract-2.04-r1.ebuild b/app-text/tesseract/tesseract-2.04-r1.ebuild index a1010c686395..ccfcb1b6c6bb 100644 --- a/app-text/tesseract/tesseract-2.04-r1.ebuild +++ b/app-text/tesseract/tesseract-2.04-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/tesseract/tesseract-2.04-r1.ebuild,v 1.7 2010/11/20 11:37:09 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/tesseract/tesseract-2.04-r1.ebuild,v 1.8 2012/06/04 11:40:10 jlec Exp $ EAPI="2" @@ -48,7 +48,10 @@ src_prepare() { rm "${S}/java/makefile" || die "remove obsolete java makefile failed" # fix gcc-4.4 compilation, bug 269320 - epatch "${FILESDIR}"/${P}-gcc44.patch + # fix gcc-4.7 compilation, bug 413937 + epatch \ + "${FILESDIR}"/${P}-gcc44.patch \ + "${FILESDIR}"/${P}-gcc47.patch } src_configure() { |