564552fffee8e4bdee92c611174aa752 pango-rc2-1.0.0.tar.gz

Changed files:
    pango-am_ac.patch -> 1.5
    pango-use_system_fribidi.patch -> 1.2

diff --git a/pango-am_ac.patch b/pango-am_ac.patch
index d62da4ded21c6cd9ee77acdfb07611f87a263096..0b6b9966e05e16ae89626bba52beb5d0ee8bb207 100644 (file)
--- a/pango-am_ac.patch
+++ b/pango-am_ac.patch
@@ -1,16 +1,22 @@
-diff -urN pango-0.25.org/pango/Makefile.am pango-0.25/pango/Makefile.am
---- pango-0.25.org/pango/Makefile.am   Tue Feb 19 00:11:36 2002
-+++ pango-0.25/pango/Makefile.am       Tue Feb 19 00:12:07 2002
-@@ -261,10 +261,10 @@
+diff -urN pango-rc2-1.0.0.org/pango/Makefile.am pango-rc2-1.0.0/pango/Makefile.am
+--- pango-rc2-1.0.0.org/pango/Makefile.am      Thu Mar  7 11:25:05 2002
++++ pango-rc2-1.0.0/pango/Makefile.am  Thu Mar  7 11:27:37 2002
+@@ -12,6 +12,7 @@
+ endif
+ 
+ if HAVE_FRIBIDI
++FRIBIDI_SUBDIR =
+ else
+ FRIBIDI_SUBDIR = mini-fribidi
+ endif
+@@ -266,10 +268,8 @@
  
  if HAVE_XFT
- pango_querymodules_LDADD = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) libpangoxft.la $(GLIB_LIBS) $(FRIBIDI_LIBS) $(XFT_LIBS) $(FREETYPE_LIBS)
--pango_querymodules_DEPENDENCIES = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) libpangoxft.la libpango.la
-+#pango_querymodules_DEPENDENCIES = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) libpangoxft.la libpango.la
+ pango_querymodules_LDADD = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) libpangoxft-$(PANGO_API_VERSION).la $(GLIB_LIBS) $(FRIBIDI_LIBS) $(XFT_LIBS) $(FREETYPE_LIBS)
+-pango_querymodules_DEPENDENCIES = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) libpangoxft-$(PANGO_API_VERSION).la libpango-$(PANGO_API_VERSION).la
  else
- pango_querymodules_LDADD = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) $(WIN32_BUILD_LIBS) $(GLIB_LIBS) $(FRIBIDI_LIBS) $(X_LIBS) $(FREETYPE_LIBS)
--pango_querymodules_DEPENDENCIES = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) $(WIN32_BUILD_LIBS) libpango.la
-+#pango_querymodules_DEPENDENCIES = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) $(WIN32_BUILD_LIBS) libpango.la
+ pango_querymodules_LDADD = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) $(WIN32_BUILD_LIBS) $(GLIB_LIBS) $(FRIBIDI_LIBS) $(X_LIBS) $(FREETYPE_LIBS) $(X_EXTRA_LIBS)
+-pango_querymodules_DEPENDENCIES = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) $(WIN32_BUILD_LIBS) libpango-$(PANGO_API_VERSION).la
  endif
  
  EXTRA_DIST =                                  \

diff --git a/pango-use_system_fribidi.patch b/pango-use_system_fribidi.patch
index fab2b1f280d6a9dbb57b7dd975c56827d16d5d9c..6d25db340324b8305ecd5b9f41c32cb4558e321d 100644 (file)
--- a/pango-use_system_fribidi.patch
+++ b/pango-use_system_fribidi.patch
@@ -59,7 +59,7 @@
  endif
  
  if HAVE_FRIBIDI
-+libpango_la_LIBADD = $(FRIBIDI_LIBS)
++libpango_1_0_la_LIBADD = $(FRIBIDI_LIBS)
  else
  FRIBIDI_SUBDIR = mini-fribidi
  endif