This commit was manufactured by cvs2git to create branch 'GNOME_2_6'.

Sprout from master 2004-08-26 10:28:46 UTC Jakub Bogusz <qboosh@pld-linux.org> '- lower xft deps (2.1.2 is not really needed) to allow using with XFree86'
Delete:
    pango-am_ac.patch
    pango-freetype.patch
    pango-gtkdoc.patch

diff --git a/pango-am_ac.patch b/pango-am_ac.patch
deleted file mode 100644 (file)
index 0b6b996..0000000
--- a/pango-am_ac.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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-$(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) $(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-freetype.patch b/pango-freetype.patch
deleted file mode 100644 (file)
index adc4090..0000000
--- a/pango-freetype.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -urN aaa/pango-1.1.4/examples/Makefile.am pango-1.1.4/examples/Makefile.am
---- aaa/pango-1.1.4/examples/Makefile.am       Tue Nov 26 14:36:40 2002
-+++ pango-1.1.4/examples/Makefile.am   Tue Dec  3 21:25:17 2002
-@@ -6,9 +6,9 @@
-       -DG_DISABLE_DEPRECATED          \
-       -I$(top_srcdir)                 \
-       $(QT_INCLUDES)                  \
-+      $(FREETYPE_CFLAGS)      \
-       $(GLIB_CFLAGS)                  \
--      $(FONTCONFIG_CFLAGS)            \
--      $(FREETYPE_CFLAGS)
-+      $(FONTCONFIG_CFLAGS)
- 
- ###################################################
- 

diff --git a/pango-gtkdoc.patch b/pango-gtkdoc.patch
deleted file mode 100644 (file)
index 9b7f730..0000000
--- a/pango-gtkdoc.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Nru pango-1.0.5.orig/configure.in pango-1.0.5/configure.in
---- pango-1.0.5.orig/configure.in      Sun Oct 13 18:32:57 2002
-+++ pango-1.0.5/configure.in   Thu Dec 19 14:55:11 2002
-@@ -523,21 +523,6 @@
- 
- AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false)
- 
--gtk_doc_min_version=0.6
--if $GTKDOC ; then 
--    gtk_doc_version=`gtkdoc-mkdb --version`
--    AC_MSG_CHECKING([gtk-doc version ($gtk_doc_version) >= $gtk_doc_min_version])
--    if perl <<EOF ; then
--      exit (("$gtk_doc_version" =~ /^[[0-9]]+\.[[0-9]]+$/) &&
--            ("$gtk_doc_version" >= "$gtk_doc_min_version") ? 0 : 1);
--EOF
--      AC_MSG_RESULT(yes)
--   else
--      AC_MSG_RESULT(no)
--      GTKDOC=false
--   fi
--fi
--
- AM_CONDITIONAL(HAVE_GTK_DOC, $GTKDOC)
- AC_SUBST(HAVE_GTK_DOC)
-