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

fix patches.

4 files changed, 70 insertions, 3 deletions

diff --git a/inputmethod/ibus-chewing/Makefile b/inputmethod/ibus-chewing/Makefile
index 5fb68262b9b..9900b5b43a4 100644
--- a/inputmethod/ibus-chewing/Makefile
+++ b/inputmethod/ibus-chewing/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2012/03/03 00:13:21 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2012/04/22 14:09:10 obache Exp $
 #
 
 DISTNAME=	ibus-chewing-1.3.10-Source
 PKGNAME=	${DISTNAME:S/-Source//}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	inputmethod chinese
 MASTER_SITES=	http://ibus.googlecode.com/files/
 
@@ -35,6 +35,13 @@ CMAKE_ARGS+=	-DGCONF_SCHEMAS_INSTALLED_DIR=${GCONF_SCHEMAS_DIR}
 post-extract:
 	find ${WRKDIR} -type d -name PaxHeader | xargs rm -rf
 
+# avoid regen files
+post-patch:
+	touch -r ${WRKSRC}/src/IBusChewingEngine-input-events.c.orig	\
+		${WRKSRC}/src/IBusChewingEngine-input-events.c
+	touch -r ${WRKSRC}/src/IBusChewingEngine.gob.orig		\
+		${WRKSRC}/src/IBusChewingEngine.gob
+
 .include "../../devel/GConf/schemas.mk"
 .include "../../inputmethod/ibus/buildlink3.mk"
 .include "../../inputmethod/libchewing/buildlink3.mk"
diff --git a/inputmethod/ibus-chewing/distinfo b/inputmethod/ibus-chewing/distinfo
index d5d98a92f1e..b70967c9889 100644
--- a/inputmethod/ibus-chewing/distinfo
+++ b/inputmethod/ibus-chewing/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.5 2011/12/04 12:40:42 obache Exp $
+$NetBSD: distinfo,v 1.6 2012/04/22 14:09:10 obache Exp $
 
 SHA1 (ibus-chewing-1.3.10-Source.tar.gz) = e9f92370c1ad99d5076b4e288704fadb759928be
 RMD160 (ibus-chewing-1.3.10-Source.tar.gz) = 84d4167a0d2c4019f165280cabea2afeaaee4464
 Size (ibus-chewing-1.3.10-Source.tar.gz) = 75365 bytes
+SHA1 (patch-src_IBusChewingEngine-input-events.c) = 7ebb4869bee3068814bb3fa6c195a6f88e481ed3
+SHA1 (patch-src_IBusChewingEngine.gob) = 5b92bbdb7e79252eb5b166f2d5eccc5c076e06e1
diff --git a/inputmethod/ibus-chewing/patches/patch-src_IBusChewingEngine-input-events.c b/inputmethod/ibus-chewing/patches/patch-src_IBusChewingEngine-input-events.c
new file mode 100644
index 00000000000..85dbaf95a35
--- /dev/null
+++ b/inputmethod/ibus-chewing/patches/patch-src_IBusChewingEngine-input-events.c
@@ -0,0 +1,28 @@
+$NetBSD: patch-src_IBusChewingEngine-input-events.c,v 1.1 2012/04/22 14:09:10 obache Exp $
+
+* for ibus-1.4
+  https://github.com/definite/ibus-chewing/pull/16
+
+--- src/IBusChewingEngine-input-events.c.orig	2011-10-12 11:50:51.000000000 +0000
++++ src/IBusChewingEngine-input-events.c
+@@ -291,12 +291,20 @@ void ibus_chewing_engine_property_activa
+ 	/* Toggle Full <-> Half */
+ 	chewing_set_ShapeMode(self->context, !chewing_get_ShapeMode(self->context));
+     }else if (strcmp(prop_name,"chewing_settings_prop")==0){
++#if IBUS_CHECK_VERSION(1, 4, 0)
++	if (ibus_property_get_state(self->settings_prop)==PROP_STATE_UNCHECKED){
++#else
+ 	if (self->settings_prop->state==PROP_STATE_UNCHECKED){
++#endif
+ 	    if (gtk_dialog_run(GTK_DIALOG(self->setting_dialog))==GTK_RESPONSE_OK){
+ 		self_save_config_all(self);
+ 	    }
+ 	    gtk_widget_hide(self->setting_dialog);
++#if IBUS_CHECK_VERSION(1, 4, 0)
++	    ibus_property_set_state(self->settings_prop,PROP_STATE_UNCHECKED);
++#else
+ 	    self->settings_prop->state=PROP_STATE_UNCHECKED;
++#endif
+ 	}
+     }else{
+ 	G_DEBUG_MSG(3,"[I3]  property_activate(-, %s, %u) not recognized",prop_name, prop_state);
diff --git a/inputmethod/ibus-chewing/patches/patch-src_IBusChewingEngine.gob b/inputmethod/ibus-chewing/patches/patch-src_IBusChewingEngine.gob
new file mode 100644
index 00000000000..3a94dc56db3
--- /dev/null
+++ b/inputmethod/ibus-chewing/patches/patch-src_IBusChewingEngine.gob
@@ -0,0 +1,30 @@
+$NetBSD: patch-src_IBusChewingEngine.gob,v 1.1 2012/04/22 14:09:10 obache Exp $
+
+* for ibus-1.4
+  https://github.com/definite/ibus-chewing/pull/16
+
+--- src/IBusChewingEngine.gob.orig	2011-10-12 11:50:51.000000000 +0000
++++ src/IBusChewingEngine.gob
+@@ -1041,12 +1041,21 @@ class IBus:Chewing:Engine from IBus:Engi
+ 	    /* Toggle Full <-> Half */
+ 	    chewing_set_ShapeMode(self->context, !chewing_get_ShapeMode(self->context));
+ 	}else if (strcmp(prop_name,"chewing_settings_prop")==0){
+-	    if (self->settings_prop->state==PROP_STATE_UNCHECKED){
++#if IBUS_CHECK_VERSION(1, 4, 0)
++	    if (ibus_property_get_state(self->settings_prop)==PROP_STATE_UNCHECKED)
++#else
++	    if (self->settings_prop->state==PROP_STATE_UNCHECKED)
++#endif
++	    {
+ 		if (gtk_dialog_run(GTK_DIALOG(self->setting_dialog))==GTK_RESPONSE_OK){
+ 		    self_save_config_all(self);
+ 		}
+ 		gtk_widget_hide(self->setting_dialog);
++#if IBUS_CHECK_VERSION(1, 4, 0)
++		ibus_property_set_state(self->settings_prop,PROP_STATE_UNCHECKED);
++#else
+ 		self->settings_prop->state=PROP_STATE_UNCHECKED;
++#endif
+ 	    }
+ 	}else{
+ 	    G_DEBUG_MSG(3,"[I3]  property_activate(-, %s, %u) not recognized",prop_name, prop_state);