pravins pushed to ibus-bogo (f22). "Resolves bug #1204029 - Crashing in F22 Alpha with updates"

[notifications at fedoraproject.org]

>From 642be480acd4f4aab357fa08695e4880b476f178 Mon Sep 17 00:00:00 2001
From: Pravin Satpute <psatpute at redhat.com>
Date: Tue, 31 Mar 2015 11:34:47 +0530
Subject: Resolves bug #1204029 - Crashing in F22 Alpha with updates


diff --git a/ibus-bogo-crash-f22-bug-1204029.patch b/ibus-bogo-crash-f22-bug-1204029.patch
new file mode 100644
index 0000000..3d5b8cf
--- /dev/null
+++ b/ibus-bogo-crash-f22-bug-1204029.patch
@@ -0,0 +1,45 @@
+diff -rup ibus-bogo-python-ce44b961de5a0f82a4a2d8fc0e487e8fcb29289d/ibus_engine/ibus_engine.py ibus-bogo-python-ce44b961de5a0f82a4a2d8fc0e487e8fcb29289d_mod/ibus_engine/ibus_engine.py
+--- ibus-bogo-python-ce44b961de5a0f82a4a2d8fc0e487e8fcb29289d/ibus_engine/ibus_engine.py	2015-03-31 10:31:05.736109792 +0530
++++ ibus-bogo-python-ce44b961de5a0f82a4a2d8fc0e487e8fcb29289d_mod/ibus_engine/ibus_engine.py	2015-03-31 10:32:50.933722217 +0530
+@@ -73,7 +73,7 @@ def is_in_unity_dash():
+ class Engine(IBus.Engine):
+     __gtype_name__ = 'EngineBoGo'
+ 
+-    def __init__(self, config, abbr_expander):
++    def init_config(self, config, abbr_expander):
+         super(Engine, self).__init__()
+         logging.info("You are running ibus-bogo")
+ 
+diff -rup ibus-bogo-python-ce44b961de5a0f82a4a2d8fc0e487e8fcb29289d/ibus_engine/main.py ibus-bogo-python-ce44b961de5a0f82a4a2d8fc0e487e8fcb29289d_mod/ibus_engine/main.py
+--- ibus-bogo-python-ce44b961de5a0f82a4a2d8fc0e487e8fcb29289d/ibus_engine/main.py	2015-03-31 10:31:05.736109792 +0530
++++ ibus-bogo-python-ce44b961de5a0f82a4a2d8fc0e487e8fcb29289d_mod/ibus_engine/main.py	2015-03-31 10:32:50.933722217 +0530
+@@ -93,28 +93,12 @@ class IMApp:
+         if engine_name == "bogo":
+             dbus_path = "/org/freedesktop/IBus/Engine/%d" % self.engine_count
+ 
+-            # It looks like the GObject's new_with_type constructor also
+-            # calls __init__ but without arguments so there will be error
+-            # messages like this:
+-            #
+-            # TypeError: __init__() missing 1 required positional argument
+-            #
+-            # We will ignore that message by temporarily redirect stderr
+-            # to /dev/null
+-
+-            f = open('/dev/null', 'w')
+-            stderr = sys.stderr
+-            sys.stderr = f
+-
+             engine = Engine.new_with_type(GObject.type_from_name("EngineBoGo"),
+                                           "bogo-python",
+                                           dbus_path,
+                                           self.bus.get_connection())
+ 
+-            sys.stderr = stderr
+-            f.close()
+-
+-            Engine.__init__(engine, self.config, self.abbr_expander)
++            Engine.init_config(engine, self.config, self.abbr_expander)
+ 
+             self.engine_count += 1
+             return engine
diff --git a/ibus-bogo.spec b/ibus-bogo.spec
index 8863a28..d7fd956 100644
--- a/ibus-bogo.spec
+++ b/ibus-bogo.spec
@@ -4,7 +4,7 @@ Name:		ibus-bogo
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Version:	0.4
-Release:	4%{?dist}
+Release:	6%{?dist}
 Summary:	Vietnamese engine for IBus input platform
 
 Group:		User Interface/X
@@ -16,6 +16,7 @@ Source0:	http://github.com/BoGoEngine/ibus-bogo-python/archive/%{commit}/%{name}
 Patch0:		ibus-bogo-fix-libexec-folder-name.patch
 # patch to disable mouse dedector function
 Patch1:		ibus-bogo-disable-mouse-detector-function.patch
+Patch2:		ibus-bogo-crash-f22-bug-1204029.patch
 
 BuildRequires:	cmake
 BuildRequires:	desktop-file-utils
@@ -43,6 +44,7 @@ A Vietnamese engine for IBus input platform that uses BoGoEngine.
 %setup -qn %{name}-python-%{commit}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1 -b .3-resolving-crash-in-engine
 
 %build
 %cmake .
@@ -57,7 +59,6 @@ desktop-file-install \
 --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
 ${RPM_BUILD_ROOT}%{_datadir}/applications/ibus-setup-bogo.desktop
 
-
 %post
 /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
@@ -89,6 +90,11 @@ fi
 
 
 %changelog
+* Tue Mar 31 2015 Pravin Satpute <psatpute at redhat.com> - 0.4-6
+- Resolves bug #1204029 - Crashing in F22 Alpha with updates
+- Patch from Fujiwara <tfujiwar at redhat.com>
+- Release bump 5 to match with rawhide.
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/ibus-bogo.git/commit/?h=f22&id=642be480acd4f4aab357fa08695e4880b476f178