Accepting request 226660 from home:ftake:branches:M17N

fix typo in changes OBS-URL: https://build.opensuse.org/request/show/226660 OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=99
2014-03-19 05:34:31 +00:00 · 2014-03-19 05:34:31 +00:00 · 6a2b7475c3
commit 6a2b7475c3
parent db19ee0e58
7 changed files with 87 additions and 85 deletions
--- a/add-libgnomekbd-and-load-preload-engines.patch
+++ b/add-libgnomekbd-and-load-preload-engines.patch
@ -1,6 +1,6 @@
-From 8085ca38cb9c2ea370ebe64d80a4d7894a485960 Mon Sep 17 00:00:00 2001
+From 167a8f31107dc3a4c6e06a7cf3674372654db2a9 Mon Sep 17 00:00:00 2001
 From: fujiwarat <takao.fujiwara1@gmail.com>
-Date: Tue, 14 Jan 2014 15:27:50 +0900
+Date: Fri, 7 Mar 2014 16:41:37 +0900
 Subject: [PATCH] Add libgnomekbd and load preload engines.

 ---
@ -130,7 +130,7 @@ index eec6da3..f84c034 100644
             continue;
         g_variant_builder_add (
 diff --git a/configure.ac b/configure.ac
-index d71c415..779e29e 100644
+index 9a502ec..3ec629d 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -261,6 +261,45 @@ else
@ -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
@ -188,7 +188,7 @@ index d71c415..779e29e 100644
 ])
 
 diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in
-index d256cbb..8fd7e15 100644
+index 2f76ce3..caec315 100644
 --- a/data/ibus.schemas.in
 +++ b/data/ibus.schemas.in
@@ -56,6 +56,52 @@
@ -1012,28 +1012,28 @@ index 0000000..5aa486d
 +G_END_DECLS
 +#endif
 diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am
-index 6012cfa..3dfa0df 100644
+index b2fb800..f148202 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 \
@ -1279,13 +1279,13 @@ index 0000000..a6e0f8d
 +    */
 +}
 diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
-index a7a0c40..1da7966 100644
+index 748cb32..2323ac4 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<Keybinding> m_keybindings = new GLib.List<Keybinding>();
 
-@@ -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)
@ -1949,5 +1949,5 @@ index 0000000..b7dfb3e
 +    */
 +}
 -- 
-1.8.5.1
+1.8.5.5

--- a/ibus-1.5.5.tar.gz
+++ b/ibus-1.5.5.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:02ab36af6048399fedbe8d85074b161219b89df5020932df33cf8829764f8aec
-size 2063794
--- a/ibus-1.5.6.tar.gz
+++ b/ibus-1.5.6.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f689fa796ad6a9b841d254a91ce2736381672d110a1fe23ebbeff200911b1b5c
+size 2061466
--- a/ibus-python-install-dir.patch
+++ b/ibus-python-install-dir.patch
@ -1,26 +1,13 @@
-diff --git a/ibus/Makefile.am b/ibus/Makefile.am
-index d1cd750..9910f54 100644
--- a/ibus/Makefile.am
-+++ b/ibus/Makefile.am
-@@ -56,7 +56,7 @@ nodist_ibus_PYTHON = \
- 	_config.py \
- 	$(NULL)
+diff --git a/configure.ac b/configure.ac
+index 9a502ec..42aaadf 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -420,7 +420,7 @@ if test x"$enable_python_library" = x"yes"; then
 
-ibusdir = @pkgpythondir@
-+ibusdir = @pyexecdir@/ibus
- 
- EXTRA_DIST = \
- 	_config.py.in \
-diff --git a/ibus/interface/Makefile.am b/ibus/interface/Makefile.am
-index 49871ed..1fa37e5 100644
--- a/ibus/interface/Makefile.am
-+++ b/ibus/interface/Makefile.am
-@@ -31,7 +31,7 @@ ibus_interface_PYTHON = \
- 	__init__.py \
- 	$(NULL)
- 
-ibus_interfacedir = @pkgpythondir@/interface
-+ibus_interfacedir = @pyexecdir@/ibus/interface
- 
- CLEANFILES = \
- 	*.pyc \
+     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"
+    PYTHON2_LIBDIR="$libdir/python$PYTHON2_VERSION"
+     python2dir="$PYTHON2_LIBDIR/site-packages"
+     pkgpython2dir="$python2dir/ibus"
+     AC_SUBST(pkgpython2dir)
--- a/ibus.changes
+++ b/ibus.changes
@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Mon Mar 17 15:37:25 UTC 2014 - ftake@geeko.jp
+
+- Update to 1.5.6
+  * Support python3 (not enabled for this package)
+  * Fix Property Panel is sometimes not shown when the focus is changed
+  * Let Property Panel not to follow cursor if it is always shown
+  * Fix a build error of Gdk.EventKey with vala 0.23.2
+  * Use XKB layout strings instead of the ibus-keyboard icon on the panel
+- Update reload-preload-engines-until-users-customize-the-list.patch
+- Update ibus-python-install-dir.patch
+  * modify Python 2 path in configure.ac instead of Makefile.am
+- Refresh add-libgnomekbd-and-load-preload-engines.patch 
+
 -------------------------------------------------------------------
 Mon Mar 17 12:29:40 UTC 2014 - fcrozat@suse.com

--- a/ibus.spec
+++ b/ibus.spec
@ -19,22 +19,23 @@
 %define with_automatic_config 1

 Name:           ibus
-Version:        1.5.5
+Version:        1.5.6
 Release:        0
 Url:            http://code.google.com/p/ibus/
 Summary:        Intelligent Input Bus for Linux OS
 License:        LGPL-2.1+
 Group:          System/I18n/Chinese

-Source:         http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
+Source:         https://github.com/ibus/ibus/releases/download/%{version}/%{name}-%{version}.tar.gz
 Source2:        ibus-README.suse  
 Source3:        xim.ibus.suse.template
 Source4:        xim.d-ibus-121
 Source5:        kde.tar.gz
 Source6:        kde-12.2.tar.gz
+# PATCH-FIX-OPENSUSE ibus-python-install-dir.patch ftake@geeko.jp
 Patch0:         ibus-python-install-dir.patch
-# PATCH-FEATURE-UPSTREAM add-libgnomekbd-and-load-preload-engines.patch Issue 1641 ftake@geeko.jp
 %if %{with_automatic_config}
+# PATCH-FEATURE-UPSTREAM add-libgnomekbd-and-load-preload-engines.patch Issue 1641 ftake@geeko.jp
 Patch1:         add-libgnomekbd-and-load-preload-engines.patch
 # PATCH-FEATURE-UPSTREAM reload-preload-engines-until-users-customize-the-list.patch Issue 1641 ftake@geeko.jp
 Patch2:         reload-preload-engines-until-users-customize-the-list.patch
@ -73,7 +74,7 @@ BuildRequires:  pkg-config
 BuildRequires:  python >= 2.5
 BuildRequires:  python-gobject2-devel
 BuildRequires:  update-desktop-files
-BuildRequires:  pkgconfig(vapigen) >= 0.16
+BuildRequires:  pkgconfig(vapigen) >= 0.18
 Requires:       dbus-1-python
 Requires:       dconf
 Requires:       iso-codes
@ -87,7 +88,6 @@ Recommends:     %{name}-lang
 #Fix cursor following problem in KDE4 for libreoffice.
 Supplements:    packageand(libreoffice:libreoffice-gnome)

-%define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 %define gtk_binary_version %(pkg-config  --variable=gtk_binary_version gtk+-2.0)

 %description
@ -342,7 +342,7 @@ dconf update

 %files -n python-ibus
 %defattr(-,root,root,-)
-%{_libdir}/python2.7/site-packages/ibus
+%{python_sitearch}/ibus

 %files devel
 %defattr(-,root,root,-)
--- a/reload-preload-engines-until-users-customize-the-list.patch
+++ b/reload-preload-engines-until-users-customize-the-list.patch
@ -1,6 +1,6 @@
-From a6d4b9ac9a22c5b88c362b659eaf6fd59a0cf5bd Mon Sep 17 00:00:00 2001
+From 68a504f7ab44c4977d15e0bd83c7e76dd8d2b06e Mon Sep 17 00:00:00 2001
 From: fujiwarat <takao.fujiwara1@gmail.com>
-Date: Tue, 14 Jan 2014 15:30:24 +0900
+Date: Fri, 7 Mar 2014 16:43:49 +0900
 Subject: [PATCH] Reload preload engines until users customize the list.

 The idea is, if users don't customize the preload_engines with ibus-setup,
@ -18,14 +18,14 @@ IBUS_PRELOAD_ENGINE_MODE_USER and users can customize the value
 'preload-engines'.
 ---
 data/ibus.schemas.in | 24 ++++++++++++++
- setup/main.py        | 70 +++++++++++++++++++++++++++++++++++----
+ setup/main.py        | 71 +++++++++++++++++++++++++++++++++++----
 setup/setup.ui       | 22 +++++++++++--
 src/ibustypes.h      | 10 ++++++
 ui/gtk3/panel.vala   | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++
- 5 files changed, 210 insertions(+), 9 deletions(-)
+ 5 files changed, 211 insertions(+), 9 deletions(-)

 diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in
-index 8fd7e15..28d2219 100644
+index caec315..1f9b1eb 100644
 --- a/data/ibus.schemas.in
 +++ b/data/ibus.schemas.in
@@ -2,6 +2,30 @@
@ -60,10 +60,10 @@ index 8fd7e15..28d2219 100644
       <applyto>/desktop/ibus/general/preload_engines</applyto>
       <owner>ibus</owner>
 diff --git a/setup/main.py b/setup/main.py
-index d3f4414..235ef9c 100644
+index dee7be4..d70da6b 100644
 --- a/setup/main.py
 +++ b/setup/main.py
-@@ -187,16 +187,30 @@ def __init_general(self):
+@@ -190,16 +190,30 @@ def __init_general(self):
                                     'active',
                                     Gio.SettingsBindFlags.DEFAULT)
 
@ -98,18 +98,19 @@ index d3f4414..235ef9c 100644
 
         self.__treeview = self.__builder.get_object("treeview_engines")
         self.__treeview.set_engines(engines)
-@@ -246,8 +260,8 @@ def __init_ui(self):
+@@ -249,8 +263,9 @@ def __init_ui(self):
     def __combobox_notify_active_engine_cb(self, combobox, property):
         engine = self.__combobox.get_active_engine()
         button = self.__builder.get_object("button_engine_add")
 -        button.set_sensitive(
 -                engine != None and engine not in self.__treeview.get_engines())
 +        button.set_sensitive(engine != None and \
-+                engine.get_name() not in map(lambda e: e.get_name(), self.__treeview.get_engines()))
+                engine.get_name() not in [e.get_name() for e \
+                                          in self.__treeview.get_engines()])
 
     def __get_engine_setup_exec_args(self, engine):
         args = []
-@@ -267,6 +281,13 @@ def __get_engine_setup_exec_args(self, engine):
+@@ -270,6 +285,13 @@ def __get_engine_setup_exec_args(self, engine):
             args.append(path.basename(setup_path))
         return args
 
@ -123,7 +124,7 @@ index d3f4414..235ef9c 100644
     def __treeview_notify_cb(self, treeview, prop):
         if prop.name not in ("active-engine", "engines"):
             return
-@@ -318,6 +339,43 @@ def __button_engine_preferences_cb(self, button):
+@@ -321,6 +343,43 @@ def __button_engine_preferences_cb(self, button):
             del self.__engine_setup_exec_list[name]
         self.__engine_setup_exec_list[name] = os.spawnl(os.P_NOWAIT, *args)
 
@ -158,9 +159,9 @@ index d3f4414..235ef9c 100644
 +        engine_names = self.__settings_general.get_strv('preload-engines')
 +        engines = self.__get_engine_descs_from_names(engine_names)
 +        current_engines = self.__treeview.get_engines()
-+        engines_csv = str.join(',', map(lambda e: e.get_name(), engines))
+        engines_csv = str.join(',', [e.get_name() for e in engines])
 +        current_engines_csv = \
-+                str.join(',', map(lambda e: e.get_name(), current_engines))
+                str.join(',', [e.get_name() for e in current_engines])
 +        if engines_csv != current_engines_csv:
 +            self.__treeview.set_engines(engines)
 +
@ -168,14 +169,14 @@ index d3f4414..235ef9c 100644
         self.__bus = IBus.Bus()
         if self.__bus.is_connected():
 diff --git a/setup/setup.ui b/setup/setup.ui
-index 65dcee4..a6a001b 100644
+index ad5386b..68e0faa 100644
 --- a/setup/setup.ui
 +++ b/setup/setup.ui
-@@ -669,7 +669,23 @@
+@@ -677,7 +677,23 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="GtkHBox" id="hbox1">
+-                      <object class="GtkBox" id="hbox1">
 +                      <object class="GtkCheckButton" id="checkbutton_preload_engine_mode">
 +                        <property name="visible">True</property>
 +                        <property name="label" translatable="yes">Customize active input _methods</property>
@ -192,11 +193,11 @@ index 65dcee4..a6a001b 100644
 +                      </packing>
 +                    </child>
 +                    <child>
-+                      <object class="GtkHBox" id="hbox_customize_active_input_methods">
+                      <object class="GtkBox" id="hbox_customize_active_input_methods">
+                         <property name="orientation">horizontal</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                         <child>
-@@ -858,7 +874,7 @@
+@@ -868,7 +884,7 @@
                       <packing>
                         <property name="expand">True</property>
                         <property name="fill">True</property>
@ -205,7 +206,7 @@ index 65dcee4..a6a001b 100644
                       </packing>
                     </child>
                     <child>
-@@ -905,7 +921,7 @@
+@@ -916,7 +932,7 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
@ -236,10 +237,10 @@ index 86fc2cc..cb9eb22 100644
  * @x: x coordinate.
  * @y: y coordinate.
 diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
-index 1da7966..fc60fd4 100644
+index 7a15049..e6c128a 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);
         });
 
@ -250,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();
         }
 
@ -348,5 +349,5 @@ index 1da7966..fc60fd4 100644
 
     private void update_xkb_engines() {
 -- 
-1.8.5.1
+1.8.5.5