|
|
Author: mclasen
Update of /cvs/dist/rpms/pango/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18849
Modified Files:
pango.spec
Added Files:
pango-1.14.3-hangul-decomposition.patch
Log Message:
fix Hangul decomposition
pango-1.14.3-hangul-decomposition.patch:
hangul-fc.c | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
--- NEW FILE pango-1.14.3-hangul-decomposition.patch ---
2006-09-12 Behdad Esfahbod <behdad@xxxxxxxxx>
Bug 355605 â?? hexbox with 0000 in it
* modules/hangul/hangul-fc.c (render_syllable): If decomposition
fails, backup and add a single hexbox glyph for the original
character.
Index: modules/hangul/hangul-fc.c
===================================================================
RCS file: /cvs/gnome/pango/modules/hangul/hangul-fc.c,v
retrieving revision 1.25
diff -u -p -d -r1.25 hangul-fc.c
--- modules/hangul/hangul-fc.c 11 Apr 2006 08:31:06 -0000 1.25
+++ modules/hangul/hangul-fc.c 12 Sep 2006 16:58:04 -0000
@@ -231,6 +231,7 @@ render_syllable (PangoFont *font, gunich
for (i = 0; i < length; i++)
{
int jindex;
+ int oldlen;
if (text[i] == LFILL || text[i] == VFILL)
continue;
@@ -247,14 +248,21 @@ render_syllable (PangoFont *font, gunich
/* This font has no glyphs on the Hangul Jamo area! Find a
fallback from the Hangul Compatibility Jamo area. */
jindex = text[i] - LBASE;
+ oldlen = *n_glyphs;
for (j = 0; j < 3 && (__jamo_to_ksc5601[jindex][j] != 0); j++)
{
wc = __jamo_to_ksc5601[jindex][j] - KSC_JAMOBASE + UNI_JAMOBASE;
index = (wc >= 0x3131) ? find_char (font, wc) : 0;
pango_glyph_string_set_size (glyphs, *n_glyphs + 1);
if (!index)
- set_glyph (font, glyphs, *n_glyphs, cluster_offset,
- get_unknown_glyph (font, index));
+ {
+ *n_glyphs = oldlen;
+ pango_glyph_string_set_size (glyphs, *n_glyphs + 1);
+ set_glyph (font, glyphs, *n_glyphs, cluster_offset,
+ get_unknown_glyph (font, text[i]));
+ (*n_glyphs)++;
+ break;
+ }
else
set_glyph (font, glyphs, *n_glyphs, cluster_offset, index);
(*n_glyphs)++;
Index: pango.spec
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/pango.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- pango.spec 5 Sep 2006 02:07:15 -0000 1.84
+++ pango.spec 13 Sep 2006 03:36:52 -0000 1.85
@@ -8,7 +8,7 @@
Summary: System for layout and rendering of internationalized text
Name: pango
Version: 1.14.3
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPL
Group: System Environment/Libraries
Source: http://download.gnome.org/sources/pango/1.14/pango-%{version}.tar.bz2
@@ -35,7 +35,10 @@
Patch1: pango-slighthint.patch
# Look for pango.modules in an arch-specific directory
-Patch5: pango-1.2.5-lib64.patch
+Patch2: pango-1.2.5-lib64.patch
+
+# fixed in upstream cvs
+Patch3: pango-1.14.3-hangul-decomposition.patch
%description
Pango is a system for layout and rendering of internationalized text.
@@ -66,7 +69,8 @@
%setup -q -n pango-%{version}
%patch1 -p1 -b .slighthint
-%patch5 -p1 -b .lib64
+%patch2 -p1 -b .lib64
+%patch3 -p0 -b .hangul-decomposition
%build
@@ -189,6 +193,9 @@
%changelog
+* Tue Sep 12 2006 Matthias Clasen <mclasen@xxxxxxxxxx> - 1.14.3-2
+- Fix Hangul decomposition issues (#206044)
+
* Mon Sep 4 2006 Matthias Clasen <mclasen@xxxxxxxxxx> - 1.14.3-1
- Update to 1.14.3
--
fedora-cvs-commits mailing list
fedora-cvs-commits@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-cvs-commits
|
|