Build fixes for latest glib2.

4 files changed, 49 insertions, 1 deletions

diff --git a/databases/gq/distinfo b/databases/gq/distinfo
index ec51636b5ab..0ee93435c12 100644
--- a/databases/gq/distinfo
+++ b/databases/gq/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2011/03/29 10:44:16 adam Exp $
+$NetBSD: distinfo,v 1.12 2012/05/06 20:12:35 dholland Exp $
 
 SHA1 (gq-1.2.3.tar.gz) = dc11f4c1c05037786ca6b212f4945fc20ecd33a4
 RMD160 (gq-1.2.3.tar.gz) = 4e8bf1700f4d7aacd906559e01a11654f6ce0f90
@@ -10,3 +10,6 @@ SHA1 (patch-ad) = 9a9a2e038163ab6a39f5325bbcdd01fa7589885b
 SHA1 (patch-ae) = aeda3e38a58b8211b8df2534409d928766078287
 SHA1 (patch-an) = 29806e725bfa9f4827b2f7367006005b7ad44c6c
 SHA1 (patch-src_Makefile.in) = 0a210f4550a7d4805d1d351ae67e6459e37cdc37
+SHA1 (patch-src_gq-hash_h) = ad63f914ffabca9f74ef0926727396d1cf699bfd
+SHA1 (patch-src_gq-server-list_h) = fe85a8ae6326bd8ae8da35df5d558f409302be48
+SHA1 (patch-src_state_c) = 6b5fd642fb86498575434b12444c50eb80d5592e
diff --git a/databases/gq/patches/patch-src_gq-hash_h b/databases/gq/patches/patch-src_gq-hash_h
new file mode 100644
index 00000000000..4d41d941a7a
--- /dev/null
+++ b/databases/gq/patches/patch-src_gq-hash_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_gq-hash_h,v 1.1 2012/05/06 20:12:35 dholland Exp $
+
+Fix build with latest glib2.
+
+--- src/gq-hash.h~	2007-05-14 16:26:51.000000000 +0000
++++ src/gq-hash.h
+@@ -24,7 +24,7 @@
+ #ifndef GQ_ENCRYPTION_H
+ #define GQ_ENCRYPTION_H
+ 
+-#include <glib/garray.h>
++#include <glib.h>
+ #include "util.h"
+ 
+ G_BEGIN_DECLS
diff --git a/databases/gq/patches/patch-src_gq-server-list_h b/databases/gq/patches/patch-src_gq-server-list_h
new file mode 100644
index 00000000000..9cd205e2f90
--- /dev/null
+++ b/databases/gq/patches/patch-src_gq-server-list_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_gq-server-list_h,v 1.1 2012/05/06 20:12:35 dholland Exp $
+
+Fix build with latest glib2.
+
+--- src/gq-server-list.h~	2007-05-14 16:26:50.000000000 +0000
++++ src/gq-server-list.h
+@@ -26,7 +26,7 @@
+ #ifndef GQ_SERVER_LIST_H
+ #define GQ_SERVER_LIST_H
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include "gq-server.h" // for GqServer
+ 
+ G_BEGIN_DECLS
diff --git a/databases/gq/patches/patch-src_state_c b/databases/gq/patches/patch-src_state_c
new file mode 100644
index 00000000000..f1da7222e57
--- /dev/null
+++ b/databases/gq/patches/patch-src_state_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_state_c,v 1.1 2012/05/06 20:12:35 dholland Exp $
+
+Fix build with latest glib2.
+
+--- src/state.c~	2007-05-14 16:26:51.000000000 +0000
++++ src/state.c
+@@ -36,7 +36,7 @@
+ #include <errno.h>
+ 
+ #include <glib/gi18n.h>
+-#include <glib/gmessages.h>
++#include <glib.h>
+ #include <gtk/gtk.h>
+ 
+ #include "xmlparse.h"