From edef3689838e7627116a9743504df9a660616156 Mon Sep 17 00:00:00 2001 From: Takao Fujiwara Date: Thu, 26 May 2011 15:02:59 +0900 Subject: [PATCH] Updated ibus-541492-xkb.patch --- ibus-541492-xkb.patch | 10 +++++----- ibus.spec | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ibus-541492-xkb.patch b/ibus-541492-xkb.patch index 333e35f..6c61c81 100644 --- a/ibus-541492-xkb.patch +++ b/ibus-541492-xkb.patch @@ -1,6 +1,6 @@ -From 161cbcc46feb27e52b6579fe4b0b328386f230e9 Mon Sep 17 00:00:00 2001 +From 63051a74572fcd4caf496c87a3eebb058ba93bc0 Mon Sep 17 00:00:00 2001 From: fujiwarat -Date: Wed, 25 May 2011 18:51:13 +0900 +Date: Thu, 26 May 2011 14:55:31 +0900 Subject: [PATCH] Add XKB layouts --- @@ -3343,7 +3343,7 @@ index 0000000..09d506d +#endif diff --git a/xkb/xkbxml.c b/xkb/xkbxml.c new file mode 100644 -index 0000000..5e9885c +index 0000000..f5582ff --- /dev/null +++ b/xkb/xkbxml.c @@ -0,0 +1,696 @@ @@ -3986,8 +3986,8 @@ index 0000000..5e9885c + + g_return_val_if_fail (lang != NULL && layout != NULL, NULL); + -+ if (layout_desc && variant_desc) { -+ longname = g_strdup_printf ("%s - %s", layout_desc, variant_desc); ++ if (variant_desc) { ++ longname = g_strdup (variant_desc); + } else if (layout && variant) { + longname = g_strdup_printf ("%s - %s", layout, variant); + } else if (layout_desc) { diff --git a/ibus.spec b/ibus.spec index 79cddf1..9c35bf2 100644 --- a/ibus.spec +++ b/ibus.spec @@ -13,7 +13,7 @@ Name: ibus Version: 1.3.99.20110408 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Intelligent Input Bus for Linux OS License: LGPLv2+ Group: System Environment/Libraries @@ -328,7 +328,7 @@ fi %{_datadir}/gtk-doc/html/* %changelog -* Wed May 25 2011 Takao Fujiwara - 1.3.99.20110408-4 +* Thu May 26 2011 Takao Fujiwara - 1.3.99.20110408-5 - Added ibus-HEAD.patch Fixed Bug 697471 - ibus-gconf zombie when restart ibus from ibus panel. - Updated ibus-541492-xkb.patch