GCC 3.4 compile fix added

4 files changed, 59 insertions, 3 deletions

diff --git a/app-office/mdbtools/ChangeLog b/app-office/mdbtools/ChangeLog
index 97afeaddcc69..a50686dbfb98 100644
--- a/app-office/mdbtools/ChangeLog
+++ b/app-office/mdbtools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/mdbtools
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/mdbtools/ChangeLog,v 1.12 2004/07/02 02:29:22 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/mdbtools/ChangeLog,v 1.13 2004/09/20 18:20:23 robmoss Exp $
+
+  20 Sep 2004; <rmoss@gentoo.org> mdbtools-0.5.ebuild:
+  Adding GCC 3.4 compile fix submitted by Ed Catmur (ed@catmur.co.uk) and
+  updated for odbc support by Mihai Limbasan (mihailim@yahoo.com).
 
   01 Jul 2004; Aron Griffis <agriffis@gentoo.org> mdbtools-0.4.ebuild:
   sync IUSE (+odbc)
diff --git a/app-office/mdbtools/Manifest b/app-office/mdbtools/Manifest
index 6a6c68f38f65..6b0fc4f58ef0 100644
--- a/app-office/mdbtools/Manifest
+++ b/app-office/mdbtools/Manifest
@@ -1,6 +1,7 @@
 MD5 8185bcec1152190cf2fa4e2a36ffdc88 mdbtools-0.4.ebuild 1484
 MD5 78f080a725598a512d0fb30f2a73ff4d ChangeLog 1307
-MD5 2f34e508eef943d448fa32524ccada42 mdbtools-0.5.ebuild 1077
+MD5 3dd3deed6a9cd9ac6cdc746cacabfbfb mdbtools-0.5.ebuild 1154
 MD5 d056516aee83f6794540f87e15521059 files/mdbtools-0.4-termcap.diff 412
 MD5 48d861b456922a79e1c3ddf47137ced9 files/digest-mdbtools-0.4 64
 MD5 402da6348fabe50879d699674f8239ea files/digest-mdbtools-0.5 64
+MD5 96e88f8e3b0a2ffc9628083a8b924d71 files/mdbtools-0.5-gcc34.patch 1682
diff --git a/app-office/mdbtools/files/mdbtools-0.5-gcc34.patch b/app-office/mdbtools/files/mdbtools-0.5-gcc34.patch
new file mode 100644
index 000000000000..192433180e7b
--- /dev/null
+++ b/app-office/mdbtools/files/mdbtools-0.5-gcc34.patch
@@ -0,0 +1,43 @@
+diff -rU3 mdbtools-0.5-orig/src/gmdb2/sql.c mdbtools-0.5/src/gmdb2/sql.c
+--- mdbtools-0.5-orig/src/gmdb2/sql.c	2003-01-15 04:02:07.000000000 +0200
++++ mdbtools-0.5/src/gmdb2/sql.c	2004-07-12 19:40:53.075904976 +0300
+@@ -38,6 +38,8 @@
+ 
+ void gmdb_sql_tree_populate(MdbHandle *mdb, GladeXML *xml);
+ void gmdb_sql_load_query(GladeXML *xml, gchar *file_path);
++void gmdb_sql_save_as_cb(GtkWidget *w, GladeXML *xml);
++void gmdb_sql_save_query(GladeXML *xml, gchar *file_path);
+ 
+ void
+ gmdb_sql_close_all()
+diff -rU3 mdbtools-0.5-orig/src/gmdb2/table_export.c mdbtools-0.5/src/gmdb2/table_export.c
+--- mdbtools-0.5-orig/src/gmdb2/table_export.c	2003-01-14 19:37:44.000000000 +0200
++++ mdbtools-0.5/src/gmdb2/table_export.c	2004-07-12 19:40:19.912946512 +0300
+@@ -37,6 +37,8 @@
+ #define NEVER "Never"
+ #define AUTOMAT "Automatic (where necessary)"
+ 
++void gmdb_table_export_populate_dialog(GladeXML *xml);
++
+ void
+ gmdb_print_quote(FILE *outfile, int need_quote, char quotechar, char *colsep, char *str)
+ {
+diff -rU3 mdbtools-0.5-orig/src/odbc/odbc.c mdbtools-0.5/src/odbc/odbc.c
+--- mdbtools-0.5-orig/src/odbc/odbc.c	2003-01-15 04:02:09.000000000 +0200
++++ mdbtools-0.5/src/odbc/odbc.c	2004-07-12 19:41:51.520020120 +0300
+@@ -46,6 +46,7 @@
+ static SQLRETURN SQL_API _SQLFreeConnect(SQLHDBC hdbc);
+ static SQLRETURN SQL_API _SQLFreeEnv(SQLHENV henv);
+ static SQLRETURN SQL_API _SQLFreeStmt(SQLHSTMT hstmt, SQLUSMALLINT fOption);
++static void bind_columns(struct _hstmt *stmt);
+ 
+ #define MIN(a,b) (a>b ? b : a)
+ #define _MAX_ERROR_LEN 255
+@@ -1445,6 +1446,7 @@
+ 	case SQL_DECIMAL:
+ 	case SQL_NUMERIC:
+ 	case SQL_FLOAT:
++		;
+ 	}
+ }
+ static SQLSMALLINT _odbc_get_client_type(int srv_type)
diff --git a/app-office/mdbtools/mdbtools-0.5.ebuild b/app-office/mdbtools/mdbtools-0.5.ebuild
index 82cd8dbdefef..ef76bd7e4edc 100644
--- a/app-office/mdbtools/mdbtools-0.5.ebuild
+++ b/app-office/mdbtools/mdbtools-0.5.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/mdbtools/mdbtools-0.5.ebuild,v 1.11 2004/06/24 22:42:55 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/mdbtools/mdbtools-0.5.ebuild,v 1.12 2004/09/20 18:20:23 robmoss Exp $
+
+inherit eutils
 
 DESCRIPTION="A set of libraries and utilities for reading Microsoft Access database (MDB) files"
 HOMEPAGE="http://sourceforge.net/projects/mdbtools/"
@@ -21,6 +23,12 @@ DEPEND=">=dev-libs/glib-2
 		>=gnome-base/libgnomeui-2 )
 	odbc? ( >=dev-db/unixODBC-2.0 )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gcc34.patch
+}
+
 src_compile() {
 	local myconf
 	use odbc && myconf="${myconf} --with-unixodbc=/usr"