SOURCES: mdbtools-oo_fixes.patch (NEW), mdbtools-compile_fix.patch...

sls sls at pld-linux.org
Wed Oct 25 12:10:05 CEST 2006 

Author: sls                          Date: Wed Oct 25 10:10:03 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- mdbtools updated to 0.6pre1; removed outdated patches - glib, gcc34;
  updated link.patch; added patches:
- compile_fix - fixes static/non-static declaration
- as_needed - adds missing -lm to libmdbodbc_la_LIBADD
- oo_fixes - based on patch from openoffice.org sources: fixes symbol
  name (mdb_run_query -> mdb_sql_run_query) in includes; removes some
  compiler warnings

---- Files affected:
SOURCES:
   mdbtools-oo_fixes.patch (NONE -> 1.1)  (NEW), mdbtools-compile_fix.patch (NONE -> 1.1)  (NEW), mdbtools-as_needed.patch (NONE -> 1.1)  (NEW), mdbtools-link.patch (1.1 -> 1.2) , mdbtools-glib.patch (1.2 -> NONE)  (REMOVED), mdbtools-gcc34.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: SOURCES/mdbtools-oo_fixes.patch
diff -u /dev/null SOURCES/mdbtools-oo_fixes.patch:1.1
--- /dev/null	Wed Oct 25 12:10:03 2006
+++ SOURCES/mdbtools-oo_fixes.patch	Wed Oct 25 12:09:58 2006
@@ -0,0 +1,86 @@
+--- gmdb.h	2004-02-11 23:04:26.000000000 +0100
++++ mdbtools-0.6pre1/src/gmdb2/gmdb.h	2005-08-01 18:27:10.000000000 +0200
+@@ -24,6 +24,7 @@
+ GtkWidget *gmdb_table_def_new(MdbCatalogEntry *entry);
+ GtkWidget *gmdb_table_export_new(MdbCatalogEntry *entry);
+ void gmdb_table_export(MdbCatalogEntry *entry) ;
++gchar *gmdb_export_get_filepath(GladeXML *xml);
+ 
+ void gmdb_file_select_cb(GtkWidget *w, gpointer data);
+ void gmdb_file_open_cb(GtkWidget *w, gpointer data);
+--- info.c	2003-01-12 23:59:42.000000000 +0100
++++ mdbtools-0.6pre1/src/gmdb2/info.c	2005-08-01 19:04:14.000000000 +0200
+@@ -71,4 +71,7 @@
+ 	gtk_label_set_text(GTK_LABEL(label), tmpstr);	
+ 
+ 	g_free(filepath);
++	// a hack to avoid warning: control reaches end of non-void function
++	// the return value is nowhere used anyway
++	return NULL;
+ }
+--- table_export.c	2003-01-14 18:37:44.000000000 +0100
++++ mdbtools-0.6pre1/src/gmdb2/table_export.c	2005-08-01 19:05:50.000000000 +0200
+@@ -49,6 +49,7 @@
+ 	}
+ }
+ 
++void
+ gmdb_export_get_delimiter(GladeXML *xml, gchar *delimiter, int max_buf)
+ {
+ 	GtkWidget *combo;
+--- data.c	2004-06-11 15:56:41.000000000 +0200
++++ mdbtools-0.6pre1/src/libmdb/data.c	2005-08-01 19:11:29.000000000 +0200
+@@ -136,7 +136,7 @@
+ }
+ static int mdb_xfer_bound_ole(MdbHandle *mdb, int start, MdbColumn *col, int len)
+ {
+-int ret;
++int ret=0;
+ 	if (len) {
+ 		col->cur_value_start = start;
+ 		col->cur_value_len = len;
+--- kkd.c	2003-04-29 19:55:17.000000000 +0200
++++ mdbtools-0.6pre1/src/libmdb/kkd.c	2005-08-01 19:15:43.000000000 +0200
+@@ -55,7 +55,7 @@
+ 
+ GHashTable *mdb_get_column_def(MdbCatalogEntry *entry, int start)
+ {
+-GHashTable *hash;
++GHashTable *hash=NULL;
+ MdbHandle *mdb = entry->mdb;
+ MdbColumnProp prop;
+ int tmp, pos, col_num, val_len, i;
+--- mdbsql.c    2004-05-30 11:20:40.000000000 +0530
++++ mdbtools-0.6pre1/src/sql/mdbsql.c  2005-07-26 17:06:18.000000000 +0530
+@@ -84,7 +84,7 @@
+                return 1;
+        }
+ }
+-int mdb_run_query(MdbSQL *sql, char *query)
++int mdb_sql_run_query(MdbSQL *sql, char *query)
+ {
+        if (_parse(sql,query) && sql->cur_table) {
+                mdb_sql_bind_all(sql);
+
+--- mdbsql.h	2004-03-07 05:29:54.000000000 +0530
++++ mdbtools-0.6pre1/include/mdbsql.h	2005-07-28 18:34:51.000000000 +0530
+@@ -1,7 +1,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <glib.h>
+-#include <mdbtools.h>
++#include "mdbtools.h"
+ 
+ #ifndef _mdbsql_h_
+ 
+--- index.c	2004-04-16 17:45:14.000000000 +0200
++++ mdbtools-0.6pre1/src/libmdb/index.c	2005-11-28 20:14:37.000000000 +0100
+@@ -330,7 +330,7 @@
+ {
+ 	int mask_bit = 0;
+ 	int mask_pos = 0x16;
+-	int mask_byte;
++	int mask_byte = 0;
+ 	int elem = 0;
+ 	int len, start, i;
+ 

================================================================
Index: SOURCES/mdbtools-compile_fix.patch
diff -u /dev/null SOURCES/mdbtools-compile_fix.patch:1.1
--- /dev/null	Wed Oct 25 12:10:03 2006
+++ SOURCES/mdbtools-compile_fix.patch	Wed Oct 25 12:09:58 2006
@@ -0,0 +1,11 @@
+--- mdbtools-0.6pre1/src/libmdb/backend.c.orig	2006-08-16 13:18:14.000000000 +0000
++++ mdbtools-0.6pre1/src/libmdb/backend.c	2006-08-16 13:18:24.000000000 +0000
+@@ -28,7 +28,7 @@
+ #endif
+ 
+ static int is_init;
+-static GHashTable *mdb_backends;
++GHashTable *mdb_backends;
+ 
+    /*    Access data types */
+ static MdbBackendType mdb_access_types[] = {

================================================================
Index: SOURCES/mdbtools-as_needed.patch
diff -u /dev/null SOURCES/mdbtools-as_needed.patch:1.1
--- /dev/null	Wed Oct 25 12:10:03 2006
+++ SOURCES/mdbtools-as_needed.patch	Wed Oct 25 12:09:58 2006
@@ -0,0 +1,11 @@
+--- mdbtools-0.6pre1/src/odbc/Makefile.am.orig	2006-10-25 00:56:42.000000000 +0000
++++ mdbtools-0.6pre1/src/odbc/Makefile.am	2006-10-25 00:56:51.000000000 +0000
+@@ -14,7 +14,7 @@
+ libmdbodbc_la_LIBADD=	$(patsubst %, $(SQLDIR)/%, \
+ 				$(patsubst %.c, %.lo, $(SQLSOURCES))) \
+ 				$(patsubst %, $(MDBDIR)/%, \
+-				$(patsubst %.c, %.lo, $(MDBSOURCES)))
++				$(patsubst %.c, %.lo, $(MDBSOURCES))) -lm
+ LIBS	=	@LEXLIB@ $(GLIB_LIBS) $(ODBC_LIBS)
+ unittest_LDADD	=	libmdbodbc.la ../libmdb/libmdb.la ../sql/libmdbsql.la
+ 

================================================================
Index: SOURCES/mdbtools-link.patch
diff -u SOURCES/mdbtools-link.patch:1.1 SOURCES/mdbtools-link.patch:1.2
--- SOURCES/mdbtools-link.patch:1.1	Tue Feb 21 20:07:49 2006
+++ SOURCES/mdbtools-link.patch	Wed Oct 25 12:09:58 2006
@@ -1,11 +1,11 @@
 --- mdbtools-0.5/src/sql/Makefile.am.orig	2002-12-27 16:09:02.000000000 +0100
 +++ mdbtools-0.5/src/sql/Makefile.am	2006-02-21 19:55:28.778581000 +0100
 @@ -2,7 +2,7 @@
- libmdbsql_la_SOURCES=	mdbsql.c parser.y lexer.l 
- INCLUDES	=	-I$(top_srcdir)/include $(GLIB_CFLAGS)
+ DISTCLEANFILES = parser.c parser.h lexer.c
+ AM_CPPFLAGS	=	-I$(top_srcdir)/include $(GLIB_CFLAGS)
  LIBS	=	$(GLIB_LIBS)
 -LDADD	=	../libmdb/libmdb.la 
 +libmdbsql_la_LIBADD=	../libmdb/libmdb.la 
- YACC = bison -y -d
+ YACC = @YACC@ -d
  
  dist-hook:
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/mdbtools-link.patch?r1=1.1&r2=1.2&f=u

More information about the pld-cvs-commit mailing list