From b9094d6b19467d29fce21d8224636b598234143a Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Mon, 24 Aug 2009 07:12:40 +0000 Subject: [PATCH] Update to tesseract-2.04 Fixes more than 20 issues, including portability ones. from Daniel Dickman, thanks! --- graphics/tesseract/Makefile | 8 ++-- graphics/tesseract/distinfo | 10 ++--- graphics/tesseract/patches/patch-Makefile_in | 18 ++++---- .../tesseract/patches/patch-ccmain_pgedit_cpp | 8 ++-- .../patches/patch-ccutil_debugwin_cpp | 10 ++--- graphics/tesseract/patches/patch-configure | 41 +++++++++++++------ .../tesseract/patches/patch-dict_dawg_cpp | 8 ++-- .../tesseract/patches/patch-dict_makedawg_cpp | 8 ++-- .../tesseract/patches/patch-viewer_svutil_h | 8 ++-- graphics/tesseract/pkg/PLIST-main | 3 +- 10 files changed, 69 insertions(+), 53 deletions(-) diff --git a/graphics/tesseract/Makefile b/graphics/tesseract/Makefile index ea335034c67..249ddfd57f0 100644 --- a/graphics/tesseract/Makefile +++ b/graphics/tesseract/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.3 2009/03/05 08:09:40 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.4 2009/08/24 07:12:40 ajacoutot Exp $ -COMMENT-main= OCR Engine developed at HP Labs. +COMMENT-main= OCR Engine developed at HP Labs COMMENT-de= German language data for tesseract COMMENT-es= Spanish language data for tesseract COMMENT-fr= French language data for tesseract @@ -8,10 +8,10 @@ COMMENT-it= Italian language data for tesseract COMMENT-nl= Dutch language data for tesseract COMMENT-pt= Portuguese (Brazilian) language data for tesseract -DISTNAME= tesseract-2.03 +DISTNAME= tesseract-2.04 CATEGORIES= graphics textproc -PKGNAME-main= ${DISTNAME}p1 +PKGNAME-main= ${DISTNAME} PKGNAME-de= tesseract-de-2.00 PKGNAME-es= tesseract-es-2.00 PKGNAME-fr= tesseract-fr-2.00 diff --git a/graphics/tesseract/distinfo b/graphics/tesseract/distinfo index d57248e1dd4..7ed09719bff 100644 --- a/graphics/tesseract/distinfo +++ b/graphics/tesseract/distinfo @@ -5,7 +5,7 @@ MD5 (tesseract-2.00.ita.tar.gz) = J1nh2ukamJpDSQ/0wiU6Sw== MD5 (tesseract-2.00.nld.tar.gz) = svbt4YLOpLv//TsEBTPOWA== MD5 (tesseract-2.00.spa.tar.gz) = vCand7I4RhOJVnfLjmHKdQ== MD5 (tesseract-2.01.por.tar.gz) = 7KIf7Tzh+N7Y387b0TUa9w== -MD5 (tesseract-2.03.tar.gz) = V3e3CxHfFsGsmqFV18/FUw== +MD5 (tesseract-2.04.tar.gz) = tE66Gp9Ikqxi5ITIB/4FMw== RMD160 (tesseract-2.00.deu.tar.gz) = x+Z1XpQIQRT7Ghvo6TCMjd3S/do= RMD160 (tesseract-2.00.eng.tar.gz) = SoCQcpUEwhazmI8YnqeaWl4iMXM= RMD160 (tesseract-2.00.fra.tar.gz) = lr9Oa/ymrCuaPsA7VFpP0S2PND4= @@ -13,7 +13,7 @@ RMD160 (tesseract-2.00.ita.tar.gz) = Bec51oSrE4tbsDJSbgGb+gHhovY= RMD160 (tesseract-2.00.nld.tar.gz) = zhb78X1M5UQmmzf1wH1SOfrSK/8= RMD160 (tesseract-2.00.spa.tar.gz) = Dh/LVzm5XUEx7+6kQNNT9WOLtX0= RMD160 (tesseract-2.01.por.tar.gz) = OwIX7GJPH38syO1PnTU0bZ/I4CE= -RMD160 (tesseract-2.03.tar.gz) = dRnn9Nh2REvTJk1Znb9CPiJEMxE= +RMD160 (tesseract-2.04.tar.gz) = gmcY3fSRyLklsCw0PUpJkv1GMdg= SHA1 (tesseract-2.00.deu.tar.gz) = 2NieJoFCGhRPOh7GHuDFMGhvUJY= SHA1 (tesseract-2.00.eng.tar.gz) = QCksjSBgkMSrNC9reBTqQcB1q84= SHA1 (tesseract-2.00.fra.tar.gz) = JPWMqysUGIFroJ5vKOM67jRgWIk= @@ -21,7 +21,7 @@ SHA1 (tesseract-2.00.ita.tar.gz) = isbEFwiVBmD9ZnifWSUGhXf7ibE= SHA1 (tesseract-2.00.nld.tar.gz) = i8Clh3wZkqsQqeEkZD/ZAG/zA1A= SHA1 (tesseract-2.00.spa.tar.gz) = SSBreUB8sjvCOxzZW+4CVE8vz5s= SHA1 (tesseract-2.01.por.tar.gz) = ltjuJngQIqLqsZVp3PI1l7iNbIE= -SHA1 (tesseract-2.03.tar.gz) = t4WSeP+YqLZL+YtaUZaI4VWc7Fc= +SHA1 (tesseract-2.04.tar.gz) = hQxCySpEccX0HUOExXBF6BL94mo= SHA256 (tesseract-2.00.deu.tar.gz) = YIPxY3NonvVWUfTdd3NCarTDKhLr9/OYr5gqwpcf5AQ= SHA256 (tesseract-2.00.eng.tar.gz) = L71Qpss1L4R+vz3q3JFLvBJZJTnUw2j398/wpx99SOc= SHA256 (tesseract-2.00.fra.tar.gz) = EgEim7izd6s9kiVeCwZCo2MEuZQVCR+wWfQjyBTOzSU= @@ -29,7 +29,7 @@ SHA256 (tesseract-2.00.ita.tar.gz) = OhuTI9382jJ3gKupTvck81aQ08/fjvgyxXCXIbfimZo SHA256 (tesseract-2.00.nld.tar.gz) = Jrn32AxM/hkHTDxdxVo3tInYm297E8Am+cLcJlEg2Fk= SHA256 (tesseract-2.00.spa.tar.gz) = tLg+Rr5GAqNhJ5wTHaLH87qMUawmwOEI+VhAbbauMg4= SHA256 (tesseract-2.01.por.tar.gz) = DcMLdoFKdpQkbKNHzLQCvNQOXm879wzKMebTygYhC6o= -SHA256 (tesseract-2.03.tar.gz) = 85CXF2sLCsgzErWZSXDRUoOtDgNrwXTZi4dQD1cqyq4= +SHA256 (tesseract-2.04.tar.gz) = YoZvKDkWVT4Czr3rG0hYVsankPX4v4bDC4fGMEN0vvg= SIZE (tesseract-2.00.deu.tar.gz) = 1373777 SIZE (tesseract-2.00.eng.tar.gz) = 1013090 SIZE (tesseract-2.00.fra.tar.gz) = 1007776 @@ -37,4 +37,4 @@ SIZE (tesseract-2.00.ita.tar.gz) = 977683 SIZE (tesseract-2.00.nld.tar.gz) = 1408071 SIZE (tesseract-2.00.spa.tar.gz) = 1365863 SIZE (tesseract-2.01.por.tar.gz) = 2107696 -SIZE (tesseract-2.03.tar.gz) = 1075509 +SIZE (tesseract-2.04.tar.gz) = 1118386 diff --git a/graphics/tesseract/patches/patch-Makefile_in b/graphics/tesseract/patches/patch-Makefile_in index 0bf58946090..b8be0dc6a46 100644 --- a/graphics/tesseract/patches/patch-Makefile_in +++ b/graphics/tesseract/patches/patch-Makefile_in @@ -1,12 +1,12 @@ -$OpenBSD: patch-Makefile_in,v 1.1.1.1 2008/09/17 10:17:27 ajacoutot Exp $ ---- Makefile.in.orig Sun Jul 13 18:34:58 2008 -+++ Makefile.in Sun Jul 13 18:35:11 2008 -@@ -76,7 +76,7 @@ PACKAGE_YEAR = @PACKAGE_YEAR@ - RANLIB = @RANLIB@ - VERSION = @VERSION@ +$OpenBSD: patch-Makefile_in,v 1.2 2009/08/24 07:12:40 ajacoutot Exp $ +--- Makefile.in.orig Tue Jun 30 18:24:21 2009 ++++ Makefile.in Sun Aug 23 20:30:34 2009 +@@ -177,7 +177,7 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + # TODO(luc) Add 'doc' to this list when ready -SUBDIRS = ccstruct ccutil classify cutil dict pageseg image textord viewer wordrec ccmain training tessdata testing dlltest java +SUBDIRS = ccstruct ccutil classify cutil dict pageseg image textord viewer wordrec ccmain training tessdata testing dlltest - - EXTRA_DIST = eurotext.tif phototest.tif ReleaseNotes tesseract.spec config tesseract.dsp tesseract.dsw tesseract.vcproj tesseract.sln StdAfx.cpp StdAfx.h tessdll.cpp tessdll.h tessdll.dsp tessdll.vcproj - + EXTRA_DIST = eurotext.tif phototest.tif ReleaseNotes tesseract.spec config \ + tesseract.dsp tesseract.dsw tesseract.vcproj tesseract.sln \ + StdAfx.cpp StdAfx.h tessdll.cpp tessdll.h tessdll.dsp tessdll.vcproj diff --git a/graphics/tesseract/patches/patch-ccmain_pgedit_cpp b/graphics/tesseract/patches/patch-ccmain_pgedit_cpp index 4af728e7d89..ccdf7c5feb0 100644 --- a/graphics/tesseract/patches/patch-ccmain_pgedit_cpp +++ b/graphics/tesseract/patches/patch-ccmain_pgedit_cpp @@ -1,10 +1,10 @@ -$OpenBSD: patch-ccmain_pgedit_cpp,v 1.1 2009/03/05 08:09:40 ajacoutot Exp $ +$OpenBSD: patch-ccmain_pgedit_cpp,v 1.2 2009/08/24 07:12:40 ajacoutot Exp $ Fix crash -- cf. http://www.win.tue.nl/~aeb/linux/ocr/tesseract.html ---- ccmain/pgedit.cpp.orig Sat Feb 28 08:33:20 2009 -+++ ccmain/pgedit.cpp Sat Feb 28 08:33:50 2009 -@@ -752,6 +752,9 @@ void pgeditor_read_file( // of seria +--- ccmain/pgedit.cpp.orig Wed Jun 3 00:54:27 2009 ++++ ccmain/pgedit.cpp Sun Aug 23 20:25:45 2009 +@@ -753,6 +753,9 @@ void pgeditor_read_file( // of seria // ptr to last dot filename_extension = strrchr(name.string(), '.'); diff --git a/graphics/tesseract/patches/patch-ccutil_debugwin_cpp b/graphics/tesseract/patches/patch-ccutil_debugwin_cpp index 1f958222c0c..4e00078e121 100644 --- a/graphics/tesseract/patches/patch-ccutil_debugwin_cpp +++ b/graphics/tesseract/patches/patch-ccutil_debugwin_cpp @@ -1,12 +1,12 @@ -$OpenBSD: patch-ccutil_debugwin_cpp,v 1.1 2009/02/17 09:19:04 ajacoutot Exp $ ---- ccutil/debugwin.cpp.orig Tue Feb 17 10:03:04 2009 -+++ ccutil/debugwin.cpp Tue Feb 17 10:03:39 2009 +$OpenBSD: patch-ccutil_debugwin_cpp,v 1.2 2009/08/24 07:12:40 ajacoutot Exp $ +--- ccutil/debugwin.cpp.orig Fri Nov 14 00:13:57 2008 ++++ ccutil/debugwin.cpp Sun Aug 23 20:34:12 2009 @@ -231,7 +231,7 @@ DEBUG_WIN::DEBUG_WIN( //constructor length += sprintf (command + length, "trap \"\" 1 2 3 13 15\n"); length += sprintf (command + length, -- "/usr/bin/X11/xterm -sb -sl " INT32FORMAT " -geometry " -+ "${X11BASE}/bin/xterm -sb -sl " INT32FORMAT " -geometry " +- "/usr/bin/xterm -sb -sl " INT32FORMAT " -geometry " ++ "${X11BASE}/xterm -sb -sl " INT32FORMAT " -geometry " INT32FORMAT "x" INT32FORMAT "", buflines, xsize / 8, ysize / 16); if (xpos >= 0) command[length++] = '+'; diff --git a/graphics/tesseract/patches/patch-configure b/graphics/tesseract/patches/patch-configure index 78d1c15b034..d2b70b3e609 100644 --- a/graphics/tesseract/patches/patch-configure +++ b/graphics/tesseract/patches/patch-configure @@ -1,20 +1,35 @@ -$OpenBSD: patch-configure,v 1.1.1.1 2008/09/17 10:17:27 ajacoutot Exp $ ---- configure.orig Tue Apr 22 13:35:36 2008 -+++ configure Sun Jul 13 19:08:04 2008 -@@ -7469,8 +7469,6 @@ fi +$OpenBSD: patch-configure,v 1.2 2009/08/24 07:12:40 ajacoutot Exp $ +--- configure.orig Sun Aug 23 20:39:20 2009 ++++ configure Sun Aug 23 20:39:38 2009 +@@ -8940,18 +8940,6 @@ ac_config_files="$ac_config_files testing/Makefile" - ac_config_files="$ac_config_files dlltest/Makefile" + ac_config_files="$ac_config_files dlltest/Makefile" -- ac_config_files="$ac_config_files java/Makefile" +-ac_config_files="$ac_config_files java/Makefile" +- +-ac_config_files="$ac_config_files java/com/Makefile" +- +-ac_config_files="$ac_config_files java/com/google/Makefile" +- +-ac_config_files="$ac_config_files java/com/google/scrollview/Makefile" +- +-ac_config_files="$ac_config_files java/com/google/scrollview/events/Makefile" +- +-ac_config_files="$ac_config_files java/com/google/scrollview/ui/Makefile" - # AC_CONFIG_FILES(doc/Doxyfile) # AC_CONFIG_FILES(doc/header.html) # AC_CONFIG_FILES(doc/footer.html) -@@ -8030,7 +8028,6 @@ do - "tessdata/tessconfigs/Makefile" ) CONFIG_FILES="$CONFIG_FILES tessdata/tessconfigs/Makefile" ;; - "testing/Makefile" ) CONFIG_FILES="$CONFIG_FILES testing/Makefile" ;; - "dlltest/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlltest/Makefile" ;; -- "java/Makefile" ) CONFIG_FILES="$CONFIG_FILES java/Makefile" ;; - "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; - "config_auto.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config_auto.h:config/config.h.in" ;; +@@ -9583,12 +9571,6 @@ do + "tessdata/tessconfigs/Makefile") CONFIG_FILES="$CONFIG_FILES tessdata/tessconfigs/Makefile" ;; + "testing/Makefile") CONFIG_FILES="$CONFIG_FILES testing/Makefile" ;; + "dlltest/Makefile") CONFIG_FILES="$CONFIG_FILES dlltest/Makefile" ;; +- "java/Makefile") CONFIG_FILES="$CONFIG_FILES java/Makefile" ;; +- "java/com/Makefile") CONFIG_FILES="$CONFIG_FILES java/com/Makefile" ;; +- "java/com/google/Makefile") CONFIG_FILES="$CONFIG_FILES java/com/google/Makefile" ;; +- "java/com/google/scrollview/Makefile") CONFIG_FILES="$CONFIG_FILES java/com/google/scrollview/Makefile" ;; +- "java/com/google/scrollview/events/Makefile") CONFIG_FILES="$CONFIG_FILES java/com/google/scrollview/events/Makefile" ;; +- "java/com/google/scrollview/ui/Makefile") CONFIG_FILES="$CONFIG_FILES java/com/google/scrollview/ui/Makefile" ;; + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 + echo "$as_me: error: invalid argument: $ac_config_target" >&2;} diff --git a/graphics/tesseract/patches/patch-dict_dawg_cpp b/graphics/tesseract/patches/patch-dict_dawg_cpp index 8f9254be5fb..0d37dedf345 100644 --- a/graphics/tesseract/patches/patch-dict_dawg_cpp +++ b/graphics/tesseract/patches/patch-dict_dawg_cpp @@ -1,6 +1,6 @@ -$OpenBSD: patch-dict_dawg_cpp,v 1.2 2009/03/05 08:09:40 ajacoutot Exp $ ---- dict/dawg.cpp.orig Mon Mar 17 21:22:09 2008 -+++ dict/dawg.cpp Sat Feb 28 08:30:58 2009 +$OpenBSD: patch-dict_dawg_cpp,v 1.3 2009/08/24 07:12:40 ajacoutot Exp $ +--- dict/dawg.cpp.orig Tue Dec 30 13:27:36 2008 ++++ dict/dawg.cpp Sun Aug 23 20:36:22 2009 @@ -28,6 +28,9 @@ #ifdef __MSW32__ #include @@ -8,6 +8,6 @@ $OpenBSD: patch-dict_dawg_cpp,v 1.2 2009/03/05 08:09:40 ajacoutot Exp $ +#ifdef __OpenBSD__ +#include +#endif - #include + #include #endif #include "dawg.h" diff --git a/graphics/tesseract/patches/patch-dict_makedawg_cpp b/graphics/tesseract/patches/patch-dict_makedawg_cpp index d5fb2b61dfc..8c3d39af5d1 100644 --- a/graphics/tesseract/patches/patch-dict_makedawg_cpp +++ b/graphics/tesseract/patches/patch-dict_makedawg_cpp @@ -1,6 +1,6 @@ -$OpenBSD: patch-dict_makedawg_cpp,v 1.1.1.1 2008/09/17 10:17:27 ajacoutot Exp $ ---- dict/makedawg.cpp.orig Mon Mar 10 17:22:00 2008 -+++ dict/makedawg.cpp Sun Sep 7 12:50:36 2008 +$OpenBSD: patch-dict_makedawg_cpp,v 1.2 2009/08/24 07:12:40 ajacoutot Exp $ +--- dict/makedawg.cpp.orig Tue Dec 30 13:28:03 2008 ++++ dict/makedawg.cpp Sun Aug 23 20:37:16 2009 @@ -33,6 +33,9 @@ #ifdef __MSW32__ #include @@ -8,6 +8,6 @@ $OpenBSD: patch-dict_makedawg_cpp,v 1.1.1.1 2008/09/17 10:17:27 ajacoutot Exp $ +#ifdef __OpenBSD__ +#include +#endif - #include + #include #endif diff --git a/graphics/tesseract/patches/patch-viewer_svutil_h b/graphics/tesseract/patches/patch-viewer_svutil_h index e8734ec30b1..fef3d2ab0df 100644 --- a/graphics/tesseract/patches/patch-viewer_svutil_h +++ b/graphics/tesseract/patches/patch-viewer_svutil_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-viewer_svutil_h,v 1.1.1.1 2008/09/17 10:17:27 ajacoutot Exp $ ---- viewer/svutil.h.orig Tue Apr 22 02:07:25 2008 -+++ viewer/svutil.h Sun Sep 7 12:51:15 2008 -@@ -32,6 +32,11 @@ +$OpenBSD: patch-viewer_svutil_h,v 1.2 2009/08/24 07:12:40 ajacoutot Exp $ +--- viewer/svutil.h.orig Wed Jun 3 15:01:03 2009 ++++ viewer/svutil.h Sun Aug 23 20:25:45 2009 +@@ -34,6 +34,11 @@ #else #include #include diff --git a/graphics/tesseract/pkg/PLIST-main b/graphics/tesseract/pkg/PLIST-main index b71fa620e2d..a7dbef89c45 100644 --- a/graphics/tesseract/pkg/PLIST-main +++ b/graphics/tesseract/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.1.1.1 2008/09/17 10:17:27 ajacoutot Exp $ +@comment $OpenBSD: PLIST-main,v 1.2 2009/08/24 07:12:40 ajacoutot Exp $ @bin bin/cntraining @bin bin/mftraining @bin bin/tesseract @@ -279,6 +279,7 @@ share/tessdata/ share/tessdata/configs/ share/tessdata/configs/api_config share/tessdata/configs/box.train +share/tessdata/configs/box.train.stderr share/tessdata/configs/inter share/tessdata/configs/kannada share/tessdata/configs/makebox