head 1.14; access; symbols OPENPKG_E1_MP_HEAD:1.10 OPENPKG_E1_MP:1.10 OPENPKG_E1_MP_2_STABLE:1.8.2.2 OPENPKG_E1_FP:1.8.2.2 OPENPKG_2_STABLE_MP:1.8 OPENPKG_2_STABLE_20061018:1.8.2.2 OPENPKG_2_STABLE:1.8.0.2 OPENPKG_CW_FP:1.4; locks; strict; comment @# @; 1.14 date 2007.03.24.09.15.59; author rse; state Exp; branches; next 1.13; commitid 6quVKcHIcbgg3kbs; 1.13 date 2007.02.12.18.18.26; author rse; state Exp; branches; next 1.12; commitid 0ET2iCbDF1S4le6s; 1.12 date 2007.02.12.17.27.39; author cs; state Exp; branches; next 1.11; commitid Y4WQVfPcpNHE3e6s; 1.11 date 2007.01.24.09.09.54; author rse; state Exp; branches; next 1.10; commitid xP49Wvg9ZNlLUJ3s; 1.10 date 2007.01.06.10.11.44; author rse; state Exp; branches; next 1.9; commitid FsMduFG8ruBQPq1s; 1.9 date 2006.11.12.11.21.36; author rse; state Exp; branches; next 1.8; commitid paRRfTtPxZIqZmUr; 1.8 date 2006.09.04.15.38.51; author cs; state Exp; branches 1.8.2.1; next 1.7; commitid rukRu67MgtwbDwLr; 1.7 date 2006.03.24.18.53.03; author rse; state Exp; branches; next 1.6; commitid VgdkcWEffyTDYsqr; 1.6 date 2005.10.27.11.17.15; author rse; state Exp; branches; next 1.5; commitid wZwa8ZRU4F0edp7r; 1.5 date 2005.08.24.18.39.08; author rse; state Exp; branches; next 1.4; 1.4 date 2005.03.23.10.49.58; author rse; state Exp; branches; next 1.3; 1.3 date 2005.01.06.10.08.25; author rse; state Exp; branches; next 1.2; 1.2 date 2004.06.08.18.39.02; author rse; state Exp; branches; next 1.1; 1.1 date 2004.06.08.15.31.06; author rse; state Exp; branches; next ; 1.8.2.1 date 2006.09.04.15.38.51; author rse; state dead; branches; next 1.8.2.2; commitid iZxwRSmmWscPXUQr; 1.8.2.2 date 2006.10.16.14.51.52; author rse; state Exp; branches; next ; commitid iZxwRSmmWscPXUQr; desc @@ 1.14 log @upgrading package: libgda 2.99.5 -> 2.99.6 @ text @Index: providers/sqlite/sqlite-src/fts1.c --- providers/sqlite/sqlite-src/fts1.c.orig 2007-02-13 14:08:34 +0100 +++ providers/sqlite/sqlite-src/fts1.c 2007-03-24 09:08:25 +0100 @@@@ -19,11 +19,7 @@@@ #endif #include -#if !defined(__APPLE__) -#include -#else #include -#endif #include #include #include Index: providers/sqlite/sqlite-src/fts1_porter.c --- providers/sqlite/sqlite-src/fts1_porter.c.orig 2007-02-13 14:08:34 +0100 +++ providers/sqlite/sqlite-src/fts1_porter.c 2007-03-24 09:08:25 +0100 @@@@ -26,11 +26,7 @@@@ #include -#if !defined(__APPLE__) -#include -#else #include -#endif #include #include #include Index: providers/sqlite/sqlite-src/fts1_tokenizer1.c --- providers/sqlite/sqlite-src/fts1_tokenizer1.c.orig 2007-02-13 14:08:34 +0100 +++ providers/sqlite/sqlite-src/fts1_tokenizer1.c 2007-03-24 09:08:25 +0100 @@@@ -18,11 +18,7 @@@@ #include -#if !defined(__APPLE__) -#include -#else #include -#endif #include #include #include Index: report/testing/Makefile.in --- report/testing/Makefile.in.orig 2007-03-23 20:08:16 +0100 +++ report/testing/Makefile.in 2007-03-24 09:08:25 +0100 @@@@ -343,7 +343,7 @@@@ gda_report_test_3_0_SOURCES = \ gda-report-test.c -gda_report_test_3_0_LDADD = \ +gda_report_test_3_0_LDADD = -static \ $(top_builddir)/libgda/libgda-3.0.la \ $(top_builddir)/report/libgda-report/libgda-report-3.0.la \ $(LIBGDA_LIBS) Index: testing/Makefile.in --- testing/Makefile.in.orig 2007-03-23 20:08:16 +0100 +++ testing/Makefile.in 2007-03-24 09:08:25 +0100 @@@@ -373,7 +373,7 @@@@ html.c \ gda-test-sql.c -gda_test_sql_LDADD = \ +gda_test_sql_LDADD = -static \ $(top_builddir)/libgda/libgda-3.0.la \ $(LIBGDA_LIBS) @@@@ -382,21 +382,21 @@@@ html.c \ gda-test-models.c -gda_test_models_LDADD = \ +gda_test_models_LDADD = -static \ $(top_builddir)/libgda/libgda-3.0.la \ $(LIBGDA_LIBS) gda_test_connection_3_0_SOURCES = \ gda-test-connection.c -gda_test_connection_3_0_LDADD = \ +gda_test_connection_3_0_LDADD = -static \ $(top_builddir)/libgda/libgda-3.0.la \ $(LIBGDA_LIBS) 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 \ $(LIBGDA_LIBS) @@@@ -405,14 +405,14 @@@@ 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 \ $(LIBGDA_LIBS) gda_test_blob_SOURCES = \ gda-test-blob.c -gda_test_blob_LDADD = \ +gda_test_blob_LDADD = -static \ $(top_builddir)/libgda/libgda-3.0.la \ $(LIBGDA_LIBS) Index: tools/Makefile.in --- tools/Makefile.in.orig 2007-03-23 20:08:16 +0100 +++ tools/Makefile.in 2007-03-24 09:08:25 +0100 @@@@ -492,22 +492,22 @@@@ done gda-author-dict-file-3.0$(EXEEXT): $(gda_author_dict_file_3_0_OBJECTS) $(gda_author_dict_file_3_0_DEPENDENCIES) @@rm -f gda-author-dict-file-3.0$(EXEEXT) - $(LINK) $(gda_author_dict_file_3_0_LDFLAGS) $(gda_author_dict_file_3_0_OBJECTS) $(gda_author_dict_file_3_0_LDADD) $(LIBS) + $(LINK) -static $(gda_author_dict_file_3_0_LDFLAGS) $(gda_author_dict_file_3_0_OBJECTS) $(gda_author_dict_file_3_0_LDADD) $(LIBS) gda-config-tool-3.0$(EXEEXT): $(gda_config_tool_3_0_OBJECTS) $(gda_config_tool_3_0_DEPENDENCIES) @@rm -f gda-config-tool-3.0$(EXEEXT) - $(LINK) $(gda_config_tool_3_0_LDFLAGS) $(gda_config_tool_3_0_OBJECTS) $(gda_config_tool_3_0_LDADD) $(LIBS) + $(LINK) -static $(gda_config_tool_3_0_LDFLAGS) $(gda_config_tool_3_0_OBJECTS) $(gda_config_tool_3_0_LDADD) $(LIBS) gda-diagnose-3.0$(EXEEXT): $(gda_diagnose_3_0_OBJECTS) $(gda_diagnose_3_0_DEPENDENCIES) @@rm -f gda-diagnose-3.0$(EXEEXT) - $(LINK) $(gda_diagnose_3_0_LDFLAGS) $(gda_diagnose_3_0_OBJECTS) $(gda_diagnose_3_0_LDADD) $(LIBS) + $(LINK) -static $(gda_diagnose_3_0_LDFLAGS) $(gda_diagnose_3_0_OBJECTS) $(gda_diagnose_3_0_LDADD) $(LIBS) gda-inspect-dict-file-3.0$(EXEEXT): $(gda_inspect_dict_file_3_0_OBJECTS) $(gda_inspect_dict_file_3_0_DEPENDENCIES) @@rm -f gda-inspect-dict-file-3.0$(EXEEXT) - $(LINK) $(gda_inspect_dict_file_3_0_LDFLAGS) $(gda_inspect_dict_file_3_0_OBJECTS) $(gda_inspect_dict_file_3_0_LDADD) $(LIBS) + $(LINK) -static $(gda_inspect_dict_file_3_0_LDFLAGS) $(gda_inspect_dict_file_3_0_OBJECTS) $(gda_inspect_dict_file_3_0_LDADD) $(LIBS) gda-list-config-3.0$(EXEEXT): $(gda_list_config_3_0_OBJECTS) $(gda_list_config_3_0_DEPENDENCIES) @@rm -f gda-list-config-3.0$(EXEEXT) - $(LINK) $(gda_list_config_3_0_LDFLAGS) $(gda_list_config_3_0_OBJECTS) $(gda_list_config_3_0_LDADD) $(LIBS) + $(LINK) -static $(gda_list_config_3_0_LDFLAGS) $(gda_list_config_3_0_OBJECTS) $(gda_list_config_3_0_LDADD) $(LIBS) gda-run-3.0$(EXEEXT): $(gda_run_3_0_OBJECTS) $(gda_run_3_0_DEPENDENCIES) @@rm -f gda-run-3.0$(EXEEXT) - $(LINK) $(gda_run_3_0_LDFLAGS) $(gda_run_3_0_OBJECTS) $(gda_run_3_0_LDADD) $(LIBS) + $(LINK) -static $(gda_run_3_0_LDFLAGS) $(gda_run_3_0_OBJECTS) $(gda_run_3_0_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @ 1.13 log @I can no longer remember for what the -static were required or on what platform, but resurrenct them in all previous placed just to make sure we do not break anything until I'm sure we don't need them @ text @a0 17 Index: libgda/gda-parameter-list.c --- libgda/gda-parameter-list.c.orig 2007-02-12 12:02:40 +0100 +++ libgda/gda-parameter-list.c 2007-02-12 18:56:30 +0100 @@@@ -363,11 +363,11 @@@@ else if (type == GDA_TYPE_SHORT) gda_value_set_short (value, va_arg (ap, int)); else if (type == GDA_TYPE_USHORT) - gda_value_set_ushort (value, va_arg (ap, uint)); + gda_value_set_ushort (value, va_arg (ap, unsigned int)); else if (type == G_TYPE_CHAR) g_value_set_char (value, va_arg (ap, int)); else if (type == G_TYPE_UCHAR) - g_value_set_uchar (value, va_arg (ap, uint)); + g_value_set_uchar (value, va_arg (ap, unsigned int)); else if (type == G_TYPE_FLOAT) g_value_set_float (value, va_arg (ap, double)); else if (type == G_TYPE_DOUBLE) d2 2 a3 2 --- providers/sqlite/sqlite-src/fts1.c.orig 2007-02-12 12:02:16 +0100 +++ providers/sqlite/sqlite-src/fts1.c 2007-02-12 18:56:30 +0100 d17 2 a18 2 --- providers/sqlite/sqlite-src/fts1_porter.c.orig 2007-02-12 12:02:16 +0100 +++ providers/sqlite/sqlite-src/fts1_porter.c 2007-02-12 18:56:30 +0100 d32 2 a33 2 --- providers/sqlite/sqlite-src/fts1_tokenizer1.c.orig 2007-02-12 12:02:16 +0100 +++ providers/sqlite/sqlite-src/fts1_tokenizer1.c 2007-02-12 18:56:30 +0100 d47 3 a49 3 --- report/testing/Makefile.in.orig 2007-02-12 12:15:46 +0100 +++ report/testing/Makefile.in 2007-02-12 18:56:56 +0100 @@@@ -360,7 +360,7 @@@@ d56 2 a57 2 $(top_builddir)/libgda/graph/libgda_graph-3.0.la \ $(top_builddir)/libgda/handlers/libgda_handlers-3.0.la \ d59 3 a61 3 --- testing/Makefile.in.orig 2007-02-12 12:15:46 +0100 +++ testing/Makefile.in 2007-02-12 18:57:32 +0100 @@@@ -408,7 +408,7 @@@@ d68 3 a70 3 $(top_builddir)/libgda/handlers/libgda_handlers-3.0.la \ $(top_builddir)/libgda/graph/libgda_graph-3.0.la \ @@@@ -420,7 +420,7 @@@@ d77 2 a78 3 $(top_builddir)/libgda/handlers/libgda_handlers-3.0.la \ $(top_builddir)/libgda/graph/libgda_graph-3.0.la \ @@@@ -430,7 +430,7 @@@@ d85 2 a86 3 $(top_builddir)/libgda/handlers/libgda_handlers-3.0.la \ $(top_builddir)/libgda/graph/libgda_graph-3.0.la \ @@@@ -440,7 +440,7 @@@@ d93 3 a95 3 $(top_builddir)/libgda/handlers/libgda_handlers-3.0.la \ $(top_builddir)/libgda/graph/libgda_graph-3.0.la \ @@@@ -452,7 +452,7 @@@@ d102 2 a103 3 $(top_builddir)/libgda/handlers/libgda_handlers-3.0.la \ $(top_builddir)/libgda/graph/libgda_graph-3.0.la \ @@@@ -462,7 +462,7 @@@@ d110 2 a111 2 $(top_builddir)/libgda/handlers/libgda_handlers-3.0.la \ $(top_builddir)/libgda/graph/libgda_graph-3.0.la \ d113 3 a115 3 --- tools/Makefile.in.orig 2007-02-12 12:15:47 +0100 +++ tools/Makefile.in 2007-02-12 18:58:11 +0100 @@@@ -545,22 +545,22 @@@@ @ 1.12 log @upgrading package: libgda 2.99.3 -> 2.99.4 @ text @d2 2 a3 2 --- libgda/gda-parameter-list.c 2007-02-12 12:02:40 +0100 +++ libgda/gda-parameter-list.c 2007-02-12 17:24:08 +0100 d19 2 a20 2 --- providers/sqlite/sqlite-src/fts1.c 2007-02-12 12:02:16 +0100 +++ providers/sqlite/sqlite-src/fts1.c 2007-02-12 17:25:04 +0100 d34 2 a35 2 --- providers/sqlite/sqlite-src/fts1_porter.c 2007-02-12 12:02:16 +0100 +++ providers/sqlite/sqlite-src/fts1_porter.c 2007-02-12 17:25:18 +0100 d49 2 a50 2 --- providers/sqlite/sqlite-src/fts1_tokenizer1.c 2007-02-12 12:02:16 +0100 +++ providers/sqlite/sqlite-src/fts1_tokenizer1.c 2007-02-12 17:25:42 +0100 d63 101 @ 1.11 log @upgrading package: libgda 2.99.2 -> 2.99.3 @ text @d2 3 a4 3 --- libgda/gda-parameter-list.c.orig 2007-01-17 11:55:51 +0100 +++ libgda/gda-parameter-list.c 2007-01-24 09:54:51 +0100 @@@@ -302,11 +302,11 @@@@ a17 11 Index: providers/sqlite/gda-sqlite-provider.c --- providers/sqlite/gda-sqlite-provider.c.orig 2007-01-17 11:55:40 +0100 +++ providers/sqlite/gda-sqlite-provider.c 2007-01-24 09:54:51 +0100 @@@@ -23,6 +23,7 @@@@ */ #include +#include #include #include #include d19 2 a20 2 --- providers/sqlite/sqlite-src/fts1.c.orig 2007-01-17 11:55:40 +0100 +++ providers/sqlite/sqlite-src/fts1.c 2007-01-24 09:54:51 +0100 d34 2 a35 2 --- providers/sqlite/sqlite-src/fts1_porter.c.orig 2007-01-17 11:55:40 +0100 +++ providers/sqlite/sqlite-src/fts1_porter.c 2007-01-24 09:54:51 +0100 d49 2 a50 2 --- providers/sqlite/sqlite-src/fts1_tokenizer1.c.orig 2007-01-17 11:55:40 +0100 +++ providers/sqlite/sqlite-src/fts1_tokenizer1.c 2007-01-24 09:54:51 +0100 a62 92 Index: report/testing/Makefile.in --- report/testing/Makefile.in.orig 2007-01-23 18:14:11 +0100 +++ report/testing/Makefile.in 2007-01-24 09:54:51 +0100 @@@@ -349,7 +349,7 @@@@ gda_report_test_SOURCES = \ gda-report-test.c -gda_report_test_LDADD = \ +gda_report_test_LDADD = -static \ $(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 2007-01-23 18:14:11 +0100 +++ testing/Makefile.in 2007-01-24 09:54:51 +0100 @@@@ -396,7 +396,7 @@@@ html.c \ gda-test-sql.c -gda_test_sql_LDADD = \ +gda_test_sql_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 \ @@@@ -408,7 +408,7 @@@@ html.c \ gda-test-models.c -gda_test_models_LDADD = \ +gda_test_models_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 \ @@@@ -418,7 +418,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 \ @@@@ -428,7 +428,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 \ @@@@ -440,7 +440,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 2007-01-23 18:14:12 +0100 +++ tools/Makefile.in 2007-01-24 09:54:51 +0100 @@@@ -528,22 +528,22 @@@@ done gda-author-dict-file$(EXEEXT): $(gda_author_dict_file_OBJECTS) $(gda_author_dict_file_DEPENDENCIES) @@rm -f gda-author-dict-file$(EXEEXT) - $(LINK) $(gda_author_dict_file_LDFLAGS) $(gda_author_dict_file_OBJECTS) $(gda_author_dict_file_LDADD) $(LIBS) + $(LINK) -static $(gda_author_dict_file_LDFLAGS) $(gda_author_dict_file_OBJECTS) $(gda_author_dict_file_LDADD) $(LIBS) gda-config-tool$(EXEEXT): $(gda_config_tool_OBJECTS) $(gda_config_tool_DEPENDENCIES) @@rm -f gda-config-tool$(EXEEXT) - $(LINK) $(gda_config_tool_LDFLAGS) $(gda_config_tool_OBJECTS) $(gda_config_tool_LDADD) $(LIBS) + $(LINK) -static $(gda_config_tool_LDFLAGS) $(gda_config_tool_OBJECTS) $(gda_config_tool_LDADD) $(LIBS) gda-diagnose$(EXEEXT): $(gda_diagnose_OBJECTS) $(gda_diagnose_DEPENDENCIES) @@rm -f gda-diagnose$(EXEEXT) - $(LINK) $(gda_diagnose_LDFLAGS) $(gda_diagnose_OBJECTS) $(gda_diagnose_LDADD) $(LIBS) + $(LINK) -static $(gda_diagnose_LDFLAGS) $(gda_diagnose_OBJECTS) $(gda_diagnose_LDADD) $(LIBS) gda-inspect-dict-file$(EXEEXT): $(gda_inspect_dict_file_OBJECTS) $(gda_inspect_dict_file_DEPENDENCIES) @@rm -f gda-inspect-dict-file$(EXEEXT) - $(LINK) $(gda_inspect_dict_file_LDFLAGS) $(gda_inspect_dict_file_OBJECTS) $(gda_inspect_dict_file_LDADD) $(LIBS) + $(LINK) -static $(gda_inspect_dict_file_LDFLAGS) $(gda_inspect_dict_file_OBJECTS) $(gda_inspect_dict_file_LDADD) $(LIBS) gda-list-config$(EXEEXT): $(gda_list_config_OBJECTS) $(gda_list_config_DEPENDENCIES) @@rm -f gda-list-config$(EXEEXT) - $(LINK) $(gda_list_config_LDFLAGS) $(gda_list_config_OBJECTS) $(gda_list_config_LDADD) $(LIBS) + $(LINK) -static $(gda_list_config_LDFLAGS) $(gda_list_config_OBJECTS) $(gda_list_config_LDADD) $(LIBS) gda-run$(EXEEXT): $(gda_run_OBJECTS) $(gda_run_DEPENDENCIES) @@rm -f gda-run$(EXEEXT) - $(LINK) $(gda_run_LDFLAGS) $(gda_run_OBJECTS) $(gda_run_LDADD) $(LIBS) + $(LINK) -static $(gda_run_LDFLAGS) $(gda_run_OBJECTS) $(gda_run_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @ 1.10 log @upgrade to 2.99 and add MDB, ODBC and DB support @ text @d2 3 a4 3 --- 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 @@@@ a17 12 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); d19 2 a20 2 --- 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 d30 2 a31 2 --- 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 d45 2 a46 2 --- 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 d60 2 a61 2 --- 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 d75 3 a77 3 --- 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 @@@@ d87 3 a89 3 --- 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 @@@@ d98 1 a98 1 @@@@ -397,7 +397,7 @@@@ d107 1 a107 1 @@@@ -407,7 +407,7 @@@@ d116 1 a116 1 @@@@ -417,7 +417,7 @@@@ d125 1 a125 1 @@@@ -429,7 +429,7 @@@@ d135 3 a137 3 --- 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 @@@@ @ 1.9 log @upgrading package: libgda 1.9.103 -> 1.99.1 @ text @d2 3 a4 3 --- 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 @@@@ d18 12 d31 2 a32 2 --- 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 d42 2 a43 2 --- 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 d57 2 a58 2 --- 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 d72 2 a73 2 --- 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 d87 3 a89 3 --- 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 @@@@ d95 3 a97 3 $(top_builddir)/libgda/libgda-3.la \ $(top_builddir)/libgda/graph/libgda_graph-3.la \ $(top_builddir)/libgda/handlers/libgda_handlers-3.la \ d99 3 a101 3 --- 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 @@@@ d107 4 a110 4 $(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 @@@@ d116 30 a145 3 $(top_builddir)/libgda/libgda-3.la \ $(top_builddir)/libgda/handlers/libgda_handlers-3.la \ $(top_builddir)/libgda/graph/libgda_graph-3.la \ d147 3 a149 3 --- 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 @@@@ @ 1.8 log @upgrading package: libgda 1.9.102 -> 1.9.103 @ text @d1 17 d19 2 a20 2 --- providers/sqlite/gda-sqlite-provider.c.orig 2006-08-30 15:22:52 +0200 +++ providers/sqlite/gda-sqlite-provider.c 2006-09-04 17:33:01 +0200 d29 45 d75 2 a76 2 --- report/testing/Makefile.in.orig 2006-03-24 11:14:59 +0100 +++ report/testing/Makefile.in 2006-03-24 18:56:34 +0100 d87 3 a89 3 --- testing/Makefile.in.orig 2006-03-24 11:14:59 +0100 +++ testing/Makefile.in 2006-03-24 19:02:19 +0100 @@@@ -425,7 +425,7 @@@@ d98 1 a98 1 @@@@ -437,7 +437,7 @@@@ d108 3 a110 3 --- tools/Makefile.in.orig 2006-03-24 11:15:00 +0100 +++ tools/Makefile.in 2006-03-24 18:56:34 +0100 @@@@ -440,10 +440,10 @@@@ d112 4 d120 12 @ 1.8.2.1 log @file libgda.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:51:52 +0000 @ text @d1 60 @ 1.8.2.2 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @a0 60 Index: providers/sqlite/gda-sqlite-provider.c --- providers/sqlite/gda-sqlite-provider.c.orig 2006-08-30 15:22:52 +0200 +++ providers/sqlite/gda-sqlite-provider.c 2006-09-04 17:33:01 +0200 @@@@ -23,6 +23,7 @@@@ */ #include +#include #include #include #include Index: report/testing/Makefile.in --- report/testing/Makefile.in.orig 2006-03-24 11:14:59 +0100 +++ report/testing/Makefile.in 2006-03-24 18:56:34 +0100 @@@@ -340,7 +340,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 \ Index: testing/Makefile.in --- testing/Makefile.in.orig 2006-03-24 11:14:59 +0100 +++ testing/Makefile.in 2006-03-24 19:02:19 +0100 @@@@ -425,7 +425,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 \ @@@@ -437,7 +437,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 \ Index: tools/Makefile.in --- tools/Makefile.in.orig 2006-03-24 11:15:00 +0100 +++ tools/Makefile.in 2006-03-24 18:56:34 +0100 @@@@ -440,10 +440,10 @@@@ done gda-config-tool$(EXEEXT): $(gda_config_tool_OBJECTS) $(gda_config_tool_DEPENDENCIES) @@rm -f gda-config-tool$(EXEEXT) - $(LINK) $(gda_config_tool_LDFLAGS) $(gda_config_tool_OBJECTS) $(gda_config_tool_LDADD) $(LIBS) + $(LINK) -static $(gda_config_tool_LDFLAGS) $(gda_config_tool_OBJECTS) $(gda_config_tool_LDADD) $(LIBS) gda-run$(EXEEXT): $(gda_run_OBJECTS) $(gda_run_DEPENDENCIES) @@rm -f gda-run$(EXEEXT) - $(LINK) $(gda_run_LDFLAGS) $(gda_run_OBJECTS) $(gda_run_LDADD) $(LIBS) + $(LINK) -static $(gda_run_LDFLAGS) $(gda_run_OBJECTS) $(gda_run_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @ 1.7 log @upgrading package: libgda 1.9.100 -> 1.9.102 @ text @d2 4 a5 4 --- providers/sqlite/gda-sqlite-provider.c.orig 2006-03-01 16:26:33 +0100 +++ providers/sqlite/gda-sqlite-provider.c 2006-03-24 19:01:45 +0100 @@@@ -26,6 +26,7 @@@@ #endif d9 1 d11 1 a11 2 #include #include @ 1.6 log @regen patch and add security fix (CVE-2005-2958) @ text @a0 21 Index: libgda/gda-log.c --- libgda/gda-log.c.orig 2004-10-09 16:37:58 +0200 +++ libgda/gda-log.c 2005-10-27 13:15:48 +0200 @@@@ -111,7 +111,7 @@@@ #ifdef LIBGDA_WIN32 g_log ("Gda", G_LOG_LEVEL_INFO, "%s", msg); #else - syslog (LOG_USER | LOG_INFO, msg); + syslog (LOG_USER | LOG_INFO, "%s", msg); #endif g_free (msg); } @@@@ -144,7 +144,7 @@@@ #ifdef LIBGDA_WIN32 g_log ("Gda", G_LOG_LEVEL_ERROR, "%s", msg); #else - syslog (LOG_USER | LOG_ERR, msg); + syslog (LOG_USER | LOG_ERR, "%s", msg); #endif g_free (msg); } d2 2 a3 2 --- providers/sqlite/gda-sqlite-provider.c.orig 2005-09-28 13:39:45 +0200 +++ providers/sqlite/gda-sqlite-provider.c 2005-10-27 13:15:08 +0200 d9 1 a9 1 #include d13 3 a15 3 --- report/testing/Makefile.in.orig 2005-10-13 10:11:35 +0200 +++ report/testing/Makefile.in 2005-10-27 13:15:08 +0200 @@@@ -336,7 +336,7 @@@@ d22 2 a23 2 $(top_builddir)/report/libgda-report/libgda-report-3.la \ $(LIBGDA_LIBS) d25 5 a29 5 --- testing/Makefile.in.orig 2005-10-13 10:11:35 +0200 +++ testing/Makefile.in 2005-10-27 13:15:08 +0200 @@@@ -350,7 +350,7 @@@@ ibmdb2-test.c \ ibmdb2-test.h d31 8 a38 4 -gda_test_LDADD = \ +gda_test_LDADD = -static \ $(top_builddir)/libgda/libgda-3.la \ $(LIBGDA_LIBS) d40 5 d46 3 a48 3 --- tools/Makefile.in.orig 2005-10-13 10:11:36 +0200 +++ tools/Makefile.in 2005-10-27 13:15:08 +0200 @@@@ -427,10 +427,10 @@@@ @ 1.5 log @upgrading package: libgda 1.3.1 -> 1.3.4 @ text @d1 21 d23 2 a24 2 --- providers/sqlite/gda-sqlite-provider.c.orig 2005-06-01 21:14:12 +0200 +++ providers/sqlite/gda-sqlite-provider.c 2005-08-24 20:35:00 +0200 d32 1 a32 1 #include d34 3 a36 3 --- report/testing/Makefile.in.orig 2005-07-08 16:45:27 +0200 +++ report/testing/Makefile.in 2005-08-24 20:35:00 +0200 @@@@ -323,7 +323,7 @@@@ d46 3 a48 3 --- testing/Makefile.in.orig 2005-07-08 16:45:28 +0200 +++ testing/Makefile.in 2005-08-24 20:35:00 +0200 @@@@ -337,7 +337,7 @@@@ d58 3 a60 3 --- tools/Makefile.in.orig 2005-07-08 16:45:28 +0200 +++ tools/Makefile.in 2005-08-24 20:35:00 +0200 @@@@ -414,10 +414,10 @@@@ @ 1.4 log @upgrading package: libgda 1.1.99 -> 1.3.1 @ text @a0 14 Index: libgda/gda-config.h --- libgda/gda-config.h.orig 2004-10-09 23:33:53 +0200 +++ libgda/gda-config.h 2005-03-23 11:05:56 +0100 @@@@ -118,8 +118,8 @@@@ #define GDA_TYPE_DATA_SOURCE_INFO (gda_data_source_info_get_type ()) GType gda_data_source_info_get_type (void); -GdaDataSourceInfo *gda_config_copy_data_source_info (GdaDataSourceInfo *src); //TODO: Rename to gda_data_source_info_copy -void gda_config_free_data_source_info (GdaDataSourceInfo *info); //TODO: Rename to gda_data_source_info_free +GdaDataSourceInfo *gda_config_copy_data_source_info (GdaDataSourceInfo *src); +void gda_config_free_data_source_info (GdaDataSourceInfo *info); GList *gda_config_get_data_source_list (void); GdaDataSourceInfo *gda_config_find_data_source (const gchar *name); d2 3 a4 3 --- providers/sqlite/gda-sqlite-provider.c.orig 2005-03-03 11:52:27 +0100 +++ providers/sqlite/gda-sqlite-provider.c 2005-03-23 11:05:56 +0100 @@@@ -25,6 +25,7 @@@@ d13 2 a14 2 --- report/testing/Makefile.in.orig 2005-03-03 18:07:10 +0100 +++ report/testing/Makefile.in 2005-03-23 11:06:25 +0100 d25 2 a26 2 --- testing/Makefile.in.orig 2005-03-03 18:07:11 +0100 +++ testing/Makefile.in 2005-03-23 11:06:40 +0100 d37 2 a38 2 --- tools/Makefile.in.orig 2005-03-03 18:07:11 +0100 +++ tools/Makefile.in 2005-03-23 11:05:56 +0100 @ 1.3 log @upgrading package: libgda 1.0.4 -> 1.1.99 @ text @d3 1 a3 1 +++ libgda/gda-config.h 2005-01-06 10:24:21 +0100 d16 2 a17 2 --- providers/sqlite/gda-sqlite-provider.c.orig 2004-10-09 16:56:27 +0200 +++ providers/sqlite/gda-sqlite-provider.c 2005-01-06 10:24:43 +0100 d27 3 a29 3 --- report/testing/Makefile.in.orig 2004-10-10 00:26:53 +0200 +++ report/testing/Makefile.in 2005-01-06 10:25:37 +0100 @@@@ -313,7 +313,7 @@@@ d35 2 a36 2 $(top_builddir)/libgda/libgda-2.la \ $(top_builddir)/report/libgda-report/libgda-report-2.la \ d39 3 a41 3 --- testing/Makefile.in.orig 2004-10-10 00:26:53 +0200 +++ testing/Makefile.in 2005-01-06 10:28:21 +0100 @@@@ -331,7 +331,7 @@@@ d47 1 a47 1 $(top_builddir)/libgda/libgda-2.la \ d51 3 a53 3 --- tools/Makefile.in.orig 2004-10-10 00:26:54 +0200 +++ tools/Makefile.in 2005-01-06 10:28:01 +0100 @@@@ -404,10 +404,10 @@@@ @ 1.2 log @remove C++ comments from exported header and use more reasonable default options @ text @d1 11 a11 10 Index: libgda/gda-util.c --- libgda/gda-util.c.orig 2004-01-15 12:56:40 +0100 +++ libgda/gda-util.c 2004-06-08 15:36:27 +0200 @@@@ -60,7 +60,7 @@@@ case GDA_VALUE_TYPE_TIME : return "time"; case GDA_VALUE_TYPE_TIMESTAMP : return "timestamp"; case GDA_VALUE_TYPE_TINYINT : return "tinyint"; - default: + default: break; } d13 2 a14 1 return "string"; d16 3 a18 3 --- providers/sqlite/gda-sqlite-provider.c.orig 2004-04-15 12:21:37 +0200 +++ providers/sqlite/gda-sqlite-provider.c 2004-06-08 15:39:23 +0200 @@@@ -25,6 +25,8 @@@@ a22 1 +#include d25 24 a48 29 #include "gda-sqlite.h" @@@@ -623,7 +625,7 @@@@ case GDA_CONNECTION_FEATURE_TRIGGERS : case GDA_CONNECTION_FEATURE_VIEWS : return TRUE; - default: + default: break; } return FALSE; @@@@ -809,7 +811,7 @@@@ return get_tables (cnc); case GDA_CONNECTION_SCHEMA_TYPES : return get_types (); - default: + default: break; } return NULL; Index: providers/xml/gda-xml-provider.c --- providers/xml/gda-xml-provider.c.orig 2003-09-02 01:55:02 +0200 +++ providers/xml/gda-xml-provider.c 2004-06-08 15:39:54 +0200 @@@@ -681,7 +681,7 @@@@ return get_tables (cnc, xmldb); case GDA_CONNECTION_SCHEMA_TYPES : return get_types (cnc); - default : + default : break; } a49 1 return NULL; d51 12 a62 25 --- tools/Makefile.in.orig 2004-04-18 21:09:45 +0200 +++ tools/Makefile.in 2004-06-08 15:54:19 +0200 @@@@ -320,11 +320,11 @@@@ am_gda_config_tool_OBJECTS = gda-config-tool.$(OBJEXT) gda_config_tool_OBJECTS = $(am_gda_config_tool_OBJECTS) gda_config_tool_DEPENDENCIES = $(top_builddir)/libgda/libgda-2.la -gda_config_tool_LDFLAGS = +gda_config_tool_LDFLAGS = -static am_gda_run_OBJECTS = gda-run.$(OBJEXT) gda_run_OBJECTS = $(am_gda_run_OBJECTS) gda_run_DEPENDENCIES = $(top_builddir)/libgda/libgda-2.la -gda_run_LDFLAGS = +gda_run_LDFLAGS = -static DEFAULT_INCLUDES = -I. -I$(srcdir) depcomp = $(SHELL) $(top_srcdir)/depcomp Index: testing/Makefile.in --- testing/Makefile.in.orig 2004-04-18 21:09:45 +0200 +++ testing/Makefile.in 2004-06-08 15:58:49 +0200 @@@@ -314,7 +314,7 @@@@ ibmdb2-test.$(OBJEXT) gda_test_OBJECTS = $(am_gda_test_OBJECTS) gda_test_DEPENDENCIES = $(top_builddir)/libgda/libgda-2.la -gda_test_LDFLAGS = +gda_test_LDFLAGS = -static d64 2 a65 88 DEFAULT_INCLUDES = -I. -I$(srcdir) depcomp = $(SHELL) $(top_srcdir)/depcomp Index: report/testing/Makefile.in --- report/testing/Makefile.in.orig 2004-04-18 21:09:45 +0200 +++ report/testing/Makefile.in 2004-06-08 15:58:15 +0200 @@@@ -299,7 +299,7 @@@@ gda_report_test_OBJECTS = $(am_gda_report_test_OBJECTS) gda_report_test_DEPENDENCIES = $(top_builddir)/libgda/libgda-2.la \ $(top_builddir)/report/libgda-report/libgda-report-2.la -gda_report_test_LDFLAGS = +gda_report_test_LDFLAGS = -static DEFAULT_INCLUDES = -I. -I$(srcdir) depcomp = $(SHELL) $(top_srcdir)/depcomp Index: providers/mysql/gda-mysql-provider.c --- providers/mysql/gda-mysql-provider.c.orig 2003-11-26 22:01:22 +0100 +++ providers/mysql/gda-mysql-provider.c 2004-06-08 17:18:22 +0200 @@@@ -510,7 +510,7 @@@@ g_free (str); break; - default: + default: break; } return reclist; @@@@ -655,7 +655,7 @@@@ case GDA_CONNECTION_FEATURE_SQL : case GDA_CONNECTION_FEATURE_TRANSACTIONS : return TRUE; - default : + default : break; } return FALSE; @@@@ -1187,7 +1187,7 @@@@ return get_mysql_tables (cnc, params); case GDA_CONNECTION_SCHEMA_TYPES : return get_mysql_types (cnc, params); - default : + default : break; } return NULL; Index: providers/ldap/gda-ldap-provider.c --- providers/ldap/gda-ldap-provider.c.orig 2003-02-03 18:12:13 +0100 +++ providers/ldap/gda-ldap-provider.c 2004-06-08 17:19:02 +0200 @@@@ -275,7 +275,7 @@@@ switch (feature) { case GDA_CONNECTION_FEATURE_SQL : return TRUE; - default : + default : break; } return FALSE; @@@@ -466,7 +466,7 @@@@ return get_ldap_tables (cnc, params); case GDA_CONNECTION_SCHEMA_TYPES : return get_ldap_types (cnc, params); - default : + default : break; } return NULL; Index: libgda/gda-config.h --- libgda/gda-config.h.orig 2003-11-03 10:48:05 +0100 +++ libgda/gda-config.h 2004-06-08 20:35:29 +0200 @@@@ -74,7 +74,7 @@@@ GType gda_provider_info_get_type (void); GdaProviderInfo* gda_provider_info_copy (GdaProviderInfo *src); -void gda_config_free_provider_info (GdaProviderInfo *provider_info); //TODO: Rename to gda_provider_info_free +void gda_config_free_provider_info (GdaProviderInfo *provider_info); GList *gda_config_get_provider_list (void); void gda_config_free_provider_list (GList *list); @@@@ -97,8 +97,8 @@@@ #define GDA_TYPE_DATA_SOURCE_INFO (gda_data_source_info_get_type ()) GType gda_data_source_info_get_type (void); -GdaDataSourceInfo *gda_config_copy_data_source_info (GdaDataSourceInfo *src); //TODO: Rename to gda_data_source_info_copy -void gda_config_free_data_source_info (GdaDataSourceInfo *info); //TODO: Rename to gda_data_source_info_free +GdaDataSourceInfo *gda_config_copy_data_source_info (GdaDataSourceInfo *src); +void gda_config_free_data_source_info (GdaDataSourceInfo *info); GList *gda_config_get_data_source_list (void); GdaDataSourceInfo *gda_config_find_data_source (const gchar *name); @ 1.1 log @new package: libgda 1.0.4 (GNU Data Access Library) @ text @d147 23 @