From: Patrick McLean Date: Thu, 1 Mar 2007 14:39:41 +0000 (+0000) Subject: Add patch contributed by David Watzke to fix build errors on some... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=aa1f2cf3fb1b793a0e3a21942bf84ece2a0a235b;p=gentoo.git Add patch contributed by David Watzke to fix build errors on some systems (fixes bug #168193) Package-Manager: portage-2.1.2-r12 --- 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 + +files/tesseract-1.03-globals.patch, tesseract-1.03-r1.ebuild: + Add patch contributed by David Watzke to fix build errors + on some systems (fixes bug #168193) 26 Feb 2007; Michael Cummings tesseract-1.03-r1.ebuild: diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest index 85034b91fd1a..b95ba7fd3a14 100644 --- a/app-text/tesseract/Manifest +++ b/app-text/tesseract/Manifest @@ -1,28 +1,29 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX tesseract-1.0.xterm-path.patch 629 RMD160 bcfd96f1ee65420c9a20260f67b52d3968bed6a4 SHA1 f1e88fb8dcb275b7ada4ca89a09069efa1f12c2c SHA256 14d0ea0dbfa35f8b457da1c568af95c01a5401392f1fc92f3f30f1b1146cd88a MD5 295f0f50f90c5be7176218c9f943c251 files/tesseract-1.0.xterm-path.patch 629 RMD160 bcfd96f1ee65420c9a20260f67b52d3968bed6a4 files/tesseract-1.0.xterm-path.patch 629 SHA256 14d0ea0dbfa35f8b457da1c568af95c01a5401392f1fc92f3f30f1b1146cd88a files/tesseract-1.0.xterm-path.patch 629 +AUX tesseract-1.03-globals.patch 1820 RMD160 9f5863bba626d16dd15178d713ab71f6ea929a96 SHA1 a78f1328766395da015079beec202d7ed67d4554 SHA256 395fd24d9093223968a9e91b648771c87eb23d602b026f0cc0436909afa16424 +MD5 c5ba7ee84f979a135f856378be0fa920 files/tesseract-1.03-globals.patch 1820 +RMD160 9f5863bba626d16dd15178d713ab71f6ea929a96 files/tesseract-1.03-globals.patch 1820 +SHA256 395fd24d9093223968a9e91b648771c87eb23d602b026f0cc0436909afa16424 files/tesseract-1.03-globals.patch 1820 DIST tesseract-1.02.02022007.tar.gz 2785659 RMD160 7fcbac6a32f838b243bd72daee46a17f53c47f93 SHA1 214b9aa35c1e06c6848d07932520661ac1ba7197 SHA256 b175f4d341a9189a1109b02defd0be4c7a27a1ccde4c6abad1d83b1fa4cccf80 DIST tesseract-1.03.tar.gz 2828351 RMD160 21a3fa31ed3c2232e33c5ebf43321c4feba735d1 SHA1 086df31165a5b467aae96f7076b2dee86dce6583 SHA256 75033707378f01e5f6e67b90e050ac385ad5bf29ab81d9063acfc791a163d971 EBUILD tesseract-1.02.02022007.ebuild 1197 RMD160 c99475c3814dc08957c1635ea392692627c5c690 SHA1 4e6e90b220a3553ac962d088d5e9041585e59e25 SHA256 8aa2fb2d5289ab12e3dcb79d6b4e43c9f442e6f1fe350b34439ec69786f14049 MD5 e97bc4e035176a6ca0647f6b5b5c5ec1 tesseract-1.02.02022007.ebuild 1197 RMD160 c99475c3814dc08957c1635ea392692627c5c690 tesseract-1.02.02022007.ebuild 1197 SHA256 8aa2fb2d5289ab12e3dcb79d6b4e43c9f442e6f1fe350b34439ec69786f14049 tesseract-1.02.02022007.ebuild 1197 -EBUILD tesseract-1.03-r1.ebuild 1266 RMD160 ff8b323b005a579e79c748d27819e00c5a0f3c17 SHA1 1f7304d96126639dec76274b461aa4fd6d89ec25 SHA256 ae7340f9aadb8c8bc8d386a692c0e3a4cd6d697739ed933a27c480111ab8c441 -MD5 46f84ea471ccd761ff18e5df5e15388e tesseract-1.03-r1.ebuild 1266 -RMD160 ff8b323b005a579e79c748d27819e00c5a0f3c17 tesseract-1.03-r1.ebuild 1266 -SHA256 ae7340f9aadb8c8bc8d386a692c0e3a4cd6d697739ed933a27c480111ab8c441 tesseract-1.03-r1.ebuild 1266 +EBUILD tesseract-1.03-r1.ebuild 1302 RMD160 914a281cddf325636f938cc8a28dbd290aff9598 SHA1 c5425c5679a1e3d7427980790a48348d8857c9ab SHA256 1cc91b58d99717aba364751404e1e6ddd90b5c41101080b4eba571fe34e6957f +MD5 5b3eed6317d26789de05c5b3b448a15f tesseract-1.03-r1.ebuild 1302 +RMD160 914a281cddf325636f938cc8a28dbd290aff9598 tesseract-1.03-r1.ebuild 1302 +SHA256 1cc91b58d99717aba364751404e1e6ddd90b5c41101080b4eba571fe34e6957f tesseract-1.03-r1.ebuild 1302 EBUILD tesseract-1.03.ebuild 1149 RMD160 edaffa5f406712cfa6b48127b73ec21fa2446139 SHA1 647ac95aa1106d6b4203dfa06c8829d84ccecba6 SHA256 7c5c1fa8cd97d9b08a6a7621428b8fe231c2afc00fc6698f32fc4acefcfbe68a MD5 af5a64d6c27e092d0f7042f664a274a5 tesseract-1.03.ebuild 1149 RMD160 edaffa5f406712cfa6b48127b73ec21fa2446139 tesseract-1.03.ebuild 1149 SHA256 7c5c1fa8cd97d9b08a6a7621428b8fe231c2afc00fc6698f32fc4acefcfbe68a tesseract-1.03.ebuild 1149 -MISC ChangeLog 1188 RMD160 2735ef2b190b38b8774c431beeefe4a75d9a9924 SHA1 c789ceb43a6b9709d506786410d298dd44cb4c23 SHA256 73d31b0710017440e75d6932d0fb0350f0dda758ecac6a329c76c426fdd89973 -MD5 4b34304b77b29dd7993eacaf4ca70cb7 ChangeLog 1188 -RMD160 2735ef2b190b38b8774c431beeefe4a75d9a9924 ChangeLog 1188 -SHA256 73d31b0710017440e75d6932d0fb0350f0dda758ecac6a329c76c426fdd89973 ChangeLog 1188 +MISC ChangeLog 1421 RMD160 efe63c4c16b21e7191dd47755f3ff6a9ad7cd950 SHA1 a5f6e0ce578a2117440326daa88ee93cac3410d6 SHA256 ab9b4ff0237fef40b3ea078b2e49c72aea96b88a3d2062d790a1b36e883e483a +MD5 4990afde7d1dbfda5639c1bcdb52827a ChangeLog 1421 +RMD160 efe63c4c16b21e7191dd47755f3ff6a9ad7cd950 ChangeLog 1421 +SHA256 ab9b4ff0237fef40b3ea078b2e49c72aea96b88a3d2062d790a1b36e883e483a ChangeLog 1421 MISC metadata.xml 486 RMD160 a822519d57f956abde805856cb6efcf7168bb7a7 SHA1 e9d1b325f4a1e2fc4bc34211c31addde8e60ab95 SHA256 f42a3773900c016a5453b563b46aabb1cdac673dfa88f5553edf609b588ea3fa MD5 b9a60e5d0d72507a2f5bcde06064d1a2 metadata.xml 486 RMD160 a822519d57f956abde805856cb6efcf7168bb7a7 metadata.xml 486 @@ -36,10 +37,3 @@ SHA256 47a9110af0c3375d9c3ab1a012a8d235ba8c979678e98281f49dfcd6588e7c02 files/di MD5 a83c5c92795fca976632add5e04a60fd files/digest-tesseract-1.03-r1 247 RMD160 a6a4065997a301c5f9705d9ab6d532ba45412310 files/digest-tesseract-1.03-r1 247 SHA256 47a9110af0c3375d9c3ab1a012a8d235ba8c979678e98281f49dfcd6588e7c02 files/digest-tesseract-1.03-r1 247 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.2 (GNU/Linux) - -iD8DBQFF4yovtG5z4I8BtQoRAkM6AJ4vftJQ4THfvuVjxJmSv6YtD8tGFgCePrIA -zNPwN0IyGxcegxNeqBdS03c= -=Nsqo ------END PGP SIGNATURE----- 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() {