[packages/ibus-hangul] - updated to 1.4.2 - removed obsolete setup-gi,engine-name patches

qboosh qboosh at pld-linux.org
Sat Feb 2 18:07:26 CET 2013


commit bffa5ae35417c74e861eb85d8d3f5653b5d1dad6
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Feb 2 18:08:27 2013 +0100

    - updated to 1.4.2
    - removed obsolete setup-gi,engine-name patches

 ibus-hangul-engine-name.patch |  23 -----
 ibus-hangul-setup-gi.patch    | 232 ------------------------------------------
 ibus-hangul.spec              |  14 +--
 3 files changed, 5 insertions(+), 264 deletions(-)
---
diff --git a/ibus-hangul.spec b/ibus-hangul.spec
index 2fa4375..572fd27 100644
--- a/ibus-hangul.spec
+++ b/ibus-hangul.spec
@@ -5,16 +5,14 @@
 Summary:	The Hangul engine for IBus input platform
 Summary(pl.UTF-8):	Silnik Hangul dla platformy wprowadzania znaków IBus
 Name:		ibus-hangul
-Version:	1.4.1
-Release:	3
+Version:	1.4.2
+Release:	1
 License:	GPL v2+
 Group:		Libraries
 #Source0Download: http://code.google.com/p/ibus/downloads/list
 Source0:	http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
-# Source0-md5:	c9615a9f704a4c29252028407329e1c3
-Patch0:		ibus-hangul-setup-gi.patch
-Patch1:		ibus-hangul-add-hangul-hotkey.patch
-Patch2:		ibus-hangul-engine-name.patch
+# Source0-md5:	0229eab9481355bb5f54230890bfa910
+Patch0:		%{name}-add-hangul-hotkey.patch
 URL:		http://code.google.com/p/ibus/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake >= 1:1.10
@@ -42,11 +40,9 @@ metodę wprowadzania znaków koreańskich zaimplementowaną w libhangul.
 
 %prep
 %setup -q
-%patch0 -p1
 %if %{with bridge_hotkey}
-%patch1 -p1
+%patch0 -p1
 %endif
-%patch2 -p1
 
 %build
 %{__libtoolize}
diff --git a/ibus-hangul-engine-name.patch b/ibus-hangul-engine-name.patch
deleted file mode 100644
index 70d21b2..0000000
--- a/ibus-hangul-engine-name.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From f1b2a97b428d8432604ec782505516b9ea1fe565 Mon Sep 17 00:00:00 2001
-From: Choe Hwanjin <choe.hwanjin at gmail.com>
-Date: Mon, 22 Oct 2012 01:39:51 +0900
-Subject: [PATCH] Rename this engine to "Hangul"
-
-"Hangul" means this engine is using libhangul.
----
- src/hangul.xml.in.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: ibus-hangul-1.4.1/src/hangul.xml.in.in
-===================================================================
---- ibus-hangul-1.4.1.orig/src/hangul.xml.in.in
-+++ ibus-hangul-1.4.1/src/hangul.xml.in.in
-@@ -18,7 +18,7 @@
- 			<author>Peng Huang <shawn.p.huang at gmail.com></author>
- 			<icon>ibus-hangul</icon>
- 			<layout>us</layout>
--			<longname>Korean</longname>
-+			<longname>Hangul</longname>
- 			<description>Korean Input Method</description>
- 			<rank>99</rank>
- 			<symbol>&#xD55C;</symbol>
diff --git a/ibus-hangul-setup-gi.patch b/ibus-hangul-setup-gi.patch
deleted file mode 100644
index b082e56..0000000
--- a/ibus-hangul-setup-gi.patch
+++ /dev/null
@@ -1,232 +0,0 @@
-From 010540d2a05fee1f8f4971db5ffa5885981aba29 Mon Sep 17 00:00:00 2001
-From: Daiki Ueno <ueno at unixuser.org>
-Date: Wed, 25 Jan 2012 11:46:33 +0900
-Subject: [PATCH] ibus-setup-hangul: use gobject-introspection instead ibus
- python library.
-
----
- setup/keycapturedialog.py |   20 +++++++-------
- setup/main.py             |   65 +++++++++++++++++++++++++--------------------
- 2 files changed, 46 insertions(+), 39 deletions(-)
-
-Index: ibus-hangul-1.4.1/setup/keycapturedialog.py
-===================================================================
---- ibus-hangul-1.4.1.orig/setup/keycapturedialog.py
-+++ ibus-hangul-1.4.1/setup/keycapturedialog.py
-@@ -1,5 +1,5 @@
--import gtk
--import gtk.gdk as gdk
-+from gi.repository import Gtk
-+from gi.repository import Gdk
- import gettext
- 
- _ = lambda a : gettext.dgettext("ibus-hangul", a)
-@@ -7,10 +7,10 @@ _ = lambda a : gettext.dgettext("ibus-ha
- class KeyCaptureDialog ():
-     def __init__ (self, title, parent):
- 	self.__key_str = ''
--	self.__dialog = gtk.MessageDialog(parent,
--			gtk.DIALOG_MODAL,
--			gtk.MESSAGE_INFO,
--			gtk.BUTTONS_OK_CANCEL,
-+	self.__dialog = Gtk.MessageDialog(parent,
-+			Gtk.DialogFlags.MODAL,
-+			Gtk.MessageType.INFO,
-+			Gtk.ButtonsType.OK_CANCEL,
- 			"")
- 	self.__dialog.set_markup(_("Press any key which you want to use as hanja key. "
-                 "The key you pressed is displayed below.\n"
-@@ -30,13 +30,13 @@ class KeyCaptureDialog ():
- 
-     def on_keypress(self, widget, event, data = None):
- 	self.__key_str = ""
--	if event.state & gdk.CONTROL_MASK :
-+	if event.state & Gdk.ModifierType.CONTROL_MASK :
- 	    self.__key_str += "Control+"
--	if event.state & gdk.MOD1_MASK :
-+	if event.state & Gdk.ModifierType.MOD1_MASK :
- 	    self.__key_str += "Alt+"
--	if event.state & gdk.SHIFT_MASK :
-+	if event.state & Gdk.ModifierType.SHIFT_MASK :
- 	    self.__key_str += "Shift+"
- 
--	self.__key_str += gdk.keyval_name(event.keyval)
-+	self.__key_str += Gdk.keyval_name(event.keyval)
- 	    
- 	self.__dialog.format_secondary_markup('<span size="large" weight="bold">%s</span>' % self.__key_str)
-Index: ibus-hangul-1.4.1/setup/main.py
-===================================================================
---- ibus-hangul-1.4.1.orig/setup/main.py
-+++ ibus-hangul-1.4.1/setup/main.py
-@@ -20,9 +20,9 @@
- 
- import sys
- import os
--import gobject
--import gtk
--import ibus
-+from gi.repository import GLib
-+from gi.repository import Gtk
-+from gi.repository import IBus
- import locale
- import gettext
- import config
-@@ -38,7 +38,7 @@ class Setup ():
- 	self.__config.connect("value-changed", self.on_value_changed, None)
- 
- 	ui_file = os.path.join(os.path.dirname(__file__), "setup.ui")
--	self.__builder = gtk.Builder()
-+	self.__builder = Gtk.Builder()
- 	self.__builder.set_translation_domain(config.gettext_package)
- 	self.__builder.add_from_file(ui_file)
- 
-@@ -47,7 +47,7 @@ class Setup ():
- 	list = pipe.communicate()[0].split('\n')
- 	
- 	self.__hangul_keyboard = self.__builder.get_object("HangulKeyboard")
--	model = gtk.ListStore(str, str, int)
-+	model = Gtk.ListStore(str, str, int)
- 	i = 0
- 	for line in list:
- 	    items = line.split('\t')
-@@ -56,11 +56,12 @@ class Setup ():
- 		i+=1
- 
- 	self.__hangul_keyboard.set_model(model)
--	renderer = gtk.CellRendererText()
--	self.__hangul_keyboard.pack_start(renderer)
-+	renderer = Gtk.CellRendererText()
-+	self.__hangul_keyboard.pack_start(renderer, True)
- 	self.__hangul_keyboard.add_attribute(renderer, "text", 0)
- 
--	current = self.__read("HangulKeyboard", "2")
-+	default = GLib.Variant.new_string("2")
-+	current = self.__read("HangulKeyboard", default).get_string()
- 	for i in model:
- 	    if i[1] == current:
- 		self.__hangul_keyboard.set_active(i[2])
-@@ -68,11 +69,13 @@ class Setup ():
- 
- 	self.__word_commit = self.__builder.get_object("WordCommit")
- 
--	word_commit = self.__read("WordCommit", False)
-+	default = GLib.Variant.new_boolean(False)
-+	word_commit = self.__read("WordCommit", default).get_boolean()
-         self.__word_commit.set_active(word_commit)
- 
- 	self.__auto_reorder = self.__builder.get_object("AutoReorder")
--	auto_reorder = self.__read("AutoReorder", True)
-+	default = GLib.Variant.new_boolean(True)
-+	auto_reorder = self.__read("AutoReorder", default).get_boolean()
-         self.__auto_reorder.set_active(auto_reorder)
- 
- 	# hanja tab
-@@ -82,19 +85,20 @@ class Setup ():
- 	button = self.__builder.get_object("HanjaKeyListRemoveButton")
- 	button.connect("clicked", self.on_hanja_key_remove, None)
- 
--	model = gtk.ListStore(str)
-+	model = Gtk.ListStore(str)
- 
--	keylist_str = self.__read("HanjaKeys", "Hangul_Hanja,F9")
-+	default = GLib.Variant.new_string("Hangul_Hanja,F9")
-+	keylist_str = self.__read("HanjaKeys", default).get_string()
- 	self.__hanja_key_list_str = keylist_str.split(',')
- 	for i in self.__hanja_key_list_str:
- 	    model.append([i])
- 
- 	self.__hanja_key_list = self.__builder.get_object("HanjaKeyList")
- 	self.__hanja_key_list.set_model(model)
--	column = gtk.TreeViewColumn()
-+	column = Gtk.TreeViewColumn()
- 	column.set_title("key")
--	renderer = gtk.CellRendererText()
--	column.pack_start(renderer)
-+	renderer = Gtk.CellRendererText()
-+	column.pack_start(renderer, True)
- 	column.add_attribute(renderer, "text", 0)
- 	self.__hanja_key_list.append_column(column)
- 
-@@ -115,17 +119,20 @@ class Setup ():
- 
-     def run(self):
- 	res = self.__window.run()
--	if (res == gtk.RESPONSE_OK):
-+	if (res == Gtk.ResponseType.OK):
- 	    self.on_ok()
- 	self.__window.destroy()
- 
-     def apply(self):
- 	model = self.__hangul_keyboard.get_model()
- 	i = self.__hangul_keyboard.get_active()
--	self.__write("HangulKeyboard", model[i][1])
-+	self.__write("HangulKeyboard", GLib.Variant.new_string(model[i][1]))
- 
-         word_commit = self.__word_commit.get_active()
--        self.__write("WordCommit", word_commit)
-+        self.__write("WordCommit", GLib.Variant.new_boolean(word_commit))
-+
-+        auto_reorder = self.__auto_reorder.get_active()
-+        self.__write("AutoReorder", GLib.Variant.new_boolean(auto_reorder))
- 
- 	model = self.__hanja_key_list.get_model()
- 	str = ""
-@@ -137,13 +144,13 @@ class Setup ():
- 	    else:
- 		str += model.get_value(iter, 0)
- 	    iter = model.iter_next(iter)
--	self.__write("HanjaKeys", str)
-+	self.__write("HanjaKeys", GLib.Variant.new_string(str))
- 
-     def on_response(self, widget, id, data = None):
--	if id == gtk.RESPONSE_APPLY:
-+	if id == Gtk.ResponseType.APPLY:
- 	    self.apply()
- 	    widget.emit_stop_by_name("response")
--	if id == gtk.RESPONSE_NONE:
-+	if id == Gtk.ResponseType.NONE:
- 	    widget.emit_stop_by_name("response")
- 
-     def on_ok(self):
-@@ -152,7 +159,7 @@ class Setup ():
-     def on_hanja_key_add(self, widget, data = None):
- 	dialog = KeyCaptureDialog(_("Select Hanja key"), self.__window)
- 	res = dialog.run()
--	if res == gtk.RESPONSE_OK:
-+	if res == Gtk.ResponseType.OK:
- 	    key_str = dialog.get_key_string()
- 	    if len(key_str) > 0:
- 		model = self.__hanja_key_list.get_model()
-@@ -185,7 +192,10 @@ class Setup ():
- 		self.__hanja_key_list_str = value.split(',')
- 
-     def __read(self, name, v):
--        return self.__config.get_value("engine/Hangul", name, v)
-+        value = self.__config.get_value("engine/Hangul", name)
-+        if value is None:
-+            return v
-+        return value
- 
-     def __write(self, name, v):
-         return self.__config.set_value("engine/Hangul", name, v)
-@@ -194,14 +204,13 @@ if __name__ == "__main__":
-     locale.bindtextdomain(config.gettext_package, config.localedir)
-     locale.bind_textdomain_codeset(config.gettext_package, "UTF-8")
- 
--    try:
--        bus = ibus.Bus()
--    except:
-+    bus = IBus.Bus()
-+    if bus.is_connected():
-+        Setup(bus).run()
-+    else:
-         message = _("IBus daemon is not running.\nHangul engine settings cannot be saved.")
--        dialog = gtk.MessageDialog(type = gtk.MESSAGE_ERROR,
--                                   buttons = gtk.BUTTONS_CLOSE,
-+        dialog = Gtk.MessageDialog(type = Gtk.MessageType.ERROR,
-+                                   buttons = Gtk.ButtonsType.CLOSE,
-                                    message_format = message)
-         dialog.run()
-         sys.exit(1)
--
--    Setup(bus).run()
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ibus-hangul.git/commitdiff/bffa5ae35417c74e861eb85d8d3f5653b5d1dad6



More information about the pld-cvs-commit mailing list