4 files changed, 13 insertions, 86 deletions

diff --git a/korean/ibus-hangul/Makefile b/korean/ibus-hangul/Makefile
index dda9e2591213..f864dc05b6c7 100644
--- a/korean/ibus-hangul/Makefile
+++ b/korean/ibus-hangul/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ibus-hangul
-PORTVERSION=	1.3.2
-PORTREVISION=	1
+PORTVERSION=	1.4.1
 CATEGORIES=	korean
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
diff --git a/korean/ibus-hangul/distinfo b/korean/ibus-hangul/distinfo
index 36407deb6275..4878a5a20bf3 100644
--- a/korean/ibus-hangul/distinfo
+++ b/korean/ibus-hangul/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ibus-hangul-1.3.2.tar.gz) = 0f6793c61d64461badadb042f0cea184ae69348d8bbfefe976f1e4a63a37a5a3
-SIZE (ibus-hangul-1.3.2.tar.gz) = 435057
+SHA256 (ibus-hangul-1.4.1.tar.gz) = 8b7cbc124850df9fb78cdcb38b138f10c648b5519d36a92107616606678b662d
+SIZE (ibus-hangul-1.4.1.tar.gz) = 484065
diff --git a/korean/ibus-hangul/files/patch-src-engine.c b/korean/ibus-hangul/files/patch-src-engine.c
deleted file mode 100644
index d6a99cd6d477..000000000000
--- a/korean/ibus-hangul/files/patch-src-engine.c
+++ /dev/null
@@ -1,82 +0,0 @@
---- src/engine.c.orig	2011-10-16 11:20:21.000000000 -0400
-+++ src/engine.c	2012-01-09 19:40:48.000000000 -0500
-@@ -130,7 +130,7 @@
- static void ibus_config_value_changed       (IBusConfig             *config,
-                                              const gchar            *section,
-                                              const gchar            *name,
--                                             GValue                 *value,
-+                                             GVariant               *value,
-                                              gpointer                user_data);
- 
- static void        lookup_table_set_visible (IBusLookupTable        *table,
-@@ -194,8 +194,7 @@
- void
- ibus_hangul_init (IBusBus *bus)
- {
--    gboolean res;
--    GValue value = { 0, };
-+    GVariant* value;
- 
-     hanja_table = hanja_table_load (NULL);
- 
-@@ -206,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);
-@@ -990,23 +989,23 @@
- ibus_config_value_changed (IBusConfig   *config,
-                            const gchar  *section,
-                            const gchar  *name,
--                           GValue       *value,
-+                           GVariant     *value,
-                            gpointer      user_data)
- {
-     IBusHangulEngine *hangul = (IBusHangulEngine *) user_data;
- 
-     if (strcmp(section, "engine/Hangul") == 0) {
-         if (strcmp(name, "HangulKeyboard") == 0) {
--            const gchar *str = g_value_get_string (value);
-+            const gchar *str = g_variant_get_string(value, NULL);
-             g_string_assign (hangul_keyboard, str);
-             hangul_ic_select_keyboard (hangul->context, hangul_keyboard->str);
-         } else if (strcmp(name, "HanjaKeys") == 0) {
--            const gchar* str = g_value_get_string (value);
-+            const gchar* str = g_variant_get_string(value, NULL);
- 	    hanja_key_list_set_from_string(&hanja_keys, str);
-         }
-     } else if (strcmp(section, "panel") == 0) {
-         if (strcmp(name, "lookup_table_orientation") == 0) {
--            lookup_table_orientation = g_value_get_int (value);
-+            lookup_table_orientation = g_variant_get_int32(value);
-         }
-     }
- }
diff --git a/korean/ibus-hangul/pkg-plist b/korean/ibus-hangul/pkg-plist
index 4a0df54cbe7d..8ea2f1bc0767 100644
--- a/korean/ibus-hangul/pkg-plist
+++ b/korean/ibus-hangul/pkg-plist
@@ -1,7 +1,10 @@
 lib/ibus-hangul/setup/hangul_keyboard_list
 libexec/ibus-engine-hangul
 libexec/ibus-setup-hangul
+share/applications/ibus-setup-hangul.desktop
 share/ibus/component/hangul.xml
+share/icons/hicolor/64x64/apps/ibus-hangul.png
+share/icons/hicolor/scalable/apps/ibus-hangul.svg
 %%DATADIR%%/data/symbol.txt
 %%DATADIR%%/icons/ibus-hangul.png
 %%DATADIR%%/icons/ibus-hangul.svg
@@ -17,6 +20,13 @@ share/ibus/component/hangul.xml
 %%DATADIR%%/setup/setup.ui
 %%NLS%%share/locale/ko/LC_MESSAGES/ibus-hangul.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/ibus-hangul.mo
+@dirrmtry share/applications
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/scalable/apps
+@dirrmtry share/icons/hicolor/scalable
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
 @dirrm %%DATADIR%%/data
 @dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%/setup