From 5750878092415fcdeb9b7cc6650a2a2361c42861 Mon Sep 17 00:00:00 2001 From: "mozilla%weilbacher.org" Date: Wed, 23 Jan 2008 08:27:49 +0000 Subject: [PATCH] Bug 376790: remove support for non-cairo GFX ports from configure.in, r=ted.mielczarek, a=mtschrep --- config/autoconf.mk.in | 4 -- config/static-config.mk | 6 -- configure.in | 74 ++---------------------- gfx/src/thebes/Makefile.in | 3 - gfx/thebes/src/Makefile.in | 2 +- gfx/thebes/test/Makefile.in | 5 +- gfx/thebes/test/gfxFontSelectionTest.cpp | 2 +- intl/build/Makefile.in | 2 +- intl/lwbrk/src/Makefile.in | 4 +- minimo/base/Makefile.in | 6 +- modules/libpref/src/init/all.js | 63 -------------------- toolkit/library/Makefile.in | 3 - toolkit/library/libxul-rules.mk | 2 +- 13 files changed, 14 insertions(+), 162 deletions(-) diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in index fc5bf57e520..ded65e53f92 100644 --- a/config/autoconf.mk.in +++ b/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@ diff --git a/config/static-config.mk b/config/static-config.mk index d59f2356426..bc727b5ec50 100644 --- a/config/static-config.mk +++ b/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 diff --git a/configure.in b/configure.in index 043e34f301e..c511c3faa32 100644 --- a/configure.in +++ b/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 diff --git a/gfx/src/thebes/Makefile.in b/gfx/src/thebes/Makefile.in index 584a6da4891..7222bcf2253 100644 --- a/gfx/src/thebes/Makefile.in +++ b/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 diff --git a/gfx/thebes/src/Makefile.in b/gfx/thebes/src/Makefile.in index b7f37004225..76a81c9df8d 100644 --- a/gfx/thebes/src/Makefile.in +++ b/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 diff --git a/gfx/thebes/test/Makefile.in b/gfx/thebes/test/Makefile.in index 11712067434..570adc2a551 100644 --- a/gfx/thebes/test/Makefile.in +++ b/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 diff --git a/gfx/thebes/test/gfxFontSelectionTest.cpp b/gfx/thebes/test/gfxFontSelectionTest.cpp index 57dc91b395b..31185a034e9 100644 --- a/gfx/thebes/test/gfxFontSelectionTest.cpp +++ b/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 diff --git a/intl/build/Makefile.in b/intl/build/Makefile.in index 1e17cf72549..34bb4b1e1e6 100644 --- a/intl/build/Makefile.in +++ b/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) diff --git a/intl/lwbrk/src/Makefile.in b/intl/lwbrk/src/Makefile.in index 0bce229b8b0..97a15c9df79 100644 --- a/intl/lwbrk/src/Makefile.in +++ b/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) diff --git a/minimo/base/Makefile.in b/minimo/base/Makefile.in index fa283fd3ba5..e46f0784d0f 100755 --- a/minimo/base/Makefile.in +++ b/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 diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js index 23d8755c5af..5a56fa8a5ec 100644 --- a/modules/libpref/src/init/all.js +++ b/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); diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in index 9218af0e920..3410581eb5a 100644 --- a/toolkit/library/Makefile.in +++ b/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 diff --git a/toolkit/library/libxul-rules.mk b/toolkit/library/libxul-rules.mk index 994d46aa7a0..80227eabf75 100644 --- a/toolkit/library/libxul-rules.mk +++ b/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