Fix compilation against current unixODBC. Thanks to Hank Leininger for providing the patch in bug 311973.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 155 insertions, 2 deletions

diff --git a/app-office/mdbtools/ChangeLog b/app-office/mdbtools/ChangeLog
index d1c31d5339bd..da03287701cf 100644
--- a/app-office/mdbtools/ChangeLog
+++ b/app-office/mdbtools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/mdbtools
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/mdbtools/ChangeLog,v 1.52 2010/05/25 13:31:33 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/mdbtools/ChangeLog,v 1.53 2010/05/30 11:46:41 graaff Exp $
+
+  30 May 2010; Hans de Graaff <graaff@gentoo.org>
+  mdbtools-0.6_pre2-r2.ebuild,
+  +files/mdbtools-0.6_pre2-odbc_definitions.patch:
+  Fix compilation against current unixODBC. Thanks to Hank Leininger for
+  providing the patch in bug 311973.
 
   25 May 2010; Markos Chandras <hwoarang@gentoo.org>
   mdbtools-0.6_pre2-r2.ebuild:
diff --git a/app-office/mdbtools/files/mdbtools-0.6_pre2-odbc_definitions.patch b/app-office/mdbtools/files/mdbtools-0.6_pre2-odbc_definitions.patch
new file mode 100644
index 000000000000..03e32800854e
--- /dev/null
+++ b/app-office/mdbtools/files/mdbtools-0.6_pre2-odbc_definitions.patch
@@ -0,0 +1,146 @@
+--- mdbtools-cvs-20050624/src/odbc/odbc.c.orig	2010-05-24 10:20:59.000000000 -0400
++++ mdbtools-cvs-20050624/src/odbc/odbc.c	2010-05-25 17:28:05.000000000 -0400
+@@ -210,7 +210,7 @@
+     SQLHSTMT           hstmt,
+     SQLUSMALLINT       ipar,
+     SQLSMALLINT FAR   *pfSqlType,
+-    SQLUINTEGER FAR   *pcbParamDef,
++    SQLULEN FAR   *pcbParamDef,
+     SQLSMALLINT FAR   *pibScale,
+     SQLSMALLINT FAR   *pfNullable)
+ {
+@@ -221,8 +221,8 @@
+ SQLRETURN SQL_API SQLExtendedFetch(
+     SQLHSTMT           hstmt,
+     SQLUSMALLINT       fFetchType,
+-    SQLINTEGER         irow,
+-    SQLUINTEGER FAR   *pcrow,
++    SQLLEN         irow,
++    SQLULEN FAR   *pcrow,
+     SQLUSMALLINT FAR  *rgfRowStatus)
+ {
+ struct _hstmt *stmt = (struct _hstmt *) hstmt;
+@@ -297,8 +297,8 @@
+ 
+ SQLRETURN SQL_API SQLParamOptions(
+     SQLHSTMT           hstmt,
+-    SQLUINTEGER        crow,
+-    SQLUINTEGER FAR   *pirow)
++    SQLULEN        crow,
++    SQLULEN FAR   *pirow)
+ {
+ 	TRACE("SQLParamOptions");
+ 	return SQL_SUCCESS;
+@@ -347,7 +347,7 @@
+ 
+ SQLRETURN SQL_API SQLSetPos(
+     SQLHSTMT           hstmt,
+-    SQLUSMALLINT       irow,
++    SQLSETPOSIROW       irow,
+     SQLUSMALLINT       fOption,
+     SQLUSMALLINT       fLock)
+ {
+@@ -398,11 +398,11 @@
+     SQLSMALLINT        fParamType,
+     SQLSMALLINT        fCType,
+     SQLSMALLINT        fSqlType,
+-    SQLUINTEGER        cbColDef,
++    SQLULEN        cbColDef,
+     SQLSMALLINT        ibScale,
+     SQLPOINTER         rgbValue,
+-    SQLINTEGER         cbValueMax,
+-    SQLINTEGER FAR    *pcbValue)
++    SQLLEN         cbValueMax,
++    SQLLEN FAR    *pcbValue)
+ {
+ struct _hstmt *stmt;
+ 
+@@ -502,8 +502,8 @@
+     SQLUSMALLINT       icol,
+     SQLSMALLINT        fCType,
+     SQLPOINTER         rgbValue,
+-    SQLINTEGER         cbValueMax,
+-    SQLINTEGER FAR    *pcbValue)
++    SQLLEN         cbValueMax,
++    SQLLEN FAR    *pcbValue)
+ {
+ 	struct _hstmt *stmt = (struct _hstmt *) hstmt;
+ 	struct _sql_bind_info *cur, *newitem;
+@@ -594,7 +594,7 @@
+     SQLSMALLINT        cbColNameMax,
+     SQLSMALLINT FAR   *pcbColName,
+     SQLSMALLINT FAR   *pfSqlType,
+-    SQLUINTEGER FAR   *pcbColDef, /* precision */
++    SQLULEN FAR   *pcbColDef, /* precision */
+     SQLSMALLINT FAR   *pibScale,
+     SQLSMALLINT FAR   *pfNullable)
+ {
+@@ -649,7 +649,7 @@
+     SQLPOINTER         rgbDesc,
+     SQLSMALLINT        cbDescMax,
+     SQLSMALLINT FAR   *pcbDesc,
+-    SQLINTEGER FAR    *pfDesc)
++    SQLLEN FAR    *pfDesc)
+ {
+ 	int namelen, i;
+ 	struct _hstmt *stmt;
+@@ -969,7 +969,7 @@
+ 
+ SQLRETURN SQL_API SQLRowCount(
+     SQLHSTMT           hstmt,
+-    SQLINTEGER FAR    *pcrow)
++    SQLLEN FAR    *pcrow)
+ {
+ struct _hstmt *stmt=(struct _hstmt *)hstmt;
+ 
+@@ -1002,10 +1002,10 @@
+     SQLUSMALLINT       ipar,
+     SQLSMALLINT        fCType,
+     SQLSMALLINT        fSqlType,
+-    SQLUINTEGER        cbParamDef,
++    SQLULEN        cbParamDef,
+     SQLSMALLINT        ibScale,
+     SQLPOINTER         rgbValue,
+-    SQLINTEGER FAR     *pcbValue)
++    SQLLEN FAR     *pcbValue)
+ {
+ 	TRACE("SQLSetParam");
+ 	return SQL_SUCCESS;
+@@ -1125,8 +1125,8 @@
+     SQLUSMALLINT       icol,
+     SQLSMALLINT        fCType,
+     SQLPOINTER         rgbValue,
+-    SQLINTEGER         cbValueMax,
+-    SQLINTEGER FAR    *pcbValue)
++    SQLLEN         cbValueMax,
++    SQLLEN FAR    *pcbValue)
+ {
+ 	struct _hstmt *stmt;
+ 	struct _hdbc *dbc;
+@@ -1457,7 +1457,7 @@
+ SQLRETURN SQL_API SQLPutData(
+     SQLHSTMT           hstmt,
+     SQLPOINTER         rgbValue,
+-    SQLINTEGER         cbValue)
++    SQLLEN         cbValue)
+ {
+ 	TRACE("SQLPutData");
+ 	return SQL_SUCCESS;
+@@ -1466,7 +1466,7 @@
+ SQLRETURN SQL_API SQLSetConnectOption(
+     SQLHDBC            hdbc,
+     SQLUSMALLINT       fOption,
+-    SQLUINTEGER        vParam)
++    SQLULEN        vParam)
+ {
+ 	TRACE("SQLSetConnectOption");
+ 	return SQL_SUCCESS;
+@@ -1475,7 +1475,7 @@
+ SQLRETURN SQL_API SQLSetStmtOption(
+     SQLHSTMT           hstmt,
+     SQLUSMALLINT       fOption,
+-    SQLUINTEGER        vParam)
++    SQLULEN        vParam)
+ {
+ 	TRACE("SQLSetStmtOption");
+ 	return SQL_SUCCESS;
diff --git a/app-office/mdbtools/mdbtools-0.6_pre2-r2.ebuild b/app-office/mdbtools/mdbtools-0.6_pre2-r2.ebuild
index ea81110ee83e..3a72dd64357a 100644
--- a/app-office/mdbtools/mdbtools-0.6_pre2-r2.ebuild
+++ b/app-office/mdbtools/mdbtools-0.6_pre2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/mdbtools/mdbtools-0.6_pre2-r2.ebuild,v 1.7 2010/05/25 13:31:33 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/mdbtools/mdbtools-0.6_pre2-r2.ebuild,v 1.8 2010/05/30 11:46:40 graaff Exp $
 
 EAPI="2"
 WANT_AUTOMAKE="1.7"
@@ -36,6 +36,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-as-needed.patch
 	epatch "${FILESDIR}"/${P}-haveiconv-fix.patch
 	epatch "${FILESDIR}"/${P}-parallel-make.patch
+	epatch "${FILESDIR}"/${P}-odbc_definitions.patch
 
 	# This is necessary since the upstream tarball was created with a
 	# buggy libtool, and the .so suffix in library names is lost in