diff -Naur pango-1.0.5.old/Makefile.in pango-1.0.5.new/Makefile.in --- pango-1.0.5.old/Makefile.in Mon Oct 14 01:50:47 2002 +++ pango-1.0.5.new/Makefile.in Mon Apr 14 01:44:26 2003 @@ -116,7 +116,7 @@ YACC = @YACC@ ms_librarian = @ms_librarian@ -SUBDIRS = pango modules examples docs tools tests +SUBDIRS = pango modules docs tools EXTRA_DIST = \ pango.spec.in \ diff -Naur pango-1.0.5.old/configure pango-1.0.5.new/configure --- pango-1.0.5.old/configure Mon Oct 14 01:41:22 2002 +++ pango-1.0.5.new/configure Mon Apr 14 01:44:26 2003 @@ -5522,7 +5522,7 @@ # FIXME: Relying on posixy $() will cause problems for # cross-compilation, but unfortunately the echo tests do not # yet detect zsh echo's removal of \ escapes. - archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring' + archive_cmds='$nonopt $(test x$module = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $tmp_verstring)' # We need to add '_' to the symbols in $export_symbols first #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' hardcode_direct=yes @@ -9435,7 +9435,7 @@ ## see which freetype we have, 2.0.3 vs. 2.0.4 pango_save_cppflags="$CPPFLAGS" -CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS" +CPPFLAGS="$FREETYPE_CFLAGS $CPPFLAGS" if test "${ac_cv_header_freetype_internal_tterrors_h+set}" = set; then echo "$as_me:$LINENO: checking for freetype/internal/tterrors.h" >&5 echo $ECHO_N "checking for freetype/internal/tterrors.h... $ECHO_C" >&6 diff -Naur pango-1.0.5.old/ltmain.sh pango-1.0.5.new/ltmain.sh --- pango-1.0.5.old/ltmain.sh Tue Aug 20 10:13:37 2002 +++ pango-1.0.5.new/ltmain.sh Mon Apr 14 01:44:26 2003 @@ -2952,7 +2952,17 @@ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then eval cmds=\"$archive_expsym_cmds\" else + if test "x$verstring" = "x0.0"; then + tmp_verstring= + else + tmp_verstring="$verstring" + fi + save_deplibs="$deplibs" + for conv in $convenience; do + deplibs="${deplibs%$conv*} ${deplibs#*$conv}" + done eval cmds=\"$archive_cmds\" + deplibs="$save_deplibs" fi save_ifs="$IFS"; IFS='~' for cmd in $cmds; do @@ -4006,10 +4016,10 @@ # Directory that this library needs to be installed in: libdir='$install_libdir'" - if test "$installed" = no && test "$need_relink" = yes; then - $echo >> $output "\ -relink_command=\"$relink_command\"" - fi +# if test "$installed" = no && test "$need_relink" = yes; then +# $echo >> $output "\ +#relink_command=\"$relink_command\"" +# fi done fi diff -Naur pango-1.0.5.old/modules/arabic/Makefile.in pango-1.0.5.new/modules/arabic/Makefile.in --- pango-1.0.5.old/modules/arabic/Makefile.in Mon Oct 14 01:50:50 2002 +++ pango-1.0.5.new/modules/arabic/Makefile.in Mon Apr 14 01:44:26 2003 @@ -117,9 +117,9 @@ ms_librarian = @ms_librarian@ pangolibs = $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la $(FRIBIDI_LIBS) $(GLIB_LIBS) -pangoxlibs = $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(X_LIBS) $(pangolibs) -pangoxftlibs = $(top_builddir)/pango/libpangoxft-$(PANGO_API_VERSION).la $(XFT_LIBS) $(pangolibs) -pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs) +pangoxlibs = $(X_LIBS) $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(pangolibs) +pangoxftlibs = $(XFT_LIBS) $(top_builddir)/pango/libpangoxft-$(PANGO_API_VERSION).la $(pangolibs) +pangoft2libs = $(FREETYPE_LIBS) $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(pangolibs) @HAVE_XFT_TRUE@@INCLUDE_ARABIC_XFT_TRUE@XFT_MODULES = @HAVE_XFT_TRUE@@INCLUDE_ARABIC_XFT_FALSE@XFT_MODULES = @HAVE_XFT_TRUE@@INCLUDE_ARABIC_XFT_FALSE@pango-arabic-xft.la @HAVE_XFT_FALSE@XFT_MODULES = diff -Naur pango-1.0.5.old/modules/basic/Makefile.in pango-1.0.5.new/modules/basic/Makefile.in --- pango-1.0.5.old/modules/basic/Makefile.in Mon Oct 14 01:50:51 2002 +++ pango-1.0.5.new/modules/basic/Makefile.in Mon Apr 14 01:44:26 2003 @@ -119,9 +119,9 @@ basic_sources = basic-x.c pangolibs = $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la $(FRIBIDI_LIBS) $(GLIB_LIBS) -pangoxlibs = $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(X_LIBS) $(pangolibs) -pangoxftlibs = $(top_builddir)/pango/libpangoxft-$(PANGO_API_VERSION).la $(XFT_LIBS) $(pangolibs) -pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs) +pangoxlibs = $(X_LIBS) $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(pangolibs) +pangoxftlibs = $(XFT_LIBS) $(top_builddir)/pango/libpangoxft-$(PANGO_API_VERSION).la $(pangolibs) +pangoft2libs = $(FREETYPE_LIBS) $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(pangolibs) pangowin32libs = $(top_builddir)/pango/libpangowin32-$(PANGO_API_VERSION).la $(pangolibs) @HAVE_XFT_TRUE@@INCLUDE_BASIC_XFT_TRUE@XFT_INCLUDED = @HAVE_XFT_TRUE@@INCLUDE_BASIC_XFT_TRUE@libpango-basic-xft.la @HAVE_XFT_TRUE@@INCLUDE_BASIC_XFT_FALSE@XFT_INCLUDED = @@ -132,7 +132,7 @@ @HAVE_XFT_TRUE@@INCLUDE_BASIC_XFT_TRUE@XFT_PREFIX = @HAVE_XFT_TRUE@@INCLUDE_BASIC_XFT_TRUE@-DXFT_MODULE_PREFIX @HAVE_XFT_TRUE@@INCLUDE_BASIC_XFT_FALSE@XFT_PREFIX = @HAVE_XFT_FALSE@XFT_PREFIX = -@HAVE_XFT_TRUE@@INCLUDE_BASIC_XFT_FALSE@basic_xft_libadd = @HAVE_XFT_TRUE@@INCLUDE_BASIC_XFT_FALSE@$(pangoxlibs) $(pangoxftlibs) +@HAVE_XFT_TRUE@@INCLUDE_BASIC_XFT_FALSE@basic_xft_libadd = @HAVE_XFT_TRUE@@INCLUDE_BASIC_XFT_FALSE@$(pangoxftlibs) $(pangoxlibs) @HAVE_FREETYPE_TRUE@@INCLUDE_BASIC_FT2_TRUE@FT2_INCLUDED = @HAVE_FREETYPE_TRUE@@INCLUDE_BASIC_FT2_TRUE@libpango-basic-ft2.la @HAVE_FREETYPE_TRUE@@INCLUDE_BASIC_FT2_FALSE@FT2_INCLUDED = @HAVE_FREETYPE_FALSE@FT2_INCLUDED = diff -Naur pango-1.0.5.old/modules/hangul/Makefile.in pango-1.0.5.new/modules/hangul/Makefile.in --- pango-1.0.5.old/modules/hangul/Makefile.in Mon Oct 14 01:50:51 2002 +++ pango-1.0.5.new/modules/hangul/Makefile.in Mon Apr 14 01:44:26 2003 @@ -119,9 +119,9 @@ sources = hangul-x.c pangolibs = $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la $(FRIBIDI_LIBS) $(GLIB_LIBS) -pangoxlibs = $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(X_LIBS) $(pangolibs) -pangoxftlibs = $(top_builddir)/pango/libpangoxft-$(PANGO_API_VERSION).la $(XFT_LIBS) $(pangolibs) -pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs) +pangoxlibs = $(X_LIBS) $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(pangolibs) +pangoxftlibs = $(XFT_LIBS) $(top_builddir)/pango/libpangoxft-$(PANGO_API_VERSION).la $(pangolibs) +pangoft2libs = $(FREETYPE_LIBS) $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(pangolibs) @HAVE_X_TRUE@@INCLUDE_HANGUL_X_TRUE@noinst_LTLIBRARIES = @HAVE_X_TRUE@@INCLUDE_HANGUL_X_TRUE@libpango-hangul-x.la @HAVE_X_TRUE@@INCLUDE_HANGUL_X_TRUE@moddefine = @HAVE_X_TRUE@@INCLUDE_HANGUL_X_TRUE@-DX_MODULE_PREFIX diff -Naur pango-1.0.5.old/modules/hebrew/Makefile.in pango-1.0.5.new/modules/hebrew/Makefile.in --- pango-1.0.5.old/modules/hebrew/Makefile.in Mon Oct 14 01:50:53 2002 +++ pango-1.0.5.new/modules/hebrew/Makefile.in Mon Apr 14 01:44:26 2003 @@ -122,9 +122,9 @@ hebrew_ft2_sources = $(common_sources) hebrew-ft2.c pangolibs = $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la $(FRIBIDI_LIBS) $(GLIB_LIBS) -pangoxlibs = $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(X_LIBS) $(pangolibs) -pangoxftlibs = $(top_builddir)/pango/libpangoxft-$(PANGO_API_VERSION).la $(XFT_LIBS) $(pangolibs) -pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs) +pangoxlibs = $(X_LIBS) $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(pangolibs) +pangoxftlibs = $(XFT_LIBS) $(top_builddir)/pango/libpangoxft-$(PANGO_API_VERSION).la $(pangolibs) +pangoft2libs = $(FREETYPE_LIBS) $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(pangolibs) @HAVE_XFT_TRUE@@INCLUDE_BASIC_XFT_TRUE@XFT_INCLUDED = @HAVE_XFT_TRUE@@INCLUDE_BASIC_XFT_TRUE@libpango-hebrew-xft.la @HAVE_XFT_TRUE@@INCLUDE_BASIC_XFT_FALSE@XFT_INCLUDED = @HAVE_XFT_FALSE@XFT_INCLUDED = @@ -134,7 +134,7 @@ @HAVE_XFT_TRUE@@INCLUDE_BASIC_XFT_TRUE@XFT_PREFIX = @HAVE_XFT_TRUE@@INCLUDE_BASIC_XFT_TRUE@-DXFT_MODULE_PREFIX @HAVE_XFT_TRUE@@INCLUDE_BASIC_XFT_FALSE@XFT_PREFIX = @HAVE_XFT_FALSE@XFT_PREFIX = -@HAVE_XFT_TRUE@@INCLUDE_BASIC_XFT_FALSE@hebrew_xft_libadd = @HAVE_XFT_TRUE@@INCLUDE_BASIC_XFT_FALSE@$(pangoxlibs) $(pangoxftlibs) +@HAVE_XFT_TRUE@@INCLUDE_BASIC_XFT_FALSE@hebrew_xft_libadd = @HAVE_XFT_TRUE@@INCLUDE_BASIC_XFT_FALSE@$(pangoxftlibs) $(pangoxlibs) @HAVE_X_TRUE@@INCLUDE_BASIC_X_TRUE@X_INCLUDED = @HAVE_X_TRUE@@INCLUDE_BASIC_X_TRUE@libpango-hebrew-x.la @HAVE_X_TRUE@@INCLUDE_BASIC_X_FALSE@X_INCLUDED = @HAVE_X_FALSE@X_INCLUDED = diff -Naur pango-1.0.5.old/modules/indic/Makefile.in pango-1.0.5.new/modules/indic/Makefile.in --- pango-1.0.5.old/modules/indic/Makefile.in Mon Oct 14 01:50:52 2002 +++ pango-1.0.5.new/modules/indic/Makefile.in Mon Apr 14 01:44:26 2003 @@ -126,9 +126,9 @@ pangolibs = $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la $(FRIBIDI_LIBS) $(GLIB_LIBS) -pangoxlibs = $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(X_LIBS) $(pangolibs) -pangoxftlibs = $(top_builddir)/pango/libpangoxft-$(PANGO_API_VERSION).la $(XFT_LIBS) $(pangolibs) -pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs) +pangoxlibs = $(X_LIBS) $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(pangolibs) +pangoxftlibs = $(XFT_LIBS) $(top_builddir)/pango/libpangoxft-$(PANGO_API_VERSION).la $(pangolibs) +pangoft2libs = $(FREETYPE_LIBS) $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(pangolibs) @HAVE_X_TRUE@@INCLUDE_MYANMAR_X_TRUE@myanmar_x_noinst = @HAVE_X_TRUE@@INCLUDE_MYANMAR_X_TRUE@libpango-myanmar-x.la @HAVE_X_TRUE@@INCLUDE_MYANMAR_X_TRUE@myanmar_x_cflags = @HAVE_X_TRUE@@INCLUDE_MYANMAR_X_TRUE@-DMYANMAR_X_MODULE_PREFIX diff -Naur pango-1.0.5.old/modules/tamil/Makefile.in pango-1.0.5.new/modules/tamil/Makefile.in --- pango-1.0.5.old/modules/tamil/Makefile.in Mon Oct 14 01:50:52 2002 +++ pango-1.0.5.new/modules/tamil/Makefile.in Mon Apr 14 01:44:26 2003 @@ -117,9 +117,9 @@ ms_librarian = @ms_librarian@ pangolibs = $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la $(FRIBIDI_LIBS) $(GLIB_LIBS) -pangoxlibs = $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(X_LIBS) $(pangolibs) -pangoxftlibs = $(top_builddir)/pango/libpangoxft-$(PANGO_API_VERSION).la $(XFT_LIBS) $(pangolibs) -pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs) +pangoxlibs = $(X_LIBS) $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(pangolibs) +pangoxftlibs = $(XFT_LIBS) $(top_builddir)/pango/libpangoxft-$(PANGO_API_VERSION).la $(pangolibs) +pangoft2libs = $(FREETYPE_LIBS) $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(pangolibs) @HAVE_XFT_TRUE@@INCLUDE_TAMIL_XFT_TRUE@XFT_MODULES = @HAVE_XFT_TRUE@@INCLUDE_TAMIL_XFT_FALSE@XFT_MODULES = @HAVE_XFT_TRUE@@INCLUDE_TAMIL_XFT_FALSE@pango-tamil-xft.la @HAVE_XFT_FALSE@XFT_MODULES = diff -Naur pango-1.0.5.old/modules/thai/Makefile.in pango-1.0.5.new/modules/thai/Makefile.in --- pango-1.0.5.old/modules/thai/Makefile.in Mon Oct 14 01:50:52 2002 +++ pango-1.0.5.new/modules/thai/Makefile.in Mon Apr 14 01:44:26 2003 @@ -121,9 +121,9 @@ thai_xft_sources = $(common_sources) thai-xft.c pangolibs = $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la $(FRIBIDI_LIBS) $(GLIB_LIBS) -pangoxlibs = $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(X_LIBS) $(pangolibs) -pangoxftlibs = $(top_builddir)/pango/libpangoxft-$(PANGO_API_VERSION).la $(XFT_LIBS) $(pangolibs) -pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs) +pangoxlibs = $(X_LIBS) $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(pangolibs) +pangoxftlibs = $(XFT_LIBS) $(top_builddir)/pango/libpangoxft-$(PANGO_API_VERSION).la $(pangolibs) +pangoft2libs = $(FREETYPE_LIBS) $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(pangolibs) @HAVE_XFT_TRUE@@INCLUDE_THAI_XFT_TRUE@XFT_MODULES = @HAVE_XFT_TRUE@@INCLUDE_THAI_XFT_FALSE@XFT_MODULES = @HAVE_XFT_TRUE@@INCLUDE_THAI_XFT_FALSE@pango-thai-xft.la @HAVE_XFT_FALSE@XFT_MODULES = @@ -133,7 +133,7 @@ @HAVE_XFT_TRUE@@INCLUDE_THAI_XFT_TRUE@XFT_PREFIX = @HAVE_XFT_TRUE@@INCLUDE_THAI_XFT_TRUE@-DXFT_MODULE_PREFIX @HAVE_XFT_TRUE@@INCLUDE_THAI_XFT_FALSE@XFT_PREFIX = @HAVE_XFT_FALSE@XFT_PREFIX = -@HAVE_XFT_TRUE@@INCLUDE_THAI_XFT_FALSE@thai_xft_libadd = @HAVE_XFT_TRUE@@INCLUDE_THAI_XFT_FALSE@$(pangoxftlibs) +@HAVE_XFT_TRUE@@INCLUDE_THAI_XFT_FALSE@thai_xft_libadd = @HAVE_XFT_TRUE@@INCLUDE_THAI_XFT_FALSE@$(pangoxftlibs) $(pangoxlibs) @HAVE_X_TRUE@@INCLUDE_THAI_X_TRUE@X_MODULES = @HAVE_X_TRUE@@INCLUDE_THAI_X_FALSE@X_MODULES = @HAVE_X_TRUE@@INCLUDE_THAI_X_FALSE@pango-thai-x.la @HAVE_X_FALSE@X_MODULES = diff -Naur pango-1.0.5.old/pango/Makefile.in pango-1.0.5.new/pango/Makefile.in --- pango-1.0.5.old/pango/Makefile.in Mon Oct 14 01:50:48 2002 +++ pango-1.0.5.new/pango/Makefile.in Mon Apr 14 01:44:26 2003 @@ -222,7 +222,7 @@ 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_LIBADD = libpango-$(PANGO_API_VERSION).la $(INCLUDED_X_MODULES) $(X_LIBS) $(X_EXTRA_LIBS) $(GLIB_LIBS) libpangox_1_0_la_DEPENDENCIES = $(INCLUDED_X_MODULES) libpango-$(PANGO_API_VERSION).la libpangowin32_1_0_la_SOURCES = \ @@ -249,7 +249,7 @@ libpangoxft_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO) -libpangoxft_1_0_la_LIBADD = opentype/libpango-ot.la libpango-$(PANGO_API_VERSION).la $(INCLUDED_XFT_MODULES) $(XFT_LIBS) +libpangoxft_1_0_la_LIBADD = $(XFT_LIBS) opentype/libpango-ot.la libpango-$(PANGO_API_VERSION).la $(INCLUDED_XFT_MODULES) $(GLIB_LIBS) libpangoxft_1_0_la_DEPENDENCIES = $(INCLUDED_XFT_MODULES) libpango-$(PANGO_API_VERSION).la libpangoft2_1_0_la_SOURCES = \ diff -Naur pango-1.0.5.old/pango/pangoft2.c pango-1.0.5.new/pango/pangoft2.c --- pango-1.0.5.old/pango/pangoft2.c Fri Aug 9 08:25:30 2002 +++ pango-1.0.5.new/pango/pangoft2.c Mon Apr 14 01:45:57 2003 @@ -696,7 +696,7 @@ coverage = pango_coverage_new (); face = pango_ft2_font_get_face (font); -#ifdef HAVE_FT_GET_FIRST_CHAR +#if 0 /* #ifdef HAVE_FT_GET_FIRST_CHAR */ { FT_UInt gindex; FT_ULong charcode; diff -Naur pango-1.0.5.old/pango/pangoxft-font.c pango-1.0.5.new/pango/pangoxft-font.c --- pango-1.0.5.old/pango/pangoxft-font.c Fri Aug 9 08:25:30 2002 +++ pango-1.0.5.new/pango/pangoxft-font.c Mon Apr 14 01:44:26 2003 @@ -544,7 +544,7 @@ face = pango_xft_font_get_face (font); coverage = pango_coverage_new (); -#ifdef HAVE_FT_GET_FIRST_CHAR +#if 0 /* #ifdef HAVE_FT_GET_FIRST_CHAR */ { FT_UInt gindex; FT_ULong charcode; diff -Naur pango-1.0.5.old/update-pango-modules pango-1.0.5.new/update-pango-modules --- pango-1.0.5.old/update-pango-modules Thu Jan 1 09:00:00 1970 +++ pango-1.0.5.new/update-pango-modules Mon Apr 14 01:44:26 2003 @@ -0,0 +1,20 @@ +#!/bin/sh -e +# +# update-pango-modules +# +# Package which install pango module(s) should call update-pango-modules in +# it's PostInstScript/PostRmScript to update pango.module file. +# + +CONFDIR=@PREFIX@/etc/pango +CONFFILE=$CONFDIR/pango.modules + +mkdir -p $CONFDIR + +TMPFILE=`tempfile` +pango-querymodules >$TMPFILE + +mv -f $TMPFILE $CONFFILE +chmod 0644 $CONFFILE + +exit 0