diff options
| -rw-r--r-- | app-i18n/ibus-unikey/ChangeLog | 12 | ||||
| -rw-r--r-- | app-i18n/ibus-unikey/files/ibus-unikey-ibus-1.4.patch | 258 | ||||
| -rw-r--r-- | app-i18n/ibus-unikey/ibus-unikey-0.5.1-r1.ebuild (renamed from app-i18n/ibus-unikey/ibus-unikey-0.3.ebuild) | 23 | ||||
| -rw-r--r-- | app-i18n/ibus-unikey/ibus-unikey-0.5.1.ebuild (renamed from app-i18n/ibus-unikey/ibus-unikey-0.4.ebuild) | 13 | ||||
| -rw-r--r-- | app-i18n/ibus-unikey/ibus-unikey-0.5.ebuild | 5 |
5 files changed, 294 insertions, 17 deletions
diff --git a/app-i18n/ibus-unikey/ChangeLog b/app-i18n/ibus-unikey/ChangeLog index 07b512b1b0d4..9e64072d6d75 100644 --- a/app-i18n/ibus-unikey/ChangeLog +++ b/app-i18n/ibus-unikey/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-i18n/ibus-unikey -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-unikey/ChangeLog,v 1.3 2010/06/15 17:56:12 matsuu Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-unikey/ChangeLog,v 1.4 2011/05/28 01:56:00 matsuu Exp $ + +*ibus-unikey-0.5.1-r1 (28 May 2011) +*ibus-unikey-0.5.1 (28 May 2011) + + 28 May 2011; MATSUU Takuto <matsuu@gentoo.org> -ibus-unikey-0.3.ebuild, + -ibus-unikey-0.4.ebuild, ibus-unikey-0.5.ebuild, +ibus-unikey-0.5.1.ebuild, + +ibus-unikey-0.5.1-r1.ebuild, +files/ibus-unikey-ibus-1.4.patch: + Version bumped, bug #353798. Support ibus-1.4. *ibus-unikey-0.5 (15 Jun 2010) diff --git a/app-i18n/ibus-unikey/files/ibus-unikey-ibus-1.4.patch b/app-i18n/ibus-unikey/files/ibus-unikey-ibus-1.4.patch new file mode 100644 index 000000000000..2c0ea376cc98 --- /dev/null +++ b/app-i18n/ibus-unikey/files/ibus-unikey-ibus-1.4.patch @@ -0,0 +1,258 @@ +diff -ru ibus-unikey-0.5.1.orig/src/engine.cpp ibus-unikey-0.5.1/src/engine.cpp +--- ibus-unikey-0.5.1.orig/src/engine.cpp 2010-09-11 20:56:49.000000000 +0900 ++++ ibus-unikey-0.5.1/src/engine.cpp 2011-02-21 10:29:28.751755007 +0900 +@@ -138,9 +138,8 @@ + + static void ibus_unikey_engine_init(IBusUnikeyEngine* unikey) + { +- GValue v = {0}; ++ GVariant *v = NULL; + gchar* str; +- gboolean succ; + guint i; + + unikey->preeditstr = new std::string(); +@@ -160,10 +159,10 @@ + + // read config value + // read Input Method +- succ = ibus_config_get_value(config, "engine/Unikey", "InputMethod", &v); +- if (succ) ++ v = ibus_config_get_value(config, "engine/Unikey", "InputMethod"); ++ if (v) + { +- str = (gchar*)g_value_get_string(&v); ++ str = (gchar*)g_variant_get_string(v, NULL); + for (i = 0; i < NUM_INPUTMETHOD; i++) + { + if (strcasecmp(str, Unikey_IMNames[i]) == 0) +@@ -171,14 +170,14 @@ + unikey->im = Unikey_IM[i]; + } + } +- g_value_unset(&v); ++ g_variant_unref(v); + } // end read Input Method + + // read Output Charset +- succ = ibus_config_get_value(config, "engine/Unikey", "OutputCharset", &v); +- if (succ) ++ v = ibus_config_get_value(config, "engine/Unikey", "OutputCharset"); ++ if (v) + { +- str = (gchar*)g_value_get_string(&v); ++ str = (gchar*)g_variant_get_string(v, NULL); + for (i = 0; i < NUM_OUTPUTCHARSET; i++) + { + if (strcasecmp(str, Unikey_OCNames[i]) == 0) +@@ -186,64 +185,64 @@ + unikey->oc = Unikey_OC[i]; + } + } +- g_value_unset(&v); ++ g_variant_unref(v); + } // end read Output Charset + + // read Unikey Option + // freemarking +- succ = ibus_config_get_value(config, "engine/Unikey/Options", "FreeMarking", &v); +- if (succ) ++ v = ibus_config_get_value(config, "engine/Unikey/Options", "FreeMarking"); ++ if (v) + { +- unikey->ukopt.freeMarking = g_value_get_boolean(&v); +- g_value_unset(&v); ++ unikey->ukopt.freeMarking = g_variant_get_boolean(v); ++ g_variant_unref(v); + } + + // modernstyle +- succ = ibus_config_get_value(config, "engine/Unikey/Options", "ModernStyle", &v); +- if (succ) ++ v = ibus_config_get_value(config, "engine/Unikey/Options", "ModernStyle"); ++ if (v) + { +- unikey->ukopt.modernStyle = g_value_get_boolean(&v); +- g_value_unset(&v); ++ unikey->ukopt.modernStyle = g_variant_get_boolean(v); ++ g_variant_unref(v); + } + + // macroEnabled +- succ = ibus_config_get_value(config, "engine/Unikey/Options", "MacroEnabled", &v); +- if (succ) ++ v = ibus_config_get_value(config, "engine/Unikey/Options", "MacroEnabled"); ++ if (v) + { +- unikey->ukopt.macroEnabled = g_value_get_boolean(&v); +- g_value_unset(&v); ++ unikey->ukopt.macroEnabled = g_variant_get_boolean(v); ++ g_variant_unref(v); + } + + // spellCheckEnabled +- succ = ibus_config_get_value(config, "engine/Unikey/Options", "SpellCheckEnabled", &v); +- if (succ) ++ v = ibus_config_get_value(config, "engine/Unikey/Options", "SpellCheckEnabled"); ++ if (v) + { +- unikey->ukopt.spellCheckEnabled = g_value_get_boolean(&v); +- g_value_unset(&v); ++ unikey->ukopt.spellCheckEnabled = g_variant_get_boolean(v); ++ g_variant_unref(v); + } + + // autoNonVnRestore +- succ = ibus_config_get_value(config, "engine/Unikey/Options", "AutoNonVnRestore", &v); +- if (succ) ++ v = ibus_config_get_value(config, "engine/Unikey/Options", "AutoNonVnRestore"); ++ if (v) + { +- unikey->ukopt.autoNonVnRestore = g_value_get_boolean(&v); +- g_value_unset(&v); ++ unikey->ukopt.autoNonVnRestore = g_variant_get_boolean(v); ++ g_variant_unref(v); + } + + // ProcessWAtBegin +- succ = ibus_config_get_value(config, "engine/Unikey/Options", "ProcessWAtBegin", &v); +- if (succ) ++ v = ibus_config_get_value(config, "engine/Unikey/Options", "ProcessWAtBegin"); ++ if (v) + { +- unikey->process_w_at_begin = g_value_get_boolean(&v); +- g_value_unset(&v); ++ unikey->process_w_at_begin = g_variant_get_boolean(v); ++ g_variant_unref(v); + } + + // MouseCapture +- succ = ibus_config_get_value(config, "engine/Unikey/Options", "MouseCapture", &v); +- if (succ) ++ v = ibus_config_get_value(config, "engine/Unikey/Options", "MouseCapture"); ++ if (v) + { +- unikey->mouse_capture = g_value_get_boolean(&v); +- g_value_unset(&v); ++ unikey->mouse_capture = g_variant_get_boolean(v); ++ g_variant_unref(v); + } + // end read Unikey Option + // end read config value +@@ -331,7 +330,7 @@ + { + IBusProperty* prop; + IBusText* label; +- GValue v = {0}; ++ GVariant *v; + guint i, j; + + unikey = (IBusUnikeyEngine*)engine; +@@ -346,9 +345,8 @@ + { + unikey->im = Unikey_IM[i]; + +- g_value_init(&v, G_TYPE_STRING); +- g_value_set_string(&v, Unikey_IMNames[i]); +- ibus_config_set_value(config, "engine/Unikey", "InputMethod", &v); ++ v = g_variant_new_string(Unikey_IMNames[i]); ++ ibus_config_set_value(config, "engine/Unikey", "InputMethod", v); + + // update label + for (j=0; j<unikey->prop_list->properties->len; j++) +@@ -391,9 +389,8 @@ + { + unikey->oc = Unikey_OC[i]; + +- g_value_init(&v, G_TYPE_STRING); +- g_value_set_string(&v, Unikey_OCNames[i]); +- ibus_config_set_value(config, "engine/Unikey", "OutputCharset", &v); ++ v = g_variant_new_string(Unikey_OCNames[i]); ++ ibus_config_set_value(config, "engine/Unikey", "OutputCharset", v); + + // update label + for (j=0; j<unikey->prop_list->properties->len; j++) +@@ -431,9 +428,8 @@ + { + unikey->ukopt.spellCheckEnabled = !unikey->ukopt.spellCheckEnabled; + +- g_value_init(&v, G_TYPE_BOOLEAN); +- g_value_set_boolean(&v, unikey->ukopt.spellCheckEnabled); +- ibus_config_set_value(config, "engine/Unikey/Options", "SpellCheckEnabled", &v); ++ v = g_variant_new_boolean (unikey->ukopt.spellCheckEnabled); ++ ibus_config_set_value(config, "engine/Unikey/Options", "SpellCheckEnabled", v); + + // update state of state + for (j = 0; j < unikey->menu_opt->properties->len ; j++) +@@ -456,9 +452,8 @@ + { + unikey->ukopt.macroEnabled = !unikey->ukopt.macroEnabled; + +- g_value_init(&v, G_TYPE_BOOLEAN); +- g_value_set_boolean(&v, unikey->ukopt.macroEnabled); +- ibus_config_set_value(config, "engine/Unikey/Options", "MacroEnabled", &v); ++ v = g_variant_new_boolean(unikey->ukopt.macroEnabled); ++ ibus_config_set_value(config, "engine/Unikey/Options", "MacroEnabled", v); + + // update state of state + for (j = 0; j < unikey->menu_opt->properties->len ; j++) +@@ -481,9 +476,8 @@ + { + unikey->mouse_capture = !unikey->mouse_capture; + +- g_value_init(&v, G_TYPE_BOOLEAN); +- g_value_set_boolean(&v, unikey->mouse_capture); +- ibus_config_set_value(config, "engine/Unikey/Options", "MouseCapture", &v); ++ v = g_variant_new_boolean(unikey->mouse_capture); ++ ibus_config_set_value(config, "engine/Unikey/Options", "MouseCapture", v); + + // update state of state + for (j = 0; j < unikey->menu_opt->properties->len ; j++) +diff -ru ibus-unikey-0.5.1.orig/src/main.cpp ibus-unikey-0.5.1/src/main.cpp +--- ibus-unikey-0.5.1.orig/src/main.cpp 2010-09-12 16:17:47.000000000 +0900 ++++ ibus-unikey-0.5.1/src/main.cpp 2011-02-21 09:48:48.188754964 +0900 +@@ -58,7 +58,7 @@ + for (p = engines; p != NULL; p = p->next) + { + IBusEngineDesc* engine = (IBusEngineDesc*)p->data; +- ibus_factory_add_engine(factory, engine->name, IBUS_TYPE_UNIKEY_ENGINE); ++ ibus_factory_add_engine(factory, ibus_engine_desc_get_name(engine), IBUS_TYPE_UNIKEY_ENGINE); + } + + if (ibus) +Only in ibus-unikey-0.5.1.orig/src: unikey.xml.in +diff -ru ibus-unikey-0.5.1.orig/src/utils.cpp ibus-unikey-0.5.1/src/utils.cpp +--- ibus-unikey-0.5.1.orig/src/utils.cpp 2010-06-12 01:43:48.000000000 +0900 ++++ ibus-unikey-0.5.1/src/utils.cpp 2011-02-21 10:04:31.003755036 +0900 +@@ -35,20 +35,20 @@ + "", + PACKAGE_NAME); + +- engine = ibus_engine_desc_new ++ engine = ibus_engine_desc_new_varargs + ( +- "Unikey", +- "Unikey", +- IU_DESC, +- "vi", +- "GPLv2", +- "Lê Quốc Tuấn <mr.lequoctuan@gmail.com>", +- PKGDATADIR"/icons/ibus-unikey.png", +- "us" ++ "name", "Unikey", ++ "longname", "Unikey", ++ "description", IU_DESC, ++ "language", "vi", ++ "license", "GPLv2", ++ "author", "Lê Quốc Tuấn <mr.lequoctuan@gmail.com>", ++ "icon", PKGDATADIR"/icons/ibus-unikey.png", ++ "layout", "us", ++ "rank", 99, ++ NULL + ); + +- engine->rank = 99; +- + ibus_component_add_engine(component, engine); + + return component; diff --git a/app-i18n/ibus-unikey/ibus-unikey-0.3.ebuild b/app-i18n/ibus-unikey/ibus-unikey-0.5.1-r1.ebuild index b210b1799bb6..e8ce1e4e748d 100644 --- a/app-i18n/ibus-unikey/ibus-unikey-0.3.ebuild +++ b/app-i18n/ibus-unikey/ibus-unikey-0.5.1-r1.ebuild @@ -1,26 +1,33 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-unikey/ibus-unikey-0.3.ebuild,v 1.1 2009/12/15 17:50:14 matsuu Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-unikey/ibus-unikey-0.5.1-r1.ebuild,v 1.1 2011/05/28 01:56:00 matsuu Exp $ -EAPI="2" +EAPI="3" +inherit eutils DESCRIPTION="Vietnamese Input Method Engine for IBUS using Unikey IME" HOMEPAGE="http://code.google.com/p/ibus-unikey/" SRC_URI="http://ibus-unikey.googlecode.com/files/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -RDEPEND=">=app-i18n/ibus-1.2 - x11-libs/gtk+:2 - gnome-base/gconf:2" +RDEPEND=">=app-i18n/ibus-1.3.99 + gnome-base/gconf:2 + >=x11-libs/gtk+-2.12:2 + x11-libs/libX11" DEPEND="${RDEPEND} dev-util/pkgconfig" +src_prepare() { + # http://pkgs.fedoraproject.org/gitweb/?p=ibus-unikey.git + epatch "${FILESDIR}/${PN}-ibus-1.4.patch" +} + src_install() { emake DESTDIR="${D}" install || die - dodoc AUTHORS ChangeLog NEWS README + dodoc AUTHORS ChangeLog NEWS README || die } diff --git a/app-i18n/ibus-unikey/ibus-unikey-0.4.ebuild b/app-i18n/ibus-unikey/ibus-unikey-0.5.1.ebuild index 26d186bd7729..6d7056553980 100644 --- a/app-i18n/ibus-unikey/ibus-unikey-0.4.ebuild +++ b/app-i18n/ibus-unikey/ibus-unikey-0.5.1.ebuild @@ -1,21 +1,24 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-unikey/ibus-unikey-0.4.ebuild,v 1.1 2010/04/14 16:42:44 matsuu Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-unikey/ibus-unikey-0.5.1.ebuild,v 1.1 2011/05/28 01:56:00 matsuu Exp $ -EAPI="2" +EAPI="3" +inherit eutils DESCRIPTION="Vietnamese Input Method Engine for IBUS using Unikey IME" HOMEPAGE="http://code.google.com/p/ibus-unikey/" SRC_URI="http://ibus-unikey.googlecode.com/files/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" RDEPEND=">=app-i18n/ibus-1.2 + !>=app-i18n/ibus-1.3.99 + gnome-base/gconf:2 >=x11-libs/gtk+-2.12:2 - gnome-base/gconf:2" + x11-libs/libX11" DEPEND="${RDEPEND} dev-util/pkgconfig" diff --git a/app-i18n/ibus-unikey/ibus-unikey-0.5.ebuild b/app-i18n/ibus-unikey/ibus-unikey-0.5.ebuild index a7258ebe06f0..4e54f9618f3a 100644 --- a/app-i18n/ibus-unikey/ibus-unikey-0.5.ebuild +++ b/app-i18n/ibus-unikey/ibus-unikey-0.5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-unikey/ibus-unikey-0.5.ebuild,v 1.1 2010/06/15 17:56:12 matsuu Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-unikey/ibus-unikey-0.5.ebuild,v 1.2 2011/05/28 01:56:00 matsuu Exp $ EAPI="2" @@ -14,6 +14,7 @@ KEYWORDS="~amd64 ~x86" IUSE="" RDEPEND=">=app-i18n/ibus-1.2 + !>=app-i18n/ibus-1.3.99 gnome-base/gconf:2 >=x11-libs/gtk+-2.12:2 x11-libs/libX11" |