rpms/pango/FC-6 harfbuzz-stuck.patch,NONE,1.1 pango.spec,1.94,1.95

[fedora-cvs-commits at redhat.com]

Author: besfahbo

Update of /cvs/dist/rpms/pango/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv11837

Modified Files:
	pango.spec 
Added Files:
	harfbuzz-stuck.patch 
Log Message:
* Tue Oct 16 2007 Behdad Esfahbod <besfahbo at redhat.com> - 1.14.10-2
- Add harfbuzz-stuck.patch (GNOME bug #463430)


harfbuzz-stuck.patch:
 harfbuzz-gpos.c |   15 ++++++++++-----
 harfbuzz-gsub.c |    2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

--- NEW FILE harfbuzz-stuck.patch ---
Index: pango/pango/opentype/harfbuzz-gpos.c
===================================================================
--- pango/pango/opentype/harfbuzz-gpos.c	(revision 2404)
+++ pango/pango/opentype/harfbuzz-gpos.c	(working copy)
@@ -1518,7 +1518,7 @@ static void  Free_PairPos( HB_GPOS_SubTa
 static FT_Error  Lookup_PairPos1( GPOS_Instance*       gpi,
 				  HB_PairPosFormat1*  ppf1,
 				  HB_Buffer           buffer,
-				  FT_UShort            first_pos,
+				  FT_ULong             first_pos,
 				  FT_UShort            index,
 				  FT_UShort            format1,
 				  FT_UShort            format2 )
@@ -1560,7 +1560,7 @@ static FT_Error  Lookup_PairPos1( GPOS_I
 static FT_Error  Lookup_PairPos2( GPOS_Instance*       gpi,
 				  HB_PairPosFormat2*  ppf2,
 				  HB_Buffer           buffer,
-				  FT_UShort            first_pos,
+				  FT_ULong             first_pos,
 				  FT_UShort            format1,
 				  FT_UShort            format2 )
 {
@@ -1600,7 +1600,8 @@ static FT_Error  Lookup_PairPos( GPOS_In
 				 int               nesting_level )
 {
   FT_Error         error;
-  FT_UShort        index, property, first_pos;
+  FT_UShort        index, property;
+  FT_ULong         first_pos;
   HB_GPOSHeader*  gpos = gpi->gpos;
   HB_PairPos*     pp = &st->pair;
 
@@ -1631,8 +1632,12 @@ static FT_Error  Lookup_PairPos( GPOS_In
       return error;
 
     if ( buffer->in_pos == buffer->in_length )
-      return HB_Err_Not_Covered;
+      {
+	buffer->in_pos = first_pos;
+        return HB_Err_Not_Covered;
+      }
     (buffer->in_pos)++;
+
   }
 
   switch ( pp->PosFormat )
@@ -3137,7 +3142,7 @@ static FT_Error  Do_ContextPos( GPOS_Ins
 				int                   nesting_level )
 {
   FT_Error  error;
-  FT_UShort i, old_pos;
+  FT_ULong i, old_pos;
 
 
   i = 0;
Index: pango/pango/opentype/harfbuzz-gsub.c
===================================================================
--- pango/pango/opentype/harfbuzz-gsub.c	(revision 2405)
+++ pango/pango/opentype/harfbuzz-gsub.c	(working copy)
@@ -1130,7 +1130,7 @@ static FT_Error  Do_ContextSubst( HB_GSU
 				  int                    nesting_level )
 {
   FT_Error  error;
-  FT_UShort i, old_pos;
+  FT_ULong i, old_pos;
 
 
   i = 0;


Index: pango.spec
===================================================================
RCS file: /cvs/dist/rpms/pango/FC-6/pango.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- pango.spec	31 Jan 2007 18:24:08 -0000	1.94
+++ pango.spec	16 Oct 2007 20:39:32 -0000	1.95
@@ -8,7 +8,7 @@
 Summary: System for layout and rendering of internationalized text
 Name: pango
 Version: 1.14.10
-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
@@ -37,6 +37,8 @@
 # Look for pango.modules in an arch-specific directory
 Patch2: pango-1.2.5-lib64.patch
 
+Patch3: harfbuzz-stuck.patch
+
 %description
 Pango is a system for layout and rendering of internationalized text.
 
@@ -67,6 +69,7 @@
 
 %patch1 -p1 -b .slighthint
 %patch2 -p1 -b .lib64
+%patch3 -p1 -b .harfbuzz-stuck
 
 %build
 
@@ -189,6 +192,9 @@
 
 
 %changelog
+* Tue Oct 16 2007 Behdad Esfahbod <besfahbo at redhat.com> - 1.14.10-2
+- Add harfbuzz-stuck.patch (GNOME bug #463430)
+
 * Wed Jan 31 2007 Matthias Clasen <mclasen at redhat.com> - 1.14.10-1
 - Update to 1.14.10