mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 376790: remove support for non-cairo GFX ports from configure.in, r=ted.mielczarek, a=mtschrep

This commit is contained in:
mozilla%weilbacher.org 2008-01-23 08:27:49 +00:00
Родитель d8e3d7c6e3
Коммит 5750878092
13 изменённых файлов: 14 добавлений и 162 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
config/autoconf.mk.in
Просмотреть файл

@ -488,12 +488,8 @@ MOZ_GTHREAD_LIBS = @MOZ_GTHREAD_LIBS@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_LIBS = @FT2_LIBS@
MOZ_ENABLE_XFT = @MOZ_ENABLE_XFT@
MOZ_XFT_CFLAGS = @MOZ_XFT_CFLAGS@
MOZ_XFT_LIBS = @MOZ_XFT_LIBS@
MOZ_ENABLE_COREXFONTS = @MOZ_ENABLE_COREXFONTS@
MOZ_ENABLE_PANGO = @MOZ_ENABLE_PANGO@
MOZ_PANGO_CFLAGS = @MOZ_PANGO_CFLAGS@
MOZ_PANGO_LIBS = @MOZ_PANGO_LIBS@

6
config/static-config.mk
Просмотреть файл

@ -88,13 +88,7 @@ STATIC_EXTRA_LIBS += $(MOZ_CAIRO_LIBS)
ifdef MOZ_ENABLE_GTK2
STATIC_EXTRA_LIBS += $(XLDFLAGS) $(XT_LIBS) -lgthread-2.0
endif
ifdef MOZ_ENABLE_XFT
STATIC_EXTRA_LIBS += $(MOZ_XFT_LIBS)
endif
ifdef MOZ_ENABLE_PANGO
STATIC_EXTRA_LIBS += $(MOZ_PANGO_LIBS)
endif

74
configure.in
Просмотреть файл

@ -1824,7 +1824,6 @@ case "$target" in
_PLATFORM_DEFAULT_TOOLKIT='windows'
BIN_SUFFIX='.exe'
USE_SHORT_LIBNAME=1
MOZ_ENABLE_COREXFONTS=
MOZ_ENABLE_POSTSCRIPT=
MOZ_USER_DIR="Mozilla"
;;
@ -4795,80 +4794,20 @@ AC_DEFINE_UNQUOTED(MOZ_DISTRIBUTION_ID,"$MOZ_DISTRIBUTION_ID")
AC_SUBST(MOZ_DISTRIBUTION_ID)
dnl ========================================================
dnl = Xft
dnl = Xft and Pango
dnl ========================================================
if test "$MOZ_ENABLE_GTK2"; then
MOZ_ENABLE_XFT=1
fi
MOZ_ARG_DISABLE_BOOL(xft,
[ --disable-xft Disable Xft support ],
MOZ_ENABLE_XFT=,
MOZ_ENABLE_XFT=1)
if test "$MOZ_ENABLE_XFT" && test -z "$MOZ_ENABLE_GTK2"; then
AC_MSG_ERROR([Cannot enable XFT support for non-GTK2 toolkits.])
fi
if test "$MOZ_ENABLE_XFT"
if test "$MOZ_ENABLE_GTK2"
then
AC_DEFINE(MOZ_ENABLE_XFT)
PKG_CHECK_MODULES(MOZ_XFT, xft)
AC_SUBST(MOZ_XFT_CFLAGS)
AC_SUBST(MOZ_XFT_LIBS)
PKG_CHECK_MODULES(_PANGOCHK, pango >= $PANGO_VERSION)
fi
AC_SUBST(MOZ_ENABLE_XFT)
AC_SUBST(MOZ_XFT_CFLAGS)
AC_SUBST(MOZ_XFT_LIBS)
dnl ========================================================
dnl = pango font rendering
dnl ========================================================
MOZ_ARG_ENABLE_BOOL(pango,
[ --enable-pango Enable Pango font rendering support],
MOZ_ENABLE_PANGO=1,
MOZ_ENABLE_PANGO=)
if test "$MOZ_ENABLE_PANGO" && test -z "$MOZ_ENABLE_CAIRO_GFX"
then
AC_MSG_ERROR([Cairo gfx is required for Pango font rendering])
fi
if test "$MOZ_ENABLE_GTK2" && test "$MOZ_ENABLE_CAIRO_GFX"
then
# For gtk2, we require --enable-pango; gtk2 already implies --enable-xft
if test -z "$MOZ_ENABLE_PANGO"
then
AC_MSG_WARN([Pango is required for cairo gfx builds, assuming --enable-pango])
MOZ_ENABLE_PANGO=1
fi
fi
if test "$MOZ_ENABLE_PANGO" && test "$MOZ_ENABLE_CAIRO_GFX"
then
AC_DEFINE(MOZ_ENABLE_PANGO)
PKG_CHECK_MODULES(MOZ_PANGO, pango >= $PANGO_VERSION pangocairo >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION)
AC_SUBST(MOZ_ENABLE_PANGO)
AC_SUBST(MOZ_PANGO_CFLAGS)
AC_SUBST(MOZ_PANGO_LIBS)
fi
dnl ========================================================
dnl = x11 core font support (default and ability to enable depend on toolkit)
dnl ========================================================
if test "$MOZ_X11"
then
MOZ_ENABLE_COREXFONTS=${MOZ_ENABLE_COREXFONTS-1}
else
MOZ_ENABLE_COREXFONTS=
fi
if test "$MOZ_ENABLE_COREXFONTS"
then
AC_DEFINE(MOZ_ENABLE_COREXFONTS)
fi
AC_SUBST(MOZ_ENABLE_COREXFONTS)
dnl ========================================================
dnl = PostScript print module
dnl ========================================================
@ -5020,8 +4959,7 @@ dnl = those converters are not built on other platforms/toolkits.
dnl = (see bug 180851)
dnl ========================================================
if test "$MOZ_ENABLE_GTK2" \
&& test "$MOZ_ENABLE_COREXFONTS"
if test "$MOZ_ENABLE_GTK2"
then
AC_DEFINE(MOZ_EXTRA_X11CONVERTERS)
MOZ_EXTRA_X11CONVERTERS=1

3
gfx/src/thebes/Makefile.in
Просмотреть файл

@ -160,9 +160,6 @@ CFLAGS += $(TK_CFLAGS)
ifdef MOZ_ENABLE_GTK2
DEFINES += -DMOZ_ENABLE_GTK2
endif
ifdef MOZ_ENABLE_PANGO
CXXFLAGS += $(MOZ_PANGO_CFLAGS)
endif

2
gfx/thebes/src/Makefile.in
Просмотреть файл

@ -144,7 +144,7 @@ include $(topsrcdir)/config/rules.mk
CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS)
CFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS)
ifdef MOZ_ENABLE_PANGO
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
CXXFLAGS += $(MOZ_PANGO_CFLAGS)
endif

5
gfx/thebes/test/Makefile.in
Просмотреть файл

@ -96,11 +96,8 @@ endif
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
OS_LIBS += $(MOZ_PANGO_LIBS) $(MOZ_XFT_LIBS) $(XLIBS)
CXXFLAGS += $(MOZ_PANGO_CFLAGS)
endif
CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS)
CFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS)
ifdef MOZ_ENABLE_PANGO
CXXFLAGS += $(MOZ_PANGO_CFLAGS)
endif

2
gfx/thebes/test/gfxFontSelectionTest.cpp
Просмотреть файл

@ -184,7 +184,7 @@ struct TestEntry {
#elif defined(XP_MACOSX)
if (strcmp(platform, "macosx"))
return;
#elif defined(MOZ_ENABLE_PANGO)
#elif defined(XP_UNIX)
if (strcmp(platform, "gtk2-pango"))
return;
#else

2
intl/build/Makefile.in
Просмотреть файл

@ -106,7 +106,7 @@ endif
include $(topsrcdir)/config/rules.mk
ifdef MOZ_ENABLE_PANGO
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
EXTRA_DSO_LDOPTS += \
$(MOZ_PANGO_LIBS) \
$(NULL)

4
intl/lwbrk/src/Makefile.in
Просмотреть файл

@ -58,7 +58,7 @@ CPPSRCS = \
nsSemanticUnitScanner.cpp \
$(NULL)
ifdef MOZ_ENABLE_PANGO
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
CPPSRCS += \
nsPangoBreaker.cpp \
$(NULL)
@ -84,7 +84,7 @@ endif
include $(topsrcdir)/config/rules.mk
ifdef MOZ_ENABLE_PANGO
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
CXXFLAGS += \
$(MOZ_PANGO_CFLAGS) \
$(NULL)

6
minimo/base/Makefile.in
Просмотреть файл

@ -110,14 +110,10 @@ endif
ifdef MOZ_ENABLE_GTK2
LIBS += $(XLDFLAGS) \
$(XLIBS) \
$(MOZ_XFT_LIBS) \
$(NULL)
endif
ifdef MOZ_ENABLE_XFT
LIBS += $(MOZ_XFT_LIBS) \
$(NULL)
endif
include $(topsrcdir)/config/config.mk
ifdef WINCE

63
modules/libpref/src/init/all.js
Просмотреть файл

@ -2143,8 +2143,6 @@ pref("font.alias-list", "sans,sans-serif,serif,monospace");
// ar
#ifdef MOZ_ENABLE_XFT
pref("font.name.serif.el", "serif");
pref("font.name.sans-serif.el", "sans-serif");
pref("font.name.monospace.el", "monospace");
@ -2202,67 +2200,6 @@ pref("font.name.sans-serif.zh-HK", "sans-serif");
pref("font.name.monospace.zh-HK", "monospace");
// zh-TW
# MOZ_ENABLE_XFT
#else
pref("font.name.serif.el", "misc-fixed-iso8859-7");
pref("font.name.sans-serif.el", "misc-fixed-iso8859-7");
pref("font.name.monospace.el", "misc-fixed-iso8859-7");
pref("font.name.serif.he", "misc-fixed-iso8859-8");
pref("font.name.sans-serif.he", "misc-fixed-iso8859-8");
pref("font.name.monospace.he", "misc-fixed-iso8859-8");
pref("font.name.serif.ja", "jis-fixed-jisx0208.1983-0");
pref("font.name.sans-serif.ja", "jis-fixed-jisx0208.1983-0");
pref("font.name.monospace.ja", "jis-fixed-jisx0208.1983-0");
pref("font.name.serif.ko", "daewoo-mincho-ksc5601.1987-0");
pref("font.name.sans-serif.ko", "daewoo-mincho-ksc5601.1987-0");
pref("font.name.monospace.ko", "daewoo-mincho-ksc5601.1987-0");
// th
pref("font.name.serif.tr", "adobe-times-iso8859-9");
pref("font.name.sans-serif.tr", "adobe-helvetica-iso8859-9");
pref("font.name.monospace.tr", "adobe-courier-iso8859-9");
pref("font.name.serif.x-baltic", "b&h-lucidux serif-iso8859-4");
pref("font.name.sans-serif.x-baltic", "b&h-lucidux sans-iso8859-4");
pref("font.name.monospace.x-baltic", "b&h-lucidux mono-iso8859-4");
pref("font.name.serif.x-central-euro", "adobe-times-iso8859-2");
pref("font.name.sans-serif.x-central-euro", "adobe-helvetica-iso8859-2");
pref("font.name.monospace.x-central-euro", "adobe-courier-iso8859-2");
pref("font.name.serif.x-cyrillic", "cronyx-times-koi8-r");
pref("font.name.sans-serif.x-cyrillic", "cronyx-helvetica-koi8-r");
pref("font.name.monospace.x-cyrillic", "cronyx-courier-koi8-r");
pref("font.name.serif.x-unicode", "adobe-times-iso8859-1");
pref("font.name.sans-serif.x-unicode", "adobe-helvetica-iso8859-1");
pref("font.name.monospace.x-unicode", "adobe-courier-iso8859-1");
pref("font.name.serif.x-user-def", "adobe-times-iso8859-1");
pref("font.name.sans-serif.x-user-def", "adobe-helvetica-iso8859-1");
pref("font.name.monospace.x-user-def", "adobe-courier-iso8859-1");
pref("font.name.serif.x-western", "adobe-times-iso8859-1");
pref("font.name.sans-serif.x-western", "adobe-helvetica-iso8859-1");
pref("font.name.monospace.x-western", "adobe-courier-iso8859-1");
pref("font.name.serif.zh-CN", "isas-song ti-gb2312.1980-0");
pref("font.name.sans-serif.zh-CN", "isas-song ti-gb2312.1980-0");
pref("font.name.monospace.zh-CN", "isas-song ti-gb2312.1980-0");
// ming_uni.ttf (HKSCS-2001)
// http://www.info.gov.hk/digital21/eng/hkscs/download/uime.exe
pref("font.name.serif.zh-HK", "-arphic-Ming for ISO10646-big5hkscs-0");
pref("font.name.sans-serif.zh-HK", "-arphic-Ming for ISO10646-big5hkscs-0");
pref("font.name.monospace.zh-HK", "-arphic-Ming for ISO10646-big5hkscs-0");
// zh-TW
# MOZ_ENABLE_XFT
#endif
pref("font.default.ar", "sans-serif");
pref("font.size.variable.ar", 16);

3
toolkit/library/Makefile.in
Просмотреть файл

@ -212,9 +212,6 @@ endif
ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT))
EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_XFT_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0
endif
ifdef MOZ_ENABLE_XFT
EXTRA_DSO_LDOPTS += $(FT2_LIBS)
endif

2
toolkit/library/libxul-rules.mk
Просмотреть файл

@ -81,7 +81,7 @@ endif
endif
endif # MOZ_ENABLE_CAIRO_GFX
ifdef MOZ_ENABLE_PANGO
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
EXTRA_DSO_LDOPTS += $(MOZ_PANGO_LIBS)
endif