From 61ed3b291ec5ec7405086eb12ff340dd965df1d4 Mon Sep 17 00:00:00 2001
From: asac <asac@hector.personalfree.com>
Date: Mon, 12 Mar 2007 16:37:18 +0100
Subject: [PATCH] bz305185 system pango fix for gtk 2.8

  * configure.in, gfx/src/gtk/mozilla-decoder.cpp: gtk 2.8 builds are
    broken due to missing xft dependencies
    -> https://bugzilla.mozilla.org/attachment.cgi?id=194164
---
 config/autoconf.mk.in           |    1 +
 configure.in                    |   17 ++++++++++++++---
 gfx/src/gtk/mozilla-decoder.cpp |    8 ++++++++
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index d3059a0..584353e 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -483,6 +483,7 @@ MOZ_ENABLE_COREXFONTS	= @MOZ_ENABLE_COREXFONTS@
 MOZ_ENABLE_PANGO        = @MOZ_ENABLE_PANGO@
 MOZ_PANGO_CFLAGS        = @MOZ_PANGO_CFLAGS@
 MOZ_PANGO_LIBS          = @MOZ_PANGO_LIBS@
+MOZ_PANGOCAIRO          = @MOZ_PANGOCAIRO@
 
 MOZ_EXTRA_X11CONVERTERS	= @MOZ_EXTRA_X11CONVERTERS@
 
diff --git a/configure.in b/configure.in
index 187656c..3d5a7af 100644
--- a/configure.in
+++ b/configure.in
@@ -3966,8 +3966,8 @@ gtk2)
     MOZ_ENABLE_GTK2=1
     MOZ_ENABLE_XREMOTE=1
     MOZ_ENABLE_COREXFONTS=${MOZ_ENABLE_COREXFONTS-}
-    TK_CFLAGS='$(MOZ_GTK2_CFLAGS)'
-    TK_LIBS='$(MOZ_GTK2_LIBS)'
+    TK_CFLAGS='$(MOZ_GTK2_CFLAGS) $(MOZ_PANGO_CFLAGS)'
+    TK_LIBS='$(MOZ_GTK2_LIBS) $(MOZ_PANGO_LIBS)'
     AC_DEFINE(MOZ_WIDGET_GTK2)
     ;;
 
@@ -4624,12 +4624,14 @@ if test "$MOZ_ENABLE_XFT"
 then
     AC_DEFINE(MOZ_ENABLE_XFT)
     PKG_CHECK_MODULES(MOZ_XFT, xft)
-    PKG_CHECK_MODULES(_PANGOCHK, pango >= 1.1.0)
+    PKG_CHECK_MODULES(_PANGOCHK, pango >= 1.1.0 pangox)
 fi
 
 AC_SUBST(MOZ_ENABLE_XFT)
 AC_SUBST(MOZ_XFT_CFLAGS)
 AC_SUBST(MOZ_XFT_LIBS)
+AC_SUBST(MOZ_PANGO_CFLAGS)
+AC_SUBST(MOZ_PANGO_LIBS)
 
 dnl ========================================================
 dnl = pango font rendering
@@ -4643,8 +4645,17 @@ if test "$MOZ_ENABLE_PANGO"
 then
     AC_DEFINE(MOZ_ENABLE_PANGO)
     PKG_CHECK_MODULES(MOZ_PANGO, pangoxft >= 1.6.0)
+    PKG_CHECK_MODULES(PANGOCAIRO_CHK, pangocairo >= 1.10.0,
+    [ 
+      MOZ_PANGOCAIRO=1
+      AC_DEFINE(MOZ_PANGOCAIRO)
+      MOZ_PANGO_CFLAGS="$PANGOCAIRO_CHK_CFLAGS $MOZ_PANGO_CFLAGS"
+      MOZ_PANGO_LIBS="$PANGOCAIRO_CHK_LIBS $MOZ_PANGO_LIBS"
+    ],
+    [:])
 
     AC_SUBST(MOZ_ENABLE_PANGO)
+    AC_SUBST(MOZ_PANGOCAIRO)
     AC_SUBST(MOZ_PANGO_CFLAGS)
     AC_SUBST(MOZ_PANGO_LIBS)
 fi
diff --git a/gfx/src/gtk/mozilla-decoder.cpp b/gfx/src/gtk/mozilla-decoder.cpp
index 609595f..ac2b56a 100644
--- a/gfx/src/gtk/mozilla-decoder.cpp
+++ b/gfx/src/gtk/mozilla-decoder.cpp
@@ -40,7 +40,11 @@
 #define PANGO_ENABLE_ENGINE
 
 #include "mozilla-decoder.h"
+#ifdef MOZ_PANGOCAIRO
+#include <pango/pangocairo.h>
+#else
 #include <pango/pangoxft.h>
+#endif
 #include <pango/pangofc-fontmap.h>
 #include <pango/pangofc-font.h>
 #include <gdk/gdkx.h>
@@ -208,7 +212,11 @@ mozilla_decoders_init(void)
         }
     }
 
+#ifdef MOZ_PANGOCAIRO
+    pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_cairo_font_map_get_default()),
+#else
     pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_xft_get_font_map(GDK_DISPLAY(),gdk_x11_get_default_screen())),
+#endif
                                             mozilla_find_decoder,
                                             NULL,
                                             NULL);
-- 
1.4.4.4