Resolved #1214092 Updated ibus-anthy-HEAD.patch

This commit is contained in:
Takao Fujiwara 2015-04-22 13:16:08 +09:00
parent a7bb810a73
commit 65c8317df7
2 changed files with 129 additions and 1 deletions

View File

@ -343,3 +343,128 @@ index 961955f..ce92a7f 100644
--
1.8.5.3
From 5cd95abb49956d4014b0bdc5b5dba356d9d3767c Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 22 Apr 2015 12:45:48 +0900
Subject: [PATCH] Fixed to import sys (#1214092)
---
engine/python2/factory.py | 5 +++--
engine/python2/thumb.py | 7 ++++---
engine/python3/factory.py | 5 +++--
engine/python3/thumb.py | 7 ++++---
4 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/engine/python2/factory.py b/engine/python2/factory.py
index d4aa075..42dee0a 100644
--- a/engine/python2/factory.py
+++ b/engine/python2/factory.py
@@ -4,8 +4,8 @@
# ibus-anthy - The Anthy engine for IBus
#
# Copyright (c) 2007-2008 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2010-2013 Takao Fujiwara <takao.fujiwara1@gmail.com>
-# Copyright (c) 2007-2013 Red Hat, Inc.
+# Copyright (c) 2010-2015 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2007-2015 Red Hat, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -22,6 +22,7 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
import os
+import sys
from gi.repository import IBus
diff --git a/engine/python2/thumb.py b/engine/python2/thumb.py
index 6a7e3d2..faa0f78 100644
--- a/engine/python2/thumb.py
+++ b/engine/python2/thumb.py
@@ -5,8 +5,8 @@
#
# Copyright (c) 2007-2008 Peng Huang <shawn.p.huang@gmail.com>
# Copyright (c) 2009 Hideaki ABE <abe.sendai@gmail.com>
-# Copyright (c) 2010-2013 Takao Fujiwara <takao.fujiwara1@gmail.com>
-# Copyright (c) 2007-2013 Red Hat, Inc.
+# Copyright (c) 2010-2015 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2007-2015 Red Hat, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -27,6 +27,8 @@ __all__ = (
'ThumbShiftSegment',
)
+import sys
+
from gi.repository import GLib
from gi.repository import IBus
@@ -411,7 +413,6 @@ class ThumbShiftKeyboard:
0, 1024, 0)[3]
layout_list = prop.split('\0')
except TypeError:
- import sys
print >> sys.stderr, \
'This problem is fixed in the latest gobject-introspection'
print >> sys.stderr, \
diff --git a/engine/python3/factory.py b/engine/python3/factory.py
index 8994793..e51faad 100644
--- a/engine/python3/factory.py
+++ b/engine/python3/factory.py
@@ -4,8 +4,8 @@
# ibus-anthy - The Anthy engine for IBus
#
# Copyright (c) 2007-2008 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2010-2014 Takao Fujiwara <takao.fujiwara1@gmail.com>
-# Copyright (c) 2007-2014 Red Hat, Inc.
+# Copyright (c) 2010-2015 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2007-2015 Red Hat, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -22,6 +22,7 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
import os
+import sys
from gi.repository import IBus
diff --git a/engine/python3/thumb.py b/engine/python3/thumb.py
index 93a3967..7fb97a8 100644
--- a/engine/python3/thumb.py
+++ b/engine/python3/thumb.py
@@ -5,8 +5,8 @@
#
# Copyright (c) 2007-2008 Peng Huang <shawn.p.huang@gmail.com>
# Copyright (c) 2009 Hideaki ABE <abe.sendai@gmail.com>
-# Copyright (c) 2010-2014 Takao Fujiwara <takao.fujiwara1@gmail.com>
-# Copyright (c) 2007-2014 Red Hat, Inc.
+# Copyright (c) 2010-2015 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2007-2015 Red Hat, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -27,6 +27,8 @@ __all__ = (
'ThumbShiftSegment',
)
+import sys
+
from gi.repository import GLib
from gi.repository import IBus
@@ -408,7 +410,6 @@ class ThumbShiftKeyboard:
0, 1024, 0)[3]
layout_list = prop.split('\0')
except TypeError:
- import sys
print >> sys.stderr, \
'This problem is fixed in the latest gobject-introspection'
print >> sys.stderr, \
--
2.1.0

View File

@ -22,7 +22,7 @@
Name: ibus-anthy
Version: 1.5.6
Release: 5%{?dist}
Release: 6%{?dist}
Summary: The Anthy engine for IBus input platform
License: GPLv2+
Group: System Environment/Libraries
@ -217,6 +217,9 @@ touch --no-create %{_datadir}/icons/hicolor || :
%{_libdir}/libanthygobject-%{sub_version}.so
%changelog
* Wed Apr 22 2015 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.6-6
- Resolved #1214092 Updated ibus-anthy-HEAD.patch
* Wed Mar 25 2015 Richard Hughes <rhughes@redhat.com> - 1.5.6-5
- Add the AppData file to the right built RPM, in this case we have to install
ibus-anthy-python rather than the main package in gnome-software.