diff --git a/mozilla/configure b/mozilla/configure index 2e84c91f5b1..902383d9a13 100755 --- a/mozilla/configure +++ b/mozilla/configure @@ -20169,6 +20169,7 @@ EOF PS_SURFACE_FEATURE="#define CAIRO_HAS_PS_SURFACE 1" PDF_SURFACE_FEATURE="#define CAIRO_HAS_PDF_SURFACE 1" FT_FONT_FEATURE="#define CAIRO_HAS_FT_FONT 1" + FT_HAS_GS_EMBOLDEN="#define HAVE_FT_GLYPHSLOT_EMBOLDEN 1" MOZ_ENABLE_CAIRO_FT=1 CAIRO_FT_CFLAGS="$FT2_CFLAGS" fi @@ -21677,6 +21678,7 @@ s%@MOZ_LIBART_LIBS@%$MOZ_LIBART_LIBS%g s%@CAIRO_FT_CFLAGS@%$CAIRO_FT_CFLAGS%g s%@CAIRO_FT_LIBS@%$CAIRO_FT_LIBS%g s%@MOZ_ENABLE_CAIRO_FT@%$MOZ_ENABLE_CAIRO_FT%g +s%@FT_HAS_GS_EMBOLDEN@%$FT_HAS_GS_EMBOLDEN%g s%@PS_SURFACE_FEATURE@%$PS_SURFACE_FEATURE%g s%@PDF_SURFACE_FEATURE@%$PDF_SURFACE_FEATURE%g s%@SVG_SURFACE_FEATURE@%$SVG_SURFACE_FEATURE%g diff --git a/mozilla/configure.in b/mozilla/configure.in index f86af0da3ff..86f7947e1d6 100644 --- a/mozilla/configure.in +++ b/mozilla/configure.in @@ -7243,6 +7243,7 @@ if test "$MOZ_SVG" -o "$MOZ_ENABLE_CANVAS" -o "$MOZ_ENABLE_CAIRO_GFX" ; then PS_SURFACE_FEATURE="#define CAIRO_HAS_PS_SURFACE 1" PDF_SURFACE_FEATURE="#define CAIRO_HAS_PDF_SURFACE 1" FT_FONT_FEATURE="#define CAIRO_HAS_FT_FONT 1" + FT_HAS_GS_EMBOLDEN="#define HAVE_FT_GLYPHSLOT_EMBOLDEN 1" MOZ_ENABLE_CAIRO_FT=1 CAIRO_FT_CFLAGS="$FT2_CFLAGS" fi @@ -7295,6 +7296,7 @@ if test "$MOZ_SVG" -o "$MOZ_ENABLE_CANVAS" -o "$MOZ_ENABLE_CAIRO_GFX" ; then AC_SUBST(GLITZ_SURFACE_FEATURE) AC_SUBST(DIRECTFB_SURFACE_FEATURE) AC_SUBST(FT_FONT_FEATURE) + AC_SUBST(FT_HAS_GS_EMBOLDEN) AC_SUBST(WIN32_FONT_FEATURE) AC_SUBST(ATSUI_FONT_FEATURE) AC_SUBST(PNG_FUNCTIONS_FEATURE) diff --git a/mozilla/gfx/cairo/cairo/src/cairo-features.h.in b/mozilla/gfx/cairo/cairo/src/cairo-features.h.in index 84fb3e5a8ef..ae5315cd5d8 100644 --- a/mozilla/gfx/cairo/cairo/src/cairo-features.h.in +++ b/mozilla/gfx/cairo/cairo/src/cairo-features.h.in @@ -81,6 +81,8 @@ @FT_FONT_FEATURE@ +@FT_HAS_GS_EMBOLDEN@ + @WIN32_FONT_FEATURE@ @ATSUI_FONT_FEATURE@ diff --git a/mozilla/gfx/cairo/cairo/test/Makefile.in b/mozilla/gfx/cairo/cairo/test/Makefile.in index f2bbb663ad4..461847e71f0 100644 --- a/mozilla/gfx/cairo/cairo/test/Makefile.in +++ b/mozilla/gfx/cairo/cairo/test/Makefile.in @@ -183,6 +183,7 @@ FREETYPE_CONFIG = @FREETYPE_CONFIG@ FREETYPE_LIBS = @FREETYPE_LIBS@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@ FT_FONT_FEATURE = @FT_FONT_FEATURE@ +FT_HAS_GS_EMBOLDEN = @FT_HAS_GS_EMBOLDEN@ GLITZ_CFLAGS = @GLITZ_CFLAGS@ GLITZ_LIBS = @GLITZ_LIBS@ GLITZ_REQUIRES = @GLITZ_REQUIRES@