libtabe: Updated to version 0.2.6. Added Debian patch to fix

compile issues. Bug #9843
(cherry picked from commit b5c3135e278fa6bad0c8ce324db1d8d0ebee26a5)

8 files changed, 22 insertions, 105 deletions

diff --git a/libs/libtabe/BUILD b/libs/libtabe/BUILD
deleted file mode 100755
index f017157832..0000000000
--- a/libs/libtabe/BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-(
-patch  -p1  <  $SCRIPT_DIRECTORY/libtabe-db4.patch           &&
-patch  -p0  <  $SCRIPT_DIRECTORY/libtabe-db41.patch          &&
-patch  -p1  <  $SCRIPT_DIRECTORY/tsi-remove-annoyance.patch  &&
-
-default_build
-)  >  ${C_FIFO}  2>&1
diff --git a/libs/libtabe/DETAILS b/libs/libtabe/DETAILS
index 4142995eb2..36b0a4c7ce 100755
--- a/libs/libtabe/DETAILS
+++ b/libs/libtabe/DETAILS
@@ -1,13 +1,12 @@
            SPELL=libtabe
-         VERSION=0.2.5
-          SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
-   SOURCE_URL[0]=ftp://xcin.linux.org.tw/pub/xcin/libtabe/devel/$SOURCE
+         VERSION=0.2.6
+          SOURCE=${SPELL}_${VERSION}.orig.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION.orig
+   SOURCE_URL[0]=http://ftp.de.debian.org/debian/pool/main/libt/libtabe/$SOURCE
         WEB_SITE=http://libtabe.sourceforge.net/
-          MD5[0]=f15aa8d89427b1a8e2e9c4d0a96ec3b6
+     SOURCE_HASH=sha512:88f1cb279ccf487de5d0f8a1e9eede8d5ca16e4507b59db0b66241d0cdae609ed0b04093a82eabe0569f885aa397c1d5fa3f0ae3c3270a348ce045d73e01fbc7
       LICENSE[0]=GPL
          ENTERED=20021012
-         UPDATED=20030907
            SHORT="Chinese lexicons library."
 cat << EOF
 Chinese lexicons library for xcin-2.5's bimsphone input method.
diff --git a/libs/libtabe/HISTORY b/libs/libtabe/HISTORY
index a9fd730c7e..a3c0aa3bfb 100644
--- a/libs/libtabe/HISTORY
+++ b/libs/libtabe/HISTORY
@@ -1,3 +1,13 @@
+2008-11-26 George Sherwood <gsherwood@sourcemage.org>
+	* DETAILS: Updated to version 0.2.6. Updated SOURCE & SOURCE_URL.
+	  Removed UPDATED. Fixes Bug 9843.
+	* BUILD: Removed.  Was only used for patching.
+	* PRE_BUILD: Added to apply patch
+	* libtabe_0.2.6-1.1.diff.bz2: Added Debian patch
+	* libtabe-db41.patch: Removed old patch.
+	* libtabe-db4.patch: Removed old patch
+	* tsi-remove-annoyance.patch: Removed old patch
+
 2008-03-18 Eric Sandall <sandalle@sourcemage.org>
 	* DEPENDS: Switch X11-LIBS to the one and only xorg-libs
 
diff --git a/libs/libtabe/PRE_BUILD b/libs/libtabe/PRE_BUILD
new file mode 100755
index 0000000000..ec9e9649d2
--- /dev/null
+++ b/libs/libtabe/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+
+cd $SOURCE_DIRECTORY &&
+cp $SCRIPT_DIRECTORY/libtabe_0.2.6-1.1.diff.bz2 $SOURCE_DIRECTORY &&
+bunzip2 libtabe_0.2.6-1.1.diff.bz2 &&
+
+patch -p1 < libtabe_0.2.6-1.1.diff
diff --git a/libs/libtabe/libtabe-db4.patch b/libs/libtabe/libtabe-db4.patch
deleted file mode 100644
index fc66c1aeaa..0000000000
--- a/libs/libtabe/libtabe-db4.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -uNr libtabe.orig/src/tabe_tsidbint.c libtabe/src/tabe_tsidbint.c
---- libtabe.orig/src/tabe_tsidbint.c	Tue Jan 29 09:52:05 2002
-+++ libtabe/src/tabe_tsidbint.c	Tue Jan 29 09:52:28 2002
-@@ -265,7 +265,7 @@
-   switch(tsidb->type) {
-   case DB_TYPE_DB:
-     dbp = (DB *)tsidb->dbp;
--    errno = dbp->stat(dbp, &sp, NULL, 0);
-+    errno = dbp->stat(dbp, &sp, 0);
-     if (!errno) {
- #ifndef HAVE_DB3
-       return(sp->bt_nrecs);
-diff -uNr libtabe.orig/src/tabe_tsiyindbint.c libtabe/src/tabe_tsiyindbint.c
---- libtabe.orig/src/tabe_tsiyindbint.c	Tue Jan 29 09:52:05 2002
-+++ libtabe/src/tabe_tsiyindbint.c	Tue Jan 29 09:52:46 2002
-@@ -268,7 +268,7 @@
-   switch(tsiyindb->type) {
-   case DB_TYPE_DB:
-     dbp = (DB *)tsiyindb->dbp;
--    errno = dbp->stat(dbp, &sp, NULL, 0);
-+    errno = dbp->stat(dbp, &sp, 0);
-     if (!errno) {
- #ifndef HAVE_DB3
-       return(sp->bt_nrecs);
diff --git a/libs/libtabe/libtabe-db41.patch b/libs/libtabe/libtabe-db41.patch
deleted file mode 100644
index 06de17ceaf..0000000000
--- a/libs/libtabe/libtabe-db41.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -ur src.orig/tabe_tsidbint.c src/tabe_tsidbint.c
---- src.orig/tabe_tsidbint.c	2003-05-26 02:16:15.000000000 +0800
-+++ src/tabe_tsidbint.c	2003-05-26 02:17:29.000000000 +0800
-@@ -85,7 +85,7 @@
- #ifndef HAVE_DB3
-       errno = db_open(db_name, DB_BTREE, DB_CREATE, 0644, NULL, NULL, &dbp);
- #else
--      errno = dbp->open(dbp, db_name, NULL, DB_BTREE, DB_CREATE, 0644);
-+      errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, DB_CREATE, 0644);
- #endif
-     }
-   }
-@@ -94,14 +94,14 @@
- #ifndef HAVE_DB3
-       errno = db_open(db_name, DB_BTREE, DB_RDONLY, 0444, NULL, NULL, &dbp);
- #else
--      errno = dbp->open(dbp, db_name, NULL, DB_BTREE, DB_RDONLY, 0444);
-+      errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, DB_RDONLY, 0444);
- #endif
-     }
-     else {
- #ifndef HAVE_DB3
-       errno = db_open(db_name, DB_BTREE, 0, 0644, NULL, NULL, &dbp);
- #else
--      errno = dbp->open(dbp, db_name, NULL, DB_BTREE, 0, 0644);
-+      errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, 0, 0644);
- #endif
-     }
-   }
-diff -ur src.orig/tabe_tsiyindbint.c src/tabe_tsiyindbint.c
---- src.orig/tabe_tsiyindbint.c	2003-05-26 02:16:15.000000000 +0800
-+++ src/tabe_tsiyindbint.c	2003-05-26 02:16:54.000000000 +0800
-@@ -88,7 +88,7 @@
- #ifndef HAVE_DB3
-       errno = db_open(db_name, DB_BTREE, DB_CREATE, 0644, NULL, NULL, &dbp);
- #else
--      errno = dbp->open(dbp, db_name, NULL, DB_BTREE, DB_CREATE, 0644);
-+      errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, DB_CREATE, 0644);
- #endif
-     }
-   }
-@@ -97,14 +97,14 @@
- #ifndef HAVE_DB3
-       errno = db_open(db_name, DB_BTREE, DB_RDONLY, 0444, NULL, NULL, &dbp);
- #else
--      errno = dbp->open(dbp, db_name, NULL, DB_BTREE, DB_RDONLY, 0444);
-+      errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, DB_RDONLY, 0444);
- #endif
-     }
-     else {
- #ifndef HAVE_DB3
-       errno = db_open(db_name, DB_BTREE, 0, 0644, NULL, NULL, &dbp);
- #else
--      errno = dbp->open(dbp, db_name, NULL, DB_BTREE, 0, 0644);
-+      errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, 0, 0644);
- #endif
-     }
-   }
diff --git a/libs/libtabe/libtabe_0.2.6-1.1.diff.bz2 b/libs/libtabe/libtabe_0.2.6-1.1.diff.bz2
new file mode 100644
index 0000000000..dc7653c9e5
--- /dev/null
+++ b/libs/libtabe/libtabe_0.2.6-1.1.diff.bz2
diff --git a/libs/libtabe/tsi-remove-annoyance.patch b/libs/libtabe/tsi-remove-annoyance.patch
deleted file mode 100644
index 36f07c984e..0000000000
--- a/libs/libtabe/tsi-remove-annoyance.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libtabe.orig/tsi-src/tsi.src	2003-02-08 16:51:29.000000000 +0800
-+++ libtabe/tsi-src/tsi.src	2003-02-08 16:50:50.000000000 +0800
-@@ -121226,7 +121226,6 @@
- Áü 21		£¡£º4
- Áü­· 75		£¡£º4 £w£¶
- Áý 596		£¹£°4
--Áý¤F 4		£¹£°4 £{£­5
- Áý¥¤ 49		£¹£°4 £z£¯3
- Áý¥¤®É 3	£¹£°4 £z£¯3 £¦2
- Áý¦Ï 1		£¹£°4 £¸£µ2