OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Jan-2007 11:11:45
Branch: HEAD Handle: 2007010610114400
Modified files:
openpkg-src/libgda libgda.patch libgda.spec
Log:
upgrade to 2.99 and add MDB, ODBC and DB support
Summary:
Revision Changes Path
1.10 +69 -30 openpkg-src/libgda/libgda.patch
1.22 +34 -4 openpkg-src/libgda/libgda.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/libgda/libgda.patch
============================================================================
$ cvs diff -u -r1.9 -r1.10 libgda.patch
--- openpkg-src/libgda/libgda.patch 12 Nov 2006 11:21:36 -0000 1.9
+++ openpkg-src/libgda/libgda.patch 6 Jan 2007 10:11:44 -0000 1.10
@@ -1,7 +1,7 @@
Index: libgda/gda-parameter-list.c
---- libgda/gda-parameter-list.c.orig 2006-10-12 10:10:46 +0200
-+++ libgda/gda-parameter-list.c 2006-11-12 10:26:13 +0100
-@@ -276,11 +276,11 @@
+--- libgda/gda-parameter-list.c.orig 2006-12-21 16:31:15 +0100
++++ libgda/gda-parameter-list.c 2007-01-06 11:01:50 +0100
+@@ -297,11 +297,11 @@
else if (type == GDA_TYPE_SHORT)
gda_value_set_short (value, va_arg (ap, int));
else if (type == GDA_TYPE_USHORT)
@@ -15,9 +15,21 @@
else if (type == G_TYPE_FLOAT)
g_value_set_float (value, va_arg (ap, double));
else if (type == G_TYPE_DOUBLE)
+Index: providers/mdb/gda-mdb-provider.c
+--- providers/mdb/gda-mdb-provider.c.orig 2006-11-07 15:20:59 +0100
++++ providers/mdb/gda-mdb-provider.c 2007-01-06 11:01:50 +0100
+@@ -795,7 +795,7 @@
+ /* allocate bound data */
+ bound_data[c] = (gchar *) malloc (MDB_BIND_SIZE);
+ bound_data[c][0] = '\0';
+- mdb_sql_bind_column (mdb_SQL, c + 1, bound_data[c], NULL);
++ mdb_sql_bind_column (mdb_SQL, c + 1, bound_data[c]);
+
+ /* set description for the field */
+ fa = gda_data_model_describe_column (model, c);
Index: providers/sqlite/gda-sqlite-provider.c
---- providers/sqlite/gda-sqlite-provider.c.orig 2006-10-13 20:28:55
+0200
-+++ providers/sqlite/gda-sqlite-provider.c 2006-11-12 10:26:13 +0100
+--- providers/sqlite/gda-sqlite-provider.c.orig 2006-11-15 16:42:30
+0100
++++ providers/sqlite/gda-sqlite-provider.c 2007-01-06 11:01:50 +0100
@@ -23,6 +23,7 @@
*/
@@ -27,8 +39,8 @@
#include <glib/gi18n-lib.h>
#include <glib/gstdio.h>
Index: providers/sqlite/sqlite-src/fts1.c
---- providers/sqlite/sqlite-src/fts1.c.orig 2006-10-13 15:14:35 +0200
-+++ providers/sqlite/sqlite-src/fts1.c 2006-11-12 10:26:13 +0100
+--- providers/sqlite/sqlite-src/fts1.c.orig 2006-10-27 17:01:36 +0200
++++ providers/sqlite/sqlite-src/fts1.c 2007-01-06 11:01:50 +0100
@@ -19,11 +19,7 @@
#endif
@@ -42,8 +54,8 @@
#include <string.h>
#include <ctype.h>
Index: providers/sqlite/sqlite-src/fts1_porter.c
---- providers/sqlite/sqlite-src/fts1_porter.c.orig 2006-10-13 15:14:35
+0200
-+++ providers/sqlite/sqlite-src/fts1_porter.c 2006-11-12 11:19:11
+0100
+--- providers/sqlite/sqlite-src/fts1_porter.c.orig 2006-10-27 17:01:36
+0200
++++ providers/sqlite/sqlite-src/fts1_porter.c 2007-01-06 11:01:50
+0100
@@ -26,11 +26,7 @@
@@ -57,8 +69,8 @@
#include <string.h>
#include <ctype.h>
Index: providers/sqlite/sqlite-src/fts1_tokenizer1.c
---- providers/sqlite/sqlite-src/fts1_tokenizer1.c.orig 2006-10-13
15:14:35 +0200
-+++ providers/sqlite/sqlite-src/fts1_tokenizer1.c 2006-11-12 11:19:23
+0100
+--- providers/sqlite/sqlite-src/fts1_tokenizer1.c.orig 2006-10-27
17:01:36 +0200
++++ providers/sqlite/sqlite-src/fts1_tokenizer1.c 2007-01-06 11:01:50
+0100
@@ -18,11 +18,7 @@
@@ -72,42 +84,69 @@
#include <string.h>
#include <ctype.h>
Index: report/testing/Makefile.in
---- report/testing/Makefile.in.orig 2006-10-24 15:29:33 +0200
-+++ report/testing/Makefile.in 2006-11-12 10:26:13 +0100
-@@ -340,7 +340,7 @@
+--- report/testing/Makefile.in.orig 2006-12-22 15:01:59 +0100
++++ report/testing/Makefile.in 2007-01-06 11:01:50 +0100
+@@ -345,7 +345,7 @@
gda_report_test_SOURCES = \
gda-report-test.c
-gda_report_test_LDADD = \
+gda_report_test_LDADD = -static \
- $(top_builddir)/libgda/libgda-3.la \
- $(top_builddir)/libgda/graph/libgda_graph-3.la \
- $(top_builddir)/libgda/handlers/libgda_handlers-3.la \
+ $(top_builddir)/libgda/libgda-3.0.la \
+ $(top_builddir)/libgda/graph/libgda_graph-3.0.la \
+ $(top_builddir)/libgda/handlers/libgda_handlers-3.0.la \
Index: testing/Makefile.in
---- testing/Makefile.in.orig 2006-10-24 15:29:33 +0200
-+++ testing/Makefile.in 2006-11-12 10:26:13 +0100
-@@ -368,7 +368,7 @@
+--- testing/Makefile.in.orig 2006-12-22 15:01:59 +0100
++++ testing/Makefile.in 2007-01-06 11:01:50 +0100
+@@ -385,7 +385,7 @@
html.c \
gda-test-sql.c
-gda_test_sql_LDADD = \
+gda_test_sql_LDADD = -static \
- $(top_builddir)/libgda/libgda-3.la \
- $(top_builddir)/libgda/handlers/libgda_handlers-3.la \
- $(top_builddir)/libgda/graph/libgda_graph-3.la \
-@@ -380,7 +380,7 @@
+ $(top_builddir)/libgda/libgda-3.0.la \
+ $(top_builddir)/libgda/handlers/libgda_handlers-3.0.la \
+ $(top_builddir)/libgda/graph/libgda_graph-3.0.la \
+@@ -397,7 +397,7 @@
html.c \
gda-test-models.c
-gda_test_models_LDADD = \
+gda_test_models_LDADD = -static \
- $(top_builddir)/libgda/libgda-3.la \
- $(top_builddir)/libgda/handlers/libgda_handlers-3.la \
- $(top_builddir)/libgda/graph/libgda_graph-3.la \
+ $(top_builddir)/libgda/libgda-3.0.la \
+ $(top_builddir)/libgda/handlers/libgda_handlers-3.0.la \
+ $(top_builddir)/libgda/graph/libgda_graph-3.0.la \
+@@ -407,7 +407,7 @@
+ gda_test_connection_SOURCES = \
+ gda-test-connection.c
+
+-gda_test_connection_LDADD = \
++gda_test_connection_LDADD = -static \
+ $(top_builddir)/libgda/libgda-3.0.la \
+ $(top_builddir)/libgda/handlers/libgda_handlers-3.0.la \
+ $(top_builddir)/libgda/graph/libgda_graph-3.0.la \
+@@ -417,7 +417,7 @@
+ gda_test_server_operation_SOURCES = \
+ gda-test-server-operation.c
+
+-gda_test_server_operation_LDADD = \
++gda_test_server_operation_LDADD = -static \
+ $(top_builddir)/libgda/libgda-3.0.la \
+ $(top_builddir)/libgda/handlers/libgda_handlers-3.0.la \
+ $(top_builddir)/libgda/graph/libgda_graph-3.0.la \
+@@ -429,7 +429,7 @@
+ html.c \
+ gda-test-model-query.c
+
+-gda_test_model_query_LDADD = \
++gda_test_model_query_LDADD = -static \
+ $(top_builddir)/libgda/libgda-3.0.la \
+ $(top_builddir)/libgda/handlers/libgda_handlers-3.0.la \
+ $(top_builddir)/libgda/graph/libgda_graph-3.0.la \
Index: tools/Makefile.in
---- tools/Makefile.in.orig 2006-10-24 15:29:33 +0200
-+++ tools/Makefile.in 2006-11-12 10:26:13 +0100
-@@ -519,22 +519,22 @@
+--- tools/Makefile.in.orig 2006-12-22 15:02:00 +0100
++++ tools/Makefile.in 2007-01-06 11:01:50 +0100
+@@ -524,22 +524,22 @@
done
gda-author-dict-file$(EXEEXT): $(gda_author_dict_file_OBJECTS)
$(gda_author_dict_file_DEPENDENCIES)
@rm -f gda-author-dict-file$(EXEEXT)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/libgda/libgda.spec
============================================================================
$ cvs diff -u -r1.21 -r1.22 libgda.spec
--- openpkg-src/libgda/libgda.spec 1 Jan 2007 17:39:08 -0000 1.21
+++ openpkg-src/libgda/libgda.spec 6 Jan 2007 10:11:44 -0000 1.22
@@ -23,8 +23,8 @@
##
# package version
-%define V_major 1.99
-%define V_minor 1
+%define V_major 2.99
+%define V_minor 2
# package information
Name: libgda
@@ -37,12 +37,15 @@
Group: Database
License: GPL/LGPL
Version: %{V_major}.%{V_minor}
-Release: 20061112
+Release: 20070106
# package options
%option with_sqlite yes
%option with_pgsql no
%option with_mysql no
+%option with_mdb no
+%option with_odbc no
+%option with_db no
%option with_ldap no
# list of sources
@@ -68,6 +71,18 @@
BuildPreReq: mysql
PreReq: mysql
%endif
+%if "%{with_mdb}" == "yes"
+BuildPreReq: mdbtools
+PreReq: mdbtools
+%endif
+%if "%{with_odbc}" == "yes"
+BuildPreReq: ODBC
+PreReq: ODBC
+%endif
+%if "%{with_db}" == "yes"
+BuildPreReq: db
+PreReq: db
+%endif
%if "%{with_ldap}" == "yes"
BuildPreReq: openldap
PreReq: openldap
@@ -106,6 +121,7 @@
export LDFLAGS="%{l_ldflags}"
./configure \
--prefix=%{l_prefix} \
+ --mandir=%{l_prefix}/man \
%if "%{with_sqlite}" == "yes"
--with-sqlite=%{l_prefix} \
%else
@@ -121,12 +137,26 @@
%else
--without-mysql \
%endif
+%if "%{with_mdb}" == "yes"
+ --with-mdb=%{l_prefix} \
+%else
+ --without-mdb \
+%endif
+%if "%{with_odbc}" == "yes"
+ --with-odbc=%{l_prefix} \
+%else
+ --without-odbc \
+%endif
+%if "%{with_db}" == "yes"
+ --with-bdb=%{l_prefix} \
+%else
+ --without-bdb \
+%endif
%if "%{with_ldap}" == "yes"
--with-ldap=%{l_prefix} \
%else
--without-ldap \
%endif
- --without-bdb \
--disable-rebuilds \
--enable-shared \
--enable-static
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
