rpms/pango/devel pango-1.15.4-slighthint.patch, NONE, 1.1 pango.spec, 1.102, 1.103 pango-slighthint.patch, 1.2, NONE

[fedora-cvs-commits redhat com]

Author: besfahbo

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

Modified Files:
	pango.spec 
Added Files:
	pango-1.15.4-slighthint.patch 
Removed Files:
	pango-slighthint.patch 
Log Message:
* Wed Jan 17 2007 Behdad Esfahbod <besfahbo redhat com> - 1.15.4-2
- Update slighthint patch to apply.


pango-1.15.4-slighthint.patch:
 pangoft2.c |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

--- NEW FILE pango-1.15.4-slighthint.patch ---
--- pango-1.15.4/pango/pangoft2.c.orig	2007-01-16 15:18:33.000000000 -0500
+++ pango-1.15.4/pango/pangoft2.c	2007-01-18 00:33:58.000000000 -0500
@@ -173,6 +173,7 @@
   FcPattern *pattern;
   FcChar8 *filename;
   FcBool antialias, hinting, autohint;
+  int hintstyle;
   int id;
 
   if (G_UNLIKELY (!PANGO_FT2_IS_FONT (font)))
@@ -206,8 +207,21 @@
 			    FC_HINTING, 0, &hinting) != FcResultMatch)
 	hinting = FcTrue;
 
-      if (!hinting)
-	ft2font->load_flags |= FT_LOAD_NO_HINTING;
+      if (FcPatternGetInteger (pattern, FC_HINT_STYLE, 0, &hintstyle) != FcResultMatch)
+	hintstyle = FC_HINT_FULL;
+
+      if (!hinting || hintstyle == FC_HINT_NONE)
+          ft2font->load_flags |= FT_LOAD_NO_HINTING;
+      
+      switch (hintstyle) {
+      case FC_HINT_SLIGHT:
+      case FC_HINT_MEDIUM:
+	ft2font->load_flags |= FT_LOAD_TARGET_LIGHT;
+	break;
+      default:
+	ft2font->load_flags |= FT_LOAD_TARGET_NORMAL;
+	break;
+      }
 
       /* force autohinting if requested */
       if (FcPatternGetBool (pattern,


Index: pango.spec
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/pango.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- pango.spec	18 Jan 2007 05:21:30 -0000	1.102
+++ pango.spec	18 Jan 2007 05:36:17 -0000	1.103
@@ -9,7 +9,7 @@
 Summary: System for layout and rendering of internationalized text
 Name: pango
 Version: 1.15.4
-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
@@ -36,7 +36,7 @@
 BuildRequires: libthai-devel >= %{libthai_version}
 Obsoletes: pango-gtkbeta, fribidi-gtkbeta
 
-Patch1: pango-slighthint.patch
+Patch1: pango-1.15.4-slighthint.patch
 # Look for pango.modules in an arch-specific directory
 Patch2: pango-1.2.5-lib64.patch
 
@@ -221,6 +221,9 @@
 
 
 %changelog
+* Wed Jan 17 2007 Behdad Esfahbod <besfahbo redhat com> - 1.15.4-2
+- Update slighthint patch to apply.
+
 * Wed Jan 17 2007 Behdad Esfahbod <besfahbo redhat com> - 1.15.4-1
 - Update to 1.15.4
 - [Build]Require libthai[-devel]


--- pango-slighthint.patch DELETED ---