Fix build with latest glib2.

5 files changed, 50 insertions, 2 deletions

diff --git a/inputmethod/tomoe/distinfo b/inputmethod/tomoe/distinfo
index a96cae30853..517ef0cff43 100644
--- a/inputmethod/tomoe/distinfo
+++ b/inputmethod/tomoe/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.3 2008/06/04 13:01:36 obache Exp $
+$NetBSD: distinfo,v 1.4 2012/05/06 17:24:41 dholland Exp $
 
 SHA1 (tomoe-0.6.0.tar.gz) = 0ab5b4fd4609d0439f90010c35305595522f54f2
 RMD160 (tomoe-0.6.0.tar.gz) = fc8e799c4b845e9c4b41879980fecc9d9dc77c69
 Size (tomoe-0.6.0.tar.gz) = 4918949 bytes
 SHA1 (patch-aa) = beaf6abd17e985d3b11eccdd0d870329b9088b00
 SHA1 (patch-ab) = 718f888ec731ea5183c0af40bb90abe1807be89e
+SHA1 (patch-lib_glib-utils_h) = a03c9f060241257cbc42d9624bfe685f53094e1e
+SHA1 (patch-lib_tomoe_c) = b38e905e6311c966291891430c3c0b7ad624d799
diff --git a/inputmethod/tomoe/patches/patch-lib_glib-utils_h b/inputmethod/tomoe/patches/patch-lib_glib-utils_h
new file mode 100644
index 00000000000..a2429d9fc61
--- /dev/null
+++ b/inputmethod/tomoe/patches/patch-lib_glib-utils_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_glib-utils_h,v 1.1 2012/05/06 17:24:41 dholland Exp $
+
+Fix build with latest glib2.
+
+--- lib/glib-utils.h~	2007-04-25 07:35:58.000000000 +0000
++++ lib/glib-utils.h
+@@ -28,7 +28,7 @@
+ #include "config.h"
+ #endif /* HAVE_CONFIG_H */
+ 
+-#include <glib/garray.h>
++#include <glib.h>
+ #include <glib/gi18n-lib.h>
+ #include "glib-compat-file-utilities.h"
+ #include "glib-compat-key-file.h"
diff --git a/inputmethod/tomoe/patches/patch-lib_tomoe_c b/inputmethod/tomoe/patches/patch-lib_tomoe_c
new file mode 100644
index 00000000000..568492cef26
--- /dev/null
+++ b/inputmethod/tomoe/patches/patch-lib_tomoe_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_tomoe_c,v 1.1 2012/05/06 17:24:41 dholland Exp $
+
+Fix build with latest glib2.
+
+--- lib/tomoe.c~	2007-06-06 07:35:53.000000000 +0000
++++ lib/tomoe.c
+@@ -26,7 +26,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <glib/garray.h>
++#include <glib.h>
+ #include "tomoe.h"
+ 
+ static gboolean initialized = FALSE;
diff --git a/x11/gtk2-engines-murrine/distinfo b/x11/gtk2-engines-murrine/distinfo
index 7d27d8be3ef..2cc4e515d19 100644
--- a/x11/gtk2-engines-murrine/distinfo
+++ b/x11/gtk2-engines-murrine/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2009/09/08 14:39:27 ahoka Exp $
+$NetBSD: distinfo,v 1.4 2012/05/06 17:29:38 dholland Exp $
 
 SHA1 (murrine-0.90.3.tar.bz2) = 5c65acf7948d23bb1693728157425120486303a8
 RMD160 (murrine-0.90.3.tar.bz2) = 347909724a11cfe53f922208f46e39f47b420459
 Size (murrine-0.90.3.tar.bz2) = 271512 bytes
+SHA1 (patch-src_animation_c) = 807b41e782050f6d8d0e596d1412c96cb4f5646e
diff --git a/x11/gtk2-engines-murrine/patches/patch-src_animation_c b/x11/gtk2-engines-murrine/patches/patch-src_animation_c
new file mode 100644
index 00000000000..528c8912aa4
--- /dev/null
+++ b/x11/gtk2-engines-murrine/patches/patch-src_animation_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_animation_c,v 1.1 2012/05/06 17:29:38 dholland Exp $
+
+Fix build with latest glib2.
+
+--- src/animation.c~	2009-02-20 18:35:50.000000000 +0000
++++ src/animation.c
+@@ -21,7 +21,7 @@
+ #include "animation.h"
+ 
+ #ifdef HAVE_ANIMATION
+-#include <glib/gtimer.h>
++#include <glib.h>
+ 
+ struct _AnimationInfo
+ {