rpms/sunbird/devel thunderbird-pango.patch, 1.2, 1.3 sunbird.spec, 1.29, 1.30

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/sunbird/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3986

Modified Files:
	sunbird.spec 
Added Files:
	thunderbird-pango.patch 
Log Message:
pango fun

thunderbird-pango.patch:

Index: thunderbird-pango.patch
===================================================================
RCS file: thunderbird-pango.patch
diff -N thunderbird-pango.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ thunderbird-pango.patch	28 Jun 2009 10:36:20 -0000	1.3
@@ -0,0 +1,50 @@
+diff -upU8 thunderbird-3.0/mozilla/gfx/thebes/src/gfxPangoFonts.cpp.pango-fix thunderbird-3.0/mozilla/gfx/thebes/src/gfxPangoFonts.cpp
+--- thunderbird-3.0/mozilla/gfx/thebes/src/gfxPangoFonts.cpp.pango-fix	2009-03-03 12:04:16.000000000 +0100
++++ thunderbird-3.0/mozilla/gfx/thebes/src/gfxPangoFonts.cpp	2009-03-03 12:05:37.000000000 +0100
+@@ -1798,22 +1798,21 @@ gfx_pango_font_map_context_substitute(Pa
+     double size = pango_font_description_get_size(desc) / FLOAT_PANGO_SCALE;
+     gfxPangoFontGroup *fontGroup = GetFontGroup(context);
+     PRBool usePrinterFont = fontGroup && fontGroup->GetStyle()->printerFont;
+     PrepareSortPattern(pattern, size, 1.0, usePrinterFont);
+ }
+ 
+ static PangoFcFont *
+ gfx_pango_font_map_create_font(PangoFcFontMap *fontmap,
+-                               PangoContext *context,
+-                               const PangoFontDescription *desc,
+-                               FcPattern *pattern)
++                               PangoFcFontKey *fontkey)
+ {
++    const FcPattern *p_pattern = pango_fc_font_key_get_pattern(fontkey);
+     return PANGO_FC_FONT(g_object_new(GFX_TYPE_PANGO_FC_FONT,
+-                                      "pattern", pattern, NULL));
++                                      "pattern", p_pattern, NULL));
+ }
+ 
+ static void
+ gfx_pango_font_map_class_init(gfxPangoFontMapClass *klass)
+ {
+     // inherit GObjectClass::finalize from parent as this class adds no data.
+ 
+     PangoFontMapClass *fontmap_class = PANGO_FONT_MAP_CLASS (klass);
+@@ -1823,19 +1822,18 @@ gfx_pango_font_map_class_init(gfxPangoFo
+     fontmap_class->load_fontset = gfx_pango_font_map_load_fontset;
+     // inherit fontmap_class->shape_engine_type from PangoFcFontMap
+ 
+     PangoFcFontMapClass *fcfontmap_class = PANGO_FC_FONT_MAP_CLASS (klass);
+     fcfontmap_class->get_resolution = gfx_pango_font_map_get_resolution;
+     // context_key_* virtual functions are only necessary if we want to
+     // dynamically respond to changes in the screen cairo_font_options_t.
+ 
+-    // context_substitute and get_font are not likely to be used but
++    // get_font are not likely to be used but
+     //   implemented because the class makes them available.
+-    fcfontmap_class->context_substitute = gfx_pango_font_map_context_substitute;
+     fcfontmap_class->create_font = gfx_pango_font_map_create_font;
+ }
+ 
+ /**
+  ** gfxPangoFontGroup
+  **/
+ 
+ struct FamilyCallbackData {


Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/sunbird.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sunbird.spec	28 Jun 2009 10:02:24 -0000	1.29
+++ sunbird.spec	28 Jun 2009 10:36:19 -0000	1.30
@@ -32,6 +32,7 @@ Source100:      find-external-requires
 
 # Pulled from Thunderbird
 Patch0:         mozilla-jemalloc.patch
+Patch1:         thunderbird-pango.patch
 
 # Ours
 Patch10:        sunbird-1.0-libical.patch
@@ -107,6 +108,7 @@ calendaring tasks.
 %prep
 %setup -q -a 2
 %patch0 -p0 -b .jemalloc
+%patch1 -p1 -b .pango
 %patch10 -p0 -b .libical
 %patch11 -p0 -b .uilocale