Bump PKGREVISION from ibus shlib name change, with some ibus-1.4 compatibility

fix patches.

3 files changed, 83 insertions, 3 deletions

diff --git a/inputmethod/ibus-array/Makefile b/inputmethod/ibus-array/Makefile
index 3b71d24d33d..dfecf04d5ea 100644
--- a/inputmethod/ibus-array/Makefile
+++ b/inputmethod/ibus-array/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2012/03/10 10:56:13 obache Exp $
+# $NetBSD: Makefile,v 1.6 2012/04/22 14:09:09 obache Exp $
 #
 
 DISTNAME=	ibus-array-0.0.2
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	inputmethod chinese
 MASTER_SITES=	http://ibus-array.googlecode.com/files/
 
diff --git a/inputmethod/ibus-array/distinfo b/inputmethod/ibus-array/distinfo
index d68d633fef4..6cb872c3ca2 100644
--- a/inputmethod/ibus-array/distinfo
+++ b/inputmethod/ibus-array/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/08/07 01:53:41 obache Exp $
+$NetBSD: distinfo,v 1.2 2012/04/22 14:09:09 obache Exp $
 
 SHA1 (ibus-array-0.0.2.tar.gz) = 1b2c65b0a5d45f858014d892ec9036918ce85a54
 RMD160 (ibus-array-0.0.2.tar.gz) = 40dbed9c00cc83855af05350da244f668fddb751
 Size (ibus-array-0.0.2.tar.gz) = 2759103 bytes
+SHA1 (patch-src_engine.c) = 35c7a1783dddeea99f40d319b6584b8b4f42c36e
diff --git a/inputmethod/ibus-array/patches/patch-src_engine.c b/inputmethod/ibus-array/patches/patch-src_engine.c
new file mode 100644
index 00000000000..b62296ae785
--- /dev/null
+++ b/inputmethod/ibus-array/patches/patch-src_engine.c
@@ -0,0 +1,79 @@
+$NetBSD: patch-src_engine.c,v 1.1 2012/04/22 14:09:10 obache Exp $
+
+* for ibus-1.4
+
+--- src/engine.c.orig	2009-10-18 17:06:12.000000000 +0000
++++ src/engine.c
+@@ -79,7 +79,7 @@ static void ibus_array_engine_show_speci
+ static void ibus_config_value_changed (IBusConfig *config, 
+                                         const gchar *section, 
+                                         const gchar *name, 
+-                                        GValue *value, 
++                                        GVariant *value, 
+                                         gpointer user_data);
+ 
+ static IBusEngineClass *parent_class = NULL;
+@@ -120,7 +120,7 @@ void 
+ ibus_array_init (IBusBus *bus) 
+ {
+     gboolean res;
+-    GValue value = { 0, };
++    GVariant *value = NULL;
+ 
+     array_context = array_create_context();
+ 
+@@ -129,20 +129,22 @@ ibus_array_init (IBusBus *bus) 
+     is_special_notify = FALSE;
+     is_special_only = FALSE;
+ 
+-    res = ibus_config_get_value (config, "engine/Array", 
+-                                "SpecialNotify", &value);
++    res = ((value = ibus_config_get_value (config, "engine/Array", 
++                                "SpecialNotify")) != NULL);
+     if (res) {
+-        const gchar* str = g_value_get_string(&value);
++        const gchar* str = g_variant_get_string(value, NULL);
+         if (g_strcmp0(str, "1") == 0)
+             is_special_notify = TRUE;
++        g_variant_unref(value);
+     }
+ 
+-    res = ibus_config_get_value (config, "engine/Array", 
+-                                "SpecialOnly", &value);
++    res = ((value = ibus_config_get_value (config, "engine/Array", 
++                                "SpecialOnly")) != NULL);
+     if (res) {
+-        const gchar* str = g_value_get_string(&value);
++        const gchar* str = g_variant_get_string(value, NULL);
+         if (g_strcmp0(str, "1") == 0)
+             is_special_only = TRUE;
++        g_variant_unref(value);
+     }
+ }
+ 
+@@ -754,14 +756,14 @@ static void ibus_array_engine_property_a
+ static void ibus_config_value_changed (IBusConfig *config, 
+                                         const gchar *section, 
+                                         const gchar *name, 
+-                                        GValue *value, 
++                                        GVariant *value, 
+                                         gpointer user_data)
+ {
+     IBusArrayEngine *arrayeng = (IBusArrayEngine*)user_data;
+ 
+     if (g_strcmp0(section, "engine/Array") == 0) {
+         if (g_strcmp0(name, "SpecialNotify") == 0) {
+-            const gchar* str = g_value_get_string(value);
++            const gchar* str = g_variant_get_string(value, NULL);
+             if (g_strcmp0(str, "1") == 0) {
+                 is_special_notify = TRUE;
+             }
+@@ -770,7 +772,7 @@ static void ibus_config_value_changed (I
+             }
+         }
+         else if (g_strcmp0(name, "SpecialOnly") == 0) {
+-            const gchar* str = g_value_get_string(value);
++            const gchar* str = g_variant_get_string(value, NULL);
+             if (g_strcmp0(str, "1") == 0) {
+                 is_special_only = TRUE;
+             }