Sophie

Sophie

distrib > Scientific%20Linux > 5x > x86_64 > by-pkgid > da60448d06ba269023fccb344dcb6a3b > files > 21

firefox-31.1.0-6.el5.src.rpm

diff -up mozilla-aurora/configure.in.pango-backport mozilla-aurora/configure.in
--- mozilla-aurora/configure.in.pango-backport	2014-05-06 13:17:17.000000000 +0200
+++ mozilla-aurora/configure.in	2014-08-07 12:07:28.000000000 +0200
@@ -60,7 +60,7 @@ dnl ====================================
 GLIB_VERSION=1.2.0
 PERL_VERSION=5.006
 CAIRO_VERSION=1.10
-PANGO_VERSION=1.22.0
+PANGO_VERSION=1.14.0
 GTK2_VERSION=2.10.0
 GTK3_VERSION=3.0.0
 WINDRES_VERSION=2.14.90
diff -up mozilla-aurora/configure.pango-backport mozilla-aurora/configure
--- mozilla-aurora/configure.pango-backport	2014-08-07 12:08:55.000000000 +0200
+++ mozilla-aurora/configure	2014-08-07 12:09:20.000000000 +0200
@@ -1296,7 +1296,7 @@ NSS_VERSION=3
 GLIB_VERSION=1.2.0
 PERL_VERSION=5.006
 CAIRO_VERSION=1.10
-PANGO_VERSION=1.22.0
+PANGO_VERSION=1.14.0
 GTK2_VERSION=2.10.0
 GTK3_VERSION=3.0.0
 WINDRES_VERSION=2.14.90
diff -up mozilla-aurora/gfx/thebes/gfxPlatform.cpp.pango-backport mozilla-aurora/gfx/thebes/gfxPlatform.cpp
--- mozilla-aurora/gfx/thebes/gfxPlatform.cpp.pango-backport	2014-05-19 11:43:50.000000000 +0200
+++ mozilla-aurora/gfx/thebes/gfxPlatform.cpp	2014-08-07 12:07:28.000000000 +0200
@@ -530,6 +530,14 @@ gfxPlatform::~gfxPlatform()
     cairo_debug_reset_static_data();
 #endif
 #endif
+
+#if 0
+    // It would be nice to do this (although it might need to be after
+    // the cairo shutdown that happens in ~gfxPlatform).  It even looks
+    // idempotent.  But it has fatal assertions that fire if stuff is
+    // leaked, and we hit them.
+    FcFini();
+#endif
 }
 
 bool
diff -up mozilla-aurora/gfx/thebes/gfxPlatformGtk.cpp.pango-backport mozilla-aurora/gfx/thebes/gfxPlatformGtk.cpp
--- mozilla-aurora/gfx/thebes/gfxPlatformGtk.cpp.pango-backport	2014-05-06 13:17:14.000000000 +0200
+++ mozilla-aurora/gfx/thebes/gfxPlatformGtk.cpp	2014-08-07 12:07:28.000000000 +0200
@@ -77,6 +77,14 @@ gfxPlatformGtk::~gfxPlatformGtk()
     sFontconfigUtils = nullptr;
 
     gfxPangoFontGroup::Shutdown();
+
+#if 0
+    // It would be nice to do this (although it might need to be after
+    // the cairo shutdown that happens in ~gfxPlatform).  It even looks
+    // idempotent.  But it has fatal assertions that fire if stuff is
+    // leaked, and we hit them.
+    FcFini();
+#endif
 }
 
 already_AddRefed<gfxASurface>