git.maemo.org Git - oespirit1/blob - gtkhtml/gtkhtml_100_dependency_removal_cleaning.diff

   1 # Set some defaults to off without entirely yanking them
   2 #
   3 # Copyright (C) 2006 - 2007 Nokia Corporation.
   4 # This file is distributed under the terms of GNU LGPL license, either version 2
   5 # of the License, or (at your option) any later version.
   6 #
   7 diff -Nru gtkhtml-3.24.4/autogen.sh gtkhtml-3.24.4.mod8/autogen.sh
   8 diff -Nru gtkhtml-3.24.4/autogen.sh gtkhtml-3.24.4.mod8/autogen.sh
   9 --- gtkhtml-3.24.4/autogen.sh   1970-01-01 02:00:00.000000000 +0200
  10 --- gtkhtml-3.24.4/autogen.sh   1970-01-01 02:00:00.000000000 +0200
  11 +++ gtkhtml-3.24.4/autogen.sh   2007-02-16 11:21:27.000000000 +0200
  12 +++ gtkhtml-3.24.4/autogen.sh   2007-02-16 11:21:27.000000000 +0200
  13 @@ -0,0 +1,7 @@
  14 +#!/bin/sh
  15 +
  16 +set -x
  17 +aclocal
  18 +autoconf
  19 +autoheader
  20 +automake --add-missing --foreign
  21 d
  22 diff -r -U5 gtkhtml-3.24.4/configure.in gtkhtml-3.24.4/configure.in
  23 --- gtkhtml-3.24.4/configure.in 2008-10-16 10:57:08.000000000 +0200
  24 +++ gtkhtml-3.24.4/configure.in 2008-10-16 11:05:40.000000000 +0200
  25 @@ -84,12 +84,12 @@
  26  dnl
  27  dnl do we want a11y support?
  28  dnl
  29  GAIL_MODULES=""
  30  AC_ARG_ENABLE(a11y,
  31 -             [ --enable-a11y   Enable Accessibility (requires gail) [default=yes]],
  32 -             [ac_cv_enable_a11y=$enableval],[ac_cv_enable_a11y=yes])
  33 +             [ --enable-a11y   Enable Accessibility (requires gail) [default=no]],
  34 +             [ac_cv_enable_a11y=$enableval],[ac_cv_enable_a11y=no])
  35  AC_MSG_CHECKING([whether to enable a11y])
  36  if test "$ac_cv_enable_a11y" = yes; then
  37         AC_MSG_RESULT(yes)
  38         GAIL_MODULES="gail >= gail_minimum_version"
  39         PKG_CHECK_MODULES(GAIL, $GAIL_MODULES)
  40 @@ -111,12 +111,12 @@
  41  dnl
  42  dnl do we want printing support?
  43  dnl
  44  GNOMEPRINT_MODULES=""
  45  AC_ARG_ENABLE(printing,
  46 -             [ --enable-printing Enable Printing [default=yes]],
  47 -             [ac_cv_enable_printing=$enableval],[ac_cv_enable_printing=yes])
  48 +             [ --enable-printing Enable Printing [default=no]],
  49 +             [ac_cv_enable_printing=$enableval],[ac_cv_enable_printing=no])
  50  AC_MSG_CHECKING([whether to enable printing])
  51  if test "$ac_cv_enable_printing" = yes; then
  52         AC_MSG_RESULT(yes)
  53         GNOME_TEST_PROGRAMS="gtest test-suite test-stress"
  54  else
  55 @@ -130,12 +130,12 @@
  56  dnl
  57  dnl do we want gnome support?
  58  dnl
  59  GNOME_MODULES=""
  60  AC_ARG_ENABLE(gnome,
  61 -             [ --enable-gnome Enable Gnome  (requires many things) [default=yes]],
  62 -             [ac_cv_enable_gnome=$enableval],[ac_cv_enable_gnome=yes])
  63 +             [ --enable-gnome Enable Gnome  (requires many things) [default=no]],
  64 +             [ac_cv_enable_gnome=$enableval],[ac_cv_enable_gnome=no])
  65  AC_MSG_CHECKING([whether to enable gnome])
  66  if test "$ac_cv_enable_gnome" = yes; then
  67         AC_MSG_RESULT(yes)
  68         GNOME_MODULES="libgnomeui-2.0 >= libgnomeui_minimum_version"
  69
  70 @@ -198,14 +198,30 @@
  71
  72  dnl **********************************
  73  dnl soup for testgtkhtml
  74  dnl **********************************
  75
  76 -PKG_CHECK_MODULES(SOUP, libsoup-2.4, have_soup="yes", have_soup="no")
  77 +AC_ARG_ENABLE(soup,
  78 +             [ --enable-soup Enable soup [default=no]],
  79 +             [ac_cv_enable_soup=$enableval],[ac_cv_enable_soup=no])
  80 +AC_MSG_CHECKING([whether to enable soup])
  81 +if test "$ac_cv_enable_soup" = yes; then
  82 +       AC_MSG_RESULT(yes)
  83 +       PKG_CHECK_MODULES(SOUP, libsoup-2.4, have_soup="yes", have_soup="no")
  84 +       if test "x$have_soup" = "xno"; then
  85 +               PKG_CHECK_MODULES(SOUP, soup-2.0 >= 0.7.9, [have_soup="yes"
  86 +                                                   AC_DEFINE(HAVE_OLD_SOUP)],
  87 +                                          have_soup="no")
  88 +       fi
  89 +       AC_SUBST(SOUP_CFLAGS)
  90 +       AC_SUBST(SOUP_LIBS)
  91 +else
  92 +       have_soup="no"
  93 +       AC_MSG_RESULT(no)
  94 +       AC_DEFINE(DISABLE_SOUP)
  95 +fi
  96  AM_CONDITIONAL(HAVE_SOUP, test x$have_soup != xno)
  97 -AC_SUBST(SOUP_CFLAGS)
  98 -AC_SUBST(SOUP_LIBS)
  99
 100  dnl **************************************************
 101  dnl * iso-codes
 102  dnl **************************************************
 103
 104 @@ -313,8 +329,9 @@
 105
 106         accessibility support:          $ac_cv_enable_a11y
 107         gnome-print support:            $ac_cv_enable_printing
 108         gnome support:                  $ac_cv_enable_gnome
 109         bonobo-editor component:        $bonobo_editor
 110 +       soup:                           $ac_cv_enable_soup
 111
 112         Editor component type:          ${GNOME_GTKHTML_EDITOR_TYPE}
 113  "
 114 Only in gtkhtml-3.24.4/gtkhtml: gtkhtml.c.orig
 115 Only in gtkhtml-3.24.4/gtkhtml: htmlengine.c.orig
 116 diff -r -U5 gtkhtml-3.24.4/Makefile.am gtkhtml-3.24.4/Makefile.am
 117 --- gtkhtml-3.24.4/Makefile.am  2008-10-16 10:57:08.000000000 +0200
 118 +++ gtkhtml-3.24.4/Makefile.am  2008-10-16 11:07:40.000000000 +0200
 119 @@ -43,6 +43,20 @@
 120         BUGS                                    \
 121         intltool-extract.in                     \
 122         intltool-update.in                      \
 123         intltool-merge.in
 124
 125 -DISTCHECK_CONFIGURE_FLAGS = --with-bonobo-editor
 126 +#DISTCHECK_CONFIGURE_FLAGS = --with-bonobo-editor
 127 +#AK/22-12-05: common way to create .deb packages (Scratchbox)
 128 +#
 129 +deb:
 130 +       dpkg-buildpackage -rfakeroot -uc -us -sa -D
 131 +
 132 +# Use "dch -a" to add comment to debian/changelog
 133 +# Use "dch -v xx" to add new version to debian/changelog
 134 +#
 135 +# DEBEMAIL and DEBFULLNAME better be defined...! :)
 136 +#
 137 +# DO NOT MANUALLY EDIT THE debian/changelog.
 138 +#
 139 +ver:
 140 +       dch -v 999