diff -crN ./pango/XftConfig /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./pango/XftConfig *** ./pango/XftConfig Thu Jan 1 01:00:00 1970 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./pango/XftConfig Thu Dec 5 15:57:17 2002 *************** *** 0 **** --- 1,108 ---- + # $XFree86: xc/lib/Xft/XftConfig.cpp,v 1.5 2000/12/14 23:03:53 keithp Exp $ + + dir "/usr/X11R6/lib/X11/fonts/Type1" + + # Red Hat additions + dir "/usr/X11R6/lib/X11/fonts/TTF" + dir "/usr/share/fonts/default/TrueType" + dir "/usr/share/fonts/default/Type1" + dir "/usr/share/fonts/ja/TrueType" + dir "/usr/share/fonts/ko/TrueType" + dir "/usr/share/fonts/zh_CN/TrueType" + dir "/usr/share/fonts/zh_TW/TrueType" + + # + # alias 'fixed' for 'mono' + # + match any family == "fixed" edit family =+ "mono"; + + # + # Don't antialias small fonts + # + match + any size < 11 + any size > 8 + edit antialias=false; + + # + # Don't antialias wingding symbols and similar types of symbol fontsets + # + match + any family == "webdings" + edit antialias = false; + encoding += "glyphs-fontspecific"; + match + any family == "wingdings" + edit antialias = false; + encoding += "glyphs-fontspecific"; + + # + # Check users config file + # + includeif "~/.xftconfig" + + # + # Use Luxi fonts for default faces + # + match any family == "serif" edit family += "Luxi Serif"; + match any family == "sans" edit family += "Luxi Sans"; + match any family == "mono" edit family += "Luxi Mono"; + + # + # Alias between XLFD families and font file family name, prefer local + # fonts + # + match any family == "charter" edit family += "bitstream charter"; + match any family == "bitstream charter" edit family =+ "charter"; + + # + # Alias older name for Luxi fonts + # + match any family == "LuciduxSerif" edit family += "Luxi Serif"; + match any family == "Lucidux Serif" edit family += "Luxi Serif"; + + match any family == "LuciduxSans" edit family += "Luxi Sans"; + match any family == "Lucidux Sans" edit family += "Luxi Sans"; + + match any family == "LuciduxMono" edit family += "Luxi Mono"; + match any family == "Lucidux Mono" edit family += "Luxi Mono"; + + # + # TrueType font aliases (disabled - experimental) + # + #match any family == "Comic Sans" edit family += "Comic Sans MS"; + #match any family == "Comic Sans MS" edit family =+ "Comic Sans"; + #match any family == "Trebuchet" edit family += "Trebuchet MS"; + #match any family == "Trebuchet MS" edit family =+ "Trebuchet"; + #match any family == "Monotype" edit family =+ "Monotype.com"; + #match any family == "Andale Mono" edit family += "Monotype.com"; + #match any family == "Monotype.com" edit family =+ "Andale Mono"; + + # + # Set some sane defaults for Anti-Aliased desktops + # + match any family == "helvetica" edit family += "Nimbus Sans L"; + match any family == "helv" edit family += "Nimbus Sans L"; + match any family == "verdana" edit family += "Nimbus Sans L"; + match any family == "times" edit family += "Nimbus Roman No9 L"; + match any family == "helvetica" edit family += "Helmet"; + match any family == "helv" edit family += "Helmet"; + match any family == "verdana" edit family += "Helmet"; + match any family == "times" edit family += "Helmet"; + + # XFree86 default fonts + match any family == "Verdana" edit family += "Luxi Sans"; + match any family == "Times New Roman" edit family += "Luxi Serif"; + + # + # Japanese + # + match any foundry == "watanabe" edit antialias = false; + match any foundry == "wadalab" edit antialias = false; + + # + # Fixes a problem in KDE with konsole + # + match any family == "fixed" edit antialias =+ "false"; + match any family == "console" edit antialias =+ "false"; + diff -crN ./pango/configure.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./pango/configure.in *** ./pango/configure.in Wed Aug 27 16:37:25 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./pango/configure.in Tue Jan 27 15:27:39 2004 *************** *** 182,187 **** --- 182,190 ---- have_xft=false PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= 1.0.1, have_fontconfig=true, :) + if test "x$FONTCONFIG_CFLAGS_PC" = "x" ; then + FONTCONFIG_CFLAGS_PC=$FONTCONFIG_CFLAGS + fi if $have_fontconfig ; then # *************** *** 194,199 **** --- 197,206 ---- FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags` FREETYPE_LIBS=`$FREETYPE_CONFIG --libs` + if test "x$FREETYPE_CFLAGS_PC" = "x" ; then + FREETYPE_CFLAGS_PC=$FREETYPE_CFLAGS + fi + pango_save_ldflags=$LDFLAGS LDFLAGS="$LDFLAGS $FREETYPE_LIBS" AC_CHECK_LIB(freetype, FT_Get_Next_Char, have_freetype=true, :) *************** *** 205,210 **** --- 212,219 ---- AC_SUBST(FREETYPE_LIBS) AC_SUBST(FREETYPE_CFLAGS) + AC_SUBST(FREETYPE_CFLAGS_PC) + AC_SUBST(FONTCONFIG_CFLAGS_PC) # # Checks for Xft/XRender diff -crN ./pango/pango/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./pango/pango/Makefile.am *** ./pango/pango/Makefile.am Mon Aug 25 15:12:45 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./pango/pango/Makefile.am Fri Oct 17 09:22:22 2003 *************** *** 156,162 **** libpango_1_0_la_LIBADD = mini-fribidi/libmini-fribidi.la $(pango_win32res) libpango_1_0_la_DEPENDENCIES = $(pango_win32res) ! libpangox_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO) libpangox_1_0_la_LIBADD = libpango-$(PANGO_API_VERSION).la $(INCLUDED_X_MODULES) $(X_LIBS) $(X_EXTRA_LIBS) libpangox_1_0_la_DEPENDENCIES = $(INCLUDED_X_MODULES) libpango-$(PANGO_API_VERSION).la --- 156,162 ---- libpango_1_0_la_LIBADD = mini-fribidi/libmini-fribidi.la $(pango_win32res) libpango_1_0_la_DEPENDENCIES = $(pango_win32res) ! libpangox_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO) $(GLIB_LIBS) libpangox_1_0_la_LIBADD = libpango-$(PANGO_API_VERSION).la $(INCLUDED_X_MODULES) $(X_LIBS) $(X_EXTRA_LIBS) libpangox_1_0_la_DEPENDENCIES = $(INCLUDED_X_MODULES) libpango-$(PANGO_API_VERSION).la *************** *** 281,286 **** --- 281,291 ---- EXTRA_DIST = \ $(pango_built_headers) \ + pangoft2.h \ + pango-ot.h \ + pangox.h \ + pangoxft.h \ + pangowin32.h \ module-defs-ft2.c.win32 \ module-defs-win32.c.win32 \ module-defs.h \ diff -crN ./pango/pango/querymodules.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./pango/pango/querymodules.c *** ./pango/pango/querymodules.c Sat Dec 7 00:17:41 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./pango/pango/querymodules.c Mon Feb 24 16:20:46 2003 *************** *** 35,45 **** #endif #include - #if USE_LA_MODULES - #define SOEXT ".la" - #else #define SOEXT ("." G_MODULE_SUFFIX) - #endif #define SOEXT_LEN (strlen (SOEXT)) static gboolean --- 35,41 ---- diff -crN ./pango/pangoft2.pc.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./pango/pangoft2.pc.in *** ./pango/pangoft2.pc.in Thu Jun 6 20:28:19 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./pango/pangoft2.pc.in Fri Jan 23 12:07:20 2004 *************** *** 1,3 **** --- 1,4 ---- + prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ *************** *** 8,12 **** Version: @VERSION@ Requires: pango Libs: -L${libdir} -lpangoft2-@PANGO_API_VERSION@ @PKGCONFIG_FREETYPE_LIBS@ ! Cflags: -I${includedir}/pango-1.0 @FONTCONFIG_CFLAGS@ @FREETYPE_CFLAGS@ --- 9,13 ---- Version: @VERSION@ Requires: pango Libs: -L${libdir} -lpangoft2-@PANGO_API_VERSION@ @PKGCONFIG_FREETYPE_LIBS@ ! Cflags: -I${includedir}/pango-1.0 @FONTCONFIG_CFLAGS_PC@ @FREETYPE_CFLAGS_PC@ diff -crN ./pango/pangoxft.pc.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./pango/pangoxft.pc.in *** ./pango/pangoxft.pc.in Tue Jun 4 17:14:16 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./pango/pangoxft.pc.in Thu Oct 23 08:16:18 2003 *************** *** 8,11 **** Version: @VERSION@ Requires: pango Libs: -L${libdir} -lpangoxft-@PANGO_API_VERSION@ @PKGCONFIG_XFT_LIBS@ ! Cflags: -I${includedir}/pango-1.0 @XFT_CFLAGS@ --- 8,11 ---- Version: @VERSION@ Requires: pango Libs: -L${libdir} -lpangoxft-@PANGO_API_VERSION@ @PKGCONFIG_XFT_LIBS@ ! Cflags: -I${includedir}/pango-1.0 @XFT_CFLAGS@ @FREETYPE_CFLAGS_PC@