Fix build with the new glib2. Bleh.

22 files changed, 357 insertions, 1 deletions

diff --git a/databases/libgda/distinfo b/databases/libgda/distinfo
index 5e0b81a35a8..ae6bc467578 100644
--- a/databases/libgda/distinfo
+++ b/databases/libgda/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.31 2012/05/04 16:08:09 joerg Exp $
+$NetBSD: distinfo,v 1.32 2012/05/06 05:29:53 dholland Exp $
 
 SHA1 (libgda-3.0.1.tar.bz2) = 78c9054c4c40463020b8f62da72fca909dd9df03
 RMD160 (libgda-3.0.1.tar.bz2) = a9a1f71cc3a6faf8086bf3044b8de91dfc3f3032
@@ -7,4 +7,25 @@ SHA1 (patch-ab) = 2304f46df0500f3f15af210fcb1f9770df59e99e
 SHA1 (patch-ad) = 5deb66dc704027625ce6fc795d880779a4b69d4b
 SHA1 (patch-ak) = dafc05f5697a733a32d135bb08b9a4275673d359
 SHA1 (patch-al) = 0267218fb02aa3e011bddc1675d2f427a97c954f
+SHA1 (patch-libgda_gda-column_c) = a290e71510d5f1171522a3a435dc3bcac2a13d30
+SHA1 (patch-libgda_gda-column_h) = 6ef0873737eca8ff005b739ea7c6a050044e9fa8
+SHA1 (patch-libgda_gda-command_c) = 9f8a27830fad60d4cb74dc9ab1e6ee1aba0483ce
+SHA1 (patch-libgda_gda-command_h) = ddcc2ca38c982e0f39c99cd5349a9da296e50254
+SHA1 (patch-libgda_gda-config_h) = 61afb51e75057b445ad9f6c0eb3b33fb470343f3
+SHA1 (patch-libgda_gda-data-model-array_c) = 8ca31d1cf8c18212e593d27fa23e5d1f4968a6d0
+SHA1 (patch-libgda_gda-data-model-filter-sql_c) = 748ad56779a532609a886652d7df922dc86c2d0a
+SHA1 (patch-libgda_gda-data-model-hash_c) = 4a89040ba9443edcce79b86b26c674454f500499
 SHA1 (patch-libgda_gda-entity-field.c) = 08902eac2340a3e9f5f7dbe4073791e551c71fdf
+SHA1 (patch-libgda_gda-init_c) = 66b132bae6ef6cf8792b1a83d3459387d6f5b151
+SHA1 (patch-libgda_gda-log_c) = 3bf3b1f84b303b866d2fcc1b949288a918922e21
+SHA1 (patch-libgda_gda-log_h) = 1af8d379c3547fef7680fadcb40f99206da4bc9c
+SHA1 (patch-libgda_gda-quark-list_c) = b99dff8e054a9a1fa74b2e302471d620b918e67a
+SHA1 (patch-libgda_gda-quark-list_h) = da3aae6366f505ac5bb5de412aa856cb8bef29d3
+SHA1 (patch-libgda_gda-row_h) = 06ec64d71ff0ca70ae2381c1bc82f35253d15fd3
+SHA1 (patch-libgda_gda-server-operation_c) = 0d9f77aefe874bd4f5bc4032181861abf1905a42
+SHA1 (patch-libgda_gda-server-provider_c) = 89498b56c2180ddcb4050c37034c14ef53ec7809
+SHA1 (patch-libgda_gda-util_c) = c8101c12d5db7d5e495db917e1688535c247100b
+SHA1 (patch-libgda_gda-util_h) = 507592a437ce2139af54a6fa5130a6e74550866b
+SHA1 (patch-libgda_gda-value_c) = f7ed4a4344971f0d3e9f6e5941333a3b0faa71bc
+SHA1 (patch-libgda_gda-value_h) = 7e9446931123ca90b0af9e3545fccc3306553132
+SHA1 (patch-providers_sqlite_gda-sqlite_h) = a4bf8c7f6da3a25fa2bd2b9c390cafbe655b586f
diff --git a/databases/libgda/patches/patch-libgda_gda-column_c b/databases/libgda/patches/patch-libgda_gda-column_c
new file mode 100644
index 00000000000..eff9db29da8
--- /dev/null
+++ b/databases/libgda/patches/patch-libgda_gda-column_c
@@ -0,0 +1,16 @@
+$NetBSD: patch-libgda_gda-column_c,v 1.1 2012/05/06 05:29:54 dholland Exp $
+
+Fix build with latest glib2.
+
+--- libgda/gda-column.c~	2007-04-24 21:13:09.000000000 +0000
++++ libgda/gda-column.c
+@@ -23,8 +23,7 @@
+  * Boston, MA 02111-1307, USA.
+  */
+ 
+-#include <glib/gmessages.h>
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ #include <libgda/gda-column.h>
+ #include <string.h>
+ #include "gda-marshal.h"
diff --git a/databases/libgda/patches/patch-libgda_gda-column_h b/databases/libgda/patches/patch-libgda_gda-column_h
new file mode 100644
index 00000000000..f2419be7bc4
--- /dev/null
+++ b/databases/libgda/patches/patch-libgda_gda-column_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-libgda_gda-column_h,v 1.1 2012/05/06 05:29:54 dholland Exp $
+
+Fix build with latest glib2.
+
+--- libgda/gda-column.h~	2007-04-24 21:13:09.000000000 +0000
++++ libgda/gda-column.h
+@@ -28,7 +28,7 @@
+ 
+ #include <glib-object.h>
+ #include <libgda/gda-value.h>
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <libgda/gda-decl.h>
+ 
+ G_BEGIN_DECLS
diff --git a/databases/libgda/patches/patch-libgda_gda-command_c b/databases/libgda/patches/patch-libgda_gda-command_c
new file mode 100644
index 00000000000..f02d99596fe
--- /dev/null
+++ b/databases/libgda/patches/patch-libgda_gda-command_c
@@ -0,0 +1,17 @@
+$NetBSD: patch-libgda_gda-command_c,v 1.1 2012/05/06 05:29:54 dholland Exp $
+
+Fix build with latest glib2.
+
+--- libgda/gda-command.c~	2007-04-24 21:13:09.000000000 +0000
++++ libgda/gda-command.c
+@@ -21,9 +21,7 @@
+  * Boston, MA 02111-1307, USA.
+  */
+ 
+-#include <glib/gmem.h>
+-#include <glib/gmessages.h>
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ #include <libgda/gda-command.h>
+ 
+ GType
diff --git a/databases/libgda/patches/patch-libgda_gda-command_h b/databases/libgda/patches/patch-libgda_gda-command_h
new file mode 100644
index 00000000000..7b982d8d397
--- /dev/null
+++ b/databases/libgda/patches/patch-libgda_gda-command_h
@@ -0,0 +1,16 @@
+$NetBSD: patch-libgda_gda-command_h,v 1.1 2012/05/06 05:29:54 dholland Exp $
+
+Fix build with latest glib2.
+
+--- libgda/gda-command.h~	2007-04-24 21:13:09.000000000 +0000
++++ libgda/gda-command.h
+@@ -25,8 +25,7 @@
+ #define __GDA_COMMAND_H__
+ 
+ #include <glib-object.h>
+-#include <glib/gmacros.h>
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
diff --git a/databases/libgda/patches/patch-libgda_gda-config_h b/databases/libgda/patches/patch-libgda_gda-config_h
new file mode 100644
index 00000000000..64b035cfc84
--- /dev/null
+++ b/databases/libgda/patches/patch-libgda_gda-config_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-libgda_gda-config_h,v 1.1 2012/05/06 05:29:54 dholland Exp $
+
+Fix build with latest glib2.
+
+--- libgda/gda-config.h~	2007-04-24 21:13:09.000000000 +0000
++++ libgda/gda-config.h
+@@ -23,7 +23,7 @@
+ #ifndef __GDA_CONFIG_H__
+ #define __GDA_CONFIG_H__
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <libgda/gda-data-model.h>
+ #include <libgda/gda-parameter.h>
+ 
diff --git a/databases/libgda/patches/patch-libgda_gda-data-model-array_c b/databases/libgda/patches/patch-libgda_gda-data-model-array_c
new file mode 100644
index 00000000000..70830b1ded5
--- /dev/null
+++ b/databases/libgda/patches/patch-libgda_gda-data-model-array_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-libgda_gda-data-model-array_c,v 1.1 2012/05/06 05:29:54 dholland Exp $
+
+Fix build with latest glib2.
+
+--- libgda/gda-data-model-array.c~	2007-04-24 21:13:09.000000000 +0000
++++ libgda/gda-data-model-array.c
+@@ -22,7 +22,7 @@
+  */
+ 
+ #include <string.h>
+-#include <glib/garray.h>
++#include <glib.h>
+ #include <libgda/gda-data-model-array.h>
+ #include <glib/gi18n-lib.h>
+ #include <libgda/gda-row.h>
diff --git a/databases/libgda/patches/patch-libgda_gda-data-model-filter-sql_c b/databases/libgda/patches/patch-libgda_gda-data-model-filter-sql_c
new file mode 100644
index 00000000000..81761b3111a
--- /dev/null
+++ b/databases/libgda/patches/patch-libgda_gda-data-model-filter-sql_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-libgda_gda-data-model-filter-sql_c,v 1.1 2012/05/06 05:29:54 dholland Exp $
+
+Fix build with latest glib2.
+
+--- libgda/gda-data-model-filter-sql.c~	2007-04-24 21:13:09.000000000 +0000
++++ libgda/gda-data-model-filter-sql.c
+@@ -21,7 +21,7 @@
+  * Boston, MA 02111-1307, USA.
+  */
+ 
+-#include <glib/gdataset.h>
++#include <glib.h>
+ #include <glib-object.h>
+ #include <libsql/sql_parser.h>
+ #include <glib/gi18n-lib.h>
diff --git a/databases/libgda/patches/patch-libgda_gda-data-model-hash_c b/databases/libgda/patches/patch-libgda_gda-data-model-hash_c
new file mode 100644
index 00000000000..20665243628
--- /dev/null
+++ b/databases/libgda/patches/patch-libgda_gda-data-model-hash_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-libgda_gda-data-model-hash_c,v 1.1 2012/05/06 05:29:54 dholland Exp $
+
+Fix build with latest glib2.
+
+--- libgda/gda-data-model-hash.c~	2007-04-24 21:13:09.000000000 +0000
++++ libgda/gda-data-model-hash.c
+@@ -23,7 +23,7 @@
+  * Boston, MA 02111-1307, USA.
+  */
+ 
+-#include <glib/ghash.h>
++#include <glib.h>
+ #include <glib/gi18n-lib.h>
+ #include <libgda/gda-data-model-hash.h>
+ #include <libgda/gda-data-model-extra.h>
diff --git a/databases/libgda/patches/patch-libgda_gda-init_c b/databases/libgda/patches/patch-libgda_gda-init_c
new file mode 100644
index 00000000000..249f3ff78d4
--- /dev/null
+++ b/databases/libgda/patches/patch-libgda_gda-init_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-libgda_gda-init_c,v 1.1 2012/05/06 05:29:54 dholland Exp $
+
+Fix build with latest glib2.
+
+--- libgda/gda-init.c~	2007-04-24 21:13:09.000000000 +0000
++++ libgda/gda-init.c
+@@ -17,7 +17,7 @@
+  * Boston, MA 02111-1307, USA.
+  */
+ 
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <gmodule.h>
+ #include <libgda/libgda.h>
+ #include <glib/gi18n-lib.h>
diff --git a/databases/libgda/patches/patch-libgda_gda-log_c b/databases/libgda/patches/patch-libgda_gda-log_c
new file mode 100644
index 00000000000..bc65636ce61
--- /dev/null
+++ b/databases/libgda/patches/patch-libgda_gda-log_c
@@ -0,0 +1,17 @@
+$NetBSD: patch-libgda_gda-log_c,v 1.1 2012/05/06 05:29:54 dholland Exp $
+
+Fix build with latest glib2.
+
+--- libgda/gda-log.c~	2007-04-24 21:13:09.000000000 +0000
++++ libgda/gda-log.c
+@@ -24,10 +24,6 @@
+ #endif
+ #include <time.h>
+ #include <glib.h>
+-#include <glib/gmem.h>
+-#include <glib/gmessages.h>
+-#include <glib/gstrfuncs.h>
+-#include <glib/gutils.h>
+ #include <glib/gi18n-lib.h>
+ #include <libgda/gda-log.h>
+ 
diff --git a/databases/libgda/patches/patch-libgda_gda-log_h b/databases/libgda/patches/patch-libgda_gda-log_h
new file mode 100644
index 00000000000..a06d5c3ef56
--- /dev/null
+++ b/databases/libgda/patches/patch-libgda_gda-log_h
@@ -0,0 +1,16 @@
+$NetBSD: patch-libgda_gda-log_h,v 1.1 2012/05/06 05:29:54 dholland Exp $
+
+Fix build with latest glib2.
+
+--- libgda/gda-log.h~	2007-04-24 21:13:09.000000000 +0000
++++ libgda/gda-log.h
+@@ -20,8 +20,7 @@
+ #if !defined(__gda_log_h__)
+ #  define __gda_log_h__
+ 
+-#include <glib/gmacros.h>
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include <time.h>
+ 
+ G_BEGIN_DECLS
diff --git a/databases/libgda/patches/patch-libgda_gda-quark-list_c b/databases/libgda/patches/patch-libgda_gda-quark-list_c
new file mode 100644
index 00000000000..1a2bf014a03
--- /dev/null
+++ b/databases/libgda/patches/patch-libgda_gda-quark-list_c
@@ -0,0 +1,18 @@
+$NetBSD: patch-libgda_gda-quark-list_c,v 1.1 2012/05/06 05:29:54 dholland Exp $
+
+Fix build with latest glib2.
+
+--- libgda/gda-quark-list.c~	2007-04-24 21:13:09.000000000 +0000
++++ libgda/gda-quark-list.c
+@@ -22,10 +22,7 @@
+  */
+ 
+ #include <libgda/gda-quark-list.h>
+-#include <glib/ghash.h>
+-#include <glib/gmem.h>
+-#include <glib/gmessages.h>
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ 
+ struct _GdaQuarkList {
+ 	GHashTable *hash_table;
diff --git a/databases/libgda/patches/patch-libgda_gda-quark-list_h b/databases/libgda/patches/patch-libgda_gda-quark-list_h
new file mode 100644
index 00000000000..3dd0a94b755
--- /dev/null
+++ b/databases/libgda/patches/patch-libgda_gda-quark-list_h
@@ -0,0 +1,16 @@
+$NetBSD: patch-libgda_gda-quark-list_h,v 1.1 2012/05/06 05:29:54 dholland Exp $
+
+Fix build with latest glib2.
+
+--- libgda/gda-quark-list.h~	2007-04-24 21:13:09.000000000 +0000
++++ libgda/gda-quark-list.h
+@@ -24,8 +24,7 @@
+ #ifndef __GDA_QUARK_LIST_H__
+ #define __GDA_QUARK_LIST_H__
+ 
+-#include <glib/gmacros.h>
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include <glib-object.h>
+ 
+ G_BEGIN_DECLS
diff --git a/databases/libgda/patches/patch-libgda_gda-row_h b/databases/libgda/patches/patch-libgda_gda-row_h
new file mode 100644
index 00000000000..fca09d529c1
--- /dev/null
+++ b/databases/libgda/patches/patch-libgda_gda-row_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-libgda_gda-row_h,v 1.1 2012/05/06 05:29:54 dholland Exp $
+
+Fix build with latest glib2.
+
+--- libgda/gda-row.h~	2007-04-24 21:13:09.000000000 +0000
++++ libgda/gda-row.h
+@@ -27,7 +27,7 @@
+ 
+ #include <glib-object.h>
+ #include <libgda/gda-column.h>
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <libgda/gda-decl.h>
+ 
+ G_BEGIN_DECLS
diff --git a/databases/libgda/patches/patch-libgda_gda-server-operation_c b/databases/libgda/patches/patch-libgda_gda-server-operation_c
new file mode 100644
index 00000000000..73b1dca4390
--- /dev/null
+++ b/databases/libgda/patches/patch-libgda_gda-server-operation_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-libgda_gda-server-operation_c,v 1.1 2012/05/06 05:29:54 dholland Exp $
+
+Fix build with latest glib2.
+
+--- libgda/gda-server-operation.c~	2007-04-24 21:13:09.000000000 +0000
++++ libgda/gda-server-operation.c
+@@ -21,7 +21,7 @@
+  */
+ 
+ #include <stdlib.h>
+-#include <glib/gmessages.h>
++#include <glib.h>
+ #include <libgda/gda-marshal.h>
+ #include <libgda/gda-dict.h>
+ #include <libgda/gda-dict-type.h>
diff --git a/databases/libgda/patches/patch-libgda_gda-server-provider_c b/databases/libgda/patches/patch-libgda_gda-server-provider_c
new file mode 100644
index 00000000000..03a2283d628
--- /dev/null
+++ b/databases/libgda/patches/patch-libgda_gda-server-provider_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-libgda_gda-server-provider_c,v 1.1 2012/05/06 05:29:54 dholland Exp $
+
+Fix build with latest glib2.
+
+--- libgda/gda-server-provider.c~	2007-04-24 21:13:09.000000000 +0000
++++ libgda/gda-server-provider.c
+@@ -22,7 +22,7 @@
+  * Boston, MA 02111-1307, USA.
+  */
+ 
+-#include <glib/gmessages.h>
++#include <glib.h>
+ #include <libgda/gda-server-provider.h>
+ #include <libgda/gda-server-provider-extra.h>
+ #include <libgda/gda-server-provider-private.h>
diff --git a/databases/libgda/patches/patch-libgda_gda-util_c b/databases/libgda/patches/patch-libgda_gda-util_c
new file mode 100644
index 00000000000..1c7004cd6b8
--- /dev/null
+++ b/databases/libgda/patches/patch-libgda_gda-util_c
@@ -0,0 +1,18 @@
+$NetBSD: patch-libgda_gda-util_c,v 1.1 2012/05/06 05:29:54 dholland Exp $
+
+Fix build with latest glib2.
+
+--- libgda/gda-util.c~	2007-04-24 21:13:09.000000000 +0000
++++ libgda/gda-util.c
+@@ -27,10 +27,7 @@
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <string.h>
+-#include <glib/gfileutils.h>
+-#include <glib/gmessages.h>
+-#include <glib/gstrfuncs.h>
+-#include <glib/gprintf.h>
++#include <glib.h>
+ #include <libsql/sql_parser.h>
+ #include <glib/gi18n-lib.h>
+ #include <libgda/gda-log.h>
diff --git a/databases/libgda/patches/patch-libgda_gda-util_h b/databases/libgda/patches/patch-libgda_gda-util_h
new file mode 100644
index 00000000000..7ef50ff579f
--- /dev/null
+++ b/databases/libgda/patches/patch-libgda_gda-util_h
@@ -0,0 +1,16 @@
+$NetBSD: patch-libgda_gda-util_h,v 1.1 2012/05/06 05:29:54 dholland Exp $
+
+Fix build with latest glib2.
+
+--- libgda/gda-util.h~	2007-04-24 21:13:09.000000000 +0000
++++ libgda/gda-util.h
+@@ -24,8 +24,7 @@
+ #if !defined(__gda_util_h__)
+ #  define __gda_util_h__
+ 
+-#include <glib/ghash.h>
+-#include <glib/glist.h>
++#include <glib.h>
+ #include "gda-parameter.h"
+ #include "gda-row.h"
+ #include "gda-connection.h"
diff --git a/databases/libgda/patches/patch-libgda_gda-value_c b/databases/libgda/patches/patch-libgda_gda-value_c
new file mode 100644
index 00000000000..6923941102d
--- /dev/null
+++ b/databases/libgda/patches/patch-libgda_gda-value_c
@@ -0,0 +1,18 @@
+$NetBSD: patch-libgda_gda-value_c,v 1.1 2012/05/06 05:29:54 dholland Exp $
+
+Fix build with latest glib2.
+
+--- libgda/gda-value.c~	2007-04-24 21:13:09.000000000 +0000
++++ libgda/gda-value.c
+@@ -28,10 +28,7 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <time.h>
+-#include <glib/gdate.h>
+-#include <glib/gmessages.h>
+-#include <glib/gstrfuncs.h>
+-#include <glib/gstring.h>
++#include <glib.h>
+ #include <glib/gi18n-lib.h>
+ #include <libgda/gda-value.h>
+ #include <libgda/gda-blob-op.h>
diff --git a/databases/libgda/patches/patch-libgda_gda-value_h b/databases/libgda/patches/patch-libgda_gda-value_h
new file mode 100644
index 00000000000..e57c6b103ff
--- /dev/null
+++ b/databases/libgda/patches/patch-libgda_gda-value_h
@@ -0,0 +1,16 @@
+$NetBSD: patch-libgda_gda-value_h,v 1.1 2012/05/06 05:29:54 dholland Exp $
+
+Fix build with latest glib2.
+
+--- libgda/gda-value.h~	2007-04-24 21:13:09.000000000 +0000
++++ libgda/gda-value.h
+@@ -27,8 +27,7 @@
+ #define __GDA_VALUE_H__
+ 
+ #include <time.h>
+-#include <glib/glist.h>
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <glib-object.h>
+ #include <libxml/tree.h>
+ #include <libgda/gda-decl.h>
diff --git a/databases/libgda/patches/patch-providers_sqlite_gda-sqlite_h b/databases/libgda/patches/patch-providers_sqlite_gda-sqlite_h
new file mode 100644
index 00000000000..298a21af05d
--- /dev/null
+++ b/databases/libgda/patches/patch-providers_sqlite_gda-sqlite_h
@@ -0,0 +1,16 @@
+$NetBSD: patch-providers_sqlite_gda-sqlite_h,v 1.1 2012/05/06 05:29:54 dholland Exp $
+
+Fix build with latest glib2.
+
+--- providers/sqlite/gda-sqlite.h~	2007-04-24 21:13:15.000000000 +0000
++++ providers/sqlite/gda-sqlite.h
+@@ -25,8 +25,7 @@
+ #ifndef __GDA_SQLITE_H__
+ #define __GDA_SQLITE_H__
+ 
+-#include <glib/gmacros.h>
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include <libgda/gda-value.h>
+ #include <libgda/gda-connection.h>
+