Skip to Content.
Sympa Menu

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

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 (7b30d67bb096c49a76e2afad2e10b4f70744ef65)
  • Date: Thu, 20 Aug 2009 11:38:22 -0500

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

graphics/tesseract/DETAILS | 4 ++--
graphics/tesseract/HISTORY | 6 ++++++
graphics/tesseract/PRE_BUILD | 4 ++--
graphics/tesseract/gcc-4.3.diff | 39
---------------------------------------
graphics/tesseract/gcc-4.4.diff | 11 +++++++++++
5 files changed, 21 insertions(+), 43 deletions(-)

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

tesseract: => 2.04

diff --git a/graphics/tesseract/DETAILS b/graphics/tesseract/DETAILS
index e74d33d..0f9eded 100755
--- a/graphics/tesseract/DETAILS
+++ b/graphics/tesseract/DETAILS
@@ -1,7 +1,7 @@
SPELL=tesseract
- VERSION=2.03
+ VERSION=2.04
LANGVER=2.00
-
SOURCE_HASH=sha512:4d760bbc00b44cd29f870f70680560dccf05e869ecad9811e04d50ec53a2a4e161b220081866b6a5f718cdc7718d5f77a28993ce9e0b21712536a9d3fdc6088a
+
SOURCE_HASH=sha512:c095407910235f7f914aa6a51feedade3f0b33108c7801b88c5ade26f2b75d1756b034d9ac32ad362a326ee468f97b69476978102ef0cefcc1b5c93be2342d42
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 387b245..4afd327 100644
--- a/graphics/tesseract/HISTORY
+++ b/graphics/tesseract/HISTORY
@@ -1,3 +1,9 @@
+2009-08-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.04
+ * gcc-4.3.diff: deleted
+ * gcc-4.4.diff: added
+ * PRE_BUILD: update patching
+
2008-04-29 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.03
* train.diff: deleted
diff --git a/graphics/tesseract/PRE_BUILD b/graphics/tesseract/PRE_BUILD
index 91c5098..d3b1a41 100755
--- a/graphics/tesseract/PRE_BUILD
+++ b/graphics/tesseract/PRE_BUILD
@@ -1,7 +1,7 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-# fix compile with gcc-4.3.0
-patch -p1 <$SPELL_DIRECTORY/gcc-4.3.diff &&
+# fix compile with gcc-4.4.1
+patch -p1 <$SPELL_DIRECTORY/gcc-4.4.diff &&
# won't install if java not present
if ! spell_ok JAVA ;then
sed -i 's/java//' Makefile.in
diff --git a/graphics/tesseract/gcc-4.3.diff b/graphics/tesseract/gcc-4.3.diff
deleted file mode 100644
index 04d5d57..0000000
--- a/graphics/tesseract/gcc-4.3.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-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/gcc-4.4.diff b/graphics/tesseract/gcc-4.4.diff
new file mode 100644
index 0000000..a7fc13f
--- /dev/null
+++ b/graphics/tesseract/gcc-4.4.diff
@@ -0,0 +1,11 @@
+diff -uNr tesseract-2.04/viewer/svutil.cpp
tesseract-2.04.orig/viewer/svutil.cpp
+--- tesseract-2.04/viewer/svutil.cpp 2009-06-03 18:29:38.000000000 +0200
++++ tesseract-2.04.orig/viewer/svutil.cpp 2009-08-20 18:30:36.000000000
+0200
+@@ -42,6 +42,7 @@
+ #endif
+ #endif
+
++#include <stdio.h>
+ #include <iostream>
+
+ const int kBufferSize = 65536;



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (7b30d67bb096c49a76e2afad2e10b4f70744ef65), Treeve Jelbert, 08/20/2009

Archive powered by MHonArc 2.6.24.

Top of Page