Update to 1.3.2.

5 files changed, 48 insertions, 16 deletions

diff --git a/korean/ibus-hangul/Makefile b/korean/ibus-hangul/Makefile
index fab7db5d59a9..fc37ae109868 100644
--- a/korean/ibus-hangul/Makefile
+++ b/korean/ibus-hangul/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ibus-hangul
-PORTVERSION=	1.3.1
+PORTVERSION=	1.3.2
 CATEGORIES=	korean
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
@@ -16,7 +16,7 @@ COMMENT=	Hangul input engine for IBus
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	hangul.1:${PORTSDIR}/korean/libhangul \
-		ibus.2:${PORTSDIR}/textproc/ibus
+		ibus-1.0.400:${PORTSDIR}/textproc/ibus
 
 PROJECTHOST=	ibus
 
diff --git a/korean/ibus-hangul/distinfo b/korean/ibus-hangul/distinfo
index 69d603e62c16..36407deb6275 100644
--- a/korean/ibus-hangul/distinfo
+++ b/korean/ibus-hangul/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ibus-hangul-1.3.1.tar.gz) = 1e5530c1d7add8970f3a98a76a0a2feda06a08d65af56fbba5329a6645915afc
-SIZE (ibus-hangul-1.3.1.tar.gz) = 431214
+SHA256 (ibus-hangul-1.3.2.tar.gz) = 0f6793c61d64461badadb042f0cea184ae69348d8bbfefe976f1e4a63a37a5a3
+SIZE (ibus-hangul-1.3.2.tar.gz) = 435057
diff --git a/korean/ibus-hangul/files/patch-setup-Makefile.in b/korean/ibus-hangul/files/patch-setup-Makefile.in
deleted file mode 100644
index 8ce1a681768b..000000000000
--- a/korean/ibus-hangul/files/patch-setup-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup/Makefile.in.orig	2011-02-26 07:23:07.000000000 -0500
-+++ setup/Makefile.in	2011-08-08 17:42:12.000000000 -0400
-@@ -302,7 +302,7 @@
- libexec_SCRIPTS = ibus-setup-hangul
- hangul_keyboard_list_SOURCES = hangul_keyboard_list.c
- hangul_keyboard_list_CFLAGS = $(HANGUL_CFLAGS)
--hangul_keyboard_list_LDADD = $(HANGUL_LIBS)
-+hangul_keyboard_list_LDADD = $(HANGUL_LIBS) $(INTLLIBS)
- CLEANFILES = \
- 	*.pyc \
- 	$(NULL)
diff --git a/korean/ibus-hangul/files/patch-src-engine.c b/korean/ibus-hangul/files/patch-src-engine.c
new file mode 100644
index 000000000000..c833b41509ce
--- /dev/null
+++ b/korean/ibus-hangul/files/patch-src-engine.c
@@ -0,0 +1,43 @@
+--- src/engine.c.orig	2011-10-16 11:20:21.000000000 -0400
++++ src/engine.c	2012-01-09 13:20:15.000000000 -0500
+@@ -194,8 +194,7 @@
+ void
+ ibus_hangul_init (IBusBus *bus)
+ {
+-    gboolean res;
+-    GValue value = { 0, };
++    GVariant *var = NULL;
+ 
+     hanja_table = hanja_table_load (NULL);
+ 
+@@ -206,22 +205,20 @@
+         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);
++    var = ibus_config_get_value (config, "engine/Hangul", "HangulKeyboard");
++    if (var) {
++        const gchar* str = g_variant_get_string (var, NULL);
+         g_string_assign (hangul_keyboard, str);
+-        g_value_unset(&value);
++        g_variant_unref(var);
+     }
+ 
+     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);
++    var = ibus_config_get_value (config, "engine/Hangul", "HanjaKeys");
++    if (var) {
++        const gchar* str = g_variant_get_string (var, NULL);
+         hanja_key_list_set_from_string(&hanja_keys, str);
+-        g_value_unset(&value);
++        g_variant_unref(var);
+     } else {
+ 	hanja_key_list_append(&hanja_keys, IBUS_Hangul_Hanja, 0);
+ 	hanja_key_list_append(&hanja_keys, IBUS_F9, 0);
diff --git a/korean/ibus-hangul/pkg-plist b/korean/ibus-hangul/pkg-plist
index 7fbe2a67d360..aa0b6bfa7dca 100644
--- a/korean/ibus-hangul/pkg-plist
+++ b/korean/ibus-hangul/pkg-plist
@@ -1,3 +1,4 @@
+lib/ibus-hangul/setup/hangul_keyboard_list
 libexec/ibus-engine-hangul
 libexec/ibus-setup-hangul
 share/ibus/component/hangul.xml
@@ -7,7 +8,6 @@ share/ibus/component/hangul.xml
 %%DATADIR%%/setup/config.py
 %%DATADIR%%/setup/config.pyc
 %%DATADIR%%/setup/config.pyo
-%%DATADIR%%/setup/hangul_keyboard_list
 %%DATADIR%%/setup/keycapturedialog.py
 %%DATADIR%%/setup/keycapturedialog.pyc
 %%DATADIR%%/setup/keycapturedialog.pyo