Mon Oct 3 23:14:36 UTC 2011

2 files changed, 64 insertions, 5 deletions

diff --git a/community/ibus-hangul/PKGBUILD b/community/ibus-hangul/PKGBUILD
index 6191465bf..c9385ed9b 100644
--- a/community/ibus-hangul/PKGBUILD
+++ b/community/ibus-hangul/PKGBUILD
@@ -1,22 +1,23 @@
-# $Id: PKGBUILD 53477 2011-08-03 21:36:31Z ebelanger $
+# $Id: PKGBUILD 56129 2011-10-02 08:05:56Z ebelanger $
 # Maintainer: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Radim Hvizdák <hvizdakr at gmail dot com>
 
 pkgname=ibus-hangul
 pkgver=1.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Korean input engine for IBus'
 arch=('i686' 'x86_64')
 url='http://ibus.googlecode.com'
 license=('GPL')
 depends=('ibus' 'libhangul')
 makedepends=('intltool')
-source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
-md5sums=('b71565bba3a1439a47212611b774ecf7')
+source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz ibus-1.4.0.patch)
+md5sums=('b71565bba3a1439a47212611b774ecf7'
+         'edf93824ab2eead1307088d3edc24dbc')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-
+  patch -p1 -i "${srcdir}/ibus-1.4.0.patch"
   ./configure \
     --prefix=/usr \
     --libexecdir=/usr/lib/ibus
diff --git a/community/ibus-hangul/ibus-1.4.0.patch b/community/ibus-hangul/ibus-1.4.0.patch
new file mode 100644
index 000000000..0c043d374
--- /dev/null
+++ b/community/ibus-hangul/ibus-1.4.0.patch
@@ -0,0 +1,58 @@
+diff -Naur ibus-hangul-1.3.1-orig/configure.ac ibus-hangul-1.3.1/configure.ac
+--- ibus-hangul-1.3.1-orig/configure.ac	2011-10-02 03:36:02.000000000 -0400
++++ ibus-hangul-1.3.1/configure.ac	2011-10-02 03:37:01.000000000 -0400
+@@ -52,7 +52,7 @@
+ 
+ # check ibus
+ PKG_CHECK_MODULES(IBUS, [
+-    ibus-1.0 >= 1.2.99
++    ibus-1.0 >= 1.3.99
+ ])
+ 
+ # check libhangul
+diff -Naur ibus-hangul-1.3.1-orig/src/engine.c ibus-hangul-1.3.1/src/engine.c
+--- ibus-hangul-1.3.1-orig/src/engine.c	2011-10-02 03:36:02.000000000 -0400
++++ ibus-hangul-1.3.1/src/engine.c	2011-10-02 03:37:51.000000000 -0400
+@@ -175,8 +194,7 @@
+ void
+ ibus_hangul_init (IBusBus *bus)
+ {
+-    gboolean res;
+-    GValue value = { 0, };
++    GVariant* value;
+ 
+     hanja_table = hanja_table_load (NULL);
+ 
+@@ -187,22 +205,22 @@
+         g_object_ref_sink (config);
+ 
+     hangul_keyboard = g_string_new_len ("2", 8);
+-    res = ibus_config_get_value (config, "engine/Hangul",
+-                                         "HangulKeyboard", &value);
+-    if (res) {
+-        const gchar* str = g_value_get_string (&value);
++    value = ibus_config_get_value (config, "engine/Hangul",
++                                         "HangulKeyboard");
++    if (value != NULL) {
++        const gchar* str = g_variant_get_string (value, NULL);
+         g_string_assign (hangul_keyboard, str);
+-        g_value_unset(&value);
++        g_variant_unref(value);
+     }
+ 
+     hanja_key_list_init(&hanja_keys);
+ 
+-    res = ibus_config_get_value (config, "engine/Hangul",
+-                                         "HanjaKeys", &value);
+-    if (res) {
+-        const gchar* str = g_value_get_string (&value);
++    value = ibus_config_get_value (config, "engine/Hangul",
++                                         "HanjaKeys");
++    if (value != NULL) {
++        const gchar* str = g_variant_get_string (value, NULL);
+         hanja_key_list_set_from_string(&hanja_keys, str);
+-        g_value_unset(&value);
++        g_variant_unref(value);
+     } else {
+ 	hanja_key_list_append(&hanja_keys, IBUS_Hangul_Hanja, 0);
+ 	hanja_key_list_append(&hanja_keys, IBUS_F9, 0);