diff --git a/.gitignore b/.gitignore index 5afc5a0..658b7df 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ ibus-1.3.6.tar.gz /ibus-1.3.8.tar.gz /ibus-1.3.9.tar.gz /ibus-1.4.0.tar.gz +/ibus-1.4.1.tar.gz /ibus-1.3.99.20101028.tar.gz /ibus-1.3.99.20101118.tar.gz /ibus-1.3.99.20101202.tar.gz @@ -14,6 +15,8 @@ ibus-1.3.6.tar.gz /ibus-1.3.99.20110408.tar.gz /ibus-1.3.99.20110419.tar.gz /ibus-1.3.99.20110817.tar.gz +/ibus-1.4.99.20120203.tar.gz +/ibus-1.4.99.20120304.tar.gz /ibus-gjs-3.0.2.20110823.tar.gz /ibus-gjs-3.1.4.20110823.tar.gz /ibus-gjs-3.0.2.20110908.tar.gz @@ -32,6 +35,4 @@ ibus-1.3.6.tar.gz /ibus-gjs-3.2.1.20111118.tar.gz /ibus-gjs-3.2.1.20111128.tar.gz /ibus-gjs-3.2.1.20111230.tar.gz -/ibus-1.4.99.20120203.tar.gz /ibus-gjs-3.3.3.20120203.tar.gz -/ibus-gsettings-db diff --git a/ibus-541492-xkb.patch b/ibus-541492-xkb.patch index dae0afa..4d135f5 100644 --- a/ibus-541492-xkb.patch +++ b/ibus-541492-xkb.patch @@ -1,33 +1,31 @@ -From 629d0a5383b3d42d7cad980bc5efe01867a01359 Mon Sep 17 00:00:00 2001 +From 571e4ab3e28acb90466ac58e3fe9f4efc4b8ba0e Mon Sep 17 00:00:00 2001 From: fujiwarat -Date: Tue, 7 Feb 2012 20:13:59 +0900 +Date: Sun, 4 Mar 2012 22:16:01 +0900 Subject: [PATCH] Add ibus-xkb and libgnomekbd. --- - bindings/vala/ibus-1.0.vapi | 11 + - bindings/vala/ibus-1.0/ibus-1.0.gi | 45 +++ - configure.ac | 59 ++++ - data/ibus.schemas.in | 58 ++++ - engine/Makefile.am | 22 ++ - engine/ibus-xkb-main.c | 111 ++++++++ - engine/main.vala | 84 ++++++ - engine/simple.xml.in.in | 531 +----------------------------------- - engine/xkblib.c | 327 ++++++++++++++++++++++ - engine/xkblib.h | 41 +++ - ibus-1.0.pc.in | 4 + - setup/enginecombobox.py | 6 +- - setup/main.py | 31 ++- - src/Makefile.am | 5 + - src/ibus.h | 1 + - src/ibusxkbxml.c | 454 ++++++++++++++++++++++++++++++ - src/ibusxkbxml.h | 187 +++++++++++++ - ui/gtk3/Gkbd-3.0.metadata | 1 + - ui/gtk3/Makefile.am | 47 ++++ - ui/gtk3/gkbdlayout.vala.false | 63 +++++ - ui/gtk3/gkbdlayout.vala.true | 111 ++++++++ - ui/gtk3/panel.vala | 274 +++++++++++++++++-- - ui/gtk3/xkblayout.vala | 466 +++++++++++++++++++++++++++++++ - 23 files changed, 2381 insertions(+), 558 deletions(-) + configure.ac | 59 +++++ + data/ibus.schemas.in | 58 +++++ + engine/Makefile.am | 22 ++ + engine/ibus-xkb-main.c | 111 +++++++++ + engine/main.vala | 86 +++++++ + engine/simple.xml.in.in | 531 +---------------------------------------- + engine/xkblib.c | 327 +++++++++++++++++++++++++ + engine/xkblib.h | 41 ++++ + ibus-1.0.pc.in | 4 + + setup/enginecombobox.py | 6 +- + setup/main.py | 17 ++- + src/Makefile.am | 5 + + src/ibus.h | 1 + + src/ibusxkbxml.c | 466 ++++++++++++++++++++++++++++++++++++ + src/ibusxkbxml.h | 187 +++++++++++++++ + ui/gtk3/Gkbd-3.0.metadata | 1 + + ui/gtk3/Makefile.am | 45 ++++ + ui/gtk3/gkbdlayout.vala.false | 63 +++++ + ui/gtk3/gkbdlayout.vala.true | 111 +++++++++ + ui/gtk3/panel.vala | 275 ++++++++++++++++++++-- + ui/gtk3/xkblayout.vala | 466 ++++++++++++++++++++++++++++++++++++ + 21 files changed, 2331 insertions(+), 551 deletions(-) create mode 100644 engine/ibus-xkb-main.c create mode 100644 engine/xkblib.c create mode 100644 engine/xkblib.h @@ -38,89 +36,11 @@ Subject: [PATCH] Add ibus-xkb and libgnomekbd. create mode 100644 ui/gtk3/gkbdlayout.vala.true create mode 100644 ui/gtk3/xkblayout.vala -diff --git a/bindings/vala/ibus-1.0.vapi b/bindings/vala/ibus-1.0.vapi -index bf3ae61..c5baa1c 100644 ---- a/bindings/vala/ibus-1.0.vapi -+++ b/bindings/vala/ibus-1.0.vapi -@@ -527,6 +527,17 @@ namespace IBus { - public unowned string get_text (); - } - [CCode (cheader_filename = "ibus.h")] -+ public class XKBConfigRegistry : IBus.Object { -+ [CCode (has_construct_function = false)] -+ public XKBConfigRegistry (); -+ public unowned GLib.HashTable get_layout_list (); -+ public unowned string layout_desc_get_desc (string layout); -+ public unowned GLib.List layout_lang_get_langs (string layout); -+ public unowned GLib.List layout_list_get_layouts (); -+ public unowned GLib.List layout_list_get_variants (string layout); -+ public unowned string variant_desc_get_desc (string variant); -+ } -+ [CCode (cheader_filename = "ibus.h")] - [Compact] - public class XMLNode { - public weak string attributes; -diff --git a/bindings/vala/ibus-1.0/ibus-1.0.gi b/bindings/vala/ibus-1.0/ibus-1.0.gi -index 65852f1..9e062fd 100644 ---- a/bindings/vala/ibus-1.0/ibus-1.0.gi -+++ b/bindings/vala/ibus-1.0/ibus-1.0.gi -@@ -2878,6 +2878,51 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - diff --git a/configure.ac b/configure.ac -index 74f6d93..fe0cd4e 100644 +index aeb22b4..a516c94 100644 --- a/configure.ac +++ b/configure.ac -@@ -222,6 +222,63 @@ else +@@ -249,6 +249,63 @@ else enable_xim="no (disabled, use --enable-xim to enable)" fi @@ -184,19 +104,19 @@ index 74f6d93..fe0cd4e 100644 # GObject introspection GOBJECT_INTROSPECTION_CHECK([0.6.8]) -@@ -517,5 +574,7 @@ Build options: - No snooper regexes "$NO_SNOOPER_APPS" +@@ -545,5 +602,7 @@ Build options: Panel icon "$IBUS_ICON_KEYBOARD" Enable surrounding-text $enable_surrounding_text + Run test cases $enable_tests + Build XKB $enable_xkb + Build libgnomebkd $enable_libgnomekbd ]) diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in -index 68def40..34de9b4 100644 +index 53ba05c..3ca0fbc 100644 --- a/data/ibus.schemas.in +++ b/data/ibus.schemas.in -@@ -26,6 +26,18 @@ +@@ -38,6 +38,18 @@ @@ -215,7 +135,7 @@ index 68def40..34de9b4 100644 /schemas/desktop/ibus/general/hotkey/enable_unconditional /desktop/ibus/general/hotkey/enable_unconditional ibus -@@ -191,6 +203,52 @@ +@@ -203,6 +215,52 @@ @@ -426,10 +346,10 @@ index 0000000..75f6679 + return 0; +} diff --git a/engine/main.vala b/engine/main.vala -index e1fd129..0dd15ce 100644 +index e1fd129..377fa2f 100644 --- a/engine/main.vala +++ b/engine/main.vala -@@ -21,6 +21,83 @@ +@@ -21,6 +21,85 @@ */ using IBus; @@ -477,9 +397,9 @@ index e1fd129..0dd15ce 100644 + +private void print_component() { + IBus.XKBConfigRegistry registry = new IBus.XKBConfigRegistry(); -+ unowned GLib.List layouts = registry.layout_list_get_layouts(); -+ unowned GLib.List variants; -+ unowned GLib.List langs; ++ GLib.List layouts = registry.layout_list_get_layouts(); ++ GLib.List variants; ++ GLib.List langs; + string layout_desc; + const string header = ""; + const string footer = " @@ -495,7 +415,9 @@ index e1fd129..0dd15ce 100644 + } + for (unowned GLib.List v = variants; v != null; v = v.next) { + var l_v = "%s(%s)".printf(l.data, v.data); -+ unowned GLib.List l_v_langs = registry.layout_lang_get_langs(l_v); ++ unowned GLib.List l_v_langs = null; ++ GLib.List _l_v_langs = registry.layout_lang_get_langs(l_v); ++ l_v_langs = _l_v_langs; + if (l_v_langs == null) { + l_v_langs = langs; + } @@ -513,7 +435,7 @@ index e1fd129..0dd15ce 100644 class DummyEngine : IBus.EngineSimple { } -@@ -28,6 +105,13 @@ class DummyEngine : IBus.EngineSimple { +@@ -28,6 +107,13 @@ class DummyEngine : IBus.EngineSimple { public int main(string[] args) { IBus.init(); @@ -1483,7 +1405,7 @@ index 8d1424b..0ac7368 100644 if current_lang in keys: keys.remove(current_lang) diff --git a/setup/main.py b/setup/main.py -index 7cd3e37..bbc5422 100644 +index 274b25a..e3027a5 100644 --- a/setup/main.py +++ b/setup/main.py @@ -182,12 +182,25 @@ class Setup(object): @@ -1514,43 +1436,8 @@ index 7cd3e37..bbc5422 100644 tmp_dict[e.get_name()] = e engine_names = values.get("preload_engines", []) engines = [tmp_dict[name] for name in engine_names if name in tmp_dict] -@@ -254,7 +267,7 @@ class Setup(object): - args = setup.split() - args.insert(1, path.basename(args[0])) - return args -- name = str(engine.name) -+ name = str(engine.props.name) - libexecdir = os.environ['IBUS_LIBEXECDIR'] - setup_path = (libexecdir + '/' + 'ibus-setup-' if libexecdir != None \ - else 'ibus-setup-') + name.split(':')[0] -@@ -275,11 +288,11 @@ class Setup(object): - self.__builder.get_object("button_engine_up").set_sensitive(engine not in engines[:1]) - self.__builder.get_object("button_engine_down").set_sensitive(engine not in engines[-1:]) - -- # obj = self.__builder.get_object("button_engine_preferences") -- # if len(self.__get_engine_setup_exec_args(engine)) != 0: -- # obj.set_sensitive(True) -- # else: -- # obj.set_sensitive(False) -+ obj = self.__builder.get_object("button_engine_preferences") -+ if len(self.__get_engine_setup_exec_args(engine)) != 0: -+ obj.set_sensitive(True) -+ else: -+ obj.set_sensitive(False) - - if prop.name == "engines": - engine_names = map(lambda e: e.get_name(), engines) -@@ -302,7 +315,7 @@ class Setup(object): - args = self.__get_engine_setup_exec_args(engine) - if len(args) == 0: - return -- name = engine.name -+ name = engine.props.name - if name in self.__engine_setup_exec_list.keys(): - try: - wpid, sts = os.waitpid(self.__engine_setup_exec_list[name], diff --git a/src/Makefile.am b/src/Makefile.am -index a53c277..0c8a820 100644 +index b4d0dcf..1631cae 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -190,6 +190,11 @@ typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) @@ -1579,10 +1466,10 @@ index ef811a4..f82a162 100644 #include diff --git a/src/ibusxkbxml.c b/src/ibusxkbxml.c new file mode 100644 -index 0000000..af30c0c +index 0000000..4792664 --- /dev/null +++ b/src/ibusxkbxml.c -@@ -0,0 +1,454 @@ +@@ -0,0 +1,466 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ +/* vim:set et sts=4: */ +/* bus - The Input Bus @@ -2006,16 +1893,28 @@ index 0000000..af30c0c + return list; +} + ++/* vala could use GLib.List for the returned pointer and ++ * the declaration calls g_list_foreach (retval, g_free, NULL). ++ * When I think about GLib.List v.s. GLib.List, probably ++ * I think GLib.List is better for the function and set ++ * g_strdup() here. I do not know about GJS implementation. ++ */ +#define TABLE_LOOKUP_LIST_FUNC(field_name, value) GList * \ +ibus_xkb_config_registry_##field_name##_get_##value (IBusXKBConfigRegistry *xkb_config, const gchar *key) \ +{ \ + GHashTable *table; \ + GList *list = NULL; \ ++ GList *retval= NULL; \ ++ GList *p = NULL; \ + \ + table = (GHashTable *) \ + ibus_xkb_config_registry_get_##field_name (xkb_config); \ + list = (GList *) g_hash_table_lookup (table, key); \ -+ return g_list_copy (list); \ ++ retval = g_list_copy (list); \ ++ for (p = retval; p; p = p->next) { \ ++ p->data = g_strdup (p->data); \ ++ } \ ++ return retval; \ +} + +#define TABLE_LOOKUP_STRING_FUNC(field_name, value) gchar * \ @@ -2238,7 +2137,7 @@ index 0000000..661e6fd @@ -0,0 +1 @@ +Configuration cheader_filename="libgnomekbd/gkbd-configuration.h" diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am -index 0fb9d3c..b6907d7 100644 +index 0fb9d3c..33aaaa3 100644 --- a/ui/gtk3/Makefile.am +++ b/ui/gtk3/Makefile.am @@ -42,6 +42,9 @@ INCLUDES = \ @@ -2262,7 +2161,7 @@ index 0fb9d3c..b6907d7 100644 -Wno-unused-variable \ -Wno-unused-but-set-variable \ -Wno-unused-function \ -@@ -86,6 +93,7 @@ ibus_ui_gtk3_SOURCES = \ +@@ -86,6 +93,7 @@ ibus_ui_gtk3_valas = \ application.vala \ candidatearea.vala \ candidatepanel.vala \ @@ -2270,15 +2169,15 @@ index 0fb9d3c..b6907d7 100644 handle.vala \ iconwidget.vala \ keybindingmanager.vala \ -@@ -94,6 +102,7 @@ ibus_ui_gtk3_SOURCES = \ +@@ -94,6 +102,7 @@ ibus_ui_gtk3_valas = \ property.vala \ separator.vala \ switcher.vala \ + xkblayout.vala \ - grabkeycode.c \ $(NULL) + ibus_ui_gtk3_vala_cfiles = $(ibus_ui_gtk3_valas:.vala=.c) -@@ -101,11 +110,49 @@ ibus_ui_gtk3_LDADD = \ +@@ -106,12 +115,48 @@ ibus_ui_gtk3_LDADD = \ $(AM_LDADD) \ $(NULL) @@ -2300,8 +2199,6 @@ index 0fb9d3c..b6907d7 100644 + --pkg=gkbd \ + $(NULL) + -+VAPIGEN = vapigen -+ +$(srcdir)/gkbd.vapi: + $(VAPIGEN) --metadatadir . --library gkbd \ + --pkg gtk+-3.0 --pkg glib-2.0 --pkg gmodule-2.0 \ @@ -2319,6 +2216,7 @@ index 0fb9d3c..b6907d7 100644 + gkbd.vapi \ + gkbdlayout.vala \ gtkpanel.xml \ + $(ibus_ui_gtk3_vala_cfiles) \ $(NULL) EXTRA_DIST = \ @@ -2515,7 +2413,7 @@ index 0000000..adacd81 + */ +} diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala -index e851b24..7c5b4ed 100644 +index b83d7e3..2a386a0 100644 --- a/ui/gtk3/panel.vala +++ b/ui/gtk3/panel.vala @@ -40,8 +40,16 @@ class Panel : IBus.PanelService { @@ -2535,7 +2433,7 @@ index e851b24..7c5b4ed 100644 public Panel(IBus.Bus bus) { GLib.assert(bus.is_connected()); -@@ -63,13 +71,6 @@ class Panel : IBus.PanelService { +@@ -65,13 +73,6 @@ class Panel : IBus.PanelService { m_switcher = new Switcher(); @@ -2549,7 +2447,7 @@ index e851b24..7c5b4ed 100644 m_property_manager = new PropertyManager(); m_property_manager.property_activate.connect((k, s) => { property_activate(k, s); -@@ -80,8 +81,66 @@ class Panel : IBus.PanelService { +@@ -82,8 +83,66 @@ class Panel : IBus.PanelService { ~Panel() { var keybinding_manager = KeybindingManager.get_instance(); @@ -2618,7 +2516,7 @@ index e851b24..7c5b4ed 100644 } public void set_config(IBus.Config config) { -@@ -91,8 +150,10 @@ class Panel : IBus.PanelService { +@@ -93,8 +152,10 @@ class Panel : IBus.PanelService { } m_config = config; @@ -2629,7 +2527,7 @@ index e851b24..7c5b4ed 100644 update_engines(m_config.get_value("general", "preload_engines"), m_config.get_value("general", "engines_order")); } else { -@@ -100,6 +161,191 @@ class Panel : IBus.PanelService { +@@ -102,6 +163,192 @@ class Panel : IBus.PanelService { } } @@ -2696,13 +2594,13 @@ index e851b24..7c5b4ed 100644 + string[] var_xkb_engine_names = {}; + for (int i = 0; i < m_layouts.length; i++) { + string name = m_layouts[i]; -+ unowned GLib.List langs = null; + string lang = null; + + if (i < m_variants.length && m_variants[i] != "") { + name = "%s:%s".printf(name, m_variants[i]); + string layout = "%s(%s)".printf(name, m_variants[i]); -+ langs = registry.layout_lang_get_langs(layout); ++ GLib.List langs = ++ registry.layout_lang_get_langs(layout); + if (langs.length() != 0) { + lang = langs.data; + } @@ -2711,7 +2609,8 @@ index e851b24..7c5b4ed 100644 + } + + if (lang == null) { -+ langs = registry.layout_lang_get_langs(m_layouts[i]); ++ GLib.List langs = ++ registry.layout_lang_get_langs(m_layouts[i]); + if (langs.length() != 0) { + lang = langs.data; + } @@ -2821,7 +2720,7 @@ index e851b24..7c5b4ed 100644 private void switch_engine(int i, bool force = false) { GLib.assert(i >= 0 && i < m_engines.length); -@@ -119,15 +365,7 @@ class Panel : IBus.PanelService { +@@ -121,15 +368,7 @@ class Panel : IBus.PanelService { return; } // set xkb layout @@ -3311,5 +3210,5 @@ index 0000000..8b75387 + */ +} -- -1.7.7.4 +1.7.9.1 diff --git a/ibus-HEAD.patch b/ibus-HEAD.patch index 64b9ea8..8b13789 100644 --- a/ibus-HEAD.patch +++ b/ibus-HEAD.patch @@ -1,48 +1 @@ ---- ibus/ui/gtk3/candidatepanel.vala.orig 2012-02-04 09:11:06.233979510 +0900 -+++ ibus/ui/gtk3/candidatepanel.vala 2012-02-04 09:16:18.813558453 +0900 -@@ -20,6 +20,7 @@ - * Boston, MA 02111-1307 USA - */ - -+using Cairo; - using Gtk; - using Pango; - -@@ -33,7 +34,7 @@ public class CandidatePanel : Gtk.HBox{ - private CandidateArea m_candidate_area; - private HSeparator m_hseparator; - -- private Gdk.Rectangle m_cursor_location; -+ private Cairo.RectangleInt m_cursor_location; - - public signal void cursor_up(); - public signal void cursor_down(); -@@ -80,7 +81,7 @@ public class CandidatePanel : Gtk.HBox{ - } - - public void set_cursor_location(int x, int y, int width, int height) { -- Gdk.Rectangle location = { x, y, width, height }; -+ Cairo.RectangleInt location = { x, y, width, height }; - if (m_cursor_location == location) - return; - m_cursor_location = location; ---- ibus/ui/gtk3/handle.vala.orig 2012-02-04 08:36:38.812523442 +0900 -+++ ibus/ui/gtk3/handle.vala 2012-02-04 09:10:36.858017677 +0900 -@@ -26,7 +26,7 @@ using Gtk; - - class Handle : Gtk.EventBox { - private bool m_move_begined; -- private Gdk.Rectangle m_workarea; -+ private Cairo.RectangleInt m_workarea; - private Gdk.Point m_press_pos; - - public signal void move_begin(); -@@ -153,7 +153,7 @@ class Handle : Gtk.EventBox { - Gtk.StyleContext context = get_style_context(); - Gtk.Allocation allocation; - get_allocation(out allocation); -- Gtk.render_handle(context, cr, -+ context.render_handle(cr, - allocation.x, allocation.y + (allocation.height - 40) / 2, allocation.width, 40.0); - } - return false; + diff --git a/ibus-xx-setup-frequent-lang.patch b/ibus-xx-setup-frequent-lang.patch index 4a6adbc..d487c37 100644 --- a/ibus-xx-setup-frequent-lang.patch +++ b/ibus-xx-setup-frequent-lang.patch @@ -1,8 +1,8 @@ -From 723721bd15eb80da9f735ac4feba4f25306ba965 Mon Sep 17 00:00:00 2001 +From fc525080c668267339baef480f53bdb8256f3239 Mon Sep 17 00:00:00 2001 From: fujiwarat -Date: Tue, 7 Feb 2012 20:15:18 +0900 -Subject: [PATCH] Enable ibus-setup to show the frequently used languages only - in IME list. +Date: Sun, 4 Mar 2012 20:18:30 +0900 +Subject: [PATCH] Enable ibus-setup to show the frequently used languages + only in IME list. --- data/ibus.schemas.in | 168 +++++++++++++++++++++++++++++++++++++++++++++++ @@ -11,10 +11,10 @@ Subject: [PATCH] Enable ibus-setup to show the frequently used languages only 3 files changed, 300 insertions(+), 25 deletions(-) diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in -index 34de9b4..bf50645 100644 +index 3ca0fbc..a3a9a5f 100644 --- a/data/ibus.schemas.in +++ b/data/ibus.schemas.in -@@ -260,6 +260,174 @@ se,si,sk,sy,sy(ku),th,tj,tr,ua,uz,vn +@@ -272,6 +272,174 @@ se,si,sk,sy,sy(ku),th,tj,tr,ua,uz,vn @@ -412,7 +412,7 @@ index 0ac7368..9af2651 100644 return self.get_property("active-engine") diff --git a/setup/main.py b/setup/main.py -index bbc5422..9456e01 100644 +index e3027a5..614737f 100644 --- a/setup/main.py +++ b/setup/main.py @@ -197,6 +197,7 @@ class Setup(object): @@ -424,5 +424,5 @@ index bbc5422..9456e01 100644 tmp_dict = {} -- -1.7.7.4 +1.7.9.1 diff --git a/ibus.spec b/ibus.spec index 83f6f60..2a51d13 100644 --- a/ibus.spec +++ b/ibus.spec @@ -5,6 +5,8 @@ %define have_libxkbfile 1 %define have_gjsfile 1 %define have_dconf 1 +%define have_pygobject2 1 +%define have_pygobject3 1 %if 0%{?fedora} > 16 %define ibus_gjs_version 3.3.3.20120203 @@ -22,8 +24,8 @@ %define gnome_icon_theme_legacy_version 2.91.6 Name: ibus -Version: 1.4.99.20120203 -Release: 3%{?dist} +Version: 1.4.99.20120304 +Release: 1%{?dist} Summary: Intelligent Input Bus for Linux OS License: LGPLv2+ Group: System Environment/Libraries @@ -34,7 +36,7 @@ Source1: xinput-ibus %if %have_gjsfile Source2: http://fujiwara.fedorapeople.org/ibus/gnome-shell/ibus-gjs-%{ibus_gjs_version}.tar.gz %endif -Patch0: ibus-HEAD.patch +# Patch0: ibus-HEAD.patch Patch1: ibus-541492-xkb.patch Patch2: ibus-xx-setup-frequent-lang.patch # Patch3: ibus-530711-preload-sys.patch @@ -69,7 +71,9 @@ BuildRequires: vala-tools %endif # for AM_GCONF_SOURCE_2 in configure.ac BuildRequires: GConf2-devel -BuildRequires: pygobject2-devel +%if %have_pygobject3 +BuildRequires: pygobject3-devel +%endif BuildRequires: intltool BuildRequires: iso-codes-devel %if %have_libxkbfile @@ -88,7 +92,12 @@ Requires: %{name}-gtk2 = %{version}-%{release} Requires: %{name}-gtk3 = %{version}-%{release} %endif +%if %have_pygobject2 Requires: pygtk2 +%endif +%if %have_pygobject3 +Requires: pygobject3 +%endif Requires: pyxdg Requires: iso-codes Requires: dbus-python >= %{dbus_python_version} @@ -198,11 +207,12 @@ cd $d cd .. %endif %endif -%patch0 -p1 +# %patch0 -p1 %patch92 -p1 -b .g-s-preedit cp client/gtk2/ibusimcontext.c client/gtk3/ibusimcontext.c || %if %have_libxkbfile %patch1 -p1 -b .xkb +rm -f bindings/vala/ibus-1.0.vapi %endif %patch2 -p1 -b .setup-frequent-lang # %patch3 -p1 -b .preload-sys @@ -224,10 +234,7 @@ XKB_PRELOAD_LAYOUTS=\ "me,mk,mm,mt,mv,ng,ng(hausa),ng,ng(igbo),ng(yoruba),nl,no,no(smi),np,"\ "pk,pl,pl(csb),pt,ro,rs,ru,ru(cv),ru(kom),ru(sah),ru(tt),ru(xal),"\ "se,si,sk,sy,sy(ku),th,tj,tr,ua,uz,vn" -aclocal -I m4 -autoheader -autoconf -f -automake -a -c -f +autoreconf -f -i %endif %configure \ --disable-static \ @@ -246,7 +253,9 @@ automake -a -c -f --enable-dconf \ --disable-gconf \ %endif +%if %have_pygobject2 --enable-python-library \ +%endif --enable-introspection # make -C po update-gmo @@ -382,13 +391,17 @@ fi %files -f %{name}10.lang %defattr(-,root,root,-) %doc AUTHORS COPYING README +%if %have_pygobject2 %dir %{python_sitelib}/ibus %{python_sitelib}/ibus/* +%endif %dir %{_datadir}/ibus/ %{_bindir}/ibus %{_bindir}/ibus-daemon %{_bindir}/ibus-setup +%if %have_pygobject3 %{_datadir}/ibus/* +%endif %{_datadir}/applications/* %{_datadir}/icons/hicolor/*/apps/* %if %have_dconf @@ -417,7 +430,9 @@ fi %files libs %defattr(-,root,root,-) %{_libdir}/libibus-%{ibus_api_version}.so.* +%if %have_pygobject3 %{_libdir}/girepository-1.0/IBus-1.0.typelib +%endif %files gtk2 %defattr(-,root,root,-) @@ -446,6 +461,9 @@ fi %{_datadir}/gtk-doc/html/* %changelog +* Sun Mar 04 2012 Takao Fujiwara - 1.4.99.20120303-1 +- Bumped to 1.4.99.20120303 + * Wed Feb 08 2012 Takao Fujiwara - 1.4.99.20120203-3 - Fixed ibus-setup on C locale - Fixed to show no registered engines from g-c-c. diff --git a/sources b/sources index db62827..fcece4e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -675136bba0b04c922cca44eecd0bc421 ibus-1.4.99.20120203.tar.gz +28c77ed889dbe25525fde12e58f1402b ibus-1.4.99.20120304.tar.gz 8c713e47d403482cdd8b851dda3d0713 ibus-gjs-3.3.3.20120203.tar.gz 2d2ad58e3e41429dbd883ba7e501c9b2 ibus-gjs-3.2.1.20111230.tar.gz