rpms/xulrunner/devel xulrunner-pango.patch, NONE, 1.1 xulrunner.spec, 1.149, 1.150

[Martin Stransky]

Author: stransky

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

Modified Files:
	xulrunner.spec 
Added Files:
	xulrunner-pango.patch 
Log Message:
* Fri Feb 27 2009 Martin Stransky <stransky at redhat.com> 1.9.1-0.9
- Build fix for pango 1.23



xulrunner-pango.patch:

--- NEW FILE xulrunner-pango.patch ---
diff -up xulrunner-1.9.1/mozilla-central/gfx/thebes/src/gfxPangoFonts.cpp.old xulrunner-1.9.1/mozilla-central/gfx/thebes/src/gfxPangoFonts.cpp
--- mozilla-central/gfx/thebes/src/gfxPangoFonts.cpp.old	2009-02-27 16:19:07.000000000 +0100
+++ mozilla-central/gfx/thebes/src/gfxPangoFonts.cpp	2009-02-27 16:37:30.000000000 +0100
@@ -1299,12 +1299,11 @@ gfx_pango_font_map_context_substitute(Pa
 
 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
@@ -1324,9 +1323,8 @@ gfx_pango_font_map_class_init(gfxPangoFo
     // 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 is 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;
 }
 


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- xulrunner.spec	26 Feb 2009 12:13:20 -0000	1.149
+++ xulrunner.spec	27 Feb 2009 15:52:00 -0000	1.150
@@ -11,7 +11,7 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9.1
-Release:        0.8.beta2%{?dist}
+Release:        0.9.beta2%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -27,6 +27,7 @@
 Patch2:         mozilla-191-path.patch
 Patch3:         mozilla-sqlite.patch
 Patch4:         mozilla-jemalloc.patch
+Patch5:         xulrunner-pango.patch
 
 # Fedora specific patches
 Patch10:        mozilla-191-pkgconfig.patch
@@ -153,6 +154,7 @@
 %patch3  -p1 -b .sqlite
 autoconf-2.13
 %patch4 -p1 -b .jemalloc
+%patch5 -p1 -b .pango
 
 %patch10 -p1 -b .pk
 
@@ -451,6 +453,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Fri Feb 27 2009 Martin Stransky <stransky at redhat.com> 1.9.1-0.9
+- Build fix for pango 1.23
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.1-0.8.beta2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild