Fix building with app-i18n/ibus >= 1.4.0 wrt #407695 by Jack Chen. Move ibus-chewing.schemas from /gconf to /etc/gconf.

(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)

3 files changed, 75 insertions, 7 deletions

diff --git a/app-i18n/ibus-chewing/ChangeLog b/app-i18n/ibus-chewing/ChangeLog
index 87b00d39a0a5..dc3d54fbbb3b 100644
--- a/app-i18n/ibus-chewing/ChangeLog
+++ b/app-i18n/ibus-chewing/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-i18n/ibus-chewing
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-chewing/ChangeLog,v 1.28 2011/11/01 18:11:36 naota Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-chewing/ChangeLog,v 1.29 2012/03/10 17:28:48 ssuominen Exp $
+
+  10 Mar 2012; Samuli Suominen <ssuominen@gentoo.org>
+  ibus-chewing-1.3.10.ebuild, +files/ibus-chewing-1.3.10-ibus-1.4.patch:
+  Fix building with app-i18n/ibus >= 1.4.0 wrt #407695 by Jack Chen. Move
+  ibus-chewing.schemas from /gconf to /etc/gconf.
 
 *ibus-chewing-1.3.10 (01 Nov 2011)
 
diff --git a/app-i18n/ibus-chewing/files/ibus-chewing-1.3.10-ibus-1.4.patch b/app-i18n/ibus-chewing/files/ibus-chewing-1.3.10-ibus-1.4.patch
new file mode 100644
index 000000000000..8122868ddb47
--- /dev/null
+++ b/app-i18n/ibus-chewing/files/ibus-chewing-1.3.10-ibus-1.4.patch
@@ -0,0 +1,52 @@
+http://bugs.gentoo.org/407695
+
+--- src/IBusChewingEngine.gob
++++ src/IBusChewingEngine.gob
+@@ -1041,12 +1041,21 @@
+ 	    /* 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);
+--- src/IBusChewingEngine-input-events.c
++++ src/IBusChewingEngine-input-events.c
+@@ -291,12 +291,21 @@
+ 	/* 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);
diff --git a/app-i18n/ibus-chewing/ibus-chewing-1.3.10.ebuild b/app-i18n/ibus-chewing/ibus-chewing-1.3.10.ebuild
index add85b16664e..f2b52ca77af7 100644
--- a/app-i18n/ibus-chewing/ibus-chewing-1.3.10.ebuild
+++ b/app-i18n/ibus-chewing/ibus-chewing-1.3.10.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-chewing/ibus-chewing-1.3.10.ebuild,v 1.1 2011/11/01 18:11:36 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-chewing/ibus-chewing-1.3.10.ebuild,v 1.2 2012/03/10 17:28:48 ssuominen Exp $
 
-EAPI="3"
+EAPI=3
 inherit cmake-utils
 
 MY_P="${P}-Source"
@@ -25,10 +25,21 @@ DEPEND="${RDEPEND}
 	dev-util/cmake-fedora
 	dev-util/pkgconfig"
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
 CMAKE_IN_SOURCE_BUILD=1
 
-PATCHES=( "${FILESDIR}/${P}-cflags.patch" )
+PATCHES=(
+	"${FILESDIR}"/${P}-cflags.patch
+	"${FILESDIR}"/${P}-ibus-1.4.patch
+	)
 
 DOCS="AUTHORS ChangeLog ChangeLog.prev README RELEASE-NOTES.txt USER-GUIDE"
+
+src_install() {
+	cmake-utils_src_install
+
+	# Move /gconf to /etc/gconf
+	dodir /etc
+	mv -vf "${ED}"/gconf "${ED}"/etc
+}