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

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 168 insertions, 4 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/Manifest b/app-office/mdbtools/Manifest
index d395a5e305ac..3fe1d7636c2e 100644
--- a/app-office/mdbtools/Manifest
+++ b/app-office/mdbtools/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX mdbtools-0.6_pre1-as-needed.patch 482 RMD160 96eb67726fcccd745dc5494fefbcb3e6db936d9a SHA1 59c1e6a246c1dc1245386cfb6f49ec6c88eea0a0 SHA256 38d06663bc41ced3e094d4a78d6a0b81909b08720bec2696ef7431fb90519416
 AUX mdbtools-0.6_pre1-gcc34.patch 1571 RMD160 b21fa43cc3b3f9e336c741862caf73a6fe66f99e SHA1 04e16d502c28cb065d04fc4afe68761380cd8521 SHA256 63a2f8d06d905274c3dfb60373b7a4c967534a06b864dc3e73e2a92ed8b0f633
 AUX mdbtools-0.6_pre1-gcc41.patch 498 RMD160 3c4c39b3c17066c09e7e3a5fa052d195eb3f6740 SHA1 b137104183f56f2a155a83036613c25b3deef15e SHA256 58ab3afcf6e3a97570db7980cf81792b21c84e9074afdc7826c2789306122a63
@@ -5,10 +8,18 @@ AUX mdbtools-0.6_pre1-strlen.patch 284 RMD160 cfa88cda151cfb7f63cc7fbd3cb366d00f
 AUX mdbtools-0.6_pre2-as-needed.patch 482 RMD160 96eb67726fcccd745dc5494fefbcb3e6db936d9a SHA1 59c1e6a246c1dc1245386cfb6f49ec6c88eea0a0 SHA256 38d06663bc41ced3e094d4a78d6a0b81909b08720bec2696ef7431fb90519416
 AUX mdbtools-0.6_pre2-gcc34.patch 1468 RMD160 fc1ba2a523bf9dd4c0dd0601d70db4e5374ec1b2 SHA1 ae4dc5100d6fc097cddb93164cad360640da6405 SHA256 ae0f0ea67b9bcc8851073acba54297268f00a31a0d286b59680f7a28f15ba108
 AUX mdbtools-0.6_pre2-haveiconv-fix.patch 660 RMD160 6fc78057697eda733e6526573c47cfe2be950012 SHA1 cc5add40346b1aeb61985d0de6a65f3a3a39af63 SHA256 e7fc8f4809968f0cfc8e890d8dc6ca98abd51f1c243d25276e566f88f9461887
+AUX mdbtools-0.6_pre2-odbc_definitions.patch 4060 RMD160 53ae212a83bcd30bb255f6f9f7a0df08026b35de SHA1 4dd3f1fcf6c8a01bb26af81e19639c69ebcbbcff SHA256 d3381970ce81ebf4663f00424af02cb5544f7c5095abba87117813182789f6b1
 AUX mdbtools-0.6_pre2-parallel-make.patch 655 RMD160 f5e9b45e7dcfd240ba5388d049bdd3d29eb2a832 SHA1 2c3a076c482f8b52f963d82eac8d6b220ef7e17c SHA256 406acd023f0af39a0d2b2b25284efd5e01defffbfade6c17ee9dcacdaa29e15a
 DIST mdbtools-0.6pre1.tar.gz 611756 RMD160 e6a89d6984ba84aa9895ab0b6e6b68ac86881be3 SHA1 37a50d623a444ec690d2677b12b59c2f11e497c0 SHA256 7169dc50da857aae2b3f62cd5c6ace37fed56f3e39d07c9afa5aba882b1de3d3
 DIST mdbtools-cvs-20050624.tar.gz 306961 RMD160 800328d9acc763ce58211b5a37ad20b8ce34cc21 SHA1 15c97da82826935032aa2089d3e9ed7e2931ce43 SHA256 471034a00f9441e34b3a236ce07bdb766fea0bd140fc69a3d8a9c7225bf573b3
 EBUILD mdbtools-0.6_pre1-r1.ebuild 1881 RMD160 1dab3e8bb357913103e6493535368dce195e2fa3 SHA1 5e83ffc7162230642668472ef93404a8a4f4ee89 SHA256 9b4246179a80d36e3e3db927500d4cf9c06df423a9c1bc9b95450049d741fcd5
-EBUILD mdbtools-0.6_pre2-r2.ebuild 1892 RMD160 68aaef6d181a61967dcecd9629752b1013b0a56f SHA1 508736ff0ac46aa6ac70ae1b56f2df4ccf61847d SHA256 46ea7bd21eb920677d7ba6561cd4b03ae74ac868bdf4b932940d20f46bf7c338
-MISC ChangeLog 7167 RMD160 40956b50cf003df66a15631b45f4f19fe1d30c38 SHA1 dd1c3410b90d76e4d677ba31e781a3001d98ffb3 SHA256 304a6fb1f35c17f7b110a70e695453962d3b09a4447ff89596e77c9c40ab6939
+EBUILD mdbtools-0.6_pre2-r2.ebuild 1940 RMD160 02c52d940834601b58f8414b710f5f8a416b3647 SHA1 973e1f1343422a9bd7df51c5c60561284eeb1cf2 SHA256 0088e7fd22e3ac174992ff07724ad32c9b9290bc85af180e3eaf707ce8b31ba6
+MISC ChangeLog 7408 RMD160 c25135ac0af7f92274416d7f0f8bb398b24b50a8 SHA1 ce7cb3112322c5bae3bd9c95d6229d0a55aecd9f SHA256 9c6e5f644c04923ebf5714c1276c6bc586259dfb1f27989b9b7cfdaec67cc3c5
 MISC metadata.xml 220 RMD160 65cff73eb25c0cc60095d42dd59adbefcb127b77 SHA1 059c076f5c2d3a1eb0b022ef90920bcabaf841b3 SHA256 0f420960bb0e6e212e563ce0883b0e412304dfd506a39e434d2c7a40a603ba86
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwCUCwACgkQeM7EJeUH71PtpgCfQOxtD3LePCXJFR2lLdhfiBL0
+AosAoI5Jjd0dJ9oXDUluCa/Jz9rkjxkd
+=roHC
+-----END PGP SIGNATURE-----
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