openpkg-packages/libgda/libgda.patch

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)
Index: providers/sqlite/sqlite-src/fts1.c
--- 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
@@ -19,11 +19,7 @@
 #endif
 
 #include <assert.h>
-#if !defined(__APPLE__)
-#include <malloc.h>
-#else
 #include <stdlib.h>
-#endif
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
Index: providers/sqlite/sqlite-src/fts1_porter.c
--- 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
@@ -26,11 +26,7 @@
 
 
 #include <assert.h>
-#if !defined(__APPLE__)
-#include <malloc.h>
-#else
 #include <stdlib.h>
-#endif
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
Index: providers/sqlite/sqlite-src/fts1_tokenizer1.c
--- 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
@@ -18,11 +18,7 @@
 
 
 #include <assert.h>
-#if !defined(__APPLE__)
-#include <malloc.h>
-#else
 #include <stdlib.h>
-#endif
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
Index: report/testing/Makefile.in
--- 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 @@
 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)/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-02-12 12:15:46 +0100
+++ testing/Makefile.in	2007-02-12 18:57:32 +0100
@@ -408,7 +408,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 \
@@ -420,7 +420,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 \
@@ -430,7 +430,7 @@
 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 \
         $(top_builddir)/libgda/handlers/libgda_handlers-3.0.la \
         $(top_builddir)/libgda/graph/libgda_graph-3.0.la \
@@ -440,7 +440,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 \
@@ -452,7 +452,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 \
@@ -462,7 +462,7 @@
 gda_test_blob_SOURCES = \
         gda-test-blob.c
 
-gda_test_blob_LDADD = \
+gda_test_blob_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-02-12 12:15:47 +0100
+++ tools/Makefile.in	2007-02-12 18:58:11 +0100
@@ -545,22 +545,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)