diff --git a/.gitignore b/.gitignore index cf9a11b..7b81f71 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ ibus-1.3.6.tar.gz /ibus-1.5.3.tar.gz /ibus-1.5.4.tar.gz /ibus-1.5.5.tar.gz +/ibus-1.5.6.tar.gz diff --git a/ibus-530711-preload-sys.patch b/ibus-530711-preload-sys.patch index 57eaced..790cbe0 100644 --- a/ibus-530711-preload-sys.patch +++ b/ibus-530711-preload-sys.patch @@ -172,11 +172,11 @@ diff --git a/setup/setup.ui b/setup/setup.ui index 65dcee4..a6a001b 100644 --- a/setup/setup.ui +++ b/setup/setup.ui -@@ -669,7 +669,23 @@ +@@ -677,7 +677,23 @@ True False -- +- + + True + Customize active input _methods @@ -193,11 +193,11 @@ index 65dcee4..a6a001b 100644 + + + -+ ++ + horizontal True False - -@@ -858,7 +874,7 @@ +@@ -868,7 +884,7 @@ True True @@ -206,7 +206,7 @@ index 65dcee4..a6a001b 100644 -@@ -905,7 +921,7 @@ +@@ -916,7 +932,7 @@ False True @@ -240,7 +240,7 @@ diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala index 1da7966..fc60fd4 100644 --- a/ui/gtk3/panel.vala +++ b/ui/gtk3/panel.vala -@@ -136,6 +136,10 @@ class Panel : IBus.PanelService { +@@ -141,6 +141,10 @@ class Panel : IBus.PanelService { null); }); @@ -251,7 +251,7 @@ index 1da7966..fc60fd4 100644 m_settings_general.changed["switcher-delay-time"].connect((key) => { set_switcher_delay_time(); }); -@@ -524,7 +528,96 @@ class Panel : IBus.PanelService { +@@ -569,7 +573,96 @@ class Panel : IBus.PanelService { init_gkbd(); } diff --git a/ibus-541492-xkb.patch b/ibus-541492-xkb.patch index 397708e..862bd4a 100644 --- a/ibus-541492-xkb.patch +++ b/ibus-541492-xkb.patch @@ -179,7 +179,7 @@ index d71c415..779e29e 100644 # GObject introspection GOBJECT_INTROSPECTION_CHECK([0.6.8]) -@@ -619,6 +658,7 @@ Build options: +@@ -640,6 +679,7 @@ Build options: Panel icon "$IBUS_ICON_KEYBOARD" Enable surrounding-text $enable_surrounding_text Enable libnotify $enable_libnotify @@ -1015,25 +1015,25 @@ diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am index 6012cfa..3dfa0df 100644 --- a/ui/gtk3/Makefile.am +++ b/ui/gtk3/Makefile.am -@@ -44,6 +44,8 @@ AM_CPPFLAGS = \ - - USE_SYMBOL_ICON = FALSE +@@ -35,6 +35,8 @@ gtkpanel.xml: gtkpanel.xml.in + -e 's|@libexecdir[@]|$(libexecdir)|g' $< > $@.tmp && \ + mv $@.tmp $@ +HAVE_IBUS_GKBD_C = $(strip $(subst false, FALSE, $(subst true, TRUE, $(HAVE_IBUS_GKBD)))) + - AM_CFLAGS = \ - @GLIB2_CFLAGS@ \ - @GIO2_CFLAGS@ \ -@@ -54,6 +56,8 @@ AM_CFLAGS = \ + # force include config.h before gi18n.h. + AM_CPPFLAGS = \ + -I$(top_srcdir)/src \ +@@ -51,6 +53,8 @@ AM_CFLAGS = \ + -DG_LOG_DOMAIN=\"IBUS\" \ -DBINDIR=\"$(bindir)\" \ -DIBUS_DISABLE_DEPRECATED \ - -DSWITCHER_USE_SYMBOL_ICON=$(USE_SYMBOL_ICON) \ + -DHAVE_IBUS_GKBD=$(HAVE_IBUS_GKBD_C) \ + -DXKB_LAYOUTS_MAX_LENGTH=4 \ -Wno-unused-variable \ -Wno-unused-but-set-variable \ -Wno-unused-function \ -@@ -97,12 +101,40 @@ AM_VALAFLAGS += \ +@@ -94,12 +98,40 @@ AM_VALAFLAGS += \ $(NULL) endif @@ -1074,7 +1074,7 @@ index 6012cfa..3dfa0df 100644 handle.vala \ iconwidget.vala \ keybindingmanager.vala \ -@@ -112,6 +144,7 @@ ibus_ui_gtk3_SOURCES = \ +@@ -109,6 +141,7 @@ ibus_ui_gtk3_SOURCES = \ propertypanel.vala \ separator.vala \ switcher.vala \ @@ -1082,7 +1082,7 @@ index 6012cfa..3dfa0df 100644 $(NULL) ibus_ui_gtk3_LDADD = \ -@@ -120,9 +153,12 @@ ibus_ui_gtk3_LDADD = \ +@@ -117,9 +150,12 @@ ibus_ui_gtk3_LDADD = \ CLEANFILES = \ gtkpanel.xml \ @@ -1282,10 +1282,10 @@ diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala index a7a0c40..1da7966 100644 --- a/ui/gtk3/panel.vala +++ b/ui/gtk3/panel.vala -@@ -58,6 +58,13 @@ class Panel : IBus.PanelService { - private Gtk.CssProvider m_css_provider; - private int m_switcher_delay_time = 400; - private bool m_use_system_keyboard_layout = false; +@@ -63,6 +63,13 @@ class Panel : IBus.PanelService { + GLib.str_equal); + private Gdk.RGBA m_xkb_icon_rgba = Gdk.RGBA(){ + red = 0.0, green = 0.0, blue = 0.0, alpha = 1.0 }; + private GkbdLayout m_gkbdlayout = null; + private XKBLayout m_xkblayout = null; + private string[] m_layouts = {}; @@ -1296,7 +1296,7 @@ index a7a0c40..1da7966 100644 private GLib.List m_keybindings = new GLib.List(); -@@ -108,6 +115,14 @@ class Panel : IBus.PanelService { +@@ -113,6 +120,14 @@ class Panel : IBus.PanelService { ~Panel() { unbind_switch_shortcut(); @@ -1311,7 +1311,7 @@ index a7a0c40..1da7966 100644 } private void init_settings() { -@@ -444,6 +459,7 @@ class Panel : IBus.PanelService { +@@ -487,6 +502,7 @@ class Panel : IBus.PanelService { } public void load_settings() { @@ -1319,7 +1319,7 @@ index a7a0c40..1da7966 100644 // Update m_use_system_keyboard_layout before update_engines() // is called. set_use_system_keyboard_layout(); -@@ -463,6 +479,184 @@ class Panel : IBus.PanelService { +@@ -508,6 +524,184 @@ class Panel : IBus.PanelService { set_version(); } @@ -1504,7 +1504,7 @@ index a7a0c40..1da7966 100644 private void exec_setxkbmap(IBus.EngineDesc engine) { string layout = engine.get_layout(); string variant = engine.get_layout_variant(); -@@ -528,7 +722,7 @@ class Panel : IBus.PanelService { +@@ -573,7 +767,7 @@ class Panel : IBus.PanelService { // set xkb layout if (!m_use_system_keyboard_layout) diff --git a/ibus-810211-no-switch-by-no-trigger.patch b/ibus-810211-no-switch-by-no-trigger.patch index c1bea4d..82a2d89 100644 --- a/ibus-810211-no-switch-by-no-trigger.patch +++ b/ibus-810211-no-switch-by-no-trigger.patch @@ -22,7 +22,7 @@ index 4a02743..c606682 100644 @@ -378,6 +379,11 @@ class Switcher : Gtk.Window { break; default: - debug("0x%04x", pe->keyval); + debug("0x%04x", pe.keyval); + if (m_loop != null) { + m_loop.quit(); + m_loop = null; diff --git a/ibus-HEAD.patch b/ibus-HEAD.patch index 92c5a2b..8b13789 100644 --- a/ibus-HEAD.patch +++ b/ibus-HEAD.patch @@ -1,530 +1 @@ -From e6ec45d64a32d16245770f8b80e795a63e6ad553 Mon Sep 17 00:00:00 2001 -From: Colin Walters -Date: Thu, 16 Jan 2014 13:22:12 +0900 -Subject: [PATCH] data/dconf: Don't run "dconf update" if $(DESTDIR) is set - -dconf changed as of -https://git.gnome.org/browse/dconf/commit/?id=c211fc46496597c7ddabd73d623bae4037754916 -to actually emit an error if /etc/dconf/db is empty. When building -ibus in a system such as dpkg/rpm or gnome-continuous, there may -actually be nothing in that directory in the buildroot. - -This will now cause "dconf update" as executed by this Makefile to -fail. The fix is to just check $(DESTDIR), like we should do for all -triggers (e.g. gtk-update-icon-cache too). It's never useful to -execute these from per-component Makefiles if $(DESTDIR) is set. - -Instead, these meta-build systems (dpkg/rpm/jhbuild/Continuous) all -take care of execution of triggers on their own. - -Review URL: https://codereview.appspot.com/51730044 -Patch from Colin Walters . ---- - data/dconf/Makefile.am | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/data/dconf/Makefile.am b/data/dconf/Makefile.am -index c841a34..62c20a3 100644 ---- a/data/dconf/Makefile.am -+++ b/data/dconf/Makefile.am -@@ -61,6 +61,8 @@ org.freedesktop.ibus.gschema.xml.in: $(top_srcdir)/data/ibus.schemas.in - { rc=$$?; $(RM) -rf $@; exit $$rc; } - - install-data-hook: -- dconf update -+ if test -z "$(DESTDIR)"; then \ -+ dconf update; \ -+ fi - - -include $(top_srcdir)/git.mk --- -1.8.0 - -From 8468de2f165ca7dba45b13cec09fdcde83a88204 Mon Sep 17 00:00:00 2001 -From: fujiwarat -Date: Fri, 24 Jan 2014 11:11:40 +0900 -Subject: [PATCH 1/2] Enable python3 ibus-setup. - -The default uses 'python' and if the path of python 3 is 'python3', -./configure --with-python=python3 - -Review URL: https://codereview.appspot.com/54930043 ---- - configure.ac | 8 ++++++++ - setup/enginecombobox.py | 25 +++++++++++++++++-------- - setup/enginetreeview.py | 13 +++++++------ - setup/keyboardshortcut.py | 10 +++++----- - setup/main.py | 21 ++++++++++++--------- - 5 files changed, 49 insertions(+), 28 deletions(-) - -diff --git a/configure.ac b/configure.ac -index b7ef1eb..73d99ee 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -372,6 +372,13 @@ AM_CONDITIONAL([ENABLE_PYTHON_LIBRARY], [test x"$enable_python_library" = x"yes" - AM_CONDITIONAL([ENABLE_SETUP], [test x"$enable_setup" = x"yes"]) - AM_CONDITIONAL([ENABLE_DAEMON], [true]) - -+# Define python version -+AC_ARG_WITH(python, -+ AS_HELP_STRING([--with-python[=PATH]], -+ [Select python2 or python3]), -+ [PYTHON=$with_python], [] -+) -+ - AM_PATH_PYTHON([2.5]) - - PYGOBJECT_REQUIRED=3.0.0 -@@ -598,6 +605,7 @@ Build options: - Build shared libs $enable_shared - Build static libs $enable_static - CFLAGS $CFLAGS -+ python $PYTHON - Gtk2 immodule dir $GTK2_IM_MODULEDIR - Gtk3 immodule dir $GTK3_IM_MODULEDIR - Build gtk2 immodule $enable_gtk2 -diff --git a/setup/enginecombobox.py b/setup/enginecombobox.py -index b45ad56..2a2a677 100644 ---- a/setup/enginecombobox.py -+++ b/setup/enginecombobox.py -@@ -2,8 +2,8 @@ - # - # ibus - The Input Bus - # --# Copyright (c) 2007-2010 Peng Huang --# Copyright (c) 2007-2010 Red Hat, Inc. -+# Copyright (c) 2007-2014 Peng Huang -+# Copyright (c) 2007-2014 Red Hat, Inc. - # - # This library is free software; you can redistribute it and/or - # modify it under the terms of the GNU Lesser General Public -@@ -21,6 +21,8 @@ - # USA - - import locale -+import functools -+import sys - - from gi.repository import GObject - from gi.repository import Gtk -@@ -72,8 +74,8 @@ class EngineComboBox(Gtk.ComboBox): - langs[l] = [] - langs[l].append(e) - -- keys = langs.keys() -- keys.sort(locale.strcoll) -+ keys = list(langs.keys()) -+ keys.sort(key=functools.cmp_to_key(locale.strcoll)) - loc = locale.getlocale()[0] - # None on C locale - if loc == None: -@@ -95,7 +97,7 @@ class EngineComboBox(Gtk.ComboBox): - if a.get_rank() == b.get_rank(): - return locale.strcoll(a.get_longname(), b.get_longname()) - return int(b.get_rank() - a.get_rank()) -- langs[l].sort(cmp_engine) -+ langs[l].sort(key=functools.cmp_to_key(cmp_engine)) - for e in langs[l]: - iter2 = self.__model.append(iter1) - self.__model.set(iter2, 0, e) -@@ -106,7 +108,10 @@ class EngineComboBox(Gtk.ComboBox): - def __icon_cell_data_cb(self, celllayout, renderer, model, iter, data): - engine = self.__model.get_value(iter, 0) - -- if isinstance(engine, str) or isinstance (engine, unicode): -+ if isinstance(engine, str): -+ renderer.set_property("visible", False) -+ renderer.set_property("sensitive", False) -+ elif sys.version < '3' and isinstance (engine, unicode): - renderer.set_property("visible", False) - renderer.set_property("sensitive", False) - elif isinstance(engine, int): -@@ -121,7 +126,11 @@ class EngineComboBox(Gtk.ComboBox): - def __name_cell_data_cb(self, celllayout, renderer, model, iter, data): - engine = self.__model.get_value(iter, 0) - -- if isinstance (engine, str) or isinstance (engine, unicode): -+ if isinstance (engine, str): -+ renderer.set_property("sensitive", False) -+ renderer.set_property("text", engine) -+ renderer.set_property("weight", Pango.Weight.NORMAL) -+ elif sys.version < '3' and isinstance (engine, unicode): - renderer.set_property("sensitive", False) - renderer.set_property("text", engine) - renderer.set_property("weight", Pango.Weight.NORMAL) -@@ -146,7 +155,7 @@ class EngineComboBox(Gtk.ComboBox): - iter = self.get_active_iter() - return self.get_model()[iter][0] - else: -- raise AttributeError, 'unknown property %s' % property.name -+ raise AttributeError('unknown property %s' % property.name) - - def get_active_engine(self): - return self.get_property("active-engine") -diff --git a/setup/enginetreeview.py b/setup/enginetreeview.py -index f8ee092..b116c54 100644 ---- a/setup/enginetreeview.py -+++ b/setup/enginetreeview.py -@@ -2,8 +2,8 @@ - # - # ibus - The Input Bus - # --# Copyright (c) 2007-2010 Peng Huang --# Copyright (c) 2007-2010 Red Hat, Inc. -+# Copyright (c) 2007-2014 Peng Huang -+# Copyright (c) 2007-2014 Red Hat, Inc. - # - # This library is free software; you can redistribute it and/or - # modify it under the terms of the GNU Lesser General Public -@@ -108,7 +108,8 @@ class EngineTreeView(Gtk.TreeView): - language_b = IBus.get_language_name(engine_b.get_language()) - label_a = "%s - %s" % (language_a, engine_a.get_longname()) - label_b = "%s - %s" % (language_b, engine_b.get_longname()) -- return cmp(label_a, label_b) -+ # http://docs.python.org/3.0/whatsnew/3.0.html#ordering-comparisons -+ return (label_a > label_b) - (label_a < label_b) - - def __selection_changed_cb(self, *args): - self.notify("active-engine"); -@@ -173,15 +174,15 @@ class EngineTreeView(Gtk.TreeView): - engines = [ r[0] for r in self.__model if r[0] != None] - return engines - else: -- raise AttributeError, 'unknown property %s' % prop.name -+ raise AttributeError('unknown property %s' % prop.name) - - def do_set_property(self, prop, value): - if prop.name == "active-engine": -- raise AttributeError, "active-engine is readonly" -+ raise AttributeError("active-engine is readonly") - elif prop.name == "engines": - set_engines(value) - else: -- raise AttributeError, 'unknown property %s' % prop.name -+ raise AttributeError('unknown property %s' % prop.name) - - def set_engines(self, engines): - self.__model.clear() -diff --git a/setup/keyboardshortcut.py b/setup/keyboardshortcut.py -index 1a88525..26bd77f 100644 ---- a/setup/keyboardshortcut.py -+++ b/setup/keyboardshortcut.py -@@ -2,8 +2,8 @@ - # - # ibus - The Input Bus - # --# Copyright (c) 2007-2010 Peng Huang --# Copyright (c) 2007-2010 Red Hat, Inc. -+# Copyright (c) 2007-2014 Peng Huang -+# Copyright (c) 2007-2014 Red Hat, Inc. - # - # This library is free software; you can redistribute it and/or - # modify it under the terms of the GNU Lesser General Public -@@ -182,7 +182,7 @@ class KeyboardShortcutSelection(Gtk.VBox): - modifiers.append(name) - if keycode.startswith("_"): - keycode = keycode[1:] -- shortcut = "".join(map(lambda m: '<' + m + '>', modifiers)) -+ shortcut = "".join(['<' + m + '>' for m in modifiers]) - shortcut += keycode - return shortcut - -@@ -335,6 +335,6 @@ if __name__ == "__main__": - Gtk.STOCK_OK, Gtk.ResponseType.OK)) - dlg.add_shortcut("Control+Shift+space") - dlg.set_shortcuts(None) -- print dlg.run() -- print dlg.get_shortcuts() -+ print((dlg.run())) -+ print((dlg.get_shortcuts())) - -diff --git a/setup/main.py b/setup/main.py -index d3f4414..cac10de 100644 ---- a/setup/main.py -+++ b/setup/main.py -@@ -2,8 +2,8 @@ - # - # ibus - The Input Bus - # --# Copyright (c) 2007-2010 Peng Huang --# Copyright (c) 2007-2010 Red Hat, Inc. -+# Copyright (c) 2007-2014 Peng Huang -+# Copyright (c) 2007-2014 Red Hat, Inc. - # - # This library is free software; you can redistribute it and/or - # modify it under the terms of the GNU Lesser General Public -@@ -20,6 +20,9 @@ - # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - # USA - -+# for python2 -+from __future__ import print_function -+ - import os - import signal - import sys -@@ -45,7 +48,7 @@ from i18n import DOMAINNAME, _, N_, init as i18n_init - COLUMN_VISIBLE, - COLUMN_ICON, - COLUMN_DATA, --) = range(6) -+) = list(range(6)) - - ( - DATA_NAME, -@@ -57,7 +60,7 @@ from i18n import DOMAINNAME, _, N_, init as i18n_init - DATA_EXEC, - DATA_STARTED, - DATA_PRELOAD --) = range(9) -+) = list(range(9)) - - class Setup(object): - def __flush_gtk_events(self): -@@ -286,7 +289,7 @@ class Setup(object): - obj.set_sensitive(False) - - if prop.name == "engines": -- engine_names = map(lambda e: e.get_name(), engines) -+ engine_names = [e.get_name() for e in engines] - self.__settings_general.set_strv('preload-engines', engine_names) - - def __button_engine_add_cb(self, button): -@@ -306,7 +309,7 @@ class Setup(object): - if len(args) == 0: - return - name = engine.get_name() -- if name in self.__engine_setup_exec_list.keys(): -+ if name in list(self.__engine_setup_exec_list.keys()): - try: - wpid, sts = os.waitpid(self.__engine_setup_exec_list[name], - os.WNOHANG) -@@ -402,7 +405,7 @@ class Setup(object): - if data[DATA_STARTED] == False: - try: - self.__bus.register_start_engine(data[DATA_LANG], data[DATA_NAME]) -- except Exception, e: -+ except Exception as e: - dlg = Gtk.MessageDialog(type = Gtk.MessageType.ERROR, - buttons = Gtk.ButtonsType.CLOSE, - message_format = str(e)) -@@ -413,7 +416,7 @@ class Setup(object): - else: - try: - self.__bus.register_stop_engine(data[DATA_LANG], data[DATA_NAME]) -- except Exception, e: -+ except Exception as e: - dlg = Gtk.MessageDialog(type = Gtk.MessageType.ERROR, - buttons = Gtk.ButtonsType.CLOSE, - message_format = str(e)) -@@ -492,7 +495,7 @@ if __name__ == "__main__": - try: - locale.setlocale(locale.LC_ALL, '') - except locale.Error: -- print >> sys.stderr, "Using the fallback 'C' locale" -+ print("Using the fallback 'C' locale", file=sys.stderr) - locale.setlocale(locale.LC_ALL, 'C') - - i18n_init() --- -1.8.0 - -From e2cd8f0870d8b15af71e839f9035dce333af3c4e Mon Sep 17 00:00:00 2001 -From: fujiwarat -Date: Mon, 27 Jan 2014 11:38:46 +0900 -Subject: [PATCH 2/2] Install IBus.py in python2 gi.override. - -Review URL: https://codereview.appspot.com/56510043 ---- - bindings/pygobject/Makefile.am | 5 +++++ - configure.ac | 13 ++++++++++--- - 2 files changed, 15 insertions(+), 3 deletions(-) - -diff --git a/bindings/pygobject/Makefile.am b/bindings/pygobject/Makefile.am -index fc23209..d257b04 100644 ---- a/bindings/pygobject/Makefile.am -+++ b/bindings/pygobject/Makefile.am -@@ -22,6 +22,11 @@ - - NULL = - -+overrides2dir = $(py2overridesdir) -+overrides2_DATA = \ -+ gi/overrides/IBus.py \ -+ $(NULL) -+ - overridesdir = $(pyoverridesdir) - overrides_PYTHON = \ - gi/overrides/IBus.py \ -diff --git a/configure.ac b/configure.ac -index 73d99ee..43071bc 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -380,6 +380,7 @@ AC_ARG_WITH(python, - ) - - AM_PATH_PYTHON([2.5]) -+AC_PATH_PROG(PYTHON2, python2) - - PYGOBJECT_REQUIRED=3.0.0 - -@@ -387,10 +388,16 @@ PKG_CHECK_EXISTS([pygobject-3.0 >= $PYGOBJECT_REQUIRED], - [enable_pygobject=yes], [enable_pygobject=no]) - - if test "x$enable_pygobject" = "xyes"; then -- PKG_CHECK_MODULES(PYTHON, [pygobject-3.0 >= $PYGOBJECT_REQUIRED]) -+ PKG_CHECK_MODULES(PYTHON, [pygobject-3.0 >= $PYGOBJECT_REQUIRED]) - -- pyoverridesdir=`$PYTHON -c "import gi; print(gi._overridesdir)"` -- AC_SUBST(pyoverridesdir) -+ pyoverridesdir=`$PYTHON -c "import gi; print(gi._overridesdir)"` -+ AC_SUBST(pyoverridesdir) -+ -+ py2overridesdir="$pyoverridesdir" -+ if test x"$PYTHON2" != x""; then -+ py2overridesdir=`$PYTHON2 -c "import gi; print(gi._overridesdir)"` -+ fi -+ AC_SUBST(py2overridesdir) - fi - - AM_CONDITIONAL(ENABLE_PYGOBJECT, test x"$enable_pygobject" = "xyes") --- -1.8.0 - -From 256e207d9574838c9ed5f9400eddc5ff2cbbec59 Mon Sep 17 00:00:00 2001 -From: fujiwarat -Date: Fri, 31 Jan 2014 16:10:07 +0900 -Subject: [PATCH] Install pygtk2 libraries to python2 site-packages. - ---- - bindings/pygobject/Makefile.am | 11 +++++++++++ - configure.ac | 19 ++++++++++++++----- - ibus/Makefile.am | 4 +++- - ibus/interface/Makefile.am | 4 +++- - 4 files changed, 31 insertions(+), 7 deletions(-) - -diff --git a/bindings/pygobject/Makefile.am b/bindings/pygobject/Makefile.am -index d257b04..aa4c330 100644 ---- a/bindings/pygobject/Makefile.am -+++ b/bindings/pygobject/Makefile.am -@@ -22,6 +22,7 @@ - - NULL = - -+am__py2_compile = PYTHON=$(PYTHON2) $(SHELL) $(py_compile) - overrides2dir = $(py2overridesdir) - overrides2_DATA = \ - gi/overrides/IBus.py \ -@@ -52,4 +53,14 @@ EXTRA_DIST = \ - test-override-ibus.py \ - $(NULL) - -+install-data-hook: -+ for data in $(overrides2_DATA); do \ -+ file=`echo $$data | sed -e 's|^.*/||'`; \ -+ dlist="$$dlist $$file"; \ -+ done; \ -+ $(am__py2_compile) --destdir "$(DESTDIR)" \ -+ --basedir "$(overrides2dir)" \ -+ $$dlist -+ $(NULL) -+ - -include $(top_srcdir)/git.mk -diff --git a/configure.ac b/configure.ac -index 43071bc..03e4725 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -382,6 +382,10 @@ AC_ARG_WITH(python, - AM_PATH_PYTHON([2.5]) - AC_PATH_PROG(PYTHON2, python2) - -+if test x"$PYTHON2" = x""; then -+ PYTHON2=$PYTHON -+fi -+ - PYGOBJECT_REQUIRED=3.0.0 - - PKG_CHECK_EXISTS([pygobject-3.0 >= $PYGOBJECT_REQUIRED], -@@ -393,10 +397,7 @@ if test "x$enable_pygobject" = "xyes"; then - pyoverridesdir=`$PYTHON -c "import gi; print(gi._overridesdir)"` - AC_SUBST(pyoverridesdir) - -- py2overridesdir="$pyoverridesdir" -- if test x"$PYTHON2" != x""; then -- py2overridesdir=`$PYTHON2 -c "import gi; print(gi._overridesdir)"` -- fi -+ py2overridesdir=`$PYTHON2 -c "import gi; print(gi._overridesdir)"` - AC_SUBST(py2overridesdir) - fi - -@@ -419,6 +420,13 @@ if test x"$enable_python_library" = x"yes"; then - AC_SUBST(PYTHON_CFLAGS) - AC_SUBST(PYTHON_INCLUDES) - AC_SUBST(PYTHON_LIBS) -+ -+ PYTHON2_PREFIX=`$PYTHON2 -c "import sys; sys.stdout.write(sys.prefix)"` -+ PYTHON2_VERSION=`$PYTHON2 -c "import sys; sys.stdout.write(sys.version[[:3]])"` -+ PYTHON2_LIBDIR="$PYTHON2_PREFIX/lib/python$PYTHON2_VERSION" -+ python2dir="$PYTHON2_LIBDIR/site-packages" -+ pkgpython2dir="$python2dir/ibus" -+ AC_SUBST(pkgpython2dir) - else - enable_python_library="no (disabled, use --enable-python-library to enable)" - fi -@@ -612,7 +620,8 @@ Build options: - Build shared libs $enable_shared - Build static libs $enable_static - CFLAGS $CFLAGS -- python $PYTHON -+ PYTHON $PYTHON -+ PYTHON2 $PYTHON2 - Gtk2 immodule dir $GTK2_IM_MODULEDIR - Gtk3 immodule dir $GTK3_IM_MODULEDIR - Build gtk2 immodule $enable_gtk2 -diff --git a/ibus/Makefile.am b/ibus/Makefile.am -index f120de1..0edabed 100644 ---- a/ibus/Makefile.am -+++ b/ibus/Makefile.am -@@ -23,6 +23,8 @@ SUBDIRS = \ - interface \ - $(NULL) - -+PYTHON = $(PYTHON2) -+ - ibus_PYTHON = \ - ascii.py \ - application.py \ -@@ -56,7 +58,7 @@ nodist_ibus_PYTHON = \ - _config.py \ - $(NULL) - --ibusdir = @pkgpythondir@ -+ibusdir = @pkgpython2dir@ - - EXTRA_DIST = \ - _config.py.in \ -diff --git a/ibus/interface/Makefile.am b/ibus/interface/Makefile.am -index 6ce510b..de83c77 100644 ---- a/ibus/interface/Makefile.am -+++ b/ibus/interface/Makefile.am -@@ -20,6 +20,8 @@ - # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - # USA - -+PYTHON = $(PYTHON2) -+ - ibus_interface_PYTHON = \ - iconfig.py \ - ienginefactory.py \ -@@ -31,7 +33,7 @@ ibus_interface_PYTHON = \ - __init__.py \ - $(NULL) - --ibus_interfacedir = @pkgpythondir@/interface -+ibus_interfacedir = @pkgpython2dir@/interface - - CLEANFILES = \ - *.pyc \ --- -1.8.0 diff --git a/ibus-xx-ctrl-space.patch b/ibus-xx-ctrl-space.patch deleted file mode 100644 index 00da9b5..0000000 --- a/ibus-xx-ctrl-space.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in -index 007fc66..6c75562 100644 ---- a/data/ibus.schemas.in -+++ b/data/ibus.schemas.in -@@ -143,7 +143,7 @@ se,si,sk,sy,sy(ku),th,tj,tr,ua,uz,vn - ibus - list - string -- [<Super>space] -+ [<Control>space] - - Trigger shortcut keys for gtk_accelerator_parse - The shortcut keys for turning input method on or off -diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala -index 54251e7..867dbd2 100644 ---- a/ui/gtk3/panel.vala -+++ b/ui/gtk3/panel.vala -@@ -354,6 +354,7 @@ class Panel : IBus.PanelService { - } - - private void update_version_1_5_3() { -+#if 0 - #if ENABLE_LIBNOTIFY - if (!Notify.is_initted()) { - Notify.init ("ibus"); -@@ -374,6 +375,7 @@ class Panel : IBus.PanelService { - #else - warning(_("Super+space is now the default hotkey.")); - #endif -+#endif - } - - private void set_version() { diff --git a/ibus-xx-setup-frequent-lang.patch b/ibus-xx-setup-frequent-lang.patch index caaccdd..f96430a 100644 --- a/ibus-xx-setup-frequent-lang.patch +++ b/ibus-xx-setup-frequent-lang.patch @@ -13,7 +13,7 @@ diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in index 28d2219..0600133 100644 --- a/data/ibus.schemas.in +++ b/data/ibus.schemas.in -@@ -351,6 +351,174 @@ se,si,sk,sy,sy(ku),th,tj,tr,ua,uz,vn +@@ -384,6 +384,174 @@ se,si,sk,sy,sy(ku),th,tj,tr,ua,uz,vn @@ -355,7 +355,7 @@ index b45ad56..830f0e8 100644 + else: + pixbuf = load_icon("go-up", Gtk.IconSize.LARGE_TOOLBAR) + if pixbuf == None: -+ pixbuf = load_icon(Gtk.STOCK_MISSING_IMAGE, ++ pixbuf = load_icon("image-missing", + Gtk.IconSize.LARGE_TOOLBAR) + if pixbuf == None: + renderer.set_property("visible", False) diff --git a/ibus.spec b/ibus.spec index 2122939..4bd76c0 100644 --- a/ibus.spec +++ b/ibus.spec @@ -19,6 +19,9 @@ %global ibus_api_version 1.0 %global ibus_xkb_version 1.5.0.20140114 +# for bytecompile in %%{_datadir}/ibus/setup +%global __python %{__python3} + %if %with_pkg_config %{!?gtk2_binary_version: %global gtk2_binary_version %(pkg-config --variable=gtk_binary_version gtk+-2.0)} %{!?gtk3_binary_version: %global gtk3_binary_version %(pkg-config --variable=gtk_binary_version gtk+-3.0)} @@ -32,13 +35,13 @@ %global dbus_python_version 0.83.0 Name: ibus -Version: 1.5.5 -Release: 2%{?dist} +Version: 1.5.6 +Release: 1%{?dist} Summary: Intelligent Input Bus for Linux OS License: LGPLv2+ Group: System Environment/Libraries URL: http://code.google.com/p/ibus/ -Source0: http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz +Source0: https://github.com/ibus/ibus/releases/download/%{version}/%{name}-%{version}.tar.gz Source1: %{name}-xinput Source2: %{name}.conf.5 # Actual path is https://github.com/.../%%{ibus_xkb_version}.tar.gz @@ -46,7 +49,6 @@ Source2: %{name}.conf.5 Source3: https://github.com/ibus/ibus-xkb/archive/ibus-xkb-%{ibus_xkb_version}.tar.gz # Upstreamed patches. # Patch0: %%{name}-HEAD.patch -Patch0: %{name}-HEAD.patch # https://bugzilla.redhat.com/show_bug.cgi?id=810211 Patch1: %{name}-810211-no-switch-by-no-trigger.patch # https://bugzilla.redhat.com/show_bug.cgi?id=541492 @@ -58,8 +60,6 @@ Patch4: %{name}-xx-setup-frequent-lang.patch # Removed the target. # Even if fedpkg srpm's target is rhel, it can run on fedora box. -# Keep the default triggers for the back compatiblity. -Patch95: %{name}-xx-ctrl-space.patch # Disable IME on gnome-shell password for the back compatiblity. Patch96: %{name}-xx-f19-password.patch @@ -250,7 +250,6 @@ The ibus-devel-docs package contains developer documentation for ibus %prep %setup -q # %%patch0 -p1 -%patch0 -p1 %if (0%{?fedora} < 20 && 0%{?rhel} < 8) %patch96 -p1 -b .passwd %endif @@ -265,10 +264,6 @@ rm -f data/dconf/00-upstream-settings %patch3 -p1 -b .preload-sys %patch4 -p1 -b .setup-frequent-lang -%if (0%{?fedora} < 19 && 0%{?rhel} < 7) -%patch95 -p1 -b .ctrl -%endif - zcat %SOURCE3 | tar xf - POS=`(cd ibus-xkb-%ibus_xkb_version/po; ls *.po)` for PO in $POS @@ -411,7 +406,7 @@ fi %{_libexecdir}/ibus-x11 %{_sysconfdir}/dconf/db/ibus.d %{_sysconfdir}/dconf/profile/ibus -%python3_sitearch/gi/overrides/__pycache__ +%python3_sitearch/gi/overrides/__pycache__/*.py* %python3_sitearch/gi/overrides/IBus.py %if ! %with_python2_override_pkg %python2_sitearch/gi/overrides/IBus.py* @@ -468,6 +463,10 @@ fi %{_datadir}/gtk-doc/html/* %changelog +* Thu Mar 06 2014 Takao Fujiwara - 1.5.6-1 +- Bumped to 1.5.6 +- Deleted ibus-xx-ctrl-space.patch + * Fri Jan 31 2014 Takao Fujiwara - 1.5.5-2 - Enabled python3 ibus-setup diff --git a/sources b/sources index 20783d2..9337c96 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -59b8d2fbed3ceb14edac130f882ccfd4 ibus-1.5.5.tar.gz +cd05de3423937928480d53d9f0ade861 ibus-1.5.6.tar.gz c0bc5be7f0c068bea1e4785c5b60694b ibus-xkb-1.5.0.20140114.tar.gz