git.sesse.net Git - vlc/blob - extras/contrib/src/Patches/glib-remove-gtkdoc.patch

   1 diff -ru configure.in configure.in
   2 --- configure.in   2009-06-27 05:34:30.000000000 +0200
   3 +++ configure.in     2009-06-27 12:45:40.000000000 +0200
   4 @@ -2600,8 +2600,6 @@
   5  dnl *** Checks for gtk-doc ***
   6  dnl **************************
   7
   8 -GTK_DOC_CHECK([1.11])
   9 -
  10  AC_ARG_ENABLE(man,
  11                [AC_HELP_STRING([--enable-man],
  12                                [regenerate man pages from Docbook [default=no]])],enable_man=yes,
  13 diff -ru Makefile.am Makefile.am
  14 --- Makefile.am 2009-05-08 01:57:50.000000000 +0200
  15 +++ Makefile.am 2009-06-27 12:43:41.000000000 +0200
  16 @@ -3,7 +3,7 @@
  17
  18  AUTOMAKE_OPTIONS = 1.7
  19
  20 -SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs
  21 +SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po
  22  DIST_SUBDIRS = $(SUBDIRS) build
  23
  24  bin_SCRIPTS = glib-gettextize
  25 @@ -68,8 +68,7 @@
  26         INSTALL                 \
  27         ChangeLog               \
  28         glibconfig.h.win32      \
  29 -       config.h.win32          \
  30 -       gtk-doc.make
  31 +       config.h.win32
  32
  33  configexecincludedir = $(libdir)/glib-2.0/include
  34  configexecinclude_DATA = glibconfig.h
  35 diff -ru autogen.sh autogen.sh
  36 --- autogen.sh  2009-06-27 03:57:54.000000000 +0200
  37 +++ autogen.sh  2009-06-27 12:32:21.000000000 +0200
  38 @@ -29,14 +29,6 @@
  39         DIE=1
  40  fi
  41
  42 -(gtkdocize --version) < /dev/null > /dev/null 2>&1 || {
  43 -       echo
  44 -       echo "You must have gtk-doc installed to compile $PROJECT."
  45 -       echo "Install the appropriate package for your distribution,"
  46 -       echo "or get the source tarball at ftp://ftp.gnome.org/pub/GNOME/sources/gtk-doc/"
  47 -       DIE=1
  48 -}
  49 -
  50  (autoconf --version) < /dev/null > /dev/null 2>&1 || {
  51         echo
  52         echo "You must have autoconf installed to compile $PROJECT."
  53 @@ -107,7 +99,6 @@
  54  $ACLOCAL $ACLOCAL_FLAGS || exit $?
  55
  56  libtoolize --force || exit $?
  57 -gtkdocize || exit $?
  58
  59  autoheader || exit $?
  60
  61 diff -ru docs/reference/gio/Makefile.am docs/reference/gio/Makefile.am
  62 --- docs/reference/gio/Makefile.am      2009-06-27 05:34:30.000000000 +0200
  63 +++ docs/reference/gio/Makefile.am      2009-06-27 12:37:01.000000000 +0200
  64 @@ -104,7 +104,6 @@
  65         version.xml.in          \
  66         gvfs-overview.odg
  67
  68 -include $(top_srcdir)/gtk-doc.make
  69
  70  EXTRA_DIST +=                          \
  71         version.xml.in
  72 diff -ru docs/reference/glib/Makefile.am docs/reference/glib/Makefile.am
  73 --- docs/reference/glib/Makefile.am     2009-04-01 01:04:20.000000000 +0200
  74 +++ docs/reference/glib/Makefile.am     2009-06-27 12:39:09.000000000 +0200
  75 @@ -69,9 +69,6 @@
  76  # Extra options to supply to gtkdoc-fixref
  77  FIXXREF_OPTIONS=
  78
  79 -# include common portion ...
  80 -include $(top_srcdir)/gtk-doc.make
  81 -
  82  # Other files to distribute
  83  EXTRA_DIST +=                          \
  84         file-name-encodings.png         \
  85 diff -ru docs/reference/gobject/Makefile.am docs/reference/gobject/Makefile.am
  86 --- docs/reference/gobject/Makefile.am  2009-04-01 01:04:20.000000000 +0200
  87 +++ docs/reference/gobject/Makefile.am  2009-06-27 12:40:34.000000000 +0200
  88 @@ -58,8 +58,6 @@
  89  # Extra options to supply to gtkdoc-fixref
  90  FIXXREF_OPTIONS=--extra-dir=$(srcdir)/../glib/html
  91
  92 -include $(top_srcdir)/gtk-doc.make
  93 -
  94  # Other files to distribute
  95  EXTRA_DIST +=          \
  96         gobject.cI      \