rpms/pango/F-7 harfbuzz-stuck.patch, NONE, 1.1 pango.spec, 1.113, 1.114

[Behdad Esfahbod (behdad)]

Author: behdad

Update of /cvs/pkgs/rpms/pango/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23068

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


harfbuzz-stuck.patch:

--- 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/pkgs/rpms/pango/F-7/pango.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- pango.spec	27 Apr 2007 07:15:27 -0000	1.113
+++ pango.spec	16 Oct 2007 20:41:55 -0000	1.114
@@ -9,7 +9,7 @@
 Summary: System for layout and rendering of internationalized text
 Name: pango
 Version: 1.16.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/pango/1.16/pango-%{version}.tar.bz2
@@ -40,6 +40,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.
 
@@ -70,6 +72,7 @@
 %setup -q -n pango-%{version}
 
 %patch2 -p1 -b .lib64
+%patch3 -p1 -b .harfbuzz-stuck
 
 %build
 
@@ -220,6 +223,9 @@
 
 
 %changelog
+* Tue Oct 16 2007 Behdad Esfahbod <besfahbo at redhat.com> - 1.16.4-2
+- Add harfbuzz-stuck.patch (GNOME bug #463430)
+
 * Fri Apr 10 2007 Behdad Esfahbod <besfahbo at redhat.com> - 1.16.4-1
 - Update to 1.16.4.
 - Enable doc rebuilding to get cross-references right.