nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1305145 - Move Pango detection to Python configure. r=glandium

Browse source 
A test against MOZ_PANGO is also removed, this has not been
set since bug 947379.

MozReview-Commit-ID: IwpsCda6mmw
This commit is contained in:
Chris Manchester 2016-10-14 11:06:30 -07:00
parent 95f73bebb9
commit 15035474f8
2 changed files with 7 additions and 18 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

20
old-configure.in
View file

@ -59,7 +59,6 @@ GLIB_VERSION=2.22
GLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_26 GLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_26
GIO_VERSION=2.22 GIO_VERSION=2.22
CAIRO_VERSION=1.10 CAIRO_VERSION=1.10
PANGO_VERSION=1.22.0
GTK2_VERSION=2.18.0 GTK2_VERSION=2.18.0
GTK3_VERSION=3.4.0 GTK3_VERSION=3.4.0
GDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_4 GDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_4
@ -2658,16 +2657,6 @@ MOZ_ANDROID_GOOGLE_CLOUD_MESSAGING
MOZ_ANDROID_INSTALL_TRACKING MOZ_ANDROID_INSTALL_TRACKING
dnl ========================================================
dnl = Pango
dnl ========================================================
if test "$MOZ_ENABLE_GTK"
then
PKG_CHECK_MODULES(_PANGOCHK, pango >= $PANGO_VERSION)
PKG_CHECK_MODULES(MOZ_PANGO, pango >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION pangocairo >= $PANGO_VERSION)
fi
dnl ======================================================== dnl ========================================================
dnl = GIO and GConf support module dnl = GIO and GConf support module
dnl ======================================================== dnl ========================================================
@ -5119,13 +5108,8 @@ if test "$USE_FC_FREETYPE"; then
PKG_CHECK_MODULES(_FONTCONFIG, fontconfig >= $FONTCONFIG_VERSION, PKG_CHECK_MODULES(_FONTCONFIG, fontconfig >= $FONTCONFIG_VERSION,
[ [
if test "$MOZ_PANGO"; then FT2_CFLAGS="$FT2_CFLAGS $_FONTCONFIG_CFLAGS"
MOZ_PANGO_CFLAGS="$MOZ_PANGO_CFLAGS $_FONTCONFIG_CFLAGS" FT2_LIBS="$FT2_LIBS $_FONTCONFIG_LIBS"
MOZ_PANGO_LIBS="$MOZ_PANGO_LIBS $_FONTCONFIG_LIBS"
else
FT2_CFLAGS="$FT2_CFLAGS $_FONTCONFIG_CFLAGS"
FT2_LIBS="$FT2_LIBS $_FONTCONFIG_LIBS"
fi
]) ])
fi fi

5
toolkit/moz.configure
View file

@ -274,6 +274,11 @@ def fc_freetype(value, toolkit):
add_old_configure_assignment('USE_FC_FREETYPE', fc_freetype) add_old_configure_assignment('USE_FC_FREETYPE', fc_freetype)
# Pango
# ==============================================================
pkg_check_modules('MOZ_PANGO',
'pango >= 1.22.0 pangoft2 >= 1.22.0 pangocairo >= 1.22.0',
when=toolkit_gtk)
# Apple platform decoder support # Apple platform decoder support
# ============================================================== # ==============================================================