Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (ff82e2a7313fe8bcbd323bb59a7509403785e6ca)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (ff82e2a7313fe8bcbd323bb59a7509403785e6ca)
  • Date: Tue, 29 Apr 2008 11:50:16 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

graphics/tesseract/DETAILS | 4 ++--
graphics/tesseract/HISTORY | 7 +++++++
graphics/tesseract/PRE_BUILD | 8 ++++++--
graphics/tesseract/gcc-4.3.diff | 39
+++++++++++++++++++++++++++++++++++++++
graphics/tesseract/train.diff | 11 -----------
5 files changed, 54 insertions(+), 15 deletions(-)

New commits:
commit ddb4fc0e85c07b2ce313be730eb9a1496b474517
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

"tesseract-2.03"

diff --git a/graphics/tesseract/DETAILS b/graphics/tesseract/DETAILS
index fc29aa3..e74d33d 100755
--- a/graphics/tesseract/DETAILS
+++ b/graphics/tesseract/DETAILS
@@ -1,7 +1,7 @@
SPELL=tesseract
- VERSION=2.01
+ VERSION=2.03
LANGVER=2.00
-
SOURCE_HASH=sha512:12ffa36a6e0006ad3a657fa5653d0d6c8fcdf557a8893ef509a7cd0aa0334e939be3f3cff172408946dc1702b83c032f53db2642bbe4f5aaec0e33091eecc831
+
SOURCE_HASH=sha512:4d760bbc00b44cd29f870f70680560dccf05e869ecad9811e04d50ec53a2a4e161b220081866b6a5f718cdc7718d5f77a28993ce9e0b21712536a9d3fdc6088a
URI=http://tesseract-ocr.googlecode.com/files
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=$URI/$SOURCE
diff --git a/graphics/tesseract/HISTORY b/graphics/tesseract/HISTORY
index 41af2e1..387b245 100644
--- a/graphics/tesseract/HISTORY
+++ b/graphics/tesseract/HISTORY
@@ -1,3 +1,10 @@
+2008-04-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.03
+ * train.diff: deleted
+ * gcc-4.3.diff: added
+ * PRE_BUILD: change patching
+ fix install if no java present
+
2007-09-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: PATCHLEVEL++
* train.diff: add
diff --git a/graphics/tesseract/PRE_BUILD b/graphics/tesseract/PRE_BUILD
index c5fbc72..91c5098 100755
--- a/graphics/tesseract/PRE_BUILD
+++ b/graphics/tesseract/PRE_BUILD
@@ -1,7 +1,11 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-# apply upstream patch
-patch -p0 <$SPELL_DIRECTORY/train.diff &&
+# fix compile with gcc-4.3.0
+patch -p1 <$SPELL_DIRECTORY/gcc-4.3.diff &&
+# won't install if java not present
+if ! spell_ok JAVA ;then
+sed -i 's/java//' Makefile.in
+fi &&
for LL in $TESS_LANG; do
case $LL in
eng) unpack_file 2 ;;
diff --git a/graphics/tesseract/gcc-4.3.diff b/graphics/tesseract/gcc-4.3.diff
new file mode 100644
index 0000000..04d5d57
--- /dev/null
+++ b/graphics/tesseract/gcc-4.3.diff
@@ -0,0 +1,39 @@
+diff -uNr tesseract-2.03/viewer/scrollview.cpp
tesseract-2.03.cp/viewer/scrollview.cpp
+--- tesseract-2.03/viewer/scrollview.cpp 2008-04-22 02:06:24.000000000
+0200
++++ tesseract-2.03.cp/viewer/scrollview.cpp 2008-04-29 18:02:04.000000000
+0200
+@@ -34,7 +34,8 @@
+ #include <utility>
+ #include <algorithm>
+ #include <vector>
+-#include <string>
++#include <cstring>
++#include <climits>
+
+ #include "svutil.h"
+
+diff -uNr tesseract-2.03/viewer/svmnode.cpp
tesseract-2.03.cp/viewer/svmnode.cpp
+--- tesseract-2.03/viewer/svmnode.cpp 2008-04-19 06:44:06.000000000 +0200
++++ tesseract-2.03.cp/viewer/svmnode.cpp 2008-04-29 18:03:25.000000000
+0200
+@@ -27,6 +27,7 @@
+ #include "svmnode.h"
+
+ #include <iostream>
++#include <cstring>
+
+ #include "scrollview.h"
+
+diff -uNr tesseract-2.03/viewer/svutil.cpp
tesseract-2.03.cp/viewer/svutil.cpp
+--- tesseract-2.03/viewer/svutil.cpp 2008-04-22 02:07:25.000000000 +0200
++++ tesseract-2.03.cp/viewer/svutil.cpp 2008-04-29 18:08:54.000000000
+0200
+@@ -37,7 +37,10 @@
+ #endif
+
+ #include <iostream>
+-#include <string>
++#include <cstring>
++#include <memory>
++#include <cstdlib>
++
+
+ const int kBufferSize = 65536;
+ const int kMaxMsgSize = 4096;
diff --git a/graphics/tesseract/train.diff b/graphics/tesseract/train.diff
deleted file mode 100644
index 07d199c..0000000
--- a/graphics/tesseract/train.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- training/unicharset_extractor.cpp 2007-08-28 03:59:07.000000000 +0200
-+++ training/unicharset_extractor.cpp 2007-08-31 00:11:09.000000000 +0200
-@@ -72,7 +72,7 @@
- unicharset->set_isalpha(id, 1);
- if (iswlower(wc))
- unicharset->set_islower(id, 1);
-- if (iswlower(wc))
-+ if (iswupper(wc))
- unicharset->set_isupper(id, 1);
- }
- if (iswdigit(wc))




Archive powered by MHonArc 2.6.24.

Top of Page