Author: evil Date: Tue Apr 12 14:20:58 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 0.6.pre2.7snap20050624 gentoo cvs snapshot (finally not segfaults with
large JET 4.0 databases :)
- changed Source0 URL to gentoo distfiles
- updated -as_needed.patch (gentoo)
- added -gcc34,-haveiconv_fix,-odbc_definitions,-parallel_make patches from
gentoo
- removed -compile_fix and -oo_fixes patches (upstream now)
- reworked autotools rules
---- Files affected:
packages/mdbtools:
mdbtools-as_needed.patch (1.1 -> 1.2) , mdbtools.spec (1.34 -> 1.35) ,
mdbtools-gcc34.patch (1.2 -> 1.3) , mdbtools-haveiconv_fix.patch (NONE -> 1.1)
(NEW), mdbtools-odbc_definitions.patch (NONE -> 1.1) (NEW),
mdbtools-parallel_make.patch (NONE -> 1.1) (NEW), mdbtools-compile_fix.patch
(1.1 -> NONE) (REMOVED), mdbtools-oo_fixes.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/mdbtools/mdbtools-as_needed.patch
diff -u packages/mdbtools/mdbtools-as_needed.patch:1.1
packages/mdbtools/mdbtools-as_needed.patch:1.2
--- packages/mdbtools/mdbtools-as_needed.patch:1.1 Wed Oct 25 12:09:58 2006
+++ packages/mdbtools/mdbtools-as_needed.patch Tue Apr 12 16:20:52 2011
@@ -1,11 +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)/%, \
+--- 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)))
-+ $(patsubst %.c, %.lo, $(MDBSOURCES))) -lm
- LIBS = @LEXLIB@ $(GLIB_LIBS) $(ODBC_LIBS)
+ $(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
================================================================
Index: packages/mdbtools/mdbtools.spec
diff -u packages/mdbtools/mdbtools.spec:1.34
packages/mdbtools/mdbtools.spec:1.35
--- packages/mdbtools/mdbtools.spec:1.34 Wed Nov 3 22:24:18 2010
+++ packages/mdbtools/mdbtools.spec Tue Apr 12 16:20:52 2011
@@ -4,24 +4,29 @@
%bcond_without gnome # without gui package
%bcond_without odbc # without odbc package
#
-%define pre pre1
+%define pre pre2
%define rel 7
+%define snap 20050624
Summary: Several utilities for using MS-Access .mdb files
Summary(pl.UTF-8): Zbiór narzędzi do używania plików MS-Access (.mdb)
Name: mdbtools
Version: 0.6
-Release: 0.%{pre}.%{rel}
+Release: 0.%{pre}.%{rel}cvs%{snap}
License: LGPL (library), GPL (gmdb2)
Group: Development/Tools
-Source0:
http://dl.sourceforge.net/mdbtools/%{name}-%{version}%{pre}.tar.gz
-# Source0-md5: 246e8f38b2a1af1bcff60ee0da59300b
+#Source0:
http://dl.sourceforge.net/mdbtools/%{name}-%{version}%{pre}.tar.gz
+Source0: http://distfiles.gentoo.org/distfiles/%{name}-cvs-%{snap}.tar.gz
+# Source0-md5: 875872ed64c4826c23d0ba5b63f5c489
Source1: gmdb2.desktop
Source2: gmdb2.png
-Patch0: %{name}-compile_fix.patch
-Patch1: %{name}-oo_fixes.patch
-Patch2: %{name}-link.patch
-Patch3: %{name}-as_needed.patch
-Patch4: %{name}-pc.patch
+Patch0: %{name}-gcc34.patch
+Patch1: %{name}-link.patch
+Patch2: %{name}-as_needed.patch
+Patch3: %{name}-pc.patch
+Patch4: %{name}-haveiconv_fix.patch
+Patch5: %{name}-parallel_make.patch
+Patch6: %{name}-odbc_definitions.patch
+
URL: http://mdbtools.sourceforge.net/
BuildRequires: autoconf
BuildRequires: automake
@@ -128,15 +133,19 @@
gmdb2 - graficzny interfejs do narzędzi MDB.
%prep
-%setup -q -n %{name}-%{version}%{pre}
-%patch0 -p1
+%setup -q -n %{name}-cvs-%{snap}
+%patch0 -p0
%patch1 -p1
-%patch2 -p1
+%patch2 -p0
%patch3 -p1
%patch4 -p1
+%patch5 -p1
+%patch6 -p1
%build
rm -f acinclude.m4
+touch config.rpath
+%{__autoheader}
%{__libtoolize}
%{__aclocal}
%{__autoconf}
@@ -182,16 +191,14 @@
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README TODO doc/faq.html
%attr(755,root,root) %{_bindir}/mdb-*
-%attr(755,root,root) %{_bindir}/pr*
-%attr(755,root,root) %{_bindir}/updrow
%{_mandir}/man1/mdb-*.1*
%files libs
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libmdb.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmdb.so.0
+%attr(755,root,root) %ghost %{_libdir}/libmdb.so.1
%attr(755,root,root) %{_libdir}/libmdbsql.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmdbsql.so.0
+%attr(755,root,root) %ghost %{_libdir}/libmdbsql.so.1
%files devel
%defattr(644,root,root,755)
@@ -232,6 +239,14 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.35 2011/04/12 14:20:52 evil
+- up to 0.6.pre2.7snap20050624 gentoo cvs snapshot (finally not segfaults with
large JET 4.0 databases :)
+- changed Source0 URL to gentoo distfiles
+- updated -as_needed.patch (gentoo)
+- added -gcc34,-haveiconv_fix,-odbc_definitions,-parallel_make patches from
gentoo
+- removed -compile_fix and -oo_fixes patches (upstream now)
+- reworked autotools rules
+
Revision 1.34 2010/11/03 21:24:18 megabajt
- added -pc.patch
- ghost soname symlinks
================================================================
Index: packages/mdbtools/mdbtools-gcc34.patch
diff -u /dev/null packages/mdbtools/mdbtools-gcc34.patch:1.3
--- /dev/null Tue Apr 12 16:20:58 2011
+++ packages/mdbtools/mdbtools-gcc34.patch Tue Apr 12 16:20:52 2011
@@ -0,0 +1,35 @@
+diff -Naur mdbtools-0.6pre1-orig/src/gmdb2/sql.c
mdbtools-0.6pre1/src/gmdb2/sql.c
+--- src/gmdb2/sql.c 2004-02-13 13:49:52.000000000 -0500
++++ src/gmdb2/sql.c 2005-10-18 08:00:19.088362686 -0400
+@@ -38,6 +38,8 @@
+
+ static void gmdb_sql_tree_populate(MdbHandle *mdb, GladeXML *xml);
+ static 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 -Naur mdbtools-0.6pre1-orig/src/gmdb2/table_export.c
mdbtools-0.6pre1/src/gmdb2/table_export.c
+--- src/gmdb2/table_export.c 2003-01-14 12:37:44.000000000 -0500
++++ src/gmdb2/table_export.c 2005-10-18 08:00:19.089362678 -0400
+@@ -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 -Naur mdbtools-0.6pre1-orig/src/odbc/odbc.c
mdbtools-0.6pre1/src/odbc/odbc.c
+--- src/odbc/odbc.c 2004-05-30 04:06:43.000000000 -0400
++++ src/odbc/odbc.c 2005-10-18 08:00:19.090362669 -0400
+@@ -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);
+
+ static void bind_columns (struct _hstmt*);
+
================================================================
Index: packages/mdbtools/mdbtools-haveiconv_fix.patch
diff -u /dev/null packages/mdbtools/mdbtools-haveiconv_fix.patch:1.1
--- /dev/null Tue Apr 12 16:20:58 2011
+++ packages/mdbtools/mdbtools-haveiconv_fix.patch Tue Apr 12 16:20:52 2011
@@ -0,0 +1,22 @@
+diff -u -r mdbtools/src/libmdb/file.c mdbtools.fix/src/libmdb/file.c
+--- mdbtools/src/libmdb/file.c 2005-06-28 13:53:40.000000000 +0900
++++ mdbtools.fix/src/libmdb/file.c 2009-09-09 04:02:47.000000000 +0900
+@@ -17,6 +17,7 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
++#include "config.h"
+ #include "mdbtools.h"
+
+ #ifdef DMALLOC
+diff -u -r mdbtools/src/libmdb/iconv.c mdbtools.fix/src/libmdb/iconv.c
+--- mdbtools/src/libmdb/iconv.c 2005-09-08 08:27:43.000000000 +0900
++++ mdbtools.fix/src/libmdb/iconv.c 2009-09-09 04:00:36.000000000 +0900
+@@ -17,6 +17,7 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
++#include "config.h"
+ #include "mdbtools.h"
+ #include "errno.h"
+
================================================================
Index: packages/mdbtools/mdbtools-odbc_definitions.patch
diff -u /dev/null packages/mdbtools/mdbtools-odbc_definitions.patch:1.1
--- /dev/null Tue Apr 12 16:20:58 2011
+++ packages/mdbtools/mdbtools-odbc_definitions.patch Tue Apr 12 16:20:52 2011
@@ -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;
================================================================
Index: packages/mdbtools/mdbtools-parallel_make.patch
diff -u /dev/null packages/mdbtools/mdbtools-parallel_make.patch:1.1
--- /dev/null Tue Apr 12 16:20:58 2011
+++ packages/mdbtools/mdbtools-parallel_make.patch Tue Apr 12 16:20:52 2011
@@ -0,0 +1,18 @@
+--- mdbtools-cvs-20050624.orig/src/sql/Makefile.am 2005-01-15
06:02:06.000000000 +0100
++++ mdbtools-cvs-20050624/src/sql/Makefile.am 2010-01-12 13:04:01.000000000
+0100
+@@ -1,5 +1,5 @@
+ lib_LTLIBRARIES = libmdbsql.la
+-libmdbsql_la_SOURCES= mdbsql.c parser.y lexer.l
++libmdbsql_la_SOURCES= mdbsql.c parser.y lexer.l parser.h
+ libmdbsql_la_LDFLAGS = -version-info 1:0:0
+ DISTCLEANFILES = parser.c parser.h lexer.c
+ AM_CPPFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS)
+@@ -7,5 +7,8 @@
+ LDADD = ../libmdb/libmdb.la
+ YACC = @YACC@ -d
+
++parser.h: parser.lo
++lexer.lo: parser.h
++
+ dist-hook:
+ rm -f $(distdir)/parser.c $(distdir)/parser.h $(distdir)/lexer.c
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mdbtools/mdbtools-as_needed.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mdbtools/mdbtools.spec?r1=1.34&r2=1.35&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mdbtools/mdbtools-gcc34.patch?r1=1.2&r2=1.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
