[Fedora-i18n-bugs] [Bug 629939] New: POXLIFF errors when downloading XLIFF files from Pootle
by Red Hat Bugzilla
Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.
Summary: POXLIFF errors when downloading XLIFF files from Pootle
https://bugzilla.redhat.com/show_bug.cgi?id=629939
Summary: POXLIFF errors when downloading XLIFF files from
Pootle
Product: Fedora
Version: 14
Platform: All
OS/Version: Linux
Status: NEW
Severity: medium
Priority: low
Component: translate-toolkit
AssignedTo: roozbeh(a)gmail.com
ReportedBy: dwayne(a)translate.org.za
QAContact: extras-qa(a)fedoraproject.org
CC: roozbeh(a)gmail.com, dwayne(a)translate.org.za,
i18n-bugs(a)lists.fedoraproject.org
Classification: Fedora
[Fri Sep 03 12:48:50 2010] [error] Traceback (most recent call last):
[Fri Sep 03 12:48:50 2010] [error] File
"/usr/lib/python2.6/site-packages/django/core/handlers/base.py", line 100, in
get_response
[Fri Sep 03 12:48:50 2010] [error] response = callback(request,
*callback_args, **callback_kwargs)
[Fri Sep 03 12:48:50 2010] [error] File
"/usr/lib/python2.6/site-packages/pootle_store/views.py", line 58, in
export_as_xliff
[Fri Sep 03 12:48:50 2010] [error] outputstore = store.convert(PoXliffFile)
[Fri Sep 03 12:48:50 2010] [error] File
"/usr/lib/python2.6/site-packages/pootle_store/models.py", line 789, in convert
[Fri Sep 03 12:48:50 2010] [error]
output.addunit(unit.convert(output.UnitClass))
[Fri Sep 03 12:48:50 2010] [error] File
"/usr/lib/python2.6/site-packages/pootle_store/models.py", line 233, in convert
[Fri Sep 03 12:48:50 2010] [error] newunit.setid(self.getid())
[Fri Sep 03 12:48:50 2010] [error] File
"/usr/lib/python2.6/site-packages/translate/storage/poxliff.py", line 204, in
setid
[Fri Sep 03 12:48:50 2010] [error] self.xmlelement.set("id", id)
[Fri Sep 03 12:48:50 2010] [error] File "lxml.etree.pyx", line 634, in
lxml.etree._Element.set (src/lxml/lxml.etree.c:31899)
[Fri Sep 03 12:48:50 2010] [error] File "apihelpers.pxi", line 488, in
lxml.etree._setAttributeValue (src/lxml/lxml.etree.c:13905)
[Fri Sep 03 12:48:50 2010] [error] File "apihelpers.pxi", line 1295, in
lxml.etree._utf8 (src/lxml/lxml.etree.c:20199)
[Fri Sep 03 12:48:50 2010] [error] ValueError: All strings must be XML
compatible: Unicode or ASCII, no NULL bytes
--
Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
13 years, 6 months
[Fedora-i18n-bugs] [Bug 656375] New: paktype-fonts-common should be obsoleted now paktype-fonts is split
by Red Hat Bugzilla
Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.
Summary: paktype-fonts-common should be obsoleted now paktype-fonts is split
https://bugzilla.redhat.com/show_bug.cgi?id=656375
Summary: paktype-fonts-common should be obsoleted now
paktype-fonts is split
Product: Fedora
Version: 13
Platform: Unspecified
OS/Version: Unspecified
Status: NEW
Severity: low
Priority: low
Component: paktype-fonts
AssignedTo: b.rahul.pm(a)gmail.com
ReportedBy: pebolle(a)tiscali.nl
QAContact: extras-qa(a)fedoraproject.org
CC: petersen(a)redhat.com, b.rahul.pm(a)gmail.com,
psatpute(a)redhat.com, i18n-bugs(a)lists.fedoraproject.org
Classification: Fedora
Description of problem:
paktype-fonts-common should be obsoleted now paktype-fonts is split into
paktype-naqsh-fonts and paktype-tehreer-fonts.
Version-Release number of selected component (if applicable):
paktype-fonts-common-2.0-5
How reproducible:
Always
Steps to Reproduce:
1. upgrade a F12 system with paktype-fonts-common to F13 or above
2.
3.
Actual results:
paktype-fonts-common stays installed (and must be manually removed)
Expected results:
paktype-fonts-common should be removed
Additional info:
paktype-fonts used to consist of three packages: paktype-fonts-common,
paktype-naqsh-fonts, and paktype-tehreer-fonts (eg, see
http://koji.fedoraproject.org/koji/buildinfo?buildID=124901 ).
That package is retired in F13 and above and split in paktype-naqsh-fonts, and
paktype-tehreer-fonts (see bug #560864).
I guess what's needed to automatically clean up paktype-fonts-common is that
both the current paktype-naqsh-fonts package, and the current
paktype-tehreer-fonts package (somehow) obsolete paktype-fonts-common.
This bug is filed under the paktype-fonts component as that is more convenient.
--
Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
13 years, 6 months
[Fedora-i18n-bugs] [ibus-m17n/f14/master] Update to 1.3.1-8.
by Daiki Ueno
commit 200e1415b46ebb247aa50d63d95267621dbe1489
Author: Daiki Ueno <ueno(a)unixuser.org>
Date: Fri Dec 10 16:21:56 2010 +0900
Update to 1.3.1-8.
ibus-m17n-HEAD.patch | 228 +++++++++++++++++++++++++++++++-------------------
ibus-m17n.spec | 6 +-
2 files changed, 148 insertions(+), 86 deletions(-)
---
diff --git a/ibus-m17n-HEAD.patch b/ibus-m17n-HEAD.patch
index 27b2d75..e71c97e 100644
--- a/ibus-m17n-HEAD.patch
+++ b/ibus-m17n-HEAD.patch
@@ -159,12 +159,17 @@ index 07e4432..eaa8bd8 100644
) > $@
diff --git a/src/default.xml.in.in b/src/default.xml.in.in
new file mode 100644
-index 0000000..4acff1c
+index 0000000..5c5d67d
--- /dev/null
+++ b/src/default.xml.in.in
-@@ -0,0 +1,227 @@
+@@ -0,0 +1,246 @@
+<?xml version="1.0" encoding="utf-8"?>
+<engines>
++ <!-- This file defines the default config value for each
++ engine. The "engine" elements below are checked in
++ first-to-last order and a "name" element in an "engine"
++ element allows wildcard patterns. Please keep more
++ specific entries to appear first. -->
+ <!-- Indic engines which represent languages. -->
+ <engine>
+ <name>m17n:as:phonetic</name>
@@ -251,6 +256,65 @@ index 0000000..4acff1c
+ <rank>2</rank>
+ <preedit-highlight>FALSE</preedit-highlight>
+ </engine>
++ <!-- Samanala should have lower rank than other Sinhala
++ engines since it is the only non-keyboard input method in
++ Sinhala. -->
++ <engine>
++ <name>m17n:si:samanala</name>
++ <rank>0</rank>
++ <preedit-highlight>FALSE</preedit-highlight>
++ </engine>
++ <!-- Chinese and Japanese engines which require preedit decoration. -->
++ <engine>
++ <name>m17n:ja:anthy</name>
++ <rank>0</rank>
++ <preedit-highlight>TRUE</preedit-highlight>
++ </engine>
++ <engine>
++ <name>m17n:zh:cangjie</name>
++ <rank>0</rank>
++ <preedit-highlight>TRUE</preedit-highlight>
++ </engine>
++ <engine>
++ <name>m17n:zh:py-b5</name>
++ <rank>0</rank>
++ <preedit-highlight>TRUE</preedit-highlight>
++ </engine>
++ <engine>
++ <name>m17n:zh:py-gb</name>
++ <rank>0</rank>
++ <preedit-highlight>TRUE</preedit-highlight>
++ </engine>
++ <engine>
++ <name>m17n:zh:py</name>
++ <rank>0</rank>
++ <preedit-highlight>TRUE</preedit-highlight>
++ </engine>
++ <engine>
++ <name>m17n:zh:quick</name>
++ <rank>0</rank>
++ <preedit-highlight>TRUE</preedit-highlight>
++ </engine>
++ <engine>
++ <name>m17n:zh:tonepy-b5</name>
++ <rank>0</rank>
++ <preedit-highlight>TRUE</preedit-highlight>
++ </engine>
++ <engine>
++ <name>m17n:zh:tonepy-gb</name>
++ <rank>0</rank>
++ <preedit-highlight>TRUE</preedit-highlight>
++ </engine>
++ <engine>
++ <name>m17n:zh:tonepy</name>
++ <rank>0</rank>
++ <preedit-highlight>TRUE</preedit-highlight>
++ </engine>
++ <engine>
++ <name>m17n:zh:util</name>
++ <rank>0</rank>
++ <preedit-highlight>TRUE</preedit-highlight>
++ </engine>
+ <!-- Other Indic engines should be selected by default:
+ https://bugzilla.redhat.com/show_bug.cgi?id=640896 -->
+ <engine>
@@ -338,56 +402,11 @@ index 0000000..4acff1c
+ <rank>1</rank>
+ <preedit-highlight>FALSE</preedit-highlight>
+ </engine>
-+ <!-- Chinese and Japanese engines which require preedit decoration. -->
-+ <engine>
-+ <name>m17n:ja:anthy</name>
-+ <rank>0</rank>
-+ <preedit-highlight>TRUE</preedit-highlight>
-+ </engine>
-+ <engine>
-+ <name>m17n:zh:cangjie</name>
-+ <rank>0</rank>
-+ <preedit-highlight>TRUE</preedit-highlight>
-+ </engine>
-+ <engine>
-+ <name>m17n:zh:py-b5</name>
-+ <rank>0</rank>
-+ <preedit-highlight>TRUE</preedit-highlight>
-+ </engine>
-+ <engine>
-+ <name>m17n:zh:py-gb</name>
-+ <rank>0</rank>
-+ <preedit-highlight>TRUE</preedit-highlight>
-+ </engine>
-+ <engine>
-+ <name>m17n:zh:py</name>
-+ <rank>0</rank>
-+ <preedit-highlight>TRUE</preedit-highlight>
-+ </engine>
-+ <engine>
-+ <name>m17n:zh:quick</name>
-+ <rank>0</rank>
-+ <preedit-highlight>TRUE</preedit-highlight>
-+ </engine>
-+ <engine>
-+ <name>m17n:zh:tonepy-b5</name>
-+ <rank>0</rank>
-+ <preedit-highlight>TRUE</preedit-highlight>
-+ </engine>
-+ <engine>
-+ <name>m17n:zh:tonepy-gb</name>
-+ <rank>0</rank>
-+ <preedit-highlight>TRUE</preedit-highlight>
-+ </engine>
-+ <engine>
-+ <name>m17n:zh:tonepy</name>
-+ <rank>0</rank>
-+ <preedit-highlight>TRUE</preedit-highlight>
-+ </engine>
++ <!-- Default for other engines. -->
+ <engine>
-+ <name>m17n:zh:util</name>
++ <name>m17n:*</name>
+ <rank>0</rank>
-+ <preedit-highlight>TRUE</preedit-highlight>
++ <preedit-highlight>FALSE</preedit-highlight>
+ </engine>
+</engines>
diff --git a/src/engine.c b/src/engine.c
@@ -1129,10 +1148,10 @@ index 3ea4394..97d72d2 100644
<engines exec=\"${libexecdir}/ibus-engine-m17n --xml\" />
</component>
diff --git a/src/m17nutil.c b/src/m17nutil.c
-index ae0fe56..7bc4ea5 100644
+index ae0fe56..6d6961f 100644
--- a/src/m17nutil.c
+++ b/src/m17nutil.c
-@@ -7,39 +7,22 @@
+@@ -7,39 +7,17 @@
static MConverter *utf8_converter = NULL;
@@ -1154,12 +1173,8 @@ index ae0fe56..7bc4ea5 100644
- "m17n:si:wijesekera",
- "m17n:ta:tamil99",
- "m17n:te:inscript"
+-};
+#define DEFAULT_XML (SETUPDIR "/default.xml")
-+
-+static IBusM17NEngineConfig default_config = {
-+ .rank = 0,
-+ .preedit_highlight = FALSE
- };
-static const gchar *preedit_highlight[] = {
- "m17n:ja:anthy",
@@ -1184,7 +1199,7 @@ index ae0fe56..7bc4ea5 100644
void
ibus_m17n_init_common (void)
{
-@@ -101,11 +84,16 @@ guint
+@@ -101,11 +79,16 @@ guint
ibus_m17n_parse_color (const gchar *hex)
{
guint color;
@@ -1206,7 +1221,17 @@ index ae0fe56..7bc4ea5 100644
}
static IBusEngineDesc *
-@@ -121,7 +109,6 @@ ibus_m17n_engine_new (MSymbol lang,
+@@ -113,7 +96,8 @@ ibus_m17n_engine_new (MSymbol lang,
+ MSymbol name,
+ MText *title,
+ MText *icon,
+- MText *desc)
++ MText *desc,
++ IBusM17NEngineConfig *config)
+ {
+ IBusEngineDesc *engine;
+ gchar *engine_name;
+@@ -121,7 +105,6 @@ ibus_m17n_engine_new (MSymbol lang,
gchar *engine_title;
gchar *engine_icon;
gchar *engine_desc;
@@ -1214,10 +1239,13 @@ index ae0fe56..7bc4ea5 100644
engine_name = g_strdup_printf ("m17n:%s:%s", msymbol_name (lang), msymbol_name (name));
-@@ -141,14 +128,6 @@ ibus_m17n_engine_new (MSymbol lang,
- /* set default rank to 0 */
- engine->rank = 0;
-
+@@ -138,16 +121,7 @@ ibus_m17n_engine_new (MSymbol lang,
+ "",
+ engine_icon ? engine_icon : "",
+ "us");
+- /* set default rank to 0 */
+- engine->rank = 0;
+-
- for (i = 0; i < G_N_ELEMENTS(keymap); i++) {
- if (strcmp (engine_name, keymap[i]) == 0) {
- /* set rank of default keymap to 1 */
@@ -1225,11 +1253,49 @@ index ae0fe56..7bc4ea5 100644
- break;
- }
- }
--
++ engine->rank = config->rank;
+
g_free (engine_name);
g_free (engine_longname);
- g_free (engine_title);
-@@ -241,11 +220,62 @@ ibus_m17n_list_engines (void)
+@@ -178,10 +152,28 @@ ibus_m17n_list_engines (void)
+ MText *icon = NULL;
+ MText *desc = NULL;
+ MPlist *l;
++ gchar *engine_name;
++ IBusM17NEngineConfig *config;
+
+ lang = tag[1];
+ name = tag[2];
+
++ /* ignore input-method explicitly blacklisted in default.xml */
++ engine_name = g_strdup_printf ("m17n:%s:%s", msymbol_name (lang), msymbol_name (name));
++ config = ibus_m17n_get_engine_config (engine_name);
++ if (config == NULL) {
++ g_warning ("can't load config for %s", engine_name);
++ g_free (engine_name);
++ continue;
++ }
++ if (config->rank < 0) {
++ g_warning ("skipped %s since its rank is lower than 0",
++ engine_name);
++ g_free (engine_name);
++ continue;
++ }
++ g_free (engine_name);
++
+ l = minput_get_variable (lang, name, msymbol ("candidates-charset"));
+ if (l) {
+ /* check candidates encoding */
+@@ -226,7 +218,7 @@ ibus_m17n_list_engines (void)
+ icon = mplist_value (n);
+ }
+
+- engines = g_list_append (engines, ibus_m17n_engine_new (lang, name, title, icon, desc));
++ engines = g_list_append (engines, ibus_m17n_engine_new (lang, name, title, icon, desc, config));
+
+ if (desc)
+ m17n_object_unref (desc);
+@@ -241,11 +233,58 @@ ibus_m17n_list_engines (void)
return engines;
}
@@ -1244,7 +1310,7 @@ index ae0fe56..7bc4ea5 100644
+ if (g_pattern_match_simple (cnode->name, engine_name))
+ return &cnode->config;
+ }
-+ return &default_config;
++ g_return_val_if_reached (NULL);
+}
+
+static gboolean
@@ -1253,10 +1319,6 @@ index ae0fe56..7bc4ea5 100644
+{
+ GList *p;
+
-+ cnode->name = NULL;
-+ memcpy (&cnode->config, &default_config,
-+ sizeof (IBusM17NEngineConfig));
-+
+ for (p = node->sub_nodes; p != NULL; p = p->next) {
+ XMLNode *sub_node = (XMLNode *) p->data;
+
@@ -1292,7 +1354,7 @@ index ae0fe56..7bc4ea5 100644
component = ibus_component_new ("org.freedesktop.IBus.M17n",
N_("M17N"),
-@@ -256,26 +286,45 @@ ibus_m17n_get_component (void)
+@@ -256,26 +295,39 @@ ibus_m17n_get_component (void)
"",
"ibus-m17n");
@@ -1308,7 +1370,7 @@ index ae0fe56..7bc4ea5 100644
+ continue;
+ }
+
-+ cnode = g_slice_new (IBusM17NEngineConfigNode);
++ cnode = g_slice_new0 (IBusM17NEngineConfigNode);
+ if (!ibus_m17n_engine_config_parse_xml_node (cnode, sub_node)) {
+ g_slice_free (IBusM17NEngineConfigNode, cnode);
+ continue;
@@ -1323,15 +1385,11 @@ index ae0fe56..7bc4ea5 100644
+
engines = ibus_m17n_list_engines ();
- for (p = engines; p != NULL; p = p->next) {
+- for (p = engines; p != NULL; p = p->next) {
- ibus_component_add_engine (component, (IBusEngineDesc *) p->data);
-+ IBusEngineDesc *engine = p->data;
-+ IBusM17NEngineConfig *config;
-+
-+ config = ibus_m17n_get_engine_config (engine->name);
-+ engine->rank = config->rank;
-+ ibus_component_add_engine (component, engine);
- }
+- }
++ for (p = engines; p != NULL; p = p->next)
++ ibus_component_add_engine (component, p->data);
g_list_free (engines);
- return component;
@@ -1351,13 +1409,13 @@ index ae0fe56..7bc4ea5 100644
}
#ifdef DEBUG
-@@ -304,4 +353,3 @@ int main ()
+@@ -304,4 +356,3 @@ int main ()
return 0;
}
#endif
-
diff --git a/src/m17nutil.h b/src/m17nutil.h
-index 7561505..5427b25 100644
+index 7561505..a9be667 100644
--- a/src/m17nutil.h
+++ b/src/m17nutil.h
@@ -10,6 +10,16 @@
@@ -1365,10 +1423,10 @@ index 7561505..5427b25 100644
#define PREEDIT_BACKGROUND 0x00c8c8f0
+struct _IBusM17NEngineConfig {
-+ /* engine rank (default 0) */
++ /* engine rank */
+ gint rank;
+
-+ /* whether to highlight preedit (default FALSE) */
++ /* whether to highlight preedit */
+ gboolean preedit_highlight;
+};
+
diff --git a/ibus-m17n.spec b/ibus-m17n.spec
index 7365f18..6ea1dde 100644
--- a/ibus-m17n.spec
+++ b/ibus-m17n.spec
@@ -2,7 +2,7 @@
Name: ibus-m17n
Version: 1.3.1
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: The M17N engine for IBus platform
License: GPLv2+
Group: System Environment/Libraries
@@ -60,6 +60,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/ibus/component/*
%changelog
+* Fri Dec 10 2010 Daiki Ueno <dueno(a)redhat.com> - 1.3.1-8
+- Update ibus-m17n-HEAD.patch.
+- Lower si-samanala.mim rank per request from a Sinhala user.
+
* Wed Dec 8 2010 Daiki Ueno <dueno(a)redhat.com> - 1.3.1-7
- Update ibus-m17n-HEAD.patch.
- Fix bug 658336 - ibus-m17n: define the IM ranks in a config file and
13 years, 6 months
[Fedora-i18n-bugs] [ibus-m17n] Update ibus-1.4 patch.
by Daiki Ueno
commit 4fafe0858349ed97fd9cdeec031bdfd89b93e9af
Author: Daiki Ueno <ueno(a)unixuser.org>
Date: Fri Dec 10 16:05:05 2010 +0900
Update ibus-1.4 patch.
ibus-m17n-ibus-1.4.patch | 37 +++++++------------------------------
1 files changed, 7 insertions(+), 30 deletions(-)
---
diff --git a/ibus-m17n-ibus-1.4.patch b/ibus-m17n-ibus-1.4.patch
index 41b44c0..928f732 100644
--- a/ibus-m17n-ibus-1.4.patch
+++ b/ibus-m17n-ibus-1.4.patch
@@ -1,14 +1,14 @@
-From 0399c80ffa111c5b16943242b817063d0e64b2fe Mon Sep 17 00:00:00 2001
+From c7acc11b3a8e72efb2479b3d1a6f20abb156994c Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno(a)unixuser.org>
Date: Fri, 3 Dec 2010 17:05:45 +0900
Subject: [PATCH] Fix problem with ibus-1.4
---
src/engine.c | 58 +++++++++++++++++++++++--------------------------
- src/m17nutil.c | 27 ++++++++++-------------
+ src/m17nutil.c | 18 +++++++-------
src/main.c | 7 +++--
src/setup.c | 65 ++++++++++++++++++++++++++++---------------------------
- 4 files changed, 76 insertions(+), 81 deletions(-)
+ 4 files changed, 73 insertions(+), 75 deletions(-)
diff --git a/src/engine.c b/src/engine.c
index f8e7fe5..5fbe46f 100644
@@ -131,22 +131,13 @@ index f8e7fe5..5fbe46f 100644
}
}
diff --git a/src/m17nutil.c b/src/m17nutil.c
-index 7bc4ea5..8fac1fe 100644
+index 6d6961f..c4098c7 100644
--- a/src/m17nutil.c
+++ b/src/m17nutil.c
-@@ -109,6 +109,7 @@ ibus_m17n_engine_new (MSymbol lang,
- gchar *engine_title;
- gchar *engine_icon;
- gchar *engine_desc;
-+ IBusM17NEngineConfig *config;
-
- engine_name = g_strdup_printf ("m17n:%s:%s", msymbol_name (lang), msymbol_name (name));
-
-@@ -116,17 +117,17 @@ ibus_m17n_engine_new (MSymbol lang,
- engine_title = ibus_m17n_mtext_to_utf8 (title);
+@@ -113,15 +113,15 @@ ibus_m17n_engine_new (MSymbol lang,
engine_icon = ibus_m17n_mtext_to_utf8 (icon);
engine_desc = ibus_m17n_mtext_to_utf8 (desc);
--
+
- engine = ibus_engine_desc_new (engine_name,
- engine_longname,
- engine_desc ? engine_desc : "",
@@ -155,10 +146,7 @@ index 7bc4ea5..8fac1fe 100644
- "",
- engine_icon ? engine_icon : "",
- "us");
-- /* set default rank to 0 */
-- engine->rank = 0;
-+ config = ibus_m17n_get_engine_config (engine_name);
-+
+- engine->rank = config->rank;
+ engine = ibus_engine_desc_new_varargs ("name", engine_name,
+ "longname", engine_longname,
+ "description", engine_desc ? engine_desc : "",
@@ -171,17 +159,6 @@ index 7bc4ea5..8fac1fe 100644
g_free (engine_name);
g_free (engine_longname);
-@@ -315,10 +316,6 @@ ibus_m17n_get_component (void)
-
- for (p = engines; p != NULL; p = p->next) {
- IBusEngineDesc *engine = p->data;
-- IBusM17NEngineConfig *config;
--
-- config = ibus_m17n_get_engine_config (engine->name);
-- engine->rank = config->rank;
- ibus_component_add_engine (component, engine);
- }
-
diff --git a/src/main.c b/src/main.c
index e76898d..bba31e1 100644
--- a/src/main.c
13 years, 6 months
[Fedora-i18n-bugs] [ibus-m17n] Update to 1.3.1-11.
by Daiki Ueno
commit 88f6916fdb741206790b5af5150147294ff9c756
Author: Daiki Ueno <ueno(a)unixuser.org>
Date: Fri Dec 10 15:43:35 2010 +0900
Update to 1.3.1-11.
ibus-m17n-HEAD.patch | 228 +++++++++++++++++++++++++++++++-------------------
ibus-m17n.spec | 6 +-
2 files changed, 148 insertions(+), 86 deletions(-)
---
diff --git a/ibus-m17n-HEAD.patch b/ibus-m17n-HEAD.patch
index 27b2d75..e71c97e 100644
--- a/ibus-m17n-HEAD.patch
+++ b/ibus-m17n-HEAD.patch
@@ -159,12 +159,17 @@ index 07e4432..eaa8bd8 100644
) > $@
diff --git a/src/default.xml.in.in b/src/default.xml.in.in
new file mode 100644
-index 0000000..4acff1c
+index 0000000..5c5d67d
--- /dev/null
+++ b/src/default.xml.in.in
-@@ -0,0 +1,227 @@
+@@ -0,0 +1,246 @@
+<?xml version="1.0" encoding="utf-8"?>
+<engines>
++ <!-- This file defines the default config value for each
++ engine. The "engine" elements below are checked in
++ first-to-last order and a "name" element in an "engine"
++ element allows wildcard patterns. Please keep more
++ specific entries to appear first. -->
+ <!-- Indic engines which represent languages. -->
+ <engine>
+ <name>m17n:as:phonetic</name>
@@ -251,6 +256,65 @@ index 0000000..4acff1c
+ <rank>2</rank>
+ <preedit-highlight>FALSE</preedit-highlight>
+ </engine>
++ <!-- Samanala should have lower rank than other Sinhala
++ engines since it is the only non-keyboard input method in
++ Sinhala. -->
++ <engine>
++ <name>m17n:si:samanala</name>
++ <rank>0</rank>
++ <preedit-highlight>FALSE</preedit-highlight>
++ </engine>
++ <!-- Chinese and Japanese engines which require preedit decoration. -->
++ <engine>
++ <name>m17n:ja:anthy</name>
++ <rank>0</rank>
++ <preedit-highlight>TRUE</preedit-highlight>
++ </engine>
++ <engine>
++ <name>m17n:zh:cangjie</name>
++ <rank>0</rank>
++ <preedit-highlight>TRUE</preedit-highlight>
++ </engine>
++ <engine>
++ <name>m17n:zh:py-b5</name>
++ <rank>0</rank>
++ <preedit-highlight>TRUE</preedit-highlight>
++ </engine>
++ <engine>
++ <name>m17n:zh:py-gb</name>
++ <rank>0</rank>
++ <preedit-highlight>TRUE</preedit-highlight>
++ </engine>
++ <engine>
++ <name>m17n:zh:py</name>
++ <rank>0</rank>
++ <preedit-highlight>TRUE</preedit-highlight>
++ </engine>
++ <engine>
++ <name>m17n:zh:quick</name>
++ <rank>0</rank>
++ <preedit-highlight>TRUE</preedit-highlight>
++ </engine>
++ <engine>
++ <name>m17n:zh:tonepy-b5</name>
++ <rank>0</rank>
++ <preedit-highlight>TRUE</preedit-highlight>
++ </engine>
++ <engine>
++ <name>m17n:zh:tonepy-gb</name>
++ <rank>0</rank>
++ <preedit-highlight>TRUE</preedit-highlight>
++ </engine>
++ <engine>
++ <name>m17n:zh:tonepy</name>
++ <rank>0</rank>
++ <preedit-highlight>TRUE</preedit-highlight>
++ </engine>
++ <engine>
++ <name>m17n:zh:util</name>
++ <rank>0</rank>
++ <preedit-highlight>TRUE</preedit-highlight>
++ </engine>
+ <!-- Other Indic engines should be selected by default:
+ https://bugzilla.redhat.com/show_bug.cgi?id=640896 -->
+ <engine>
@@ -338,56 +402,11 @@ index 0000000..4acff1c
+ <rank>1</rank>
+ <preedit-highlight>FALSE</preedit-highlight>
+ </engine>
-+ <!-- Chinese and Japanese engines which require preedit decoration. -->
-+ <engine>
-+ <name>m17n:ja:anthy</name>
-+ <rank>0</rank>
-+ <preedit-highlight>TRUE</preedit-highlight>
-+ </engine>
-+ <engine>
-+ <name>m17n:zh:cangjie</name>
-+ <rank>0</rank>
-+ <preedit-highlight>TRUE</preedit-highlight>
-+ </engine>
-+ <engine>
-+ <name>m17n:zh:py-b5</name>
-+ <rank>0</rank>
-+ <preedit-highlight>TRUE</preedit-highlight>
-+ </engine>
-+ <engine>
-+ <name>m17n:zh:py-gb</name>
-+ <rank>0</rank>
-+ <preedit-highlight>TRUE</preedit-highlight>
-+ </engine>
-+ <engine>
-+ <name>m17n:zh:py</name>
-+ <rank>0</rank>
-+ <preedit-highlight>TRUE</preedit-highlight>
-+ </engine>
-+ <engine>
-+ <name>m17n:zh:quick</name>
-+ <rank>0</rank>
-+ <preedit-highlight>TRUE</preedit-highlight>
-+ </engine>
-+ <engine>
-+ <name>m17n:zh:tonepy-b5</name>
-+ <rank>0</rank>
-+ <preedit-highlight>TRUE</preedit-highlight>
-+ </engine>
-+ <engine>
-+ <name>m17n:zh:tonepy-gb</name>
-+ <rank>0</rank>
-+ <preedit-highlight>TRUE</preedit-highlight>
-+ </engine>
-+ <engine>
-+ <name>m17n:zh:tonepy</name>
-+ <rank>0</rank>
-+ <preedit-highlight>TRUE</preedit-highlight>
-+ </engine>
++ <!-- Default for other engines. -->
+ <engine>
-+ <name>m17n:zh:util</name>
++ <name>m17n:*</name>
+ <rank>0</rank>
-+ <preedit-highlight>TRUE</preedit-highlight>
++ <preedit-highlight>FALSE</preedit-highlight>
+ </engine>
+</engines>
diff --git a/src/engine.c b/src/engine.c
@@ -1129,10 +1148,10 @@ index 3ea4394..97d72d2 100644
<engines exec=\"${libexecdir}/ibus-engine-m17n --xml\" />
</component>
diff --git a/src/m17nutil.c b/src/m17nutil.c
-index ae0fe56..7bc4ea5 100644
+index ae0fe56..6d6961f 100644
--- a/src/m17nutil.c
+++ b/src/m17nutil.c
-@@ -7,39 +7,22 @@
+@@ -7,39 +7,17 @@
static MConverter *utf8_converter = NULL;
@@ -1154,12 +1173,8 @@ index ae0fe56..7bc4ea5 100644
- "m17n:si:wijesekera",
- "m17n:ta:tamil99",
- "m17n:te:inscript"
+-};
+#define DEFAULT_XML (SETUPDIR "/default.xml")
-+
-+static IBusM17NEngineConfig default_config = {
-+ .rank = 0,
-+ .preedit_highlight = FALSE
- };
-static const gchar *preedit_highlight[] = {
- "m17n:ja:anthy",
@@ -1184,7 +1199,7 @@ index ae0fe56..7bc4ea5 100644
void
ibus_m17n_init_common (void)
{
-@@ -101,11 +84,16 @@ guint
+@@ -101,11 +79,16 @@ guint
ibus_m17n_parse_color (const gchar *hex)
{
guint color;
@@ -1206,7 +1221,17 @@ index ae0fe56..7bc4ea5 100644
}
static IBusEngineDesc *
-@@ -121,7 +109,6 @@ ibus_m17n_engine_new (MSymbol lang,
+@@ -113,7 +96,8 @@ ibus_m17n_engine_new (MSymbol lang,
+ MSymbol name,
+ MText *title,
+ MText *icon,
+- MText *desc)
++ MText *desc,
++ IBusM17NEngineConfig *config)
+ {
+ IBusEngineDesc *engine;
+ gchar *engine_name;
+@@ -121,7 +105,6 @@ ibus_m17n_engine_new (MSymbol lang,
gchar *engine_title;
gchar *engine_icon;
gchar *engine_desc;
@@ -1214,10 +1239,13 @@ index ae0fe56..7bc4ea5 100644
engine_name = g_strdup_printf ("m17n:%s:%s", msymbol_name (lang), msymbol_name (name));
-@@ -141,14 +128,6 @@ ibus_m17n_engine_new (MSymbol lang,
- /* set default rank to 0 */
- engine->rank = 0;
-
+@@ -138,16 +121,7 @@ ibus_m17n_engine_new (MSymbol lang,
+ "",
+ engine_icon ? engine_icon : "",
+ "us");
+- /* set default rank to 0 */
+- engine->rank = 0;
+-
- for (i = 0; i < G_N_ELEMENTS(keymap); i++) {
- if (strcmp (engine_name, keymap[i]) == 0) {
- /* set rank of default keymap to 1 */
@@ -1225,11 +1253,49 @@ index ae0fe56..7bc4ea5 100644
- break;
- }
- }
--
++ engine->rank = config->rank;
+
g_free (engine_name);
g_free (engine_longname);
- g_free (engine_title);
-@@ -241,11 +220,62 @@ ibus_m17n_list_engines (void)
+@@ -178,10 +152,28 @@ ibus_m17n_list_engines (void)
+ MText *icon = NULL;
+ MText *desc = NULL;
+ MPlist *l;
++ gchar *engine_name;
++ IBusM17NEngineConfig *config;
+
+ lang = tag[1];
+ name = tag[2];
+
++ /* ignore input-method explicitly blacklisted in default.xml */
++ engine_name = g_strdup_printf ("m17n:%s:%s", msymbol_name (lang), msymbol_name (name));
++ config = ibus_m17n_get_engine_config (engine_name);
++ if (config == NULL) {
++ g_warning ("can't load config for %s", engine_name);
++ g_free (engine_name);
++ continue;
++ }
++ if (config->rank < 0) {
++ g_warning ("skipped %s since its rank is lower than 0",
++ engine_name);
++ g_free (engine_name);
++ continue;
++ }
++ g_free (engine_name);
++
+ l = minput_get_variable (lang, name, msymbol ("candidates-charset"));
+ if (l) {
+ /* check candidates encoding */
+@@ -226,7 +218,7 @@ ibus_m17n_list_engines (void)
+ icon = mplist_value (n);
+ }
+
+- engines = g_list_append (engines, ibus_m17n_engine_new (lang, name, title, icon, desc));
++ engines = g_list_append (engines, ibus_m17n_engine_new (lang, name, title, icon, desc, config));
+
+ if (desc)
+ m17n_object_unref (desc);
+@@ -241,11 +233,58 @@ ibus_m17n_list_engines (void)
return engines;
}
@@ -1244,7 +1310,7 @@ index ae0fe56..7bc4ea5 100644
+ if (g_pattern_match_simple (cnode->name, engine_name))
+ return &cnode->config;
+ }
-+ return &default_config;
++ g_return_val_if_reached (NULL);
+}
+
+static gboolean
@@ -1253,10 +1319,6 @@ index ae0fe56..7bc4ea5 100644
+{
+ GList *p;
+
-+ cnode->name = NULL;
-+ memcpy (&cnode->config, &default_config,
-+ sizeof (IBusM17NEngineConfig));
-+
+ for (p = node->sub_nodes; p != NULL; p = p->next) {
+ XMLNode *sub_node = (XMLNode *) p->data;
+
@@ -1292,7 +1354,7 @@ index ae0fe56..7bc4ea5 100644
component = ibus_component_new ("org.freedesktop.IBus.M17n",
N_("M17N"),
-@@ -256,26 +286,45 @@ ibus_m17n_get_component (void)
+@@ -256,26 +295,39 @@ ibus_m17n_get_component (void)
"",
"ibus-m17n");
@@ -1308,7 +1370,7 @@ index ae0fe56..7bc4ea5 100644
+ continue;
+ }
+
-+ cnode = g_slice_new (IBusM17NEngineConfigNode);
++ cnode = g_slice_new0 (IBusM17NEngineConfigNode);
+ if (!ibus_m17n_engine_config_parse_xml_node (cnode, sub_node)) {
+ g_slice_free (IBusM17NEngineConfigNode, cnode);
+ continue;
@@ -1323,15 +1385,11 @@ index ae0fe56..7bc4ea5 100644
+
engines = ibus_m17n_list_engines ();
- for (p = engines; p != NULL; p = p->next) {
+- for (p = engines; p != NULL; p = p->next) {
- ibus_component_add_engine (component, (IBusEngineDesc *) p->data);
-+ IBusEngineDesc *engine = p->data;
-+ IBusM17NEngineConfig *config;
-+
-+ config = ibus_m17n_get_engine_config (engine->name);
-+ engine->rank = config->rank;
-+ ibus_component_add_engine (component, engine);
- }
+- }
++ for (p = engines; p != NULL; p = p->next)
++ ibus_component_add_engine (component, p->data);
g_list_free (engines);
- return component;
@@ -1351,13 +1409,13 @@ index ae0fe56..7bc4ea5 100644
}
#ifdef DEBUG
-@@ -304,4 +353,3 @@ int main ()
+@@ -304,4 +356,3 @@ int main ()
return 0;
}
#endif
-
diff --git a/src/m17nutil.h b/src/m17nutil.h
-index 7561505..5427b25 100644
+index 7561505..a9be667 100644
--- a/src/m17nutil.h
+++ b/src/m17nutil.h
@@ -10,6 +10,16 @@
@@ -1365,10 +1423,10 @@ index 7561505..5427b25 100644
#define PREEDIT_BACKGROUND 0x00c8c8f0
+struct _IBusM17NEngineConfig {
-+ /* engine rank (default 0) */
++ /* engine rank */
+ gint rank;
+
-+ /* whether to highlight preedit (default FALSE) */
++ /* whether to highlight preedit */
+ gboolean preedit_highlight;
+};
+
diff --git a/ibus-m17n.spec b/ibus-m17n.spec
index 84d93d8..a901c6e 100644
--- a/ibus-m17n.spec
+++ b/ibus-m17n.spec
@@ -2,7 +2,7 @@
Name: ibus-m17n
Version: 1.3.1
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: The M17N engine for IBus platform
License: GPLv2+
Group: System Environment/Libraries
@@ -66,6 +66,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/ibus/component/*
%changelog
+* Fri Dec 10 2010 Daiki Ueno <dueno(a)redhat.com> - 1.3.1-11
+- Update ibus-m17n-HEAD.patch.
+- Lower si-samanala.mim rank per request from a Sinhala user.
+
* Wed Dec 8 2010 Daiki Ueno <dueno(a)redhat.com> - 1.3.1-10
- Update ibus-m17n-HEAD.patch.
- Fix bug 658336 - ibus-m17n: define the IM ranks in a config file and
13 years, 6 months
[Fedora-i18n-bugs] [eclipse-nls/f13/master] - Updated from upstream to 0.8.0 (3.5.0.v20100814074441) - Added locales ca, en_CA, fa and id - Mark
by Sean Flanigan
commit f003dac29c32cef4176e4f164c57bb46bc69489c
Author: Sean Flanigan <sflaniga(a)redhat.com>
Date: Fri Dec 10 13:10:35 2010 +1000
- Updated from upstream to 0.8.0 (3.5.0.v20100814074441)
- Added locales ca, en_CA, fa and id
- Marked eclipse-nls as not having debuginfo
.gitignore | 11 ++++++++++-
eclipse-nls.spec | 21 +++++++++++++++------
fetch-babel.sh | 32 ++++++++++++++++++++------------
sources | 2 +-
4 files changed, 46 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9e69c69..4992d6c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,10 @@
-BabelLanguagePack-3.5.0.v20090620043401.tar.bz2
+BabelLanguagePack-3.5.0.v20100729072834.tar.bz2
+BabelLanguagePack-3.5.0.v20100731072648.tar.bz2
+/BabelLanguagePack-3.5.0.v20100814074441.tar.bz2
+nohup.out
+/eclipse/
+/eclipse-nls/
+/.*.log
+*~
+/clog
+eclipse-nls*.rpm
diff --git a/eclipse-nls.spec b/eclipse-nls.spec
index 546a77d..e79d171 100644
--- a/eclipse-nls.spec
+++ b/eclipse-nls.spec
@@ -3,19 +3,19 @@
# and we don't need multilib anyway:
%define __jar_repack %{nil}
+%define debug_package %{nil}
+
Name: eclipse-nls
Summary: Babel language packs for the Eclipse platform and various plugins
Group: Text Editors/Integrated Development Environments (IDE)
License: EPL
URL: http://babel.eclipse.org/
-Version: 3.5.0.v20090620043401
-Release: 2%{?dist}
+Version: 3.5.0.v20100814074441
+Release: 1%{?dist}
## The source for this package is taken from
-# http://download.eclipse.org/technology/babel/babel_language_packs/ *.zip
-# and http://download.eclipse.org/technology/babel/update-site/galileo/{artifac...
-# or http://build.eclipse.org/technology/babel/test-updates/galileo/{artifacts...
-# or http://download.eclipse.org/technology/babel/update-site/galileo/site.xml
+# http://download.eclipse.org/technology/babel/babel_language_packs/R0.8.0/...
+# usage: FROM=http://download.eclipse.org/technology/babel/babel_language_packs/R0... ./fetch-babel.sh
Source0: BabelLanguagePack-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -72,13 +72,16 @@ have a translation for a given string. \
%lang_meta_pkg ar ar Arabic
%lang_meta_pkg bg bg Bulgarian
+%lang_meta_pkg ca ca Catalan
%lang_meta_pkg zh zh Chinese%{spc}(Simplified)
%lang_meta_pkg zh_TW zh_TW Chinese%{spc}(Traditional)
%lang_meta_pkg cs cs Czech
%lang_meta_pkg da da Danish
%lang_meta_pkg nl nl Dutch
%lang_meta_pkg en_AU en_AU English%{spc}(Australian)
+%lang_meta_pkg en_CA en_CA English%{spc}(Canadian)
%lang_meta_pkg et et Estonian
+%lang_meta_pkg fa fa Farsi
%lang_meta_pkg fi fi Finnish
%lang_meta_pkg fr fr French
%lang_meta_pkg de de German
@@ -88,6 +91,7 @@ have a translation for a given string. \
%lang_meta_pkg he iw Hebrew
%lang_meta_pkg hi hi Hindi
%lang_meta_pkg hu hu Hungarian
+%lang_meta_pkg id id Indonesian
%lang_meta_pkg it it Italian
%lang_meta_pkg ja ja Japanese
# tl should be Tagalog. Klingon has < 1% coverage at present in Babel. Tagalog is unsupported.
@@ -138,6 +142,11 @@ cp -a eclipse $RPM_BUILD_ROOT%{eclipse_data}/dropins/babel/
rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Dec 10 2010 Sean Flanigan <sflaniga(a)redhat.com> - 3.5.0.v20100814074441-1
+- Updated from upstream to 0.8.0 (3.5.0.v20100814074441)
+- Added locales ca, en_CA, fa and id
+- Marked eclipse-nls as not having debuginfo
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.5.0.v20090620043401-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
diff --git a/fetch-babel.sh b/fetch-babel.sh
index 2ff41d5..0c3e22a 100644
--- a/fetch-babel.sh
+++ b/fetch-babel.sh
@@ -1,26 +1,34 @@
#!/bin/bash -e
-LANGPACKS=http://download.eclipse.org/technology/babel/babel_language_packs
-ZIP_DOWNLOAD_PAGE=$LANGPACKS/galileo.php
-
+FROM=${FROM:-http://download.eclipse.org/technology/babel/babel_language_packs/R0.8.0/galileo.php}
+LANGPACKS=${FROM%/*}
CURL='curl -H Pragma: --remote-time --show-error --silent'
#CURL='curl --remote-time --show-error'
WORKDIR=eclipse-nls
mkdir -p $WORKDIR
cd $WORKDIR
-$CURL $ZIP_DOWNLOAD_PAGE -o index.html
+$CURL $FROM -o index.html
ziplist=`mktemp --tmpdir -t`
sed -n 's/.*<a href="\([^"]*\.zip\)">.*/\1/p' index.html > $ziplist
version=`sed -n 's/.*_\([^_]*\)\.zip.*/\1/p' $ziplist|head -1`
echo "Langpack version: $version"
+echo "Downloading all langpacks from $FROM"
-for zip in `cat $ziplist`; do
- zipbase=`basename $zip`
- if [ ! -r $zipbase ]; then
- echo "Downloading $zipbase"
- $CURL -o $zipbase.tmp -C - $LANGPACKS/$zip
- mv $zipbase.tmp $zipbase
- fi
+zips=(`cat $ziplist`)
+zipslen=${#zips[*]}
+for index in ${!zips[*]}; do
+ zip=${zips[$index]}
+ zipbase=`basename $zip`
+ if [ ! -r $zipbase ]; then
+ echo "[$((index+1))/$zipslen] Downloading $zipbase"
+ $CURL -o $zipbase.tmp -C - $LANGPACKS/$zipbase
+ mv $zipbase.tmp $zipbase
+ else
+ echo "[$((index+1))/$zipslen] Skipping $zipbase (file exists)"
+ fi
done
+
rm -f $ziplist
cd ..
-tar cjf BabelLanguagePack-$version.tar.bz2 $WORKDIR
+tarball=BabelLanguagePack-$version.tar.bz2
+echo "Creating tarball $tarball"
+tar cjf $tarball $WORKDIR
diff --git a/sources b/sources
index 55c7a5a..8caf6b2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6a0caafe21af677e7d0f0301484ac4dd BabelLanguagePack-3.5.0.v20090620043401.tar.bz2
+24f7b036b92c17db8fc91d0665109225 BabelLanguagePack-3.5.0.v20100814074441.tar.bz2
13 years, 6 months
[Fedora-i18n-bugs] [eclipse-nls/f14/master] - Reverted unnecessary "fix" for Indonesian
by Sean Flanigan
commit 680653f82389748464642441a6ea27466e017a41
Author: Sean Flanigan <sflaniga(a)redhat.com>
Date: Fri Dec 10 12:00:04 2010 +1000
- Reverted unnecessary "fix" for Indonesian
eclipse-nls.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/eclipse-nls.spec b/eclipse-nls.spec
index bec2ca5..3470ff0 100644
--- a/eclipse-nls.spec
+++ b/eclipse-nls.spec
@@ -13,7 +13,7 @@ License: EPL
URL: http://www.eclipse.org/babel/
Version: 3.6.0.v20100814043401
-Release: 3%{?dist}
+Release: 4%{?dist}
## The source for this package is taken from
# http://download.eclipse.org/technology/babel/babel_language_packs/R0.8.0/...
# usage: FROM=http://download.eclipse.org/technology/babel/babel_language_packs/R0... ./fetch-babel.sh
@@ -86,7 +86,7 @@ have a translation for a given string. \
%lang_meta_pkg he iw Hebrew
%lang_meta_pkg hi hi Hindi
%lang_meta_pkg hu hu Hungarian
-%lang_meta_pkg id in Indonesian
+%lang_meta_pkg id id Indonesian
%lang_meta_pkg it it Italian
%lang_meta_pkg ja ja Japanese
# tl should be Tagalog. Klingon has < 1% coverage at present in Babel. Tagalog is unsupported.
@@ -137,6 +137,9 @@ find eclipse/features -type f -exec chmod 644 {} \;
rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Dec 10 2010 Sean Flanigan <sflaniga(a)redhat.com> - 3.6.0.v20100814043401-4
+- Reverted unnecessary "fix" for Indonesian
+
* Fri Dec 10 2010 Sean Flanigan <sflaniga(a)redhat.com> - 3.6.0.v20100814043401-3
- Fixed locale mapping for Indonesian
13 years, 6 months