Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add mdbtools

Browse Source
This commit is contained in:
suvari
2015-10-14 16:59:08 +03:00
parent 68d55ba431
commit d184ddcd89
17 changed files with 508 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
office/misc/mdbtools/files/gmdb2.desktop
+11
View File
@@ -0,0 +1,11 @@
[Desktop Entry]
Encoding=UTF-8
Name=MDB Database Explorer
Name[tr]=MDB Veritabanı Görüntüleyici
Comment=Explorer for your MDB database files
Comment[tr]=MDB veritabanı dosyalarınız için görüntüleyici
Icon=server-database.png
Exec=gmdb2
Terminal=false
Type=Application
Categories=Development;
office/misc/mdbtools/files/mdbtools-0.6_pre1-as-needed.patch
+11
View File
@@ -0,0 +1,11 @@
--- src/odbc/Makefile.am.orig 2006-07-26 14:05:55.000000000 +0200
+++ src/odbc/Makefile.am 2006-07-26 14:06:02.000000000 +0200
@@ -15,7 +15,7 @@
$(patsubst %.c, %.lo, $(SQLSOURCES))) \
$(patsubst %, $(MDBDIR)/%, \
$(patsubst %.c, %.lo, $(MDBSOURCES)))
-LIBS = @LEXLIB@ $(GLIB_LIBS) $(ODBC_LIBS)
+LIBS = @LEXLIB@ $(GLIB_LIBS) $(ODBC_LIBS) -lm
unittest_LDADD = libmdbodbc.la ../libmdb/libmdb.la ../sql/libmdbsql.la
## Need blank statement to avoid compiling odbc.c
office/misc/mdbtools/files/mdbtools-0.6_pre1-gcc41.patch
+13
View File
@@ -0,0 +1,13 @@
diff -ur mdbtools-0.6pre1-orig/include/mdbtools.h mdbtools-0.6pre1/include/mdbtools.h
--- mdbtools-0.6pre1-orig/include/mdbtools.h 2006-05-28 18:01:32.000000000 -0400
+++ mdbtools-0.6pre1/include/mdbtools.h 2006-05-28 18:04:33.000000000 -0400
@@ -147,7 +147,7 @@
#define IS_JET3(mdb) (mdb->f->jet_version==MDB_VER_JET3)
/* hash to store registered backends */
-extern GHashTable *mdb_backends;
+static GHashTable *mdb_backends;
/* forward declarations */
typedef struct mdbindex MdbIndex;
office/misc/mdbtools/files/mdbtools-0.6_pre1-strlen.patch
+10
View File
@@ -0,0 +1,10 @@
--- src/extras/mdbsupport.c.orig 2007-05-13 11:55:43.000000000 +0200
+++ src/extras/mdbsupport.c 2007-05-13 11:55:57.000000000 +0200
@@ -1,6 +1,7 @@
/* support routines for code generated by the util programs */
#include <stdio.h>
+#include <string.h>
void dump_int (int i)
{
office/misc/mdbtools/files/mdbtools-0.6_pre2-odbc_definitions.patch
+146
View File
@@ -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;
office/misc/mdbtools/files/mdbtools-linkage_fix.diff
+11
View File
@@ -0,0 +1,11 @@
Index: src/sql/Makefile.am
===================================================================
--- src/sql/Makefile.am.orig
+++ src/sql/Makefile.am
@@ -1,5 +1,6 @@
lib_LTLIBRARIES = libmdbsql.la
libmdbsql_la_SOURCES= mdbsql.c parser.y lexer.l
+libmdbsql_la_LIBADD = ../libmdb/libmdb.la
EXTRA_DIST = main.c
DISTCLEANFILES = parser.c parser.h lexer.c
AM_CPPFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS)
office/misc/mdbtools/files/suse/mdbtools-0.5-gnome_prefix.diff
+48
View File
@@ -0,0 +1,48 @@
Index: configure.in
===================================================================
--- configure.in.orig
+++ configure.in
@@ -106,6 +106,7 @@ PKG_CHECK_MODULES(GNOME,libglade-2.0 lib
if test "x$HAVE_GNOME" = "xtrue"; then
AC_SUBST(GNOME_CFLAGS)
AC_SUBST(GNOME_LIBS)
+ AC_SUBST(GNOME_PREFIX)
OPTDIRS="$OPTDIRS gmdb2"
fi
Index: src/gmdb2/Makefile.am
===================================================================
--- src/gmdb2/Makefile.am.orig
+++ src/gmdb2/Makefile.am
@@ -1,3 +1,4 @@
+prefix = @GNOME_PREFIX@
SUBDIRS = help gladefiles pixmaps
bin_PROGRAMS = gmdb2
include_HEADERS = gmdb.h
Index: src/gmdb2/gladefiles/Makefile.am
===================================================================
--- src/gmdb2/gladefiles/Makefile.am.orig
+++ src/gmdb2/gladefiles/Makefile.am
@@ -1,3 +1,4 @@
+prefix = @GNOME_PREFIX@
gladedir = $(datadir)/gmdb/glade/
glade_DATA = \
Index: src/gmdb2/help/C/Makefile.am
===================================================================
--- src/gmdb2/help/C/Makefile.am.orig
+++ src/gmdb2/help/C/Makefile.am
@@ -1,3 +1,4 @@
+prefix = @GNOME_PREFIX@
figs = \
figures/gmdb2_window.png \
figures/gmdb2_sql_window.png
Index: src/gmdb2/pixmaps/Makefile.am
===================================================================
--- src/gmdb2/pixmaps/Makefile.am.orig
+++ src/gmdb2/pixmaps/Makefile.am
@@ -1,3 +1,4 @@
+prefix = @GNOME_PREFIX@
appicondir = $(datadir)/gmdb/glade
office/misc/mdbtools/files/suse/mdbtools-0.5-no_gmdb_h.diff
+13
View File
@@ -0,0 +1,13 @@
Index: src/gmdb2/Makefile.am
===================================================================
--- src/gmdb2/Makefile.am.orig 2009-12-02 19:57:27.000000000 +0100
+++ src/gmdb2/Makefile.am 2009-12-02 19:57:27.000000000 +0100
@@ -1,7 +1,7 @@
prefix = @GNOME_PREFIX@
SUBDIRS = help gladefiles pixmaps
bin_PROGRAMS = gmdb2
-include_HEADERS = gmdb.h
+noinst_HEADERS = gmdb.h
gmdb2_SOURCES = main2.c file.c util.c table.c query.c module.c macro.c report.c form.c info.c table_def.c table_data.c table_export.c debug.c sql.c schema.c prefs.c
LIBS = -rdynamic $(GNOME_LIBS) @LIBS@ @LEXLIB@
AM_CPPFLAGS = -I$(top_srcdir)/include \
office/misc/mdbtools/files/suse/mdbtools-aliasingandendianness.patch
+19
View File
@@ -0,0 +1,19 @@
Index: src/libmdb/data.c
===================================================================
--- src/libmdb/data.c.orig
+++ src/libmdb/data.c
@@ -581,10 +581,13 @@ mdb_fetch_row(MdbTableDef *table)
do {
if (table->strategy==MDB_INDEX_SCAN) {
- if (!mdb_index_find_next(table->mdbidx, table->scan_idx, table->chain, &pg, (guint16 *) &(table->cur_row))) {
+ guint16 tmp = (guint16)table->cur_row;
+ if (!mdb_index_find_next(table->mdbidx, table->scan_idx, table->chain, &pg, &tmp)) {
+ table->cur_row = tmp;
mdb_index_scan_free(table);
return 0;
}
+ table->cur_row = tmp;
mdb_read_pg(mdb, pg);
} else {
rows = mdb_pg_get_int16(mdb,fmt->row_count_offset);
office/misc/mdbtools/files/suse/mdbtools-declare_yyinput.patch
+10
View File
@@ -0,0 +1,10 @@
--- src/sql/lexer.l
+++ src/sql/lexer.l
@@ -21,6 +21,7 @@
#include "mdbsql.h"
#include "parser.h"
+extern int mdb_sql_yyinput(char *buf, int need);
%}
%%
office/misc/mdbtools/files/suse/mdbtools-off_by_one.patch
+13
View File
@@ -0,0 +1,13 @@
basename is char[33]
--- src/gmdb2/file.c
+++ src/gmdb2/file.c
@@ -99,7 +99,7 @@
} else {
strncpy(basename,file_path,32);
}
- basename[33]='\0';
+ basename[32]='\0';
gnome_config_set_string("/gmdb/RecentFiles/menu_recent1.basename", basename);
gnome_config_set_string("/gmdb/RecentFiles/menu_recent1.filepath", file_path);
gnome_config_sync();
office/misc/mdbtools/files/suse/mdbtools-retvals.patch
+9
View File
@@ -0,0 +1,9 @@
--- src/gmdb2/info.c
+++ src/gmdb2/info.c
@@ -71,4 +71,6 @@
gtk_label_set_text(GTK_LABEL(label), tmpstr);
g_free(filepath);
+
+ return NULL;
}
office/misc/mdbtools/files/suse/mdbtools-uninit.patch
+11
View File
@@ -0,0 +1,11 @@
--- src/util/prindex.c
+++ src/util/prindex.c
@@ -115,7 +115,7 @@
void
walk_index(MdbHandle *mdb, MdbIndex *idx)
{
- int start, len;
+ int start = 0, len = 0; // I seriously doubt this function does anything useful.
guint32 pg;
guint16 row;
MdbHandle *mdbidx;
office/misc/mdbtools/files/suse/parallelmake.patch
+11
View File
@@ -0,0 +1,11 @@
Index: mdbtools-0.6pre1/src/sql/Makefile.am
===================================================================
--- mdbtools-0.6pre1.orig/src/sql/Makefile.am 2005-01-15 06:02:06.000000000 +0100
+++ mdbtools-0.6pre1/src/sql/Makefile.am 2010-06-07 08:05:16.652462537 +0200
@@ -9,3 +9,6 @@ YACC = @YACC@ -d
dist-hook:
rm -f $(distdir)/parser.c $(distdir)/parser.h $(distdir)/lexer.c
+
+lexer.o: parser.h
+