Add patch to support >=gtk-2.24.0. #460714

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8551514

4 files changed, 35 insertions, 18 deletions

diff --git a/app-i18n/scim-hangul/ChangeLog b/app-i18n/scim-hangul/ChangeLog
index 1c3718e9b5e5..4fc70d208bcd 100644
--- a/app-i18n/scim-hangul/ChangeLog
+++ b/app-i18n/scim-hangul/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/scim-hangul
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-hangul/ChangeLog,v 1.33 2013/03/04 07:43:45 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-hangul/ChangeLog,v 1.34 2013/04/06 00:00:19 naota Exp $
+
+  05 Apr 2013; Naohiro Aota <naota@gentoo.org>
+  +files/scim-hangul-0.4.0+gtk.patch, scim-hangul-0.4.0.ebuild:
+  Add patch to support >=gtk-2.24.0. #460714
 
 *scim-hangul-0.4.0 (04 Mar 2013)
 
diff --git a/app-i18n/scim-hangul/Manifest b/app-i18n/scim-hangul/Manifest
index 750ea69cf2f3..c4b8d2e79ae7 100644
--- a/app-i18n/scim-hangul/Manifest
+++ b/app-i18n/scim-hangul/Manifest
@@ -3,26 +3,27 @@ Hash: SHA256
 
 AUX scim-hangul-0.3.2+gcc-4.3.patch 883 SHA256 3acb142ac167f3c4bba3aa63fd95f68715c701c175cfc637408e2b5b5e21b6aa SHA512 f7b65475af23667110219182ec9ba235da83d27603028c8f7655c39ffe36307762e3791d3630602c1cf0b56e87300f45562426e199f39845e39832d88fa7258a WHIRLPOOL 2cfa869b82483bb3b3866e47fddb80c7d95300bf3825f8cb69818ee027b14d6717fa581c673db9267ec68b3118ac0701a81e4f0d3cdef70b41f1c78784a4220f
 AUX scim-hangul-0.3.2+gcc-4.7.patch 318 SHA256 90fc04760ae599dfd242c3ddf69c834a215d1f8f44188043a479608d7605d65a SHA512 b07a6dadf8e206fad812e184f506d034628eccf76de00729f3c8b68eb20bfc48a881a26ed78fbfa87e16dbd7164778eebe03fc7d45297462311a5386ea72da38 WHIRLPOOL 1d195e795eabd1d838b329f048698069b6d60ef7a1694a922daec4bfd6561a3ab3c6c29663c60ce04bbb6104fd8aeb166c9d8243976e08d6fc01b726c432564a
+AUX scim-hangul-0.4.0+gtk.patch 511 SHA256 0ef53a18f866fdac5fec25f1e5401fb9aa60398f7b57295d7f1707d0174a95ea SHA512 ccdcf1b6f35bc02c29cde55a89c67b1d52a716a7e2cb87f98c15140e52266aab9c2fc4b78869fa3c69472d973988c2ccfc3204965fd3ebe2142a3f9d82d6aad5 WHIRLPOOL fe3c4c5049422eda5a05959d3d14db8767f804f28f02c32c9f000f051cf6e18847b8ee42ad593a1517e260ad35338a02a0010f29044c1e5668eb22fe2ad2798d
 DIST scim-hangul-0.3.2.tar.gz 1176577 SHA256 b7c67778f5dd8ec29b96c1477ef008e10fae436928975fc46fbeb7a546d4462b SHA512 e8905320ff8aeeddf0041987ac5a63a19fb75bea44ffc55b5d28b825e064d6881ee0187b55025d69dad35af85da86818afa3ac39f1f10991021a7fbed3e1462e WHIRLPOOL 8a167250f8cda2e72235986b3f6d231951a0ecfd44755a7b256783d158079d2013f2e22545bf5a31907acebadc701f1fbc22eef9222dabe3525772bfb5e8d96e
 DIST scim-hangul-0.4.0.tar.gz 456953 SHA256 7f116c87e78da51363fb4968d627364718de6ec02aa6c6119451fdf403e668c0 SHA512 2f0285268deac35763c67487a40b718bf846d63634701a2a68d85109f686421f2c935b1f2998487b1f017c1a5e5bf453c56933ab4984f7464e1613d7e0b3131b WHIRLPOOL a370963855fb1c684af3d20fedeccf45fe0af1ac8dead1bf1f0c303d090f97921ee7d0e78e01fb667fb55cff33fc0ff73f63607aabc50ab2e4b688a9d16c96b1
 EBUILD scim-hangul-0.3.2.ebuild 1172 SHA256 6e6ee5f9dfa1a92883e76b3ac48484c6032e1f1d51222c1af6ded776b86e787e SHA512 e47223532a281c7028d3b08a4a94eafa75541f7a15a9ac6e0f33080044436f49896d357691417821d4516e28281fc46177867ecd6123a2c38ff74516aeff2838 WHIRLPOOL 71f37b0be325d6efdacabd61f1b1127dfa2ffe86bfe0efc5b33eac84433ab263749055e9baefcf01e3157c3ac74f21aee67403ac897e658e932f4e12a56f07ba
-EBUILD scim-hangul-0.4.0.ebuild 1218 SHA256 c0074bda48ded9a1d139229b9eb17619ff22d2238a52a8089ad8dec06954093b SHA512 2855847aa37939911c4aaa5552447c58c9f7644e9c6e45688e9cee65b1f9e2cb16be6051de2cd2ad7002e23f964394369ff5cc2bade0abbdf18ce58c9e852733 WHIRLPOOL fde437d4e2bf24bce6958b5c88074bce51ff8ac08e93f05ee3ba2406047bc1d38117458c9e9dce0e265a8450c68aef42d2d45fb1780a0d33fe6bd77810553602
-MISC ChangeLog 4593 SHA256 b8ef3e6f33c4864fc88b7e0348999f67bad5b1765b013823d1f8a9a4c38d75e9 SHA512 4af2dd3fac808395f1aa5b533615ac40a71bb268d44bdd5077aeae54d9a47b9b65df48916c2cbaa85be257b4647018b8c84a1f38586ecbb61ac5cb2cbba4c342 WHIRLPOOL 129a3e6371f55e0e3ee6e889fbb87cf6e043b3ee17e4209d6bc2bee4faeef4e2d438f808e0dd56964e7bb2631930d6f9ea7d8338b61e1daabd2142993206e005
+EBUILD scim-hangul-0.4.0.ebuild 1255 SHA256 57faceb7fc2f1232aff9b082af9096f7f869d91697f830dd8e11f23208b669c4 SHA512 f3bd22bf07475b4dd3c42760b0b0439856b8009e52fe431594528f816b89b8b0a3fc04bff9869dc5c20478056f913727d66b6307efc9c566c7548a9c8a781af8 WHIRLPOOL 6cb4a0f6102a8e92ae57229aa9d8a3a80da20d8fa76dfafb929bd8a191a56703beff8c6920c81543f9aa9ad9e10ca13dc70e1b2894d9d587b3cc4542037e35d7
+MISC ChangeLog 4750 SHA256 3297e12064bd249d1508b533edbb6f8c70a8c45a99460cec206a1de68ac5225d SHA512 1c1e71c7e3c5a72d6e62d6589b01ad0746ba20d96d85546c64390ddbdb8be744d43812c08050022968af0aa285fe087e9d821401a82780476a6e2ca75955ddb5 WHIRLPOOL aec6551c8bcee00e46a0ba09cf419814669f715d6ceeb2590ac3351ebaec8b35db1699c57b1a8cd3833e127cbcad2bbaea52889efa461817b86542eba7b4d03b
 MISC metadata.xml 156 SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215 SHA512 e46682afa9f674a8685beb29de6485f750484180d86f8980a3c5c220861f38495ac6f4ceda7cf21c317c640d0d218af3ea9bc1a406b207124c1ffb4bcc99628b WHIRLPOOL 347b826ae650374a01eb144ef127dea2fb96c8646b9a1e4b142bce523822988c4597bc2980cc29dcbfeabc1e44ba70136ddea73f1837d4c6ef7d5e3e9d1d1268
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRNFC3AAoJEDYO1FT4VRUUQ0YQAI4gBK9G9duu6YXN6Aye/Dyr
-WbeSQ5nu/cUb9iNKyywjdRRjmC7032T/n8TxckxP9DO2dNAzbEjDoSYzjlh3mI5K
-n/EDcA6mhfuvz1bwJBmKs5BwZHxPYJaIP9WQ/1DxEqBydOHc+ISxsOsn7TUKVZ8l
-FnLe3cQUsOtYnmD0+j6dhnw48bimYbzi+L/5OaH6DspDpTy1fp2KoexD/nb7w9/U
-theZAoGVFp2e7EE+1CmY5BbmV2+nVj5RVN4Zs43GkJGI2kKmgnSvoFHrluE+nBn2
-VxivSEuB5GkbefppM5YQmK+WYbpzo/ZD7b9u/DbvZHe6HNMnq/rmyj/y4AXorwbx
-moA0Ksd7dqdjQZOdGKKsxA7tb8f+wLw2TzixGlSmuPQN+Hc98BtMqTgVI5K8scFG
-kUuVIaSapLiJLGz4HRsITdddx2wBoA1HUavd+5TpvHR1H535p1WwN0R6XBAtno/U
-UhzHKlknoaNzdZYbLz4NTWEg6OVwiT0WtB8dzonXy41+30N6FTJ+GlGBRA+5oull
-588Q5EJx7o5D4QngvD5YarsjF02swQgCd77L8zX/LURlLT7uCqdhZ0uKtluo4Ad8
-Xym6T1Lfa/lPW/pAmR6kSH09gf1x49+b0jyUXzlIlzgdDW056x/MzAsksqEaFWgX
-QZ6dCumwHp8GRmeshO3L
-=l70a
+iQIcBAEBCAAGBQJRX2WaAAoJEDYO1FT4VRUUjKcP/0jP6rIeevAE7mqWtLCSsf73
+uEAYQA/0zm32nOTrn4Bhkbv8VBe+3gI0PPy5ct97RNV94DvNOVoSP3twlgZ6R78+
+Oq6IRvXHmmBtGUmJs0yLdgiRsGXLcaXVMiS8y4Ct0WVK9o3Ws2FUP/CLSz7WjGz3
+71lK0iqbs9X/oCu2D/56TE5dGw9TJHbYMqjTmLTolLsIgst3rB6uuszUsVZu0kzu
+/ycfbbfHRJcn3PkEUqgFrj3I08/Iq9sAD4Oj+CKT1WbWdtRs/Ec5E/eMjBt4UZdT
+WL7F66MbISvewZuDLPCR2nY9zef6bsIeBBx6wVw+H55jhgbeUXwj0vv8FBvvz5L/
+RoSlx7+hNvPX/fml6fJdpnDK8fj0PoU/QoSculZCdu4xByETpJafYD8WJpJhtLHW
+Zr8cQViBfWE706v+UT7jjjyOl3BdoM2Mmbd/Dzvs0UxLuYvGflj5QcLqPOxXrdX/
+tcdJZWu11XgcdOcD8LhCLK29GHBcOHVIbb/JWhIFRJYk4VY85ksZyW1+kq3SiC/W
+pWO4o9vFLv3UVreFGmhPhFhgXvU9u2GRhCGmXD+uh3RDFb6sTw7mOXDFOFiYg1+0
+tDeKNt8Dnu0XqB46UTTUY3nAMWAtUUXGAibvf/QRB/s2sxF9qC2aJjzeA9Yr69DS
+Em3nt7PcV9s9DFswRM88
+=4YFY
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/scim-hangul/files/scim-hangul-0.4.0+gtk.patch b/app-i18n/scim-hangul/files/scim-hangul-0.4.0+gtk.patch
new file mode 100644
index 000000000000..bc1fd4b673ee
--- /dev/null
+++ b/app-i18n/scim-hangul/files/scim-hangul-0.4.0+gtk.patch
@@ -0,0 +1,11 @@
+--- src/scim_hangul_imengine_setup.cpp.orig	2012-07-08 07:52:07.000000000 -0400
++++ src/scim_hangul_imengine_setup.cpp	2012-11-02 14:13:14.000000000 -0400
+@@ -346,7 +346,7 @@
+     for (i = 0; i < n; i++) {
+ 	const char* name = hangul_ic_get_keyboard_name(i);
+ #if GTK_CHECK_VERSION(2, 24, 0)
+-	gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(combo_box), NULL, name);
++	gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo_box), name);
+ #else
+ 	gtk_combo_box_append_text(GTK_COMBO_BOX(combo_box), name);
+ #endif
diff --git a/app-i18n/scim-hangul/scim-hangul-0.4.0.ebuild b/app-i18n/scim-hangul/scim-hangul-0.4.0.ebuild
index 2289d2705308..ece9121e9e7b 100644
--- a/app-i18n/scim-hangul/scim-hangul-0.4.0.ebuild
+++ b/app-i18n/scim-hangul/scim-hangul-0.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-hangul/scim-hangul-0.4.0.ebuild,v 1.1 2013/03/04 07:43:45 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-hangul/scim-hangul-0.4.0.ebuild,v 1.2 2013/04/06 00:00:19 naota Exp $
 
 EAPI=5
 
@@ -24,7 +24,8 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.3.2+gcc-4.3.patch"
-	"${FILESDIR}/${PN}-0.3.2+gcc-4.7.patch" )
+	"${FILESDIR}/${PN}-0.3.2+gcc-4.7.patch"
+	"${FILESDIR}/${PN}-0.4.0+gtk.patch" )
 
 DOCS=(AUTHORS NEWS)