Fix saving of configuration wrt #407779 by Jack Chen

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

5 files changed, 90 insertions, 10 deletions

diff --git a/app-i18n/ibus-chewing/ChangeLog b/app-i18n/ibus-chewing/ChangeLog
index e123b9137fa3..b61cb3a361a4 100644
--- a/app-i18n/ibus-chewing/ChangeLog
+++ b/app-i18n/ibus-chewing/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-i18n/ibus-chewing
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-chewing/ChangeLog,v 1.30 2012/03/10 17:29:52 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-chewing/ChangeLog,v 1.31 2012/03/11 11:28:46 ssuominen Exp $
+
+*ibus-chewing-1.3.10-r1 (11 Mar 2012)
+
+  11 Mar 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +ibus-chewing-1.3.10-r1.ebuild,
+  +files/ibus-chewing-1.3.10-fix_save_setting.patch:
+  Fix saving of configuration wrt #407779 by Jack Chen
 
   10 Mar 2012; Samuli Suominen <ssuominen@gentoo.org>
   -ibus-chewing-1.2.0.20100209.ebuild, -ibus-chewing-1.3.6.20100730.ebuild,
diff --git a/app-i18n/ibus-chewing/Manifest b/app-i18n/ibus-chewing/Manifest
index e6396af1d782..ace664f87d4f 100644
--- a/app-i18n/ibus-chewing/Manifest
+++ b/app-i18n/ibus-chewing/Manifest
@@ -2,20 +2,22 @@
 Hash: SHA1
 
 AUX ibus-chewing-1.3.10-cflags.patch 510 RMD160 3ee086f9f097162a39d9525006bb656ca2e94586 SHA1 9442b31c53853bc9a02f50caed74d2a29e118e8d SHA256 bfb9ba81ebabcc4b77a46ec80bf9217d6ad4e863a77d7edcd336b8780cb8cafd
-AUX ibus-chewing-1.3.10-ibus-1.4.patch 1935 RMD160 7fb47d38ab1a7096514d16d4ec2cdcfc4ccfd60d SHA1 bcfe26aa07e36966ca1a3332d41c64c66c509427 SHA256 f787149ff0185fb7b1620134e5e292b59faa1c8cf2bcb26fc96f714dde55e0aa
+AUX ibus-chewing-1.3.10-fix_save_setting.patch 777 RMD160 e5932f670ce898c618441001727a3acb458d3ab6 SHA1 d97658edf6336a1afe6bfb02afe00a71f0fb50d1 SHA256 f7ff35f3a2b390f69758754edaf66c69644c98cea115903f1a2dd04e9b515f4c
+AUX ibus-chewing-1.3.10-ibus-1.4.patch 1987 RMD160 303c84fe7f63c3baca62466a8a59a669f200dc7b SHA1 9d41f02c3a3d809dcd936441777c671f8dc0ed20 SHA256 6f3dbc5e992b8466e22face485ead8716106c64cce9328374a7415fa1ad935d4
 DIST cmake-fedora-modules-only-latest.tar.gz 26660 RMD160 a94d1e770d64de0f60bb8670ddd32414cef31b3a SHA1 38ca209aaa11ab336aa288772054e00803baadbf SHA256 019b1d6727430e305996eb042410be83af9c780bcaf197501b16aca42ee68643
 DIST ibus-chewing-1.3.10-Source.tar.gz 75365 RMD160 84d4167a0d2c4019f165280cabea2afeaaee4464 SHA1 e9f92370c1ad99d5076b4e288704fadb759928be SHA256 171402a7d6d141d485454493e097746d73da7cef172d2ab5ec1a2c593a2ee1c8
+EBUILD ibus-chewing-1.3.10-r1.ebuild 1152 RMD160 99eab2f28fa8a8fa575f6f5d189b8dc64a16cf93 SHA1 5e044026e493ffb44747259df4ed674f8c3ec80e SHA256 7bd7b24e9d6e1df416032581ddb65bdcc6a7c0e49d8ce26938574edb2e67e1f6
 EBUILD ibus-chewing-1.3.10.ebuild 1087 RMD160 4c206f13b017f71a0a15854e36ed034b26d3f7b0 SHA1 611bbc7e1263930c42ab9ee25a754da949be731d SHA256 f9405660f1ec66c12cafdd077c691d59d5d5866337a0a637cabea85fa14bfc71
-MISC ChangeLog 6174 RMD160 afffdbabcfb49c30bd97bb0982d50035acf2f519 SHA1 2e950e516167bcd73ec772190b1be4d07e88db06 SHA256 52167e06ac6b0bdec805a24a4cc02bb87e8b9e8dedb0d2973e6c36cefdcafba9
+MISC ChangeLog 6410 RMD160 b1110d71f8dfe108cb41ba7122e140ac8f95db1b SHA1 ad342ab5e26a328aa0b68f9104a37e96e5050291 SHA256 17db66b76130fe52e98fe3dde73bd4338ca917d2df794a230aae024d9053f699
 MISC metadata.xml 291 RMD160 bc757f9c6bbc19431626042b327e40df13c36c8a SHA1 6b9164025250b871ea68133cc630a5f26890e9f7 SHA256 24d2f857086c12cd8d448e083c9dd33ec8784804581000b7e8088e01b8e85e54
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPW46XAAoJEEdUh39IaPFNtgcIAIeDj1VHQNm3hAX6lj69W89Y
-zqzjQDVeBc1w3WvP6Ij+Y2n19XnR4rGGaDxA80mURjWG8ZcL5UgkwRcTjOLRspB1
-e8pLAdm98ZsuVtr4XdeXOKxUs7EgDBu7Uz++o+6pJ4xeFhyqyJoZo2bA8CbuJo4E
-BqlCJ0/Dlp0S1tRyEbuqzYgrYskmAWHCZWAXYzdKTyKlaiYTUCW+YVKtkoRGNL3L
-Bb7gaJSdbZ3WKfa1xF1k1BvKyE0FotJ1WrY8rdIgT4fLscoz1HvLwtPRhZrK42pz
-ECH81BzPZ+xhVXC3U5V8srZonIOHMAsM8V8Juu/NrDPRMhhygeSLTH7pMkCuqLw=
-=a1l2
+iQEcBAEBAgAGBQJPXIt0AAoJEEdUh39IaPFNZVkIAIcq33ZQCgBntUYg1rfGHLzI
+kYaXqKePLNcTeu3EuxoukRoh0LEmcnl2Ye132bg3kpnnoedafItea8g7DgyyXaq0
+KoDuWO5VZs//oihunzJJYEbvwC5X7I7HrQ28BIjFi/YNbT7MBrpSkRuGFrFyNrdA
+KiS10IaA0KA3Eldxl2iffg7oE+jYEPoktjg/MNkOvJ9QaXq9ruAWkOlffIsk7FUc
+yIF6NRgT81ew9mxl+0S+1nY6ZxZbCyWPCfo+aHqeW6EX+2VZHxQSd4x+COWxkYCk
+UzUP7DgnVyjgb5iAch2yWw1SEF3YJLiVaxYHDLJ7SmaeIkOtvisIbky4U+2/oOc=
+=iRz5
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/ibus-chewing/files/ibus-chewing-1.3.10-fix_save_setting.patch b/app-i18n/ibus-chewing/files/ibus-chewing-1.3.10-fix_save_setting.patch
new file mode 100644
index 000000000000..05a21b33cffa
--- /dev/null
+++ b/app-i18n/ibus-chewing/files/ibus-chewing-1.3.10-fix_save_setting.patch
@@ -0,0 +1,22 @@
+http://bugs.gentoo.org/407779
+http://code.google.com/p/ibus/issues/detail?id=1428
+
+--- src/IBusChewingEngine-def.c
++++ src/IBusChewingEngine-def.c
+@@ -392,13 +392,13 @@
+ 	    gVar=g_variant_new_uint32(g_value_get_uint(gValue));
+ 	    break;
+ 	case G_TYPE_UINT64:
+-	    gVar=g_variant_new_uint64(g_value_get_uint(gValue));
++	    gVar=g_variant_new_uint64(g_value_get_uint64(gValue));
+ 	    break;
+ 	case G_TYPE_INT:
+-	    gVar=g_variant_new_int32(g_value_get_uint(gValue));
++	    gVar=g_variant_new_int32(g_value_get_int(gValue));
+ 	    break;
+ 	case G_TYPE_INT64:
+-	    gVar=g_variant_new_int64(g_value_get_uint(gValue));
++	    gVar=g_variant_new_int64(g_value_get_int64(gValue));
+ 	    break;
+ 	case G_TYPE_STRING:
+ 	    gVar=g_variant_new_string(g_value_get_string(gValue));
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
index 8122868ddb47..7376c02d0581 100644
--- 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
@@ -1,4 +1,5 @@
 http://bugs.gentoo.org/407695
+http://code.google.com/p/ibus/issues/detail?id=1427
 
 --- src/IBusChewingEngine.gob
 +++ src/IBusChewingEngine.gob
diff --git a/app-i18n/ibus-chewing/ibus-chewing-1.3.10-r1.ebuild b/app-i18n/ibus-chewing/ibus-chewing-1.3.10-r1.ebuild
new file mode 100644
index 000000000000..7a8353732e22
--- /dev/null
+++ b/app-i18n/ibus-chewing/ibus-chewing-1.3.10-r1.ebuild
@@ -0,0 +1,48 @@
+# 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-r1.ebuild,v 1.1 2012/03/11 11:28:46 ssuominen Exp $
+
+EAPI=4
+inherit cmake-utils
+
+MY_P=${P}-Source
+
+DESCRIPTION="The Chewing IMEngine for IBus Framework"
+HOMEPAGE="http://code.google.com/p/ibus/"
+SRC_URI="http://ibus.googlecode.com/files/${MY_P}.tar.gz
+	https://fedorahosted.org/releases/c/m/cmake-fedora/cmake-fedora-modules-only-latest.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="x11-libs/libXtst
+	>=app-i18n/ibus-1.1
+	>=dev-libs/libchewing-0.3.2
+	x11-libs/gtk+:2
+	dev-util/gob:2"
+DEPEND="${RDEPEND}
+	dev-util/cmake-fedora
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+CMAKE_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cflags.patch
+	"${FILESDIR}"/${P}-ibus-1.4.patch
+	"${FILESDIR}"/${P}-fix_save_setting.patch
+	)
+
+DOCS="AUTHORS ChangeLog ChangeLog.prev README RELEASE-NOTES.txt USER-GUIDE"
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR=/etc
+		-DPRJ_DOC_DIR=/usr/share/doc/${PF}
+		)
+
+	cmake-utils_src_configure
+}