[Pkg-ime-devel] Bug#640712: ibus-hangul: diff for NMU version 1.3.1-2.1

Mehdi Dogguy mehdi at dogguy.org
Fri Sep 23 22:17:46 UTC 2011


On  0, Mehdi Dogguy <mehdi at dogguy.org> wrote:
> 
> I've prepared an NMU for ibus-hangul (versioned as 1.3.1-2.1) and
> uploaded it to DELAYED/2. Please feel free to tell me if I
> should delay it longer.
> 

Actually, my patch is wrong. I cancelled my NMU. Here attached a new
patch that looks correct to me. Please double check...

Regards,

-- 
Mehdi Dogguy
-------------- next part --------------
diff -Nru ibus-hangul-1.3.1/debian/changelog ibus-hangul-1.3.1/debian/changelog
--- ibus-hangul-1.3.1/debian/changelog	2011-02-27 10:22:48.000000000 +0100
+++ ibus-hangul-1.3.1/debian/changelog	2011-09-24 00:04:44.000000000 +0200
@@ -1,3 +1,11 @@
+ibus-hangul (1.3.1-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Build depend on libibus-1.0-dev instead of libibus-dev (Closes: #640712)
+    and fix ibus_config_get_value call in src/engine.c.
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Sat, 24 Sep 2011 00:04:22 +0200
+
 ibus-hangul (1.3.1-2) unstable; urgency=low
 
   * debian/control:
diff -Nru ibus-hangul-1.3.1/debian/control ibus-hangul-1.3.1/debian/control
--- ibus-hangul-1.3.1/debian/control	2011-02-27 10:19:56.000000000 +0100
+++ ibus-hangul-1.3.1/debian/control	2011-09-24 00:05:42.000000000 +0200
@@ -5,7 +5,7 @@
 Uploaders: 
  LI Daobing <lidaobing at debian.org>
 Build-Depends: debhelper (>= 7), autotools-dev, libhangul-dev (>= 0.0.12),
- python-support, swig, python-dev (>= 2.5), pkg-config, libibus-dev (>= 1.2.99),
+ python-support, swig, python-dev (>= 2.5), pkg-config, libibus-1.0-dev (>= 1.2.99),
  intltool
 Standards-Version: 3.9.1
 Homepage: http://code.google.com/p/ibus
diff -Nru ibus-hangul-1.3.1/debian/patches/ibus1.3.99.patch ibus-hangul-1.3.1/debian/patches/ibus1.3.99.patch
--- ibus-hangul-1.3.1/debian/patches/ibus1.3.99.patch	1970-01-01 01:00:00.000000000 +0100
+++ ibus-hangul-1.3.1/debian/patches/ibus1.3.99.patch	2011-09-24 00:09:03.000000000 +0200
@@ -0,0 +1,42 @@
+--- a/src/engine.c
++++ b/src/engine.c
+@@ -175,8 +175,7 @@
+ void
+ ibus_hangul_init (IBusBus *bus)
+ {
+-    gboolean res;
+-    GValue value = { 0, };
++    GVariant *res;
+ 
+     hanja_table = hanja_table_load (NULL);
+ 
+@@ -188,21 +187,23 @@
+ 
+     hangul_keyboard = g_string_new_len ("2", 8);
+     res = ibus_config_get_value (config, "engine/Hangul",
+-                                         "HangulKeyboard", &value);
++                                         "HangulKeyboard");
+     if (res) {
+-        const gchar* str = g_value_get_string (&value);
++        const gchar* str;
++        g_variant_get (res, "s", &str);
+         g_string_assign (hangul_keyboard, str);
+-        g_value_unset(&value);
++        g_variant_unref(res);
+     }
+ 
+     hanja_key_list_init(&hanja_keys);
+ 
+     res = ibus_config_get_value (config, "engine/Hangul",
+-                                         "HanjaKeys", &value);
++                                         "HanjaKeys");
+     if (res) {
+-        const gchar* str = g_value_get_string (&value);
++        const gchar* str;
++        g_variant_get (res, "s", &str);
+         hanja_key_list_set_from_string(&hanja_keys, str);
+-        g_value_unset(&value);
++        g_variant_unref(res);
+     } else {
+ 	hanja_key_list_append(&hanja_keys, IBUS_Hangul_Hanja, 0);
+ 	hanja_key_list_append(&hanja_keys, IBUS_F9, 0);
diff -Nru ibus-hangul-1.3.1/debian/patches/series ibus-hangul-1.3.1/debian/patches/series
--- ibus-hangul-1.3.1/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ ibus-hangul-1.3.1/debian/patches/series	2011-09-24 00:09:55.000000000 +0200
@@ -0,0 +1 @@
+ibus1.3.99.patch


More information about the Pkg-ime-devel mailing list