merge of '95bd611a11ed2faa8d23507a857c2668a96587fa'

     and 'fd3305e1333a4c25b9d300f0b3c39319801c2869'

53 files changed, 811 insertions, 5318 deletions

diff --git a/packages/atk/atk-1.2.0/m4.patch b/packages/atk/atk-1.2.0/m4.patch
deleted file mode 100644
index 8f373364e4..0000000000
--- a/packages/atk/atk-1.2.0/m4.patch
+++ /dev/null
@@ -1,2458 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- /dev/null
-+++ atk-1.2.0/m4/codeset.m4
-@@ -0,0 +1,23 @@
-+# codeset.m4 serial AM1 (gettext-0.10.40)
-+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Bruno Haible.
-+
-+AC_DEFUN([AM_LANGINFO_CODESET],
-+[
-+  AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
-+    [AC_TRY_LINK([#include <langinfo.h>],
-+      [char* cs = nl_langinfo(CODESET);],
-+      am_cv_langinfo_codeset=yes,
-+      am_cv_langinfo_codeset=no)
-+    ])
-+  if test $am_cv_langinfo_codeset = yes; then
-+    AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
-+      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
-+  fi
-+])
---- /dev/null
-+++ atk-1.2.0/m4/gettext.m4
-@@ -0,0 +1,587 @@
-+# gettext.m4 serial 17 (gettext-0.11.5)
-+dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+dnl
-+dnl This file can can be used in projects which are not available under
-+dnl the GNU General Public License or the GNU Library General Public
-+dnl License but which still want to provide support for the GNU gettext
-+dnl functionality.
-+dnl Please note that the actual code of the GNU gettext library is covered
-+dnl by the GNU Library General Public License, and the rest of the GNU
-+dnl gettext package package is covered by the GNU General Public License.
-+dnl They are *not* in the public domain.
-+
-+dnl Authors:
-+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-+dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2002.
-+
-+dnl Macro to add for using GNU gettext.
-+
-+dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
-+dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
-+dnl    default (if it is not specified or empty) is 'no-libtool'.
-+dnl    INTLSYMBOL should be 'external' for packages with no intl directory,
-+dnl    and 'no-libtool' or 'use-libtool' for packages with an intl directory.
-+dnl    If INTLSYMBOL is 'use-libtool', then a libtool library
-+dnl    $(top_builddir)/intl/libintl.la will be created (shared and/or static,
-+dnl    depending on --{enable,disable}-{shared,static} and on the presence of
-+dnl    AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
-+dnl    $(top_builddir)/intl/libintl.a will be created.
-+dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
-+dnl    implementations (in libc or libintl) without the ngettext() function
-+dnl    will be ignored.  If NEEDSYMBOL is specified and is
-+dnl    'need-formatstring-macros', then GNU gettext implementations that don't
-+dnl    support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
-+dnl INTLDIR is used to find the intl libraries.  If empty,
-+dnl    the value `$(top_builddir)/intl/' is used.
-+dnl
-+dnl The result of the configuration is one of three cases:
-+dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
-+dnl    and used.
-+dnl    Catalog format: GNU --> install in $(datadir)
-+dnl    Catalog extension: .mo after installation, .gmo in source tree
-+dnl 2) GNU gettext has been found in the system's C library.
-+dnl    Catalog format: GNU --> install in $(datadir)
-+dnl    Catalog extension: .mo after installation, .gmo in source tree
-+dnl 3) No internationalization, always use English msgid.
-+dnl    Catalog format: none
-+dnl    Catalog extension: none
-+dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
-+dnl The use of .gmo is historical (it was needed to avoid overwriting the
-+dnl GNU format catalogs when building on a platform with an X/Open gettext),
-+dnl but we keep it in order not to force irrelevant filename changes on the
-+dnl maintainers.
-+dnl
-+AC_DEFUN([AM_GNU_GETTEXT],
-+[
-+  dnl Argument checking.
-+  ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
-+    [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
-+])])])])])
-+  ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
-+    [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
-+])])])])
-+  define(gt_included_intl, ifelse([$1], [external], [no], [yes]))
-+  define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], []))
-+
-+  AC_REQUIRE([AM_PO_SUBDIRS])dnl
-+  ifelse(gt_included_intl, yes, [
-+    AC_REQUIRE([AM_INTL_SUBDIR])dnl
-+  ])
-+
-+  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
-+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-+  AC_REQUIRE([AC_LIB_RPATH])
-+
-+  dnl Sometimes libintl requires libiconv, so first search for libiconv.
-+  dnl Ideally we would do this search only after the
-+  dnl      if test "$USE_NLS" = "yes"; then
-+  dnl        if test "$gt_cv_func_gnugettext_libc" != "yes"; then
-+  dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
-+  dnl the configure script would need to contain the same shell code
-+  dnl again, outside any 'if'. There are two solutions:
-+  dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
-+  dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
-+  dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
-+  dnl documented, we avoid it.
-+  ifelse(gt_included_intl, yes, , [
-+    AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
-+  ])
-+
-+  AC_MSG_CHECKING([whether NLS is requested])
-+  dnl Default is enabled NLS
-+  AC_ARG_ENABLE(nls,
-+    [  --disable-nls           do not use Native Language Support],
-+    USE_NLS=$enableval, USE_NLS=yes)
-+  AC_MSG_RESULT($USE_NLS)
-+  AC_SUBST(USE_NLS)
-+
-+  ifelse(gt_included_intl, yes, [
-+    BUILD_INCLUDED_LIBINTL=no
-+    USE_INCLUDED_LIBINTL=no
-+  ])
-+  LIBINTL=
-+  LTLIBINTL=
-+  POSUB=
-+
-+  dnl If we use NLS figure out what method
-+  if test "$USE_NLS" = "yes"; then
-+    gt_use_preinstalled_gnugettext=no
-+    ifelse(gt_included_intl, yes, [
-+      AC_MSG_CHECKING([whether included gettext is requested])
-+      AC_ARG_WITH(included-gettext,
-+        [  --with-included-gettext use the GNU gettext library included here],
-+        nls_cv_force_use_gnu_gettext=$withval,
-+        nls_cv_force_use_gnu_gettext=no)
-+      AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
-+
-+      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
-+      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-+    ])
-+        dnl User does not insist on using GNU NLS library.  Figure out what
-+        dnl to use.  If GNU gettext is available we use this.  Else we have
-+        dnl to fall back to GNU NLS library.
-+
-+        dnl Add a version number to the cache macros.
-+        define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1)))
-+        define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc])
-+        define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl])
-+
-+        AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
-+         [AC_TRY_LINK([#include <libintl.h>
-+]ifelse([$2], [need-formatstring-macros],
-+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-+#endif
-+changequote(,)dnl
-+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-+changequote([,])dnl
-+], [])[extern int _nl_msg_cat_cntr;
-+extern int *_nl_domain_bindings;],
-+            [bindtextdomain ("", "");
-+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
-+            gt_cv_func_gnugettext_libc=yes,
-+            gt_cv_func_gnugettext_libc=no)])
-+
-+        if test "$gt_cv_func_gnugettext_libc" != "yes"; then
-+          dnl Sometimes libintl requires libiconv, so first search for libiconv.
-+          ifelse(gt_included_intl, yes, , [
-+            AM_ICONV_LINK
-+          ])
-+          dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
-+          dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
-+          dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
-+          dnl even if libiconv doesn't exist.
-+          AC_LIB_LINKFLAGS_BODY([intl])
-+          AC_CACHE_CHECK([for GNU gettext in libintl],
-+            gt_cv_func_gnugettext_libintl,
-+           [gt_save_CPPFLAGS="$CPPFLAGS"
-+            CPPFLAGS="$CPPFLAGS $INCINTL"
-+            gt_save_LIBS="$LIBS"
-+            LIBS="$LIBS $LIBINTL"
-+            dnl Now see whether libintl exists and does not depend on libiconv.
-+            AC_TRY_LINK([#include <libintl.h>
-+]ifelse([$2], [need-formatstring-macros],
-+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-+#endif
-+changequote(,)dnl
-+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-+changequote([,])dnl
-+], [])[extern int _nl_msg_cat_cntr;
-+extern
-+#ifdef __cplusplus
-+"C"
-+#endif
-+const char *_nl_expand_alias ();],
-+              [bindtextdomain ("", "");
-+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
-+              gt_cv_func_gnugettext_libintl=yes,
-+              gt_cv_func_gnugettext_libintl=no)
-+            dnl Now see whether libintl exists and depends on libiconv.
-+            if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then
-+              LIBS="$LIBS $LIBICONV"
-+              AC_TRY_LINK([#include <libintl.h>
-+]ifelse([$2], [need-formatstring-macros],
-+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-+#endif
-+changequote(,)dnl
-+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-+changequote([,])dnl
-+], [])[extern int _nl_msg_cat_cntr;
-+extern
-+#ifdef __cplusplus
-+"C"
-+#endif
-+const char *_nl_expand_alias ();],
-+                [bindtextdomain ("", "");
-+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
-+               [LIBINTL="$LIBINTL $LIBICONV"
-+                LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-+                gt_cv_func_gnugettext_libintl=yes
-+               ])
-+            fi
-+            CPPFLAGS="$gt_save_CPPFLAGS"
-+            LIBS="$gt_save_LIBS"])
-+        fi
-+
-+        dnl If an already present or preinstalled GNU gettext() is found,
-+        dnl use it.  But if this macro is used in GNU gettext, and GNU
-+        dnl gettext is already preinstalled in libintl, we update this
-+        dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
-+        if test "$gt_cv_func_gnugettext_libc" = "yes" \
-+           || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
-+                && test "$PACKAGE" != gettext; }; then
-+          gt_use_preinstalled_gnugettext=yes
-+        else
-+          dnl Reset the values set by searching for libintl.
-+          LIBINTL=
-+          LTLIBINTL=
-+          INCINTL=
-+        fi
-+
-+    ifelse(gt_included_intl, yes, [
-+        if test "$gt_use_preinstalled_gnugettext" != "yes"; then
-+          dnl GNU gettext is not found in the C library.
-+          dnl Fall back on included GNU gettext library.
-+          nls_cv_use_gnu_gettext=yes
-+        fi
-+      fi
-+
-+      if test "$nls_cv_use_gnu_gettext" = "yes"; then
-+        dnl Mark actions used to generate GNU NLS library.
-+        INTLOBJS="\$(GETTOBJS)"
-+        BUILD_INCLUDED_LIBINTL=yes
-+        USE_INCLUDED_LIBINTL=yes
-+        LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV"
-+        LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV"
-+        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
-+      fi
-+
-+      if test "$gt_use_preinstalled_gnugettext" = "yes" \
-+         || test "$nls_cv_use_gnu_gettext" = "yes"; then
-+        dnl Mark actions to use GNU gettext tools.
-+        CATOBJEXT=.gmo
-+      fi
-+    ])
-+
-+    if test "$gt_use_preinstalled_gnugettext" = "yes" \
-+       || test "$nls_cv_use_gnu_gettext" = "yes"; then
-+      AC_DEFINE(ENABLE_NLS, 1,
-+        [Define to 1 if translation of program messages to the user's native language
-+   is requested.])
-+    else
-+      USE_NLS=no
-+    fi
-+  fi
-+
-+  if test "$USE_NLS" = "yes"; then
-+
-+    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-+      if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
-+        AC_MSG_CHECKING([how to link with libintl])
-+        AC_MSG_RESULT([$LIBINTL])
-+        AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
-+      fi
-+
-+      dnl For backward compatibility. Some packages may be using this.
-+      AC_DEFINE(HAVE_GETTEXT, 1,
-+       [Define if the GNU gettext() function is already present or preinstalled.])
-+      AC_DEFINE(HAVE_DCGETTEXT, 1,
-+       [Define if the GNU dcgettext() function is already present or preinstalled.])
-+    fi
-+
-+    dnl We need to process the po/ directory.
-+    POSUB=po
-+  fi
-+
-+  ifelse(gt_included_intl, yes, [
-+    dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
-+    dnl to 'yes' because some of the testsuite requires it.
-+    if test "$PACKAGE" = gettext; then
-+      BUILD_INCLUDED_LIBINTL=yes
-+    fi
-+
-+    dnl Make all variables we use known to autoconf.
-+    AC_SUBST(BUILD_INCLUDED_LIBINTL)
-+    AC_SUBST(USE_INCLUDED_LIBINTL)
-+    AC_SUBST(CATOBJEXT)
-+    AC_SUBST(INTLOBJS)
-+
-+    dnl For backward compatibility. Some configure.ins may be using this.
-+    nls_cv_header_intl=
-+    nls_cv_header_libgt=
-+
-+    dnl For backward compatibility. Some Makefiles may be using this.
-+    DATADIRNAME=share
-+    AC_SUBST(DATADIRNAME)
-+
-+    dnl For backward compatibility. Some Makefiles may be using this.
-+    INSTOBJEXT=.mo
-+    AC_SUBST(INSTOBJEXT)
-+
-+    dnl For backward compatibility. Some Makefiles may be using this.
-+    GENCAT=gencat
-+    AC_SUBST(GENCAT)
-+
-+    dnl Enable libtool support if the surrounding package wishes it.
-+    INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
-+    AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
-+  ])
-+
-+  dnl For backward compatibility. Some Makefiles may be using this.
-+  INTLLIBS="$LIBINTL"
-+  AC_SUBST(INTLLIBS)
-+
-+  dnl Make all documented variables known to autoconf.
-+  AC_SUBST(LIBINTL)
-+  AC_SUBST(LTLIBINTL)
-+  AC_SUBST(POSUB)
-+])
-+
-+
-+dnl Checks for all prerequisites of the po subdirectory,
-+dnl except for USE_NLS.
-+AC_DEFUN([AM_PO_SUBDIRS],
-+[
-+  AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-+  AC_REQUIRE([AC_PROG_INSTALL])dnl
-+  AC_REQUIRE([AM_MKINSTALLDIRS])dnl
-+
-+  dnl Perform the following tests also if --disable-nls has been given,
-+  dnl because they are needed for "make dist" to work.
-+
-+  dnl Search for GNU msgfmt in the PATH.
-+  dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
-+  dnl The second test excludes FreeBSD msgfmt.
-+  AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-+    [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
-+     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
-+    :)
-+  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-+
-+  dnl Search for GNU xgettext 0.11 or newer in the PATH.
-+  dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
-+  dnl The second test excludes FreeBSD xgettext.
-+  AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-+    [$ac_dir/$ac_word --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
-+     (if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
-+    :)
-+  dnl Remove leftover from FreeBSD xgettext call.
-+  rm -f messages.po
-+
-+  dnl Search for GNU msgmerge 0.11 or newer in the PATH.
-+  AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
-+    [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :)
-+
-+  dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
-+  dnl Test whether we really found GNU msgfmt.
-+  if test "$GMSGFMT" != ":"; then
-+    dnl If it is no GNU msgfmt we define it as : so that the
-+    dnl Makefiles still can work.
-+    if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
-+       (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-+      : ;
-+    else
-+      GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
-+      AC_MSG_RESULT(
-+        [found $GMSGFMT program is not GNU msgfmt; ignore it])
-+      GMSGFMT=":"
-+    fi
-+  fi
-+
-+  dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
-+  dnl Test whether we really found GNU xgettext.
-+  if test "$XGETTEXT" != ":"; then
-+    dnl If it is no GNU xgettext we define it as : so that the
-+    dnl Makefiles still can work.
-+    if $XGETTEXT --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
-+       (if $XGETTEXT --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-+      : ;
-+    else
-+      AC_MSG_RESULT(
-+        [found xgettext program is not GNU xgettext; ignore it])
-+      XGETTEXT=":"
-+    fi
-+    dnl Remove leftover from FreeBSD xgettext call.
-+    rm -f messages.po
-+  fi
-+
-+  AC_OUTPUT_COMMANDS([
-+    for ac_file in $CONFIG_FILES; do
-+      # Support "outfile[:infile[:infile...]]"
-+      case "$ac_file" in
-+        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-+      esac
-+      # PO directories have a Makefile.in generated from Makefile.in.in.
-+      case "$ac_file" in */Makefile.in)
-+        # Adjust a relative srcdir.
-+        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-+        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
-+        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
-+        # In autoconf-2.13 it is called $ac_given_srcdir.
-+        # In autoconf-2.50 it is called $srcdir.
-+        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-+        case "$ac_given_srcdir" in
-+          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-+          /*) top_srcdir="$ac_given_srcdir" ;;
-+          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
-+        esac
-+        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
-+          rm -f "$ac_dir/POTFILES"
-+          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-+          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
-+          # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend
-+          # on $ac_dir but don't depend on user-specified configuration
-+          # parameters.
-+          if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
-+            # The LINGUAS file contains the set of available languages.
-+            if test -n "$ALL_LINGUAS"; then
-+              test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
-+            fi
-+            ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-+            # Hide the ALL_LINGUAS assigment from automake.
-+            eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
-+          fi
-+          case "$ac_given_srcdir" in
-+            .) srcdirpre= ;;
-+            *) srcdirpre='$(srcdir)/' ;;
-+          esac
-+          POFILES=
-+          GMOFILES=
-+          UPDATEPOFILES=
-+          DUMMYPOFILES=
-+          for lang in $ALL_LINGUAS; do
-+            POFILES="$POFILES $srcdirpre$lang.po"
-+            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
-+            UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
-+            DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
-+          done
-+          # CATALOGS depends on both $ac_dir and the user's LINGUAS
-+          # environment variable.
-+          INST_LINGUAS=
-+          if test -n "$ALL_LINGUAS"; then
-+            for presentlang in $ALL_LINGUAS; do
-+              useit=no
-+              if test "%UNSET%" != "$LINGUAS"; then
-+                desiredlanguages="$LINGUAS"
-+              else
-+                desiredlanguages="$ALL_LINGUAS"
-+              fi
-+              for desiredlang in $desiredlanguages; do
-+                # Use the presentlang catalog if desiredlang is
-+                #   a. equal to presentlang, or
-+                #   b. a variant of presentlang (because in this case,
-+                #      presentlang can be used as a fallback for messages
-+                #      which are not translated in the desiredlang catalog).
-+                case "$desiredlang" in
-+                  "$presentlang"*) useit=yes;;
-+                esac
-+              done
-+              if test $useit = yes; then
-+                INST_LINGUAS="$INST_LINGUAS $presentlang"
-+              fi
-+            done
-+          fi
-+          CATALOGS=
-+          if test -n "$INST_LINGUAS"; then
-+            for lang in $INST_LINGUAS; do
-+              CATALOGS="$CATALOGS $lang.gmo"
-+            done
-+          fi
-+          test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
-+          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
-+          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
-+            if test -f "$f"; then
-+              case "$f" in
-+                *.orig | *.bak | *~) ;;
-+                *) cat "$f" >> "$ac_dir/Makefile" ;;
-+              esac
-+            fi
-+          done
-+        fi
-+        ;;
-+      esac
-+    done],
-+   [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
-+    # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it
-+    # from automake.
-+    eval 'ALL_LINGUAS''="$ALL_LINGUAS"'
-+    # Capture the value of LINGUAS because we need it to compute CATALOGS.
-+    LINGUAS="${LINGUAS-%UNSET%}"
-+   ])
-+])
-+
-+
-+dnl Checks for all prerequisites of the intl subdirectory,
-+dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
-+dnl            USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
-+AC_DEFUN([AM_INTL_SUBDIR],
-+[
-+  AC_REQUIRE([AC_PROG_INSTALL])dnl
-+  AC_REQUIRE([AM_MKINSTALLDIRS])dnl
-+  AC_REQUIRE([AC_PROG_CC])dnl
-+  AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+  AC_REQUIRE([AC_PROG_RANLIB])dnl
-+  AC_REQUIRE([AC_ISC_POSIX])dnl
-+  AC_REQUIRE([AC_HEADER_STDC])dnl
-+  AC_REQUIRE([AC_C_CONST])dnl
-+  AC_REQUIRE([AC_C_INLINE])dnl
-+  AC_REQUIRE([AC_TYPE_OFF_T])dnl
-+  AC_REQUIRE([AC_TYPE_SIZE_T])dnl
-+  AC_REQUIRE([AC_FUNC_ALLOCA])dnl
-+  AC_REQUIRE([AC_FUNC_MMAP])dnl
-+  AC_REQUIRE([jm_GLIBC21])dnl
-+  AC_REQUIRE([gt_INTDIV0])dnl
-+  AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl
-+  AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
-+  AC_REQUIRE([gt_INTTYPES_PRI])dnl
-+
-+  AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
-+stdlib.h string.h unistd.h sys/param.h])
-+  AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getc_unlocked getcwd getegid \
-+geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \
-+strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
-+
-+  AM_ICONV
-+  AM_LANGINFO_CODESET
-+  if test $ac_cv_header_locale_h = yes; then
-+    AM_LC_MESSAGES
-+  fi
-+
-+  dnl intl/plural.c is generated from intl/plural.y. It requires bison,
-+  dnl because plural.y uses bison specific features. It requires at least
-+  dnl bison-1.26 because earlier versions generate a plural.c that doesn't
-+  dnl compile.
-+  dnl bison is only needed for the maintainer (who touches plural.y). But in
-+  dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
-+  dnl the rule in general Makefile. Now, some people carelessly touch the
-+  dnl files or have a broken "make" program, hence the plural.c rule will
-+  dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
-+  dnl present or too old.
-+  AC_CHECK_PROGS([INTLBISON], [bison])
-+  if test -z "$INTLBISON"; then
-+    ac_verc_fail=yes
-+  else
-+    dnl Found it, now check the version.
-+    AC_MSG_CHECKING([version of bison])
-+changequote(<<,>>)dnl
-+    ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
-+    case $ac_prog_version in
-+      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-+      1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
-+changequote([,])dnl
-+         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-+      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
-+    esac
-+    AC_MSG_RESULT([$ac_prog_version])
-+  fi
-+  if test $ac_verc_fail = yes; then
-+    INTLBISON=:
-+  fi
-+])
-+
-+
-+AC_DEFUN([AM_MKINSTALLDIRS],
-+[
-+  dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
-+  dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
-+  dnl Try to locate is.
-+  MKINSTALLDIRS=
-+  if test -n "$ac_aux_dir"; then
-+    MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
-+  fi
-+  if test -z "$MKINSTALLDIRS"; then
-+    MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-+  fi
-+  AC_SUBST(MKINSTALLDIRS)
-+])
-+
-+
-+dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
-+AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
---- /dev/null
-+++ atk-1.2.0/m4/glib-2.0.m4
-@@ -0,0 +1,212 @@
-+# Configure paths for GLIB
-+# Owen Taylor     1997-2001
-+
-+dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-+dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or 
-+dnl gthread is specified in MODULES, pass to pkg-config
-+dnl
-+AC_DEFUN(AM_PATH_GLIB_2_0,
-+[dnl 
-+dnl Get the cflags and libraries from pkg-config
-+dnl
-+AC_ARG_ENABLE(glibtest, [  --disable-glibtest      do not try to compile and run a test GLIB program],
-+		    , enable_glibtest=yes)
-+
-+  pkg_config_args=glib-2.0
-+  for module in . $4
-+  do
-+      case "$module" in
-+         gmodule) 
-+             pkg_config_args="$pkg_config_args gmodule-2.0"
-+         ;;
-+         gobject) 
-+             pkg_config_args="$pkg_config_args gobject-2.0"
-+         ;;
-+         gthread) 
-+             pkg_config_args="$pkg_config_args gthread-2.0"
-+         ;;
-+      esac
-+  done
-+
-+  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+
-+  no_glib=""
-+
-+  if test x$PKG_CONFIG != xno ; then
-+    if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then
-+      :
-+    else
-+      echo *** pkg-config too old; version 0.7 or better required.
-+      no_glib=yes
-+      PKG_CONFIG=no
-+    fi
-+  else
-+    no_glib=yes
-+  fi
-+
-+  min_glib_version=ifelse([$1], ,2.0.0,$1)
-+  AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
-+
-+  if test x$PKG_CONFIG != xno ; then
-+    ## don't try to run the test against uninstalled libtool libs
-+    if $PKG_CONFIG --uninstalled $pkg_config_args; then
-+	  echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH"
-+	  enable_glibtest=no
-+    fi
-+
-+    if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then
-+	  :
-+    else
-+	  no_glib=yes
-+    fi
-+  fi
-+
-+  if test x"$no_glib" = x ; then
-+    GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
-+    GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
-+    GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
-+
-+    GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
-+    GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
-+    glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
-+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-+    glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
-+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-+    glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \
-+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-+    if test "x$enable_glibtest" = "xyes" ; then
-+      ac_save_CFLAGS="$CFLAGS"
-+      ac_save_LIBS="$LIBS"
-+      CFLAGS="$CFLAGS $GLIB_CFLAGS"
-+      LIBS="$GLIB_LIBS $LIBS"
-+dnl
-+dnl Now check if the installed GLIB is sufficiently new. (Also sanity
-+dnl checks the results of pkg-config to some extent)
-+dnl
-+      rm -f conf.glibtest
-+      AC_TRY_RUN([
-+#include <glib.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+
-+int 
-+main ()
-+{
-+  int major, minor, micro;
-+  char *tmp_version;
-+
-+  system ("touch conf.glibtest");
-+
-+  /* HP/UX 9 (%@#!) writes to sscanf strings */
-+  tmp_version = g_strdup("$min_glib_version");
-+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-+     printf("%s, bad version string\n", "$min_glib_version");
-+     exit(1);
-+   }
-+
-+  if ((glib_major_version != $glib_config_major_version) ||
-+      (glib_minor_version != $glib_config_minor_version) ||
-+      (glib_micro_version != $glib_config_micro_version))
-+    {
-+      printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", 
-+             $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
-+             glib_major_version, glib_minor_version, glib_micro_version);
-+      printf ("*** was found! If pkg-config was correct, then it is best\n");
-+      printf ("*** to remove the old version of GLib. You may also be able to fix the error\n");
-+      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-+      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-+      printf("*** required on your system.\n");
-+      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
-+      printf("*** to point to the correct configuration files\n");
-+    } 
-+  else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
-+	   (glib_minor_version != GLIB_MINOR_VERSION) ||
-+           (glib_micro_version != GLIB_MICRO_VERSION))
-+    {
-+      printf("*** GLIB header files (version %d.%d.%d) do not match\n",
-+	     GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
-+      printf("*** library (version %d.%d.%d)\n",
-+	     glib_major_version, glib_minor_version, glib_micro_version);
-+    }
-+  else
-+    {
-+      if ((glib_major_version > major) ||
-+        ((glib_major_version == major) && (glib_minor_version > minor)) ||
-+        ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
-+      {
-+        return 0;
-+       }
-+     else
-+      {
-+        printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
-+               glib_major_version, glib_minor_version, glib_micro_version);
-+        printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
-+	       major, minor, micro);
-+        printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
-+        printf("***\n");
-+        printf("*** If you have already installed a sufficiently new version, this error\n");
-+        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
-+        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-+        printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n");
-+        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
-+        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-+        printf("*** so that the correct libraries are found at run-time))\n");
-+      }
-+    }
-+  return 1;
-+}
-+],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-+       CFLAGS="$ac_save_CFLAGS"
-+       LIBS="$ac_save_LIBS"
-+     fi
-+  fi
-+  if test "x$no_glib" = x ; then
-+     AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version))
-+     ifelse([$2], , :, [$2])     
-+  else
-+     AC_MSG_RESULT(no)
-+     if test "$PKG_CONFIG" = "no" ; then
-+       echo "*** A new enough version of pkg-config was not found."
-+       echo "*** See http://www.freedesktop.org/software/pkgconfig/"
-+     else
-+       if test -f conf.glibtest ; then
-+        :
-+       else
-+          echo "*** Could not run GLIB test program, checking why..."
-+          ac_save_CFLAGS="$CFLAGS"
-+          ac_save_LIBS="$LIBS"
-+          CFLAGS="$CFLAGS $GLIB_CFLAGS"
-+          LIBS="$LIBS $GLIB_LIBS"
-+          AC_TRY_LINK([
-+#include <glib.h>
-+#include <stdio.h>
-+],      [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
-+        [ echo "*** The test program compiled, but did not run. This usually means"
-+          echo "*** that the run-time linker is not finding GLIB or finding the wrong"
-+          echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
-+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-+          echo "*** is required on your system"
-+	  echo "***"
-+          echo "*** If you have an old version installed, it is best to remove it, although"
-+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
-+        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-+          echo "*** exact error that occured. This usually means GLIB is incorrectly installed."])
-+          CFLAGS="$ac_save_CFLAGS"
-+          LIBS="$ac_save_LIBS"
-+       fi
-+     fi
-+     GLIB_CFLAGS=""
-+     GLIB_LIBS=""
-+     GLIB_GENMARSHAL=""
-+     GOBJECT_QUERY=""
-+     GLIB_MKENUMS=""
-+     ifelse([$3], , :, [$3])
-+  fi
-+  AC_SUBST(GLIB_CFLAGS)
-+  AC_SUBST(GLIB_LIBS)
-+  AC_SUBST(GLIB_GENMARSHAL)
-+  AC_SUBST(GOBJECT_QUERY)
-+  AC_SUBST(GLIB_MKENUMS)
-+  rm -f conf.glibtest
-+])
---- /dev/null
-+++ atk-1.2.0/m4/glibc21.m4
-@@ -0,0 +1,32 @@
-+# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40)
-+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+# Test for the GNU C Library, version 2.1 or newer.
-+# From Bruno Haible.
-+
-+AC_DEFUN([jm_GLIBC21],
-+  [
-+    AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
-+      ac_cv_gnu_library_2_1,
-+      [AC_EGREP_CPP([Lucky GNU user],
-+	[
-+#include <features.h>
-+#ifdef __GNU_LIBRARY__
-+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
-+  Lucky GNU user
-+ #endif
-+#endif
-+	],
-+	ac_cv_gnu_library_2_1=yes,
-+	ac_cv_gnu_library_2_1=no)
-+      ]
-+    )
-+    AC_SUBST(GLIBC21)
-+    GLIBC21="$ac_cv_gnu_library_2_1"
-+  ]
-+)
---- /dev/null
-+++ atk-1.2.0/m4/glib-gettext.m4
-@@ -0,0 +1,284 @@
-+# Macro to add for using GNU gettext.
-+# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996
-+#
-+# Modified to never use included libintl. 
-+# Owen Taylor <otaylor@redhat.com>, 12/15/1998
-+#
-+#
-+# This file can be copied and used freely without restrictions.  It can
-+# be used in projects which are not available under the GNU Public License
-+# but which still want to provide support for the GNU gettext functionality.
-+# Please note that the actual code is *not* freely available.
-+#
-+#
-+# If you make changes to this file, you MUST update the copy in
-+# acinclude.m4. [ aclocal dies on duplicate macros, so if
-+# we run 'aclocal -I macros/' then we'll run into problems
-+# once we've installed glib-gettext.m4 :-( ]
-+#
-+
-+AC_DEFUN([AM_GLIB_LC_MESSAGES],
-+  [if test $ac_cv_header_locale_h = yes; then
-+    AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
-+      [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-+       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-+    if test $am_cv_val_LC_MESSAGES = yes; then
-+      AC_DEFINE(HAVE_LC_MESSAGES, 1,
-+        [Define if your <locale.h> file defines LC_MESSAGES.])
-+    fi
-+  fi])
-+
-+dnl AM_GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-+dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-+AC_DEFUN([AM_GLIB_PATH_PROG_WITH_TEST],
-+[# Extract the first word of "$2", so it can be a program name with args.
-+set dummy $2; ac_word=[$]2
-+AC_MSG_CHECKING([for $ac_word])
-+AC_CACHE_VAL(ac_cv_path_$1,
-+[case "[$]$1" in
-+  /*)
-+  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-+  for ac_dir in ifelse([$5], , $PATH, [$5]); do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      if [$3]; then
-+	ac_cv_path_$1="$ac_dir/$ac_word"
-+	break
-+      fi
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+dnl If no 4th arg is given, leave the cache variable unset,
-+dnl so AC_PATH_PROGS will keep looking.
-+ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-+])dnl
-+  ;;
-+esac])dnl
-+$1="$ac_cv_path_$1"
-+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
-+  AC_MSG_RESULT([$]$1)
-+else
-+  AC_MSG_RESULT(no)
-+fi
-+AC_SUBST($1)dnl
-+])
-+
-+# serial 5
-+
-+AC_DEFUN(AM_GLIB_WITH_NLS,
-+  dnl NLS is obligatory
-+  [USE_NLS=yes
-+    AC_SUBST(USE_NLS)
-+
-+    dnl Figure out what method
-+    nls_cv_force_use_gnu_gettext="no"
-+
-+    nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
-+    if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-+      dnl User does not insist on using GNU NLS library.  Figure out what
-+      dnl to use.  If gettext or catgets are available (in this order) we
-+      dnl use this.  Else we have to fall back to GNU NLS library.
-+      dnl catgets is only used if permitted by option --with-catgets.
-+      nls_cv_header_intl=
-+      nls_cv_header_libgt=
-+      CATOBJEXT=NONE
-+      XGETTEXT=:
-+
-+      AC_CHECK_HEADER(libintl.h,
-+        [AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
-+	  [AC_TRY_LINK([#include <libintl.h>], [return (int) dgettext ("","")],
-+	    gt_cv_func_dgettext_libc=yes, gt_cv_func_dgettext_libc=no)])
-+
-+          gt_cv_func_dgettext_libintl="no"
-+          libintl_extra_libs=""
-+
-+	  if test "$gt_cv_func_dgettext_libc" != "yes" ; then
-+	    AC_CHECK_LIB(intl, bindtextdomain,
-+              [AC_CHECK_LIB(intl, dgettext,
-+                            gt_cv_func_dgettext_libintl=yes)])
-+
-+	    if test "$gt_cv_func_dgettext_libc" != "yes" ; then
-+              AC_MSG_CHECKING([if -liconv is needed to use gettext])
-+              AC_MSG_RESULT([])
-+              AC_CHECK_LIB(intl, dcgettext,
-+                           [gt_cv_func_dgettext_libintl=yes
-+                            libintl_extra_libs=-liconv],
-+                           :,-liconv)
-+            fi
-+          fi
-+
-+          if test "$gt_cv_func_dgettext_libintl" = "yes"; then
-+	    LIBS="$LIBS -lintl $libintl_extra_libs";
-+          fi
-+
-+	  if test "$gt_cv_func_dgettext_libc" = "yes" \
-+	    || test "$gt_cv_func_dgettext_libintl" = "yes"; then
-+	    AC_DEFINE(HAVE_GETTEXT,1,
-+              [Define if the GNU gettext() function is already present or preinstalled.])
-+	    AM_GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-+ 	      [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
-+	    if test "$MSGFMT" != "no"; then
-+	      AC_CHECK_FUNCS(dcgettext)
-+	      AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-+	      AM_GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-+	        [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-+	      AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
-+		 	     return _nl_msg_cat_cntr],
-+	        [CATOBJEXT=.gmo
-+	         DATADIRNAME=share],
-+	        [CATOBJEXT=.mo
-+	         DATADIRNAME=lib])
-+	      INSTOBJEXT=.mo
-+	    fi
-+	  fi
-+
-+	  # Added by Martin Baulig 12/15/98 for libc5 systems
-+	  if test "$gt_cv_func_dgettext_libc" != "yes" \
-+	    && test "$gt_cv_func_dgettext_libintl" = "yes"; then
-+	    INTLLIBS="-lintl $libintl_extra_libs"
-+	    LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-+	  fi
-+      ])
-+
-+      if test "$CATOBJEXT" = "NONE"; then
-+        dnl Neither gettext nor catgets in included in the C library.
-+        dnl Fall back on GNU gettext library.
-+        nls_cv_use_gnu_gettext=yes
-+      fi
-+    fi
-+
-+    if test "$nls_cv_use_gnu_gettext" != "yes"; then
-+      AC_DEFINE(ENABLE_NLS, 1,
-+        [always defined to indicate that i18n is enabled])
-+    else
-+      dnl Unset this variable since we use the non-zero value as a flag.
-+      CATOBJEXT=
-+    fi
-+
-+    dnl Test whether we really found GNU xgettext.
-+    if test "$XGETTEXT" != ":"; then
-+      dnl If it is no GNU xgettext we define it as : so that the
-+      dnl Makefiles still can work.
-+      if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-+        : ;
-+      else
-+        AC_MSG_RESULT(
-+	  [found xgettext program is not GNU xgettext; ignore it])
-+        XGETTEXT=":"
-+      fi
-+    fi
-+
-+    # We need to process the po/ directory.
-+    POSUB=po
-+
-+    AC_OUTPUT_COMMANDS(
-+      [case "$CONFIG_FILES" in *po/Makefile.in*)
-+        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
-+      esac])
-+
-+    dnl These rules are solely for the distribution goal.  While doing this
-+    dnl we only have to keep exactly one list of the available catalogs
-+    dnl in configure.in.
-+    for lang in $ALL_LINGUAS; do
-+      GMOFILES="$GMOFILES $lang.gmo"
-+      POFILES="$POFILES $lang.po"
-+    done
-+
-+    dnl Make all variables we use known to autoconf.
-+    AC_SUBST(CATALOGS)
-+    AC_SUBST(CATOBJEXT)
-+    AC_SUBST(DATADIRNAME)
-+    AC_SUBST(GMOFILES)
-+    AC_SUBST(INSTOBJEXT)
-+    AC_SUBST(INTLDEPS)
-+    AC_SUBST(INTLLIBS)
-+    AC_SUBST(INTLOBJS)
-+    AC_SUBST(POFILES)
-+    AC_SUBST(POSUB)
-+  ])
-+
-+AC_DEFUN(AM_GLIB_GNU_GETTEXT,
-+  [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-+   AC_REQUIRE([AC_PROG_CC])dnl
-+   AC_REQUIRE([AC_PROG_RANLIB])dnl
-+   AC_REQUIRE([AC_HEADER_STDC])dnl
-+   AC_REQUIRE([AC_C_CONST])dnl
-+   AC_REQUIRE([AC_C_INLINE])dnl
-+   AC_REQUIRE([AC_TYPE_OFF_T])dnl
-+   AC_REQUIRE([AC_TYPE_SIZE_T])dnl
-+   AC_REQUIRE([AC_FUNC_ALLOCA])dnl
-+   AC_REQUIRE([AC_FUNC_MMAP])dnl
-+
-+   AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \
-+unistd.h sys/param.h])
-+   AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
-+strdup __argz_count __argz_stringify __argz_next])
-+
-+   AM_GLIB_LC_MESSAGES
-+   AM_GLIB_WITH_NLS
-+
-+   if test "x$CATOBJEXT" != "x"; then
-+     if test "x$ALL_LINGUAS" = "x"; then
-+       LINGUAS=
-+     else
-+       AC_MSG_CHECKING(for catalogs to be installed)
-+       NEW_LINGUAS=
-+       for lang in ${LINGUAS=$ALL_LINGUAS}; do
-+         case "$ALL_LINGUAS" in
-+          *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
-+         esac
-+       done
-+       LINGUAS=$NEW_LINGUAS
-+       AC_MSG_RESULT($LINGUAS)
-+     fi
-+
-+     dnl Construct list of names of catalog files to be constructed.
-+     if test -n "$LINGUAS"; then
-+       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
-+     fi
-+   fi
-+
-+   dnl Determine which catalog format we have (if any is needed)
-+   dnl For now we know about two different formats:
-+   dnl   Linux libc-5 and the normal X/Open format
-+   test -d po || mkdir po
-+   if test "$CATOBJEXT" = ".cat"; then
-+     AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen)
-+
-+     dnl Transform the SED scripts while copying because some dumb SEDs
-+     dnl cannot handle comments.
-+     sed -e '/^#/d' $srcdir/po/$msgformat-msg.sed > po/po2msg.sed
-+   fi
-+
-+   dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
-+   dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
-+   dnl Try to locate is.
-+   MKINSTALLDIRS=
-+   if test -n "$ac_aux_dir"; then
-+     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
-+   fi
-+   if test -z "$MKINSTALLDIRS"; then
-+     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-+   fi
-+   AC_SUBST(MKINSTALLDIRS)
-+
-+   dnl Generate list of files to be processed by xgettext which will
-+   dnl be included in po/Makefile.
-+   test -d po || mkdir po
-+   if test "x$srcdir" != "x."; then
-+     if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-+       posrcprefix="$srcdir/"
-+     else
-+       posrcprefix="../$srcdir/"
-+     fi
-+   else
-+     posrcprefix="../"
-+   fi
-+   rm -f po/POTFILES
-+   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
-+	< $srcdir/po/POTFILES.in > po/POTFILES
-+  ])
-+
---- /dev/null
-+++ atk-1.2.0/m4/iconv.m4
-@@ -0,0 +1,103 @@
-+# iconv.m4 serial AM4 (gettext-0.11.3)
-+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Bruno Haible.
-+
-+AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
-+[
-+  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
-+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-+  AC_REQUIRE([AC_LIB_RPATH])
-+
-+  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
-+  dnl accordingly.
-+  AC_LIB_LINKFLAGS_BODY([iconv])
-+])
-+
-+AC_DEFUN([AM_ICONV_LINK],
-+[
-+  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
-+  dnl those with the standalone portable GNU libiconv installed).
-+
-+  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
-+  dnl accordingly.
-+  AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
-+
-+  dnl Add $INCICONV to CPPFLAGS before performing the following checks,
-+  dnl because if the user has installed libiconv and not disabled its use
-+  dnl via --without-libiconv-prefix, he wants to use it. The first
-+  dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
-+  am_save_CPPFLAGS="$CPPFLAGS"
-+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
-+
-+  AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
-+    am_cv_func_iconv="no, consider installing GNU libiconv"
-+    am_cv_lib_iconv=no
-+    AC_TRY_LINK([#include <stdlib.h>
-+#include <iconv.h>],
-+      [iconv_t cd = iconv_open("","");
-+       iconv(cd,NULL,NULL,NULL,NULL);
-+       iconv_close(cd);],
-+      am_cv_func_iconv=yes)
-+    if test "$am_cv_func_iconv" != yes; then
-+      am_save_LIBS="$LIBS"
-+      LIBS="$LIBS $LIBICONV"
-+      AC_TRY_LINK([#include <stdlib.h>
-+#include <iconv.h>],
-+        [iconv_t cd = iconv_open("","");
-+         iconv(cd,NULL,NULL,NULL,NULL);
-+         iconv_close(cd);],
-+        am_cv_lib_iconv=yes
-+        am_cv_func_iconv=yes)
-+      LIBS="$am_save_LIBS"
-+    fi
-+  ])
-+  if test "$am_cv_func_iconv" = yes; then
-+    AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
-+  fi
-+  if test "$am_cv_lib_iconv" = yes; then
-+    AC_MSG_CHECKING([how to link with libiconv])
-+    AC_MSG_RESULT([$LIBICONV])
-+  else
-+    dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
-+    dnl either.
-+    CPPFLAGS="$am_save_CPPFLAGS"
-+    LIBICONV=
-+    LTLIBICONV=
-+  fi
-+  AC_SUBST(LIBICONV)
-+  AC_SUBST(LTLIBICONV)
-+])
-+
-+AC_DEFUN([AM_ICONV],
-+[
-+  AM_ICONV_LINK
-+  if test "$am_cv_func_iconv" = yes; then
-+    AC_MSG_CHECKING([for iconv declaration])
-+    AC_CACHE_VAL(am_cv_proto_iconv, [
-+      AC_TRY_COMPILE([
-+#include <stdlib.h>
-+#include <iconv.h>
-+extern
-+#ifdef __cplusplus
-+"C"
-+#endif
-+#if defined(__STDC__) || defined(__cplusplus)
-+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
-+#else
-+size_t iconv();
-+#endif
-+], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
-+      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
-+    am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-+    AC_MSG_RESULT([$]{ac_t:-
-+         }[$]am_cv_proto_iconv)
-+    AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
-+      [Define as const if the declaration of iconv() needs const.])
-+  fi
-+])
---- /dev/null
-+++ atk-1.2.0/m4/intdiv0.m4
-@@ -0,0 +1,72 @@
-+# intdiv0.m4 serial 1 (gettext-0.11.3)
-+dnl Copyright (C) 2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Bruno Haible.
-+
-+AC_DEFUN([gt_INTDIV0],
-+[
-+  AC_REQUIRE([AC_PROG_CC])dnl
-+  AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+
-+  AC_CACHE_CHECK([whether integer division by zero raises SIGFPE],
-+    gt_cv_int_divbyzero_sigfpe,
-+    [
-+      AC_TRY_RUN([
-+#include <stdlib.h>
-+#include <signal.h>
-+
-+static void
-+#ifdef __cplusplus
-+sigfpe_handler (int sig)
-+#else
-+sigfpe_handler (sig) int sig;
-+#endif
-+{
-+  /* Exit with code 0 if SIGFPE, with code 1 if any other signal.  */
-+  exit (sig != SIGFPE);
-+}
-+
-+int x = 1;
-+int y = 0;
-+int z;
-+int nan;
-+
-+int main ()
-+{
-+  signal (SIGFPE, sigfpe_handler);
-+/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP.  */
-+#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
-+  signal (SIGTRAP, sigfpe_handler);
-+#endif
-+/* Linux/SPARC yields signal SIGILL.  */
-+#if defined (__sparc__) && defined (__linux__)
-+  signal (SIGILL, sigfpe_handler);
-+#endif
-+
-+  z = x / y;
-+  nan = y / y;
-+  exit (1);
-+}
-+], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no,
-+        [
-+          # Guess based on the CPU.
-+          case "$host_cpu" in
-+            alpha* | i[34567]86 | m68k | s390*)
-+              gt_cv_int_divbyzero_sigfpe="guessing yes";;
-+            *)
-+              gt_cv_int_divbyzero_sigfpe="guessing no";;
-+          esac
-+        ])
-+    ])
-+  case "$gt_cv_int_divbyzero_sigfpe" in
-+    *yes) value=1;;
-+    *) value=0;;
-+  esac
-+  AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value,
-+    [Define if integer division by zero raises signal SIGFPE.])
-+])
---- /dev/null
-+++ atk-1.2.0/m4/inttypes_h.m4
-@@ -0,0 +1,28 @@
-+# inttypes_h.m4 serial 4 (gettext-0.11.4)
-+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Paul Eggert.
-+
-+# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
-+# doesn't clash with <sys/types.h>, and declares uintmax_t.
-+
-+AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
-+[
-+  AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h,
-+  [AC_TRY_COMPILE(
-+    [#include <sys/types.h>
-+#include <inttypes.h>],
-+    [uintmax_t i = (uintmax_t) -1;],
-+    jm_ac_cv_header_inttypes_h=yes,
-+    jm_ac_cv_header_inttypes_h=no)])
-+  if test $jm_ac_cv_header_inttypes_h = yes; then
-+    AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
-+[Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
-+   and declares uintmax_t. ])
-+  fi
-+])
---- /dev/null
-+++ atk-1.2.0/m4/inttypes.m4
-@@ -0,0 +1,27 @@
-+# inttypes.m4 serial 1 (gettext-0.11.4)
-+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Paul Eggert.
-+
-+# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with
-+# <sys/types.h>.
-+
-+AC_DEFUN([gt_HEADER_INTTYPES_H],
-+[
-+  AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h,
-+  [
-+    AC_TRY_COMPILE(
-+      [#include <sys/types.h>
-+#include <inttypes.h>],
-+      [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no)
-+  ])
-+  if test $gt_cv_header_inttypes_h = yes; then
-+    AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
-+      [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
-+  fi
-+])
---- /dev/null
-+++ atk-1.2.0/m4/inttypes-pri.m4
-@@ -0,0 +1,32 @@
-+# inttypes-pri.m4 serial 1 (gettext-0.11.4)
-+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Bruno Haible.
-+
-+# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
-+# macros to non-string values.  This is the case on AIX 4.3.3.
-+
-+AC_DEFUN([gt_INTTYPES_PRI],
-+[
-+  AC_REQUIRE([gt_HEADER_INTTYPES_H])
-+  if test $gt_cv_header_inttypes_h = yes; then
-+    AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
-+      gt_cv_inttypes_pri_broken,
-+      [
-+        AC_TRY_COMPILE([#include <inttypes.h>
-+#ifdef PRId32
-+char *p = PRId32;
-+#endif
-+], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes)
-+      ])
-+  fi
-+  if test "$gt_cv_inttypes_pri_broken" = yes; then
-+    AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
-+      [Define if <inttypes.h> exists and defines unusable PRI* macros.])
-+  fi
-+])
---- /dev/null
-+++ atk-1.2.0/m4/isc-posix.m4
-@@ -0,0 +1,26 @@
-+# isc-posix.m4 serial 2 (gettext-0.11.2)
-+dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+# This file is not needed with autoconf-2.53 and newer.  Remove it in 2005.
-+
-+# This test replaces the one in autoconf.
-+# Currently this macro should have the same name as the autoconf macro
-+# because gettext's gettext.m4 (distributed in the automake package)
-+# still uses it.  Otherwise, the use in gettext.m4 makes autoheader
-+# give these diagnostics:
-+#   configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
-+#   configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
-+
-+undefine([AC_ISC_POSIX])
-+
-+AC_DEFUN([AC_ISC_POSIX],
-+  [
-+    dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
-+    AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
-+  ]
-+)
---- /dev/null
-+++ atk-1.2.0/m4/lcmessage.m4
-@@ -0,0 +1,32 @@
-+# lcmessage.m4 serial 3 (gettext-0.11.3)
-+dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+dnl
-+dnl This file can can be used in projects which are not available under
-+dnl the GNU General Public License or the GNU Library General Public
-+dnl License but which still want to provide support for the GNU gettext
-+dnl functionality.
-+dnl Please note that the actual code of the GNU gettext library is covered
-+dnl by the GNU Library General Public License, and the rest of the GNU
-+dnl gettext package package is covered by the GNU General Public License.
-+dnl They are *not* in the public domain.
-+
-+dnl Authors:
-+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995.
-+
-+# Check whether LC_MESSAGES is available in <locale.h>.
-+
-+AC_DEFUN([AM_LC_MESSAGES],
-+[
-+  AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
-+    [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-+       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-+  if test $am_cv_val_LC_MESSAGES = yes; then
-+    AC_DEFINE(HAVE_LC_MESSAGES, 1,
-+      [Define if your <locale.h> file defines LC_MESSAGES.])
-+  fi
-+])
---- /dev/null
-+++ atk-1.2.0/m4/lib-ld.m4
-@@ -0,0 +1,97 @@
-+# lib-ld.m4 serial 1 (gettext-0.11)
-+dnl Copyright (C) 1996-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl Subroutines of libtool.m4,
-+dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
-+dnl with libtool.m4.
-+
-+dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
-+AC_DEFUN([AC_LIB_PROG_LD_GNU],
-+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
-+[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-+if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-+  acl_cv_prog_gnu_ld=yes
-+else
-+  acl_cv_prog_gnu_ld=no
-+fi])
-+with_gnu_ld=$acl_cv_prog_gnu_ld
-+])
-+
-+dnl From libtool-1.4. Sets the variable LD.
-+AC_DEFUN([AC_LIB_PROG_LD],
-+[AC_ARG_WITH(gnu-ld,
-+[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
-+test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-+AC_REQUIRE([AC_PROG_CC])dnl
-+AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+ac_prog=ld
-+if test "$GCC" = yes; then
-+  # Check if gcc -print-prog-name=ld gives a path.
-+  AC_MSG_CHECKING([for ld used by GCC])
-+  case $host in
-+  *-*-mingw*)
-+    # gcc leaves a trailing carriage return which upsets mingw
-+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-+  *)
-+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-+  esac
-+  case $ac_prog in
-+    # Accept absolute paths.
-+    [[\\/]* | [A-Za-z]:[\\/]*)]
-+      [re_direlt='/[^/][^/]*/\.\./']
-+      # Canonicalize the path of ld
-+      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-+	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-+      done
-+      test -z "$LD" && LD="$ac_prog"
-+      ;;
-+  "")
-+    # If it fails, then pretend we aren't using GCC.
-+    ac_prog=ld
-+    ;;
-+  *)
-+    # If it is relative, then search for the first ld in PATH.
-+    with_gnu_ld=unknown
-+    ;;
-+  esac
-+elif test "$with_gnu_ld" = yes; then
-+  AC_MSG_CHECKING([for GNU ld])
-+else
-+  AC_MSG_CHECKING([for non-GNU ld])
-+fi
-+AC_CACHE_VAL(acl_cv_path_LD,
-+[if test -z "$LD"; then
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-+  for ac_dir in $PATH; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-+      acl_cv_path_LD="$ac_dir/$ac_prog"
-+      # Check to see if the program is GNU ld.  I'd rather use --version,
-+      # but apparently some GNU ld's only accept -v.
-+      # Break only if it was the GNU/non-GNU ld that we prefer.
-+      if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-+	test "$with_gnu_ld" != no && break
-+      else
-+	test "$with_gnu_ld" != yes && break
-+      fi
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+else
-+  acl_cv_path_LD="$LD" # Let the user override the test with a path.
-+fi])
-+LD="$acl_cv_path_LD"
-+if test -n "$LD"; then
-+  AC_MSG_RESULT($LD)
-+else
-+  AC_MSG_RESULT(no)
-+fi
-+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-+AC_LIB_PROG_LD_GNU
-+])
---- /dev/null
-+++ atk-1.2.0/m4/lib-link.m4
-@@ -0,0 +1,554 @@
-+# lib-link.m4 serial 3 (gettext-0.11.3)
-+dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Bruno Haible.
-+
-+dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
-+dnl the libraries corresponding to explicit and implicit dependencies.
-+dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
-+dnl augments the CPPFLAGS variable.
-+AC_DEFUN([AC_LIB_LINKFLAGS],
-+[
-+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-+  AC_REQUIRE([AC_LIB_RPATH])
-+  define([Name],[translit([$1],[./-], [___])])
-+  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-+                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-+  AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
-+    AC_LIB_LINKFLAGS_BODY([$1], [$2])
-+    ac_cv_lib[]Name[]_libs="$LIB[]NAME"
-+    ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
-+    ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
-+  ])
-+  LIB[]NAME="$ac_cv_lib[]Name[]_libs"
-+  LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
-+  INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
-+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
-+  AC_SUBST([LIB]NAME)
-+  AC_SUBST([LTLIB]NAME)
-+  dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
-+  dnl results of this search when this library appears as a dependency.
-+  HAVE_LIB[]NAME=yes
-+  undefine([Name])
-+  undefine([NAME])
-+])
-+
-+dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
-+dnl searches for libname and the libraries corresponding to explicit and
-+dnl implicit dependencies, together with the specified include files and
-+dnl the ability to compile and link the specified testcode. If found, it
-+dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
-+dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
-+dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
-+dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
-+AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
-+[
-+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-+  AC_REQUIRE([AC_LIB_RPATH])
-+  define([Name],[translit([$1],[./-], [___])])
-+  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-+                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-+
-+  dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
-+  dnl accordingly.
-+  AC_LIB_LINKFLAGS_BODY([$1], [$2])
-+
-+  dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
-+  dnl because if the user has installed lib[]Name and not disabled its use
-+  dnl via --without-lib[]Name-prefix, he wants to use it.
-+  ac_save_CPPFLAGS="$CPPFLAGS"
-+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
-+
-+  AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
-+    ac_save_LIBS="$LIBS"
-+    LIBS="$LIBS $LIB[]NAME"
-+    AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
-+    LIBS="$ac_save_LIBS"
-+  ])
-+  if test "$ac_cv_lib[]Name" = yes; then
-+    HAVE_LIB[]NAME=yes
-+    AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
-+    AC_MSG_CHECKING([how to link with lib[]$1])
-+    AC_MSG_RESULT([$LIB[]NAME])
-+  else
-+    HAVE_LIB[]NAME=no
-+    dnl If $LIB[]NAME didn't lead to a usable library, we don't need
-+    dnl $INC[]NAME either.
-+    CPPFLAGS="$ac_save_CPPFLAGS"
-+    LIB[]NAME=
-+    LTLIB[]NAME=
-+  fi
-+  AC_SUBST([HAVE_LIB]NAME)
-+  AC_SUBST([LIB]NAME)
-+  AC_SUBST([LTLIB]NAME)
-+  undefine([Name])
-+  undefine([NAME])
-+])
-+
-+dnl Determine the platform dependent parameters needed to use rpath:
-+dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
-+dnl hardcode_direct, hardcode_minus_L,
-+dnl sys_lib_search_path_spec, sys_lib_dlsearch_path_spec.
-+AC_DEFUN([AC_LIB_RPATH],
-+[
-+  AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
-+  AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld
-+  AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
-+  AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
-+  AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
-+    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
-+    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
-+    . ./conftest.sh
-+    rm -f ./conftest.sh
-+    acl_cv_rpath=done
-+  ])
-+  wl="$acl_cv_wl"
-+  libext="$acl_cv_libext"
-+  shlibext="$acl_cv_shlibext"
-+  hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
-+  hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
-+  hardcode_direct="$acl_cv_hardcode_direct"
-+  hardcode_minus_L="$acl_cv_hardcode_minus_L"
-+  sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
-+  sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
-+  dnl Determine whether the user wants rpath handling at all.
-+  AC_ARG_ENABLE(rpath,
-+    [  --disable-rpath         do not hardcode runtime library paths],
-+    :, enable_rpath=yes)
-+])
-+
-+dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
-+dnl the libraries corresponding to explicit and implicit dependencies.
-+dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
-+AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
-+[
-+  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-+                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-+  dnl By default, look in $includedir and $libdir.
-+  use_additional=yes
-+  AC_LIB_WITH_FINAL_PREFIX([
-+    eval additional_includedir=\"$includedir\"
-+    eval additional_libdir=\"$libdir\"
-+  ])
-+  AC_ARG_WITH([lib$1-prefix],
-+[  --with-lib$1-prefix[=DIR]  search for lib$1 in DIR/include and DIR/lib
-+  --without-lib$1-prefix     don't search for lib$1 in includedir and libdir],
-+[
-+    if test "X$withval" = "Xno"; then
-+      use_additional=no
-+    else
-+      if test "X$withval" = "X"; then
-+        AC_LIB_WITH_FINAL_PREFIX([
-+          eval additional_includedir=\"$includedir\"
-+          eval additional_libdir=\"$libdir\"
-+        ])
-+      else
-+        additional_includedir="$withval/include"
-+        additional_libdir="$withval/lib"
-+      fi
-+    fi
-+])
-+  dnl Search the library and its dependencies in $additional_libdir and
-+  dnl $LDFLAGS. Using breadth-first-seach.
-+  LIB[]NAME=
-+  LTLIB[]NAME=
-+  INC[]NAME=
-+  rpathdirs=
-+  ltrpathdirs=
-+  names_already_handled=
-+  names_next_round='$1 $2'
-+  while test -n "$names_next_round"; do
-+    names_this_round="$names_next_round"
-+    names_next_round=
-+    for name in $names_this_round; do
-+      already_handled=
-+      for n in $names_already_handled; do
-+        if test "$n" = "$name"; then
-+          already_handled=yes
-+          break
-+        fi
-+      done
-+      if test -z "$already_handled"; then
-+        names_already_handled="$names_already_handled $name"
-+        dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
-+        dnl or AC_LIB_HAVE_LINKFLAGS call.
-+        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
-+        eval value=\"\$HAVE_LIB$uppername\"
-+        if test -n "$value"; then
-+          if test "$value" = yes; then
-+            eval value=\"\$LIB$uppername\"
-+            test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
-+            eval value=\"\$LTLIB$uppername\"
-+            test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
-+          else
-+            dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
-+            dnl that this library doesn't exist. So just drop it.
-+            :
-+          fi
-+        else
-+          dnl Search the library lib$name in $additional_libdir and $LDFLAGS
-+          dnl and the already constructed $LIBNAME/$LTLIBNAME.
-+          found_dir=
-+          found_la=
-+          found_so=
-+          found_a=
-+          if test $use_additional = yes; then
-+            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
-+              found_dir="$additional_libdir"
-+              found_so="$additional_libdir/lib$name.$shlibext"
-+              if test -f "$additional_libdir/lib$name.la"; then
-+                found_la="$additional_libdir/lib$name.la"
-+              fi
-+            else
-+              if test -f "$additional_libdir/lib$name.$libext"; then
-+                found_dir="$additional_libdir"
-+                found_a="$additional_libdir/lib$name.$libext"
-+                if test -f "$additional_libdir/lib$name.la"; then
-+                  found_la="$additional_libdir/lib$name.la"
-+                fi
-+              fi
-+            fi
-+          fi
-+          if test "X$found_dir" = "X"; then
-+            for x in $LDFLAGS $LTLIB[]NAME; do
-+              AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-+              case "$x" in
-+                -L*)
-+                  dir=`echo "X$x" | sed -e 's/^X-L//'`
-+                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
-+                    found_dir="$dir"
-+                    found_so="$dir/lib$name.$shlibext"
-+                    if test -f "$dir/lib$name.la"; then
-+                      found_la="$dir/lib$name.la"
-+                    fi
-+                  else
-+                    if test -f "$dir/lib$name.$libext"; then
-+                      found_dir="$dir"
-+                      found_a="$dir/lib$name.$libext"
-+                      if test -f "$dir/lib$name.la"; then
-+                        found_la="$dir/lib$name.la"
-+                      fi
-+                    fi
-+                  fi
-+                  ;;
-+              esac
-+              if test "X$found_dir" != "X"; then
-+                break
-+              fi
-+            done
-+          fi
-+          if test "X$found_dir" != "X"; then
-+            dnl Found the library.
-+            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
-+            if test "X$found_so" != "X"; then
-+              dnl Linking with a shared library. We attempt to hardcode its
-+              dnl directory into the executable's runpath, unless it's the
-+              dnl standard /usr/lib.
-+              if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
-+                dnl No hardcoding is needed.
-+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-+              else
-+                dnl Use an explicit option to hardcode DIR into the resulting
-+                dnl binary.
-+                dnl Potentially add DIR to ltrpathdirs.
-+                dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
-+                haveit=
-+                for x in $ltrpathdirs; do
-+                  if test "X$x" = "X$found_dir"; then
-+                    haveit=yes
-+                    break
-+                  fi
-+                done
-+                if test -z "$haveit"; then
-+                  ltrpathdirs="$ltrpathdirs $found_dir"
-+                fi
-+                dnl The hardcoding into $LIBNAME is system dependent.
-+                if test "$hardcode_direct" = yes; then
-+                  dnl Using DIR/libNAME.so during linking hardcodes DIR into the
-+                  dnl resulting binary.
-+                  LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-+                else
-+                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
-+                    dnl Use an explicit option to hardcode DIR into the resulting
-+                    dnl binary.
-+                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-+                    dnl Potentially add DIR to rpathdirs.
-+                    dnl The rpathdirs will be appended to $LIBNAME at the end.
-+                    haveit=
-+                    for x in $rpathdirs; do
-+                      if test "X$x" = "X$found_dir"; then
-+                        haveit=yes
-+                        break
-+                      fi
-+                    done
-+                    if test -z "$haveit"; then
-+                      rpathdirs="$rpathdirs $found_dir"
-+                    fi
-+                  else
-+                    dnl Rely on "-L$found_dir".
-+                    dnl But don't add it if it's already contained in the LDFLAGS
-+                    dnl or the already constructed $LIBNAME
-+                    haveit=
-+                    for x in $LDFLAGS $LIB[]NAME; do
-+                      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-+                      if test "X$x" = "X-L$found_dir"; then
-+                        haveit=yes
-+                        break
-+                      fi
-+                    done
-+                    if test -z "$haveit"; then
-+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
-+                    fi
-+                    if test "$hardcode_minus_L" != no; then
-+                      dnl FIXME: Not sure whether we should use
-+                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
-+                      dnl here.
-+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-+                    else
-+                      dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
-+                      dnl here, because this doesn't fit in flags passed to the
-+                      dnl compiler. So give up. No hardcoding. This affects only
-+                      dnl very old systems.
-+                      dnl FIXME: Not sure whether we should use
-+                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
-+                      dnl here.
-+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
-+                    fi
-+                  fi
-+                fi
-+              fi
-+            else
-+              if test "X$found_a" != "X"; then
-+                dnl Linking with a static library.
-+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
-+              else
-+                dnl We shouldn't come here, but anyway it's good to have a
-+                dnl fallback.
-+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
-+              fi
-+            fi
-+            dnl Assume the include files are nearby.
-+            additional_includedir=
-+            case "$found_dir" in
-+              */lib | */lib/)
-+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
-+                additional_includedir="$basedir/include"
-+                ;;
-+            esac
-+            if test "X$additional_includedir" != "X"; then
-+              dnl Potentially add $additional_includedir to $INCNAME.
-+              dnl But don't add it
-+              dnl   1. if it's the standard /usr/include,
-+              dnl   2. if it's /usr/local/include and we are using GCC on Linux,
-+              dnl   3. if it's already present in $CPPFLAGS or the already
-+              dnl      constructed $INCNAME,
-+              dnl   4. if it doesn't exist as a directory.
-+              if test "X$additional_includedir" != "X/usr/include"; then
-+                haveit=
-+                if test "X$additional_includedir" = "X/usr/local/include"; then
-+                  if test -n "$GCC"; then
-+                    case $host_os in
-+                      linux*) haveit=yes;;
-+                    esac
-+                  fi
-+                fi
-+                if test -z "$haveit"; then
-+                  for x in $CPPFLAGS $INC[]NAME; do
-+                    AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-+                    if test "X$x" = "X-I$additional_includedir"; then
-+                      haveit=yes
-+                      break
-+                    fi
-+                  done
-+                  if test -z "$haveit"; then
-+                    if test -d "$additional_includedir"; then
-+                      dnl Really add $additional_includedir to $INCNAME.
-+                      INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
-+                    fi
-+                  fi
-+                fi
-+              fi
-+            fi
-+            dnl Look for dependencies.
-+            if test -n "$found_la"; then
-+              dnl Read the .la file. It defines the variables
-+              dnl dlname, library_names, old_library, dependency_libs, current,
-+              dnl age, revision, installed, dlopen, dlpreopen, libdir.
-+              save_libdir="$libdir"
-+              case "$found_la" in
-+                */* | *\\*) . "$found_la" ;;
-+                *) . "./$found_la" ;;
-+              esac
-+              libdir="$save_libdir"
-+              dnl We use only dependency_libs.
-+              for dep in $dependency_libs; do
-+                case "$dep" in
-+                  -L*)
-+                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-+                    dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
-+                    dnl But don't add it
-+                    dnl   1. if it's the standard /usr/lib,
-+                    dnl   2. if it's /usr/local/lib and we are using GCC on Linux,
-+                    dnl   3. if it's already present in $LDFLAGS or the already
-+                    dnl      constructed $LIBNAME,
-+                    dnl   4. if it doesn't exist as a directory.
-+                    if test "X$additional_libdir" != "X/usr/lib"; then
-+                      haveit=
-+                      if test "X$additional_libdir" = "X/usr/local/lib"; then
-+                        if test -n "$GCC"; then
-+                          case $host_os in
-+                            linux*) haveit=yes;;
-+                          esac
-+                        fi
-+                      fi
-+                      if test -z "$haveit"; then
-+                        haveit=
-+                        for x in $LDFLAGS $LIB[]NAME; do
-+                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-+                          if test "X$x" = "X-L$additional_libdir"; then
-+                            haveit=yes
-+                            break
-+                          fi
-+                        done
-+                        if test -z "$haveit"; then
-+                          if test -d "$additional_libdir"; then
-+                            dnl Really add $additional_libdir to $LIBNAME.
-+                            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
-+                          fi
-+                        fi
-+                        haveit=
-+                        for x in $LDFLAGS $LTLIB[]NAME; do
-+                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-+                          if test "X$x" = "X-L$additional_libdir"; then
-+                            haveit=yes
-+                            break
-+                          fi
-+                        done
-+                        if test -z "$haveit"; then
-+                          if test -d "$additional_libdir"; then
-+                            dnl Really add $additional_libdir to $LTLIBNAME.
-+                            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
-+                          fi
-+                        fi
-+                      fi
-+                    fi
-+                    ;;
-+                  -R*)
-+                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
-+                    if test "$enable_rpath" != no; then
-+                      dnl Potentially add DIR to rpathdirs.
-+                      dnl The rpathdirs will be appended to $LIBNAME at the end.
-+                      haveit=
-+                      for x in $rpathdirs; do
-+                        if test "X$x" = "X$dir"; then
-+                          haveit=yes
-+                          break
-+                        fi
-+                      done
-+                      if test -z "$haveit"; then
-+                        rpathdirs="$rpathdirs $dir"
-+                      fi
-+                      dnl Potentially add DIR to ltrpathdirs.
-+                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
-+                      haveit=
-+                      for x in $ltrpathdirs; do
-+                        if test "X$x" = "X$dir"; then
-+                          haveit=yes
-+                          break
-+                        fi
-+                      done
-+                      if test -z "$haveit"; then
-+                        ltrpathdirs="$ltrpathdirs $dir"
-+                      fi
-+                    fi
-+                    ;;
-+                  -l*)
-+                    dnl Handle this in the next round.
-+                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
-+                    ;;
-+                  *.la)
-+                    dnl Handle this in the next round. Throw away the .la's
-+                    dnl directory; it is already contained in a preceding -L
-+                    dnl option.
-+                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
-+                    ;;
-+                  *)
-+                    dnl Most likely an immediate library name.
-+                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
-+                    LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
-+                    ;;
-+                esac
-+              done
-+            fi
-+          else
-+            dnl Didn't find the library; assume it is in the system directories
-+            dnl known to the linker and runtime loader. (All the system
-+            dnl directories known to the linker should also be known to the
-+            dnl runtime loader, otherwise the system is severely misconfigured.)
-+            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
-+            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
-+          fi
-+        fi
-+      fi
-+    done
-+  done
-+  if test "X$rpathdirs" != "X"; then
-+    if test -n "$hardcode_libdir_separator"; then
-+      dnl Weird platform: only the last -rpath option counts, the user must
-+      dnl pass all path elements in one option. We can arrange that for a
-+      dnl single library, but not when more than one $LIBNAMEs are used.
-+      alldirs=
-+      for found_dir in $rpathdirs; do
-+        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
-+      done
-+      dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
-+      acl_save_libdir="$libdir"
-+      libdir="$alldirs"
-+      eval flag=\"$hardcode_libdir_flag_spec\"
-+      libdir="$acl_save_libdir"
-+      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
-+    else
-+      dnl The -rpath options are cumulative.
-+      for found_dir in $rpathdirs; do
-+        acl_save_libdir="$libdir"
-+        libdir="$found_dir"
-+        eval flag=\"$hardcode_libdir_flag_spec\"
-+        libdir="$acl_save_libdir"
-+        LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
-+      done
-+    fi
-+  fi
-+  if test "X$ltrpathdirs" != "X"; then
-+    dnl When using libtool, the option that works for both libraries and
-+    dnl executables is -R. The -R options are cumulative.
-+    for found_dir in $ltrpathdirs; do
-+      LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
-+    done
-+  fi
-+])
-+
-+dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
-+dnl unless already present in VAR.
-+dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
-+dnl contains two or three consecutive elements that belong together.
-+AC_DEFUN([AC_LIB_APPENDTOVAR],
-+[
-+  for element in [$2]; do
-+    haveit=
-+    for x in $[$1]; do
-+      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-+      if test "X$x" = "X$element"; then
-+        haveit=yes
-+        break
-+      fi
-+    done
-+    if test -z "$haveit"; then
-+      [$1]="${[$1]}${[$1]:+ }$element"
-+    fi
-+  done
-+])
---- /dev/null
-+++ atk-1.2.0/m4/lib-prefix.m4
-@@ -0,0 +1,148 @@
-+# lib-prefix.m4 serial 1 (gettext-0.11)
-+dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Bruno Haible.
-+
-+dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
-+dnl to access previously installed libraries. The basic assumption is that
-+dnl a user will want packages to use other packages he previously installed
-+dnl with the same --prefix option.
-+dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
-+dnl libraries, but is otherwise very convenient.
-+AC_DEFUN([AC_LIB_PREFIX],
-+[
-+  AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
-+  AC_REQUIRE([AC_PROG_CC])
-+  AC_REQUIRE([AC_CANONICAL_HOST])
-+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-+  dnl By default, look in $includedir and $libdir.
-+  use_additional=yes
-+  AC_LIB_WITH_FINAL_PREFIX([
-+    eval additional_includedir=\"$includedir\"
-+    eval additional_libdir=\"$libdir\"
-+  ])
-+  AC_ARG_WITH([lib-prefix],
-+[  --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
-+  --without-lib-prefix    don't search for libraries in includedir and libdir],
-+[
-+    if test "X$withval" = "Xno"; then
-+      use_additional=no
-+    else
-+      if test "X$withval" = "X"; then
-+        AC_LIB_WITH_FINAL_PREFIX([
-+          eval additional_includedir=\"$includedir\"
-+          eval additional_libdir=\"$libdir\"
-+        ])
-+      else
-+        additional_includedir="$withval/include"
-+        additional_libdir="$withval/lib"
-+      fi
-+    fi
-+])
-+  if test $use_additional = yes; then
-+    dnl Potentially add $additional_includedir to $CPPFLAGS.
-+    dnl But don't add it
-+    dnl   1. if it's the standard /usr/include,
-+    dnl   2. if it's already present in $CPPFLAGS,
-+    dnl   3. if it's /usr/local/include and we are using GCC on Linux,
-+    dnl   4. if it doesn't exist as a directory.
-+    if test "X$additional_includedir" != "X/usr/include"; then
-+      haveit=
-+      for x in $CPPFLAGS; do
-+        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-+        if test "X$x" = "X-I$additional_includedir"; then
-+          haveit=yes
-+          break
-+        fi
-+      done
-+      if test -z "$haveit"; then
-+        if test "X$additional_includedir" = "X/usr/local/include"; then
-+          if test -n "$GCC"; then
-+            case $host_os in
-+              linux*) haveit=yes;;
-+            esac
-+          fi
-+        fi
-+        if test -z "$haveit"; then
-+          if test -d "$additional_includedir"; then
-+            dnl Really add $additional_includedir to $CPPFLAGS.
-+            CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
-+          fi
-+        fi
-+      fi
-+    fi
-+    dnl Potentially add $additional_libdir to $LDFLAGS.
-+    dnl But don't add it
-+    dnl   1. if it's the standard /usr/lib,
-+    dnl   2. if it's already present in $LDFLAGS,
-+    dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
-+    dnl   4. if it doesn't exist as a directory.
-+    if test "X$additional_libdir" != "X/usr/lib"; then
-+      haveit=
-+      for x in $LDFLAGS; do
-+        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-+        if test "X$x" = "X-L$additional_libdir"; then
-+          haveit=yes
-+          break
-+        fi
-+      done
-+      if test -z "$haveit"; then
-+        if test "X$additional_libdir" = "X/usr/local/lib"; then
-+          if test -n "$GCC"; then
-+            case $host_os in
-+              linux*) haveit=yes;;
-+            esac
-+          fi
-+        fi
-+        if test -z "$haveit"; then
-+          if test -d "$additional_libdir"; then
-+            dnl Really add $additional_libdir to $LDFLAGS.
-+            LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
-+          fi
-+        fi
-+      fi
-+    fi
-+  fi
-+])
-+
-+dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
-+dnl acl_final_exec_prefix, containing the values to which $prefix and
-+dnl $exec_prefix will expand at the end of the configure script.
-+AC_DEFUN([AC_LIB_PREPARE_PREFIX],
-+[
-+  dnl Unfortunately, prefix and exec_prefix get only finally determined
-+  dnl at the end of configure.
-+  if test "X$prefix" = "XNONE"; then
-+    acl_final_prefix="$ac_default_prefix"
-+  else
-+    acl_final_prefix="$prefix"
-+  fi
-+  if test "X$exec_prefix" = "XNONE"; then
-+    acl_final_exec_prefix='${prefix}'
-+  else
-+    acl_final_exec_prefix="$exec_prefix"
-+  fi
-+  acl_save_prefix="$prefix"
-+  prefix="$acl_final_prefix"
-+  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
-+  prefix="$acl_save_prefix"
-+])
-+
-+dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
-+dnl variables prefix and exec_prefix bound to the values they will have
-+dnl at the end of the configure script.
-+AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
-+[
-+  acl_save_prefix="$prefix"
-+  prefix="$acl_final_prefix"
-+  acl_save_exec_prefix="$exec_prefix"
-+  exec_prefix="$acl_final_exec_prefix"
-+  $1
-+  exec_prefix="$acl_save_exec_prefix"
-+  prefix="$acl_save_prefix"
-+])
---- /dev/null
-+++ atk-1.2.0/m4/progtest.m4
-@@ -0,0 +1,59 @@
-+# progtest.m4 serial 2 (gettext-0.10.40)
-+dnl Copyright (C) 1996-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+dnl
-+dnl This file can can be used in projects which are not available under
-+dnl the GNU General Public License or the GNU Library General Public
-+dnl License but which still want to provide support for the GNU gettext
-+dnl functionality.
-+dnl Please note that the actual code of the GNU gettext library is covered
-+dnl by the GNU Library General Public License, and the rest of the GNU
-+dnl gettext package package is covered by the GNU General Public License.
-+dnl They are *not* in the public domain.
-+
-+dnl Authors:
-+dnl   Ulrich Drepper <drepper@cygnus.com>, 1996.
-+
-+# Search path for a program which passes the given test.
-+
-+dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-+dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-+AC_DEFUN([AM_PATH_PROG_WITH_TEST],
-+[# Extract the first word of "$2", so it can be a program name with args.
-+set dummy $2; ac_word=[$]2
-+AC_MSG_CHECKING([for $ac_word])
-+AC_CACHE_VAL(ac_cv_path_$1,
-+[case "[$]$1" in
-+  /*)
-+  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-+  for ac_dir in ifelse([$5], , $PATH, [$5]); do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      if [$3]; then
-+	ac_cv_path_$1="$ac_dir/$ac_word"
-+	break
-+      fi
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+dnl If no 4th arg is given, leave the cache variable unset,
-+dnl so AC_PATH_PROGS will keep looking.
-+ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-+])dnl
-+  ;;
-+esac])dnl
-+$1="$ac_cv_path_$1"
-+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
-+  AC_MSG_RESULT([$]$1)
-+else
-+  AC_MSG_RESULT(no)
-+fi
-+AC_SUBST($1)dnl
-+])
---- /dev/null
-+++ atk-1.2.0/m4/stdint_h.m4
-@@ -0,0 +1,28 @@
-+# stdint_h.m4 serial 2 (gettext-0.11.4)
-+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Paul Eggert.
-+
-+# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
-+# doesn't clash with <sys/types.h>, and declares uintmax_t.
-+
-+AC_DEFUN([jm_AC_HEADER_STDINT_H],
-+[
-+  AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h,
-+  [AC_TRY_COMPILE(
-+    [#include <sys/types.h>
-+#include <stdint.h>],
-+    [uintmax_t i = (uintmax_t) -1;],
-+    jm_ac_cv_header_stdint_h=yes,
-+    jm_ac_cv_header_stdint_h=no)])
-+  if test $jm_ac_cv_header_stdint_h = yes; then
-+    AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1,
-+[Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
-+   and declares uintmax_t. ])
-+  fi
-+])
---- /dev/null
-+++ atk-1.2.0/m4/uintmax_t.m4
-@@ -0,0 +1,29 @@
-+# uintmax_t.m4 serial 6 (gettext-0.11)
-+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Paul Eggert.
-+
-+AC_PREREQ(2.13)
-+
-+# Define uintmax_t to `unsigned long' or `unsigned long long'
-+# if <inttypes.h> does not exist.
-+
-+AC_DEFUN([jm_AC_TYPE_UINTMAX_T],
-+[
-+  AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
-+  AC_REQUIRE([jm_AC_HEADER_STDINT_H])
-+  if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then
-+    AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
-+    test $ac_cv_type_unsigned_long_long = yes \
-+      && ac_type='unsigned long long' \
-+      || ac_type='unsigned long'
-+    AC_DEFINE_UNQUOTED(uintmax_t, $ac_type,
-+  [Define to unsigned long or unsigned long long
-+   if <inttypes.h> and <stdint.h> don't define.])
-+  fi
-+])
---- /dev/null
-+++ atk-1.2.0/m4/ulonglong.m4
-@@ -0,0 +1,23 @@
-+# ulonglong.m4 serial 2 (fileutils-4.0.32, gettext-0.10.40)
-+dnl Copyright (C) 1999-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Paul Eggert.
-+
-+AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG],
-+[
-+  AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
-+  [AC_TRY_LINK([unsigned long long ull = 1; int i = 63;],
-+    [unsigned long long ullmax = (unsigned long long) -1;
-+     return ull << i | ull >> i | ullmax / ull | ullmax % ull;],
-+    ac_cv_type_unsigned_long_long=yes,
-+    ac_cv_type_unsigned_long_long=no)])
-+  if test $ac_cv_type_unsigned_long_long = yes; then
-+    AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1,
-+      [Define if you have the unsigned long long type.])
-+  fi
-+])
diff --git a/packages/atk/atk-1.6.0/gtk-doc.patch b/packages/atk/atk-1.6.0/gtk-doc.patch
deleted file mode 100644
index 04770290e1..0000000000
--- a/packages/atk/atk-1.6.0/gtk-doc.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- /dev/null	2004-02-02 20:32:13.000000000 +0000
-+++ atk/acinclude.m4	2003-07-21 03:26:44.000000000 +0100
-@@ -0,0 +1,53 @@
-+dnl -*- mode: autoconf -*-
-+
-+# serial 1
-+
-+dnl Usage:
-+dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
-+AC_DEFUN([GTK_DOC_CHECK],
-+[
-+  AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
-+  AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
-+  dnl for overriding the documentation installation directory
-+  AC_ARG_WITH(html-dir,
-+    AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
-+    [with_html_dir='${datadir}/gtk-doc/html'])
-+  HTML_DIR="$with_html_dir"
-+  AC_SUBST(HTML_DIR)
-+
-+  dnl enable/disable documentation building
-+  AC_ARG_ENABLE(gtk-doc,
-+    AC_HELP_STRING([--enable-gtk-doc],
-+                   [use gtk-doc to build documentation [default=no]]),,
-+    enable_gtk_doc=no)
-+
-+  have_gtk_doc=no
-+  if test -z "$PKG_CONFIG"; then
-+    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+  fi
-+  if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
-+    have_gtk_doc=yes
-+  fi
-+
-+  dnl do we want to do a version check?
-+ifelse([$1],[],,
-+  [gtk_doc_min_version=$1
-+  if test "$have_gtk_doc" = yes; then
-+    AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
-+    if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then
-+      AC_MSG_RESULT(yes)
-+    else
-+      AC_MSG_RESULT(no)
-+      have_gtk_doc=no
-+    fi
-+  fi
-+])
-+  if test x$enable_gtk_doc = xyes; then
-+    if test "$have_gtk_doc" != yes; then
-+      enable_gtk_doc=no
-+    fi
-+  fi
-+
-+  AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
-+  AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL")
-+])
diff --git a/packages/atk/atk_1.10.3.bb b/packages/atk/atk_1.10.3.bb
deleted file mode 100644
index ab359172a1..0000000000
--- a/packages/atk/atk_1.10.3.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require atk.inc
-
-SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/atk-${PV}.tar.bz2"
-
-do_stage () {
-        oe_libinstall -so -C atk libatk-1.0 ${STAGING_LIBDIR}
-        autotools_stage_includes
-}
diff --git a/packages/atk/atk_1.2.0.bb b/packages/atk/atk_1.2.0.bb
deleted file mode 100644
index 767c13fb4d..0000000000
--- a/packages/atk/atk_1.2.0.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-require atk.inc
-
-SRC_URI = "${GNOME_MIRROR}/atk/1.2/atk-${PV}.tar.bz2 \
-	   file://m4.patch;patch=1"
-
-do_stage () {
-	oe_libinstall -so -C atk libatk-1.0 ${STAGING_LIBDIR}
-	install -d ${STAGING_INCDIR}/atk
-	install -m 0644 atk/atkaction.h ${STAGING_INCDIR}/atk/atkaction.h
-	install -m 0644 atk/atkcomponent.h ${STAGING_INCDIR}/atk/atkcomponent.h
-	install -m 0644 atk/atkdocument.h ${STAGING_INCDIR}/atk/atkdocument.h
-	install -m 0644 atk/atkeditabletext.h ${STAGING_INCDIR}/atk/atkeditabletext.h
-	install -m 0644 atk/atk-enum-types.h ${STAGING_INCDIR}/atk/atk-enum-types.h
-	install -m 0644 atk/atkgobjectaccessible.h ${STAGING_INCDIR}/atk/atkgobjectaccessible.h
-	install -m 0644 atk/atk.h ${STAGING_INCDIR}/atk/atk.h
-	install -m 0644 atk/atkhyperlink.h ${STAGING_INCDIR}/atk/atkhyperlink.h
-	install -m 0644 atk/atkhypertext.h ${STAGING_INCDIR}/atk/atkhypertext.h
-	install -m 0644 atk/atkimage.h ${STAGING_INCDIR}/atk/atkimage.h
-	install -m 0644 atk/atknoopobjectfactory.h ${STAGING_INCDIR}/atk/atknoopobjectfactory.h
-	install -m 0644 atk/atknoopobject.h ${STAGING_INCDIR}/atk/atknoopobject.h
-	install -m 0644 atk/atkobjectfactory.h ${STAGING_INCDIR}/atk/atkobjectfactory.h
-	install -m 0644 atk/atkobject.h ${STAGING_INCDIR}/atk/atkobject.h
-	install -m 0644 atk/atkregistry.h ${STAGING_INCDIR}/atk/atkregistry.h
-	install -m 0644 atk/atkrelation.h ${STAGING_INCDIR}/atk/atkrelation.h
-	install -m 0644 atk/atkrelationset.h ${STAGING_INCDIR}/atk/atkrelationset.h
-	install -m 0644 atk/atkrelationtype.h ${STAGING_INCDIR}/atk/atkrelationtype.h
-	install -m 0644 atk/atkselection.h ${STAGING_INCDIR}/atk/atkselection.h
-	install -m 0644 atk/atkstate.h ${STAGING_INCDIR}/atk/atkstate.h
-	install -m 0644 atk/atkstateset.h ${STAGING_INCDIR}/atk/atkstateset.h
-	install -m 0644 atk/atkstreamablecontent.h ${STAGING_INCDIR}/atk/atkstreamablecontent.h
-	install -m 0644 atk/atktable.h ${STAGING_INCDIR}/atk/atktable.h
-	install -m 0644 atk/atktext.h ${STAGING_INCDIR}/atk/atktext.h
-	install -m 0644 atk/atkutil.h ${STAGING_INCDIR}/atk/atkutil.h
-	install -m 0644 atk/atkvalue.h ${STAGING_INCDIR}/atk/atkvalue.h
-}
diff --git a/packages/atk/atk_1.6.0.bb b/packages/atk/atk_1.6.0.bb
deleted file mode 100644
index 320a205d9f..0000000000
--- a/packages/atk/atk_1.6.0.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-require atk.inc
-
-SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/atk-${PV}.tar.bz2 \
-	   file://gtk-doc.patch;patch=1"
-
-do_stage () {
-	oe_libinstall -so -C atk libatk-1.0 ${STAGING_LIBDIR}
-	install -d ${STAGING_INCDIR}/atk
-	install -m 0644 atk/atkaction.h ${STAGING_INCDIR}/atk/atkaction.h
-	install -m 0644 atk/atkcomponent.h ${STAGING_INCDIR}/atk/atkcomponent.h
-	install -m 0644 atk/atkdocument.h ${STAGING_INCDIR}/atk/atkdocument.h
-	install -m 0644 atk/atkeditabletext.h ${STAGING_INCDIR}/atk/atkeditabletext.h
-	install -m 0644 atk/atk-enum-types.h ${STAGING_INCDIR}/atk/atk-enum-types.h
-	install -m 0644 atk/atkgobjectaccessible.h ${STAGING_INCDIR}/atk/atkgobjectaccessible.h
-	install -m 0644 atk/atk.h ${STAGING_INCDIR}/atk/atk.h
-	install -m 0644 atk/atkhyperlink.h ${STAGING_INCDIR}/atk/atkhyperlink.h
-	install -m 0644 atk/atkhypertext.h ${STAGING_INCDIR}/atk/atkhypertext.h
-	install -m 0644 atk/atkimage.h ${STAGING_INCDIR}/atk/atkimage.h
-	install -m 0644 atk/atknoopobjectfactory.h ${STAGING_INCDIR}/atk/atknoopobjectfactory.h
-	install -m 0644 atk/atknoopobject.h ${STAGING_INCDIR}/atk/atknoopobject.h
-	install -m 0644 atk/atkobjectfactory.h ${STAGING_INCDIR}/atk/atkobjectfactory.h
-	install -m 0644 atk/atkobject.h ${STAGING_INCDIR}/atk/atkobject.h
-	install -m 0644 atk/atkregistry.h ${STAGING_INCDIR}/atk/atkregistry.h
-	install -m 0644 atk/atkrelation.h ${STAGING_INCDIR}/atk/atkrelation.h
-	install -m 0644 atk/atkrelationset.h ${STAGING_INCDIR}/atk/atkrelationset.h
-	install -m 0644 atk/atkrelationtype.h ${STAGING_INCDIR}/atk/atkrelationtype.h
-	install -m 0644 atk/atkselection.h ${STAGING_INCDIR}/atk/atkselection.h
-	install -m 0644 atk/atkstate.h ${STAGING_INCDIR}/atk/atkstate.h
-	install -m 0644 atk/atkstateset.h ${STAGING_INCDIR}/atk/atkstateset.h
-	install -m 0644 atk/atkstreamablecontent.h ${STAGING_INCDIR}/atk/atkstreamablecontent.h
-	install -m 0644 atk/atktable.h ${STAGING_INCDIR}/atk/atktable.h
-	install -m 0644 atk/atktext.h ${STAGING_INCDIR}/atk/atktext.h
-	install -m 0644 atk/atkutil.h ${STAGING_INCDIR}/atk/atkutil.h
-	install -m 0644 atk/atkvalue.h ${STAGING_INCDIR}/atk/atkvalue.h
-}
diff --git a/packages/atk/atk_1.6.1.bb b/packages/atk/atk_1.6.1.bb
deleted file mode 100644
index afc21753d5..0000000000
--- a/packages/atk/atk_1.6.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require atk.inc
-
-SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/atk-${PV}.tar.bz2"
-
-do_stage () {
-	oe_libinstall -so -C atk libatk-1.0 ${STAGING_LIBDIR}
-	autotools_stage_includes
-}
diff --git a/packages/atk/atk_1.9.0.bb b/packages/atk/atk_1.9.0.bb
deleted file mode 100644
index 557858318d..0000000000
--- a/packages/atk/atk_1.9.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require atk.inc
-
-SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/atk-${PV}.tar.bz2"
-
-do_stage () {
-        oe_libinstall -so -C atk libatk-1.0 ${STAGING_LIBDIR}
-        autotools_stage_includes
-}
diff --git a/packages/gtk+/gtk+-2.2.4/automake-lossage.patch b/packages/gtk+/gtk+-2.2.4/automake-lossage.patch
deleted file mode 100644
index 9560abf9ba..0000000000
--- a/packages/gtk+/gtk+-2.2.4/automake-lossage.patch
+++ /dev/null
@@ -1,446 +0,0 @@
---- gtk/Makefile.am.old	2003-09-03 20:50:06.000000000 +0100
-+++ gtk/Makefile.am	2004-03-07 12:17:29.000000000 +0000
-@@ -2,7 +2,7 @@
- 
- SUBDIRS=stock-icons theme-bits
- 
--INCLUDES = @STRIP_BEGIN@ \
-+INCLUDES =  \
- 	-DG_LOG_DOMAIN=\"Gtk\"				\
- 	-DGTK_LIBDIR=\"$(libdir)\"			\
- 	-DGTK_DATA_PREFIX=\"$(prefix)\"			\
-@@ -20,8 +20,7 @@
- 	-DGDK_DISABLE_DEPRECATED			\
- 	-DGTK_DISABLE_DEPRECATED			\
- 	@GTK_DEBUG_FLAGS@				\
--	@GTK_DEP_CFLAGS@				\
--@STRIP_END@
-+	@GTK_DEP_CFLAGS@
- 
- gtarget=@gdktarget@
- 
-@@ -67,7 +66,7 @@
- # since automake doesn't support conditionalized libsomething_la_LDFLAGS
- # we use the general approach here
- libgtkincludedir = $(includedir)/gtk-2.0/gtk
--LDFLAGS = @STRIP_BEGIN@ \
-+AM_LDFLAGS =  \
- 	@LDFLAGS@								\
- 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)			\
- 	-export-dynamic								\
-@@ -77,8 +76,8 @@
- 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la		\
- 	$(top_builddir)/gdk/@gdktargetlib@					\
- 	$(libgtk_target_ldflags)						\
--	@GTK_DEP_LIBS@								\
--@STRIP_END@
-+	@GTK_DEP_LIBS@
-+
- 
- #
- # setup source file variables
-@@ -86,7 +85,7 @@
- 
- # GTK+ header files for public installation (non-generated, or generated
- # by configure)
--gtk_public_h_sources = @STRIP_BEGIN@ \
-+gtk_public_h_sources =  \
- 	gtk.h			\
- 	gtkaccelgroup.h		\
- 	gtkaccellabel.h		\
-@@ -228,10 +227,10 @@
- 	gtkvscrollbar.h		\
- 	gtkvseparator.h		\
- 	gtkwidget.h		\
--	gtkwindow.h		\
--@STRIP_END@
-+	gtkwindow.h
-+
- # GTK+ header files that don't get installed
--gtk_private_h_sources = @STRIP_BEGIN@ \
-+gtk_private_h_sources =  \
- 	gtkrbtree.h 		\
- 	gtktextbtree.h		\
- 	gtktextchildprivate.h   \
-@@ -244,8 +243,7 @@
- 	gtkthemes.h		\
- 	gtktreedatalist.h	\
- 	gtktreeprivate.h	\
--	gtkwindow-decorate.h    \
--@STRIP_END@
-+	gtkwindow-decorate.h
- 
- # GTK+ C sources to build the library from
- 
-@@ -257,7 +255,7 @@
- 	gtktreeitem.c
- endif
- 
--gtk_c_sources = @STRIP_BEGIN@   \
-+gtk_c_sources =			\
- 	gtkaccelgroup.c		\
- 	gtkaccelmap.c		\
- 	gtkaccellabel.c		\
-@@ -410,15 +408,13 @@
- 	gtkwindow-decorate.c    \
- 	fnmatch.c		\
- 	xembed.h		\
--	${crufty_gtk_c_sources}	\
--@STRIP_END@
-+	${crufty_gtk_c_sources}
- 
--gtk_plug_c_sources = @STRIP_BEGIN@   \
-+gtk_plug_c_sources =		\
- 	gtkplug.c		\
- 	gtksocket.c		\
- 	gtkxembed.c		\
--	gtkxembed.h		\
--@STRIP_END@
-+	gtkxembed.h
- 
- # we use our own built_sources variable rules to avoid automake's
- # BUILT_SOURCES oddities
-@@ -427,35 +423,34 @@
- # content
- 
- # built sources that get installed with the header files
--gtk_built_public_sources = @STRIP_BEGIN@ \
-+gtk_built_public_sources =  \
- 	gtkmarshal.h		\
--	gtktypebuiltins.h	\
--@STRIP_END@
--gtk_built_private_headers = @STRIP_BEGIN@ \
--	gtkmarshalers.h		\
--@STRIP_END@
-+	gtktypebuiltins.h
-+
-+gtk_built_private_headers =  \
-+	gtkmarshalers.h
-+
- # built sources that don't get installed
--gtk_built_sources = @STRIP_BEGIN@		\
-+gtk_built_sources = 		\
- 	gtktypebuiltins.c			\
- 	gtkmarshalers.c				\
- 	gtkmarshalers.h				\
- 	gtkmarshal.c				\
- 	${gtk_built_private_headers}		\
--	${gtk_built_public_sources}		\
--@STRIP_END@
--stamp_files = @STRIP_BEGIN@ 		\
-+	${gtk_built_public_sources}
-+
-+stamp_files =  		\
- 	stamp-gtkmarshalers.h		\
- 	stamp-gtkmarshal.h		\
--	stamp-gtktypebuiltins.h		\
--@STRIP_END@
-+	stamp-gtktypebuiltins.h
-+
- # non-header sources (headers should be specified in the above variables)
- # that don't serve as direct make target sources, i.e. they don't have
- # their own .lo rules and don't get publically installed
--gtk_extra_sources = @STRIP_BEGIN@ \
-+gtk_extra_sources =  \
- 	gtkversion.h.in		\
- 	gtkmarshalers.list	\
--	gtkmarshal.list		\
--@STRIP_END@
-+	gtkmarshal.list
- 
- #
- # setup GTK+ sources and their dependencies
-@@ -592,11 +587,10 @@
- 
- TEST_DEPS = $(DEPS) gtk.immodules
- 
--LDADDS = @STRIP_BEGIN@ \
-+LDADDS =  \
- 	$(gtktargetlib)							\
- 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
--	$(top_builddir)/gdk/$(gdktargetlib) 				\
--@STRIP_END@
-+	$(top_builddir)/gdk/$(gdktargetlib)
- 
- #
- # Installed tools
-@@ -615,7 +609,7 @@
- 	  echo $$p; \
- 	done
- 
--EXTRA_DIST += @STRIP_BEGIN@ 	\
-+EXTRA_DIST +=  	\
- 	line-arrow.xbm 		\
- 	line-wrap.xbm 		\
- 	tree_plus.xbm		\
-@@ -629,9 +623,8 @@
- 	gtkrc.key.default	\
- 	gtkrc.key.emacs		\
- 	makefile.msc		\
--	makefile.msc.in		\
--@STRIP_END@
-+	makefile.msc.in
- 
- install-data-local:
- 
-
---- gdk/Makefile.am.old	2003-09-03 20:49:25.000000000 +0100
-+++ gdk/Makefile.am	2004-03-07 12:18:18.000000000 +0000
-@@ -10,7 +10,7 @@
- 	makeenums.pl		\
- 	makefile.msc
- 
--common_includes = @STRIP_BEGIN@ 	\
-+common_includes =  	\
- 	-DG_LOG_DOMAIN=\"Gdk\"		\
- 	-DGDK_COMPILATION		\
- 	-I$(top_srcdir)			\
-@@ -20,8 +20,7 @@
- 	-DGDK_PIXBUF_DISABLE_DEPRECATED	\
- 	-DGDK_DISABLE_DEPRECATED	\
- 	@GTK_DEBUG_FLAGS@ 		\
--	@GDK_DEP_CFLAGS@		\
--@STRIP_END@
-+	@GDK_DEP_CFLAGS@
- 
- INCLUDES = $(common_includes)
- gtarget=@gdktarget@
-@@ -69,7 +68,7 @@
- # libtool stuff: set version and export symbols for resolving
- # since automake doesn't support conditionalized libsomething_la_LDFLAGS
- # we use the general approach here
--LDFLAGS = @STRIP_BEGIN@ 						\
-+AM_LDFLAGS =  						\
- 	@LDFLAGS@							\
- 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 		\
- 	-export-dynamic 						\
-@@ -77,8 +76,7 @@
- 	$(no_undefined)							\
- 	@LIBTOOL_EXPORT_OPTIONS@					\
- 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
--	$(gdk_win32_symbols)						\
--@STRIP_END@
-+	$(gdk_win32_symbols)
- 
- #
- # setup source file variables
-@@ -88,7 +86,7 @@
- #
- # Note: files added here may need to be be propagated to gdk_headers in gtk/Makefile.am
- #
--gdk_public_h_sources = @STRIP_BEGIN@		\
-+gdk_public_h_sources = 		\
- 	gdk.h					\
- 	gdkcolor.h				\
- 	gdkcursor.h				\
-@@ -114,16 +112,14 @@
- 	gdkselection.h				\
- 	gdktypes.h				\
- 	gdkvisual.h				\
--	gdkwindow.h				\
--@STRIP_END@
-+	gdkwindow.h
- 
--gdk_headers = @STRIP_BEGIN@       \
-+gdk_headers =        \
- 	$(gdk_public_h_sources)   \
- 	gdkenumtypes.h		  \
--	gdkprivate.h		  \
--@STRIP_END@
-+	gdkprivate.h
- 
--gdk_c_sources = @STRIP_BEGIN@ 	\
-+gdk_c_sources =  	\
- 	gdk.c			\
- 	gdkcolor.c		\
- 	gdkcursor.c		\
-@@ -153,8 +149,7 @@
- 	gdkscreen.c		\
- 	gdkselection.c		\
- 	gdkvisual.c		\
--	gdkwindow.c		\
--@STRIP_END@
-+	gdkwindow.c
- 
- #
- # setup GDK sources and their dependencies
-@@ -164,11 +159,10 @@
- gdkinclude_HEADERS = $(gdk_headers)
- 
- # gdkmarshalers.c is not here becuase it is currently an empty file
--common_sources = @STRIP_BEGIN@	\
-+common_sources = 	\
- 	$(gdk_c_sources)	\
- 	gdkenumtypes.c		\
--	gdkmarshalers.h		\
--@STRIP_END@
-+	gdkmarshalers.h
- 
- libgdk_x11_2_0_la_SOURCES = $(common_sources)
- libgdk_linux_fb_2_0_la_SOURCES = $(common_sources) gdkkeynames.c
---- gdk-pixbuf/Makefile.am.old	2003-01-27 23:19:07.000000000 +0000
-+++ gdk-pixbuf/Makefile.am	2004-03-07 12:19:11.000000000 +0000
-@@ -238,7 +238,7 @@
- endif
- 
- DEPS = libgdk_pixbuf-$(GTK_API_VERSION).la
--INCLUDES = @STRIP_BEGIN@ 			\
-+INCLUDES =  			\
- 	-DG_LOG_DOMAIN=\"GdkPixbuf\"		\
- 	-I$(top_srcdir) -I$(top_builddir) 	\
- 	-I$(top_srcdir)/gdk-pixbuf 		\
-@@ -252,8 +252,7 @@
- 	@INCLUDED_LOADER_DEFINE@ 		\
- 	@GTK_DEBUG_FLAGS@			\
- 	@GDK_PIXBUF_DEP_CFLAGS@			\
--	-DGDK_PIXBUF_ENABLE_BACKEND		\
--@STRIP_END@
-+	-DGDK_PIXBUF_ENABLE_BACKEND
- 
- AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
- LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la
-@@ -281,7 +280,7 @@
- # The GdkPixBuf library
- #
- libgdk_pixbufincludedir = $(includedir)/gtk-2.0/gdk-pixbuf
--libgdk_pixbuf_2_0_la_SOURCES = @STRIP_BEGIN@ \
-+libgdk_pixbuf_2_0_la_SOURCES =  \
- 	gdk-pixbuf-i18n.h	\
- 	gdk-pixbuf.c		\
- 	gdk-pixbuf-animation.c	\
-@@ -291,14 +290,13 @@
- 	gdk-pixbuf-scale.c	\
- 	gdk-pixbuf-util.c	\
- 	gdk-pixdata.c		\
--	$(gdk_pixbuf_built_cfiles) \
--@STRIP_END@
--libgdk_pixbuf_2_0_la_LDFLAGS = @STRIP_BEGIN@ \
-+	$(gdk_pixbuf_built_cfiles)
-+
-+libgdk_pixbuf_2_0_la_LDFLAGS =  \
- 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)    \
- 	@LIBTOOL_EXPORT_OPTIONS@				\
- 	$(no_undefined)						\
--	$(gdk_pixbuf_symbols)					\
--@STRIP_END@
-+	$(gdk_pixbuf_symbols)
- 
- libgdk_pixbuf_2_0_la_LIBADD = pixops/libpixops.la $(builtin_objs) $(gdk_pixbuf_win32res_lo) $(GDK_PIXBUF_DEP_LIBS)
- libgdk_pixbuf_2_0_la_DEPENDENCIES = pixops/libpixops.la $(builtin_objs) $(gdk_pixbuf_def) $(gdk_pixbuf_win32res_lo)
---- demos/Makefile.am.old	2003-06-06 01:52:59.000000000 +0100
-+++ demos/Makefile.am	2004-03-07 12:20:23.000000000 +0000
-@@ -2,7 +2,7 @@
- 
- SUBDIRS = gtk-demo
- 
--INCLUDES = @STRIP_BEGIN@ \
-+INCLUDES =  \
- 	-I$(top_srcdir) 				\
- 	-I$(top_builddir)/gdk				\
- 	-DG_DISABLE_DEPRECATED	 			\
-@@ -10,19 +10,17 @@
- 	-DGDK_DISABLE_DEPRECATED			\
- 	-DGTK_DISABLE_DEPRECATED			\
- 	@GTK_DEBUG_FLAGS@				\
--	@GTK_DEP_CFLAGS@				\
--@STRIP_END@
-+	@GTK_DEP_CFLAGS@
- 
- DEPS = \
- 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
- 	$(top_builddir)/gdk/@gdktargetlib@ 				\
- 	$(top_builddir)/gtk/@gtktargetlib@
- 
--LDADDS = @STRIP_BEGIN@ 							\
-+LDADDS =  							\
- 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
- 	$(top_builddir)/gdk/@gdktargetlib@        			\
--	$(top_builddir)/gtk/@gtktargetlib@ 				\
--@STRIP_END@
-+	$(top_builddir)/gtk/@gtktargetlib@
- 
- noinst_PROGRAMS = 		\
- 	testpixbuf 		\
---- docs/faq/Makefile.am.old	2002-03-06 03:59:12.000000000 +0000
-+++ docs/faq/Makefile.am	2004-03-07 12:23:40.000000000 +0000
-@@ -14,15 +14,6 @@
- dist-hook: html
- 	cp -Rp $(srcdir)/html $(distdir)
- else
--html:
--	echo "***"
--	echo "*** Warning: FAQ not built"
--	echo "***"
--
--pdf:
--	echo "***"
--	echo "*** Warning: FAQ not built"
--	echo "***"
- 
- dist-hook:
- 	echo "***"
---- docs/tutorial/Makefile.am.old	2002-03-06 03:59:12.000000000 +0000
-+++ docs/tutorial/Makefile.am	2004-03-07 12:24:42.000000000 +0000
-@@ -49,15 +49,6 @@
- dist-hook: html
- 	cp -Rp $(srcdir)/html $(distdir)
- else
--html:
--	echo "***"
--	echo "*** Warning: Tutorial not built"
--	echo "***"
--
--pdf:
--	echo "***"
--	echo "*** Warning: Tutorial not built"
--	echo "***"
- 
- dist-hook:
- 	echo "***"
---- demos/gtk-demo/Makefile.am.old	2003-06-09 22:58:32.000000000 +0100
-+++ demos/gtk-demo/Makefile.am	2004-03-07 12:25:47.000000000 +0000
-@@ -4,7 +4,7 @@
- 
- ## These should be in the order you want them to appear in the 
- ## demo app, which means alphabetized by demo title, not filename
--demos = @STRIP_BEGIN@	\
-+demos = 	\
- 	appwindow.c	\
- 	button_box.c	\
- 	changedisplay.c	\
-@@ -21,10 +21,9 @@
- 	sizegroup.c	\
- 	stock_browser.c	\
- 	textview.c	\
--	tree_store.c	\
--@STRIP_END@
-+	tree_store.c
- 
--INCLUDES = @STRIP_BEGIN@ \
-+INCLUDES =  \
- 	-DDEMOCODEDIR="\"$(democodedir)\""		\
- 	-I$(top_srcdir) 				\
- 	-I$(top_builddir)/gdk				\
-@@ -33,19 +32,17 @@
- 	-DGDK_DISABLE_DEPRECATED			\
- 	-DGTK_DISABLE_DEPRECATED 			\
- 	@GTK_DEBUG_FLAGS@				\
--	@GTK_DEP_CFLAGS@				\
--@STRIP_END@
-+	@GTK_DEP_CFLAGS@
- 
- DEPS = \
- 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
- 	$(top_builddir)/gdk/@gdktargetlib@ 				\
- 	$(top_builddir)/gtk/@gtktargetlib@
- 
--LDADDS = @STRIP_BEGIN@ 							\
-+LDADDS =  							\
- 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
- 	$(top_builddir)/gdk/@gdktargetlib@        			\
--	$(top_builddir)/gtk/@gtktargetlib@ 				\
--@STRIP_END@
-+	$(top_builddir)/gtk/@gtktargetlib@
- 
- bin_PROGRAMS = gtk-demo
- 
diff --git a/packages/gtk+/gtk+-2.2.4/configure-lossage.patch b/packages/gtk+/gtk+-2.2.4/configure-lossage.patch
deleted file mode 100644
index 04b789675d..0000000000
--- a/packages/gtk+/gtk+-2.2.4/configure-lossage.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure.in~	2003-09-04 18:06:42.000000000 +0100
-+++ configure.in	2004-03-07 12:28:12.000000000 +0000
-@@ -963,7 +963,8 @@
- 
-       AC_MSG_CHECKING([For sufficiently new FreeType (at least 2.0.1)])
-       AC_TRY_COMPILE([
--#include <freetype/freetype.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- #include FT_ERRORS_H
-     ],
- 	             [(void)1;],:,have_freetype=false)
diff --git a/packages/gtk+/gtk+-2.2.4/glib-2.0.m4 b/packages/gtk+/gtk+-2.2.4/glib-2.0.m4
deleted file mode 100644
index 28ccef4a5f..0000000000
--- a/packages/gtk+/gtk+-2.2.4/glib-2.0.m4
+++ /dev/null
@@ -1,212 +0,0 @@
-# Configure paths for GLIB
-# Owen Taylor     1997-2001
-
-dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or 
-dnl gthread is specified in MODULES, pass to pkg-config
-dnl
-AC_DEFUN(AM_PATH_GLIB_2_0,
-[dnl 
-dnl Get the cflags and libraries from pkg-config
-dnl
-AC_ARG_ENABLE(glibtest, [  --disable-glibtest      do not try to compile and run a test GLIB program],
-		    , enable_glibtest=yes)
-
-  pkg_config_args=glib-2.0
-  for module in . $4
-  do
-      case "$module" in
-         gmodule) 
-             pkg_config_args="$pkg_config_args gmodule-2.0"
-         ;;
-         gobject) 
-             pkg_config_args="$pkg_config_args gobject-2.0"
-         ;;
-         gthread) 
-             pkg_config_args="$pkg_config_args gthread-2.0"
-         ;;
-      esac
-  done
-
-  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-
-  no_glib=""
-
-  if test x$PKG_CONFIG != xno ; then
-    if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then
-      :
-    else
-      echo *** pkg-config too old; version 0.7 or better required.
-      no_glib=yes
-      PKG_CONFIG=no
-    fi
-  else
-    no_glib=yes
-  fi
-
-  min_glib_version=ifelse([$1], ,2.0.0,$1)
-  AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
-
-  if test x$PKG_CONFIG != xno ; then
-    ## don't try to run the test against uninstalled libtool libs
-    if $PKG_CONFIG --uninstalled $pkg_config_args; then
-	  echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH"
-	  enable_glibtest=no
-    fi
-
-    if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then
-	  :
-    else
-	  no_glib=yes
-    fi
-  fi
-
-  if test x"$no_glib" = x ; then
-    GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
-    GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
-    GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
-
-    GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
-    GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
-    glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_glibtest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GLIB_CFLAGS"
-      LIBS="$GLIB_LIBS $LIBS"
-dnl
-dnl Now check if the installed GLIB is sufficiently new. (Also sanity
-dnl checks the results of pkg-config to some extent)
-dnl
-      rm -f conf.glibtest
-      AC_TRY_RUN([
-#include <glib.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int 
-main ()
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  system ("touch conf.glibtest");
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = g_strdup("$min_glib_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_glib_version");
-     exit(1);
-   }
-
-  if ((glib_major_version != $glib_config_major_version) ||
-      (glib_minor_version != $glib_config_minor_version) ||
-      (glib_micro_version != $glib_config_micro_version))
-    {
-      printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", 
-             $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
-             glib_major_version, glib_minor_version, glib_micro_version);
-      printf ("*** was found! If pkg-config was correct, then it is best\n");
-      printf ("*** to remove the old version of GLib. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
-      printf("*** to point to the correct configuration files\n");
-    } 
-  else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
-	   (glib_minor_version != GLIB_MINOR_VERSION) ||
-           (glib_micro_version != GLIB_MICRO_VERSION))
-    {
-      printf("*** GLIB header files (version %d.%d.%d) do not match\n",
-	     GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
-      printf("*** library (version %d.%d.%d)\n",
-	     glib_major_version, glib_minor_version, glib_micro_version);
-    }
-  else
-    {
-      if ((glib_major_version > major) ||
-        ((glib_major_version == major) && (glib_minor_version > minor)) ||
-        ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
-               glib_major_version, glib_minor_version, glib_micro_version);
-        printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
-	       major, minor, micro);
-        printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n");
-        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_glib" = x ; then
-     AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version))
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$PKG_CONFIG" = "no" ; then
-       echo "*** A new enough version of pkg-config was not found."
-       echo "*** See http://www.freedesktop.org/software/pkgconfig/"
-     else
-       if test -f conf.glibtest ; then
-        :
-       else
-          echo "*** Could not run GLIB test program, checking why..."
-          ac_save_CFLAGS="$CFLAGS"
-          ac_save_LIBS="$LIBS"
-          CFLAGS="$CFLAGS $GLIB_CFLAGS"
-          LIBS="$LIBS $GLIB_LIBS"
-          AC_TRY_LINK([
-#include <glib.h>
-#include <stdio.h>
-],      [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding GLIB or finding the wrong"
-          echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means GLIB is incorrectly installed."])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GLIB_CFLAGS=""
-     GLIB_LIBS=""
-     GLIB_GENMARSHAL=""
-     GOBJECT_QUERY=""
-     GLIB_MKENUMS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(GLIB_CFLAGS)
-  AC_SUBST(GLIB_LIBS)
-  AC_SUBST(GLIB_GENMARSHAL)
-  AC_SUBST(GOBJECT_QUERY)
-  AC_SUBST(GLIB_MKENUMS)
-  rm -f conf.glibtest
-])
diff --git a/packages/gtk+/gtk+-2.2.4/glib-gettext.m4 b/packages/gtk+/gtk+-2.2.4/glib-gettext.m4
deleted file mode 100644
index 862db40a93..0000000000
--- a/packages/gtk+/gtk+-2.2.4/glib-gettext.m4
+++ /dev/null
@@ -1,380 +0,0 @@
-# Copyright (C) 1995-2002 Free Software Foundation, Inc.
-# Copyright (C) 2001-2003 Red Hat, Inc.
-#
-# This file is free software, distributed under the terms of the GNU
-# General Public License.  As a special exception to the GNU General
-# Public License, this file may be distributed as part of a program
-# that contains a configuration script generated by Autoconf, under
-# the same distribution terms as the rest of that program.
-#
-# This file can be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-#
-# Macro to add for using GNU gettext.
-# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996
-#
-# Modified to never use included libintl. 
-# Owen Taylor <otaylor@redhat.com>, 12/15/1998
-#
-# Major rework to remove unused code
-# Owen Taylor <otaylor@redhat.com>, 12/11/2002
-#
-# Added better handling of ALL_LINGUAS from GNU gettext version 
-# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
-
-#
-# We need this here as well, since someone might use autoconf-2.5x
-# to configure GLib then an older version to configure a package
-# using AM_GLIB_GNU_GETTEXT
-AC_PREREQ(2.53)
-
-dnl
-dnl We go to great lengths to make sure that aclocal won't 
-dnl try to pull in the installed version of these macros
-dnl when running aclocal in the glib directory.
-dnl
-m4_copy([AC_DEFUN],[glib_DEFUN])
-m4_copy([AC_REQUIRE],[glib_REQUIRE])
-dnl
-dnl At the end, if we're not within glib, we'll define the public
-dnl definitions in terms of our private definitions.
-dnl
-
-# GLIB_LC_MESSAGES
-#--------------------
-glib_DEFUN([GLIB_LC_MESSAGES],
-  [AC_CHECK_HEADERS([locale.h])
-    if test $ac_cv_header_locale_h = yes; then
-    AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
-      [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-    if test $am_cv_val_LC_MESSAGES = yes; then
-      AC_DEFINE(HAVE_LC_MESSAGES, 1,
-        [Define if your <locale.h> file defines LC_MESSAGES.])
-    fi
-  fi])
-
-# GLIB_PATH_PROG_WITH_TEST
-#----------------------------
-dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
-[# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=[$]2
-AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL(ac_cv_path_$1,
-[case "[$]$1" in
-  /*)
-  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in ifelse([$5], , $PATH, [$5]); do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if [$3]; then
-	ac_cv_path_$1="$ac_dir/$ac_word"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-])dnl
-  ;;
-esac])dnl
-$1="$ac_cv_path_$1"
-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
-  AC_MSG_RESULT([$]$1)
-else
-  AC_MSG_RESULT(no)
-fi
-AC_SUBST($1)dnl
-])
-
-# GLIB_WITH_NLS
-#-----------------
-glib_DEFUN([GLIB_WITH_NLS],
-  dnl NLS is obligatory
-  [USE_NLS=yes
-    AC_SUBST(USE_NLS)
-
-    gt_cv_have_gettext=no
-
-    CATOBJEXT=NONE
-    XGETTEXT=:
-    INTLLIBS=
-
-    AC_CHECK_HEADER(libintl.h,
-     [gt_cv_func_dgettext_libintl="no"
-      libintl_extra_libs=""
-
-      #
-      # First check in libc
-      #
-      AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
-        [AC_TRY_LINK([
-#include <libintl.h>
-],
-          [return (int) dgettext ("","")],
-	  gt_cv_func_dgettext_libc=yes,
-          gt_cv_func_dgettext_libc=no)
-        ])
-  
-      if test "$gt_cv_func_dgettext_libc" = "yes" ; then
-        AC_CHECK_FUNCS(bind_textdomain_codeset)
-      fi
-
-      #
-      # If we don't have everything we want, check in libintl
-      #
-      if test "$gt_cv_func_dgettext_libc" != "yes" \
-         || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
-        
-        AC_CHECK_LIB(intl, bindtextdomain,
-	    [AC_CHECK_LIB(intl, dgettext,
-		          gt_cv_func_dgettext_libintl=yes)])
-
-	if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
-	  AC_MSG_CHECKING([if -liconv is needed to use gettext])
-	  AC_MSG_RESULT([])
-          AC_CHECK_LIB(intl, dcgettext,
-		       [gt_cv_func_dgettext_libintl=yes
-			libintl_extra_libs=-liconv],
-			:,-liconv)
-        fi
-
-        #
-        # If we found libintl, then check in it for bind_textdomain_codeset();
-        # we'll prefer libc if neither have bind_textdomain_codeset(),
-        # and both have dgettext
-        #
-        if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
-          glib_save_LIBS="$LIBS"
-          LIBS="$LIBS -lintl $libintl_extra_libs"
-          unset ac_cv_func_bind_textdomain_codeset
-          AC_CHECK_FUNCS(bind_textdomain_codeset)
-          LIBS="$glib_save_LIBS"
-
-          if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
-            gt_cv_func_dgettext_libc=no
-          else
-            if test "$gt_cv_func_dgettext_libc" = "yes"; then
-              gt_cv_func_dgettext_libintl=no
-            fi
-          fi
-        fi
-      fi
-
-      if test "$gt_cv_func_dgettext_libc" = "yes" \
-	|| test "$gt_cv_func_dgettext_libintl" = "yes"; then
-        gt_cv_have_gettext=yes
-      fi
-  
-      if test "$gt_cv_func_dgettext_libintl" = "yes"; then
-        INTLLIBS="-lintl $libintl_extra_libs"
-      fi
-  
-      if test "$gt_cv_have_gettext" = "yes"; then
-	AC_DEFINE(HAVE_GETTEXT,1,
-	  [Define if the GNU gettext() function is already present or preinstalled.])
-	GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
-	if test "$MSGFMT" != "no"; then
-          glib_save_LIBS="$LIBS"
-          LIBS="$LIBS $INTLLIBS"
-	  AC_CHECK_FUNCS(dcgettext)
-	  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-	  GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-	    [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-	  AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
-			 return _nl_msg_cat_cntr],
-	    [CATOBJEXT=.gmo 
-             DATADIRNAME=share],
-	    [case $host in
-	    *-*-solaris*)
-	    dnl On Solaris, if bind_textdomain_codeset is in libc,
-	    dnl GNU format message catalog is always supported,
-            dnl since both are added to the libc all together.
-	    dnl Hence, we'd like to go with DATADIRNAME=share and
-	    dnl and CATOBJEXT=.gmo in this case.
-            AC_CHECK_FUNC(bind_textdomain_codeset,
-	      [CATOBJEXT=.gmo 
-               DATADIRNAME=share],
-	      [CATOBJEXT=.mo
-               DATADIRNAME=lib])
-	    ;;
-	    *)
-	    CATOBJEXT=.mo
-            DATADIRNAME=lib
-	    ;;
-	    esac])
-          LIBS="$glib_save_LIBS"
-	  INSTOBJEXT=.mo
-	else
-	  gt_cv_have_gettext=no
-	fi
-      fi
-    ])
-
-    if test "$gt_cv_have_gettext" = "yes" ; then
-      AC_DEFINE(ENABLE_NLS, 1,
-        [always defined to indicate that i18n is enabled])
-    fi
-
-    dnl Test whether we really found GNU xgettext.
-    if test "$XGETTEXT" != ":"; then
-      dnl If it is not GNU xgettext we define it as : so that the
-      dnl Makefiles still can work.
-      if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-        : ;
-      else
-        AC_MSG_RESULT(
-	  [found xgettext program is not GNU xgettext; ignore it])
-        XGETTEXT=":"
-      fi
-    fi
-
-    # We need to process the po/ directory.
-    POSUB=po
-
-    AC_OUTPUT_COMMANDS(
-      [case "$CONFIG_FILES" in *po/Makefile.in*)
-        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
-      esac])
-
-    dnl These rules are solely for the distribution goal.  While doing this
-    dnl we only have to keep exactly one list of the available catalogs
-    dnl in configure.in.
-    for lang in $ALL_LINGUAS; do
-      GMOFILES="$GMOFILES $lang.gmo"
-      POFILES="$POFILES $lang.po"
-    done
-
-    dnl Make all variables we use known to autoconf.
-    AC_SUBST(CATALOGS)
-    AC_SUBST(CATOBJEXT)
-    AC_SUBST(DATADIRNAME)
-    AC_SUBST(GMOFILES)
-    AC_SUBST(INSTOBJEXT)
-    AC_SUBST(INTLLIBS)
-    AC_SUBST(PO_IN_DATADIR_TRUE)
-    AC_SUBST(PO_IN_DATADIR_FALSE)
-    AC_SUBST(POFILES)
-    AC_SUBST(POSUB)
-  ])
-
-# AM_GLIB_GNU_GETTEXT
-# -------------------
-# Do checks necessary for use of gettext. If a suitable implementation 
-# of gettext is found in either in libintl or in the C library,
-# it will set INTLLIBS to the libraries needed for use of gettext
-# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
-# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
-# on various variables needed by the Makefile.in.in installed by 
-# glib-gettextize.
-dnl
-glib_DEFUN(GLIB_GNU_GETTEXT,
-  [AC_REQUIRE([AC_PROG_CC])dnl
-   AC_REQUIRE([AC_HEADER_STDC])dnl
-   
-   GLIB_LC_MESSAGES
-   GLIB_WITH_NLS
-
-   if test "$gt_cv_have_gettext" = "yes"; then
-     if test "x$ALL_LINGUAS" = "x"; then
-       LINGUAS=
-     else
-       AC_MSG_CHECKING(for catalogs to be installed)
-       NEW_LINGUAS=
-       for presentlang in $ALL_LINGUAS; do
-         useit=no
-         if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
-           desiredlanguages="$LINGUAS"
-         else
-           desiredlanguages="$ALL_LINGUAS"
-         fi
-         for desiredlang in $desiredlanguages; do
- 	   # Use the presentlang catalog if desiredlang is
-           #   a. equal to presentlang, or
-           #   b. a variant of presentlang (because in this case,
-           #      presentlang can be used as a fallback for messages
-           #      which are not translated in the desiredlang catalog).
-           case "$desiredlang" in
-             "$presentlang"*) useit=yes;;
-           esac
-         done
-         if test $useit = yes; then
-           NEW_LINGUAS="$NEW_LINGUAS $presentlang"
-         fi
-       done
-       LINGUAS=$NEW_LINGUAS
-       AC_MSG_RESULT($LINGUAS)
-     fi
-
-     dnl Construct list of names of catalog files to be constructed.
-     if test -n "$LINGUAS"; then
-       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
-     fi
-   fi
-
-   dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
-   dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
-   dnl Try to locate is.
-   MKINSTALLDIRS=
-   if test -n "$ac_aux_dir"; then
-     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
-   fi
-   if test -z "$MKINSTALLDIRS"; then
-     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-   fi
-   AC_SUBST(MKINSTALLDIRS)
-
-   dnl Generate list of files to be processed by xgettext which will
-   dnl be included in po/Makefile.
-   test -d po || mkdir po
-   if test "x$srcdir" != "x."; then
-     if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-       posrcprefix="$srcdir/"
-     else
-       posrcprefix="../$srcdir/"
-     fi
-   else
-     posrcprefix="../"
-   fi
-   rm -f po/POTFILES
-   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
-	< $srcdir/po/POTFILES.in > po/POTFILES
-  ])
-
-# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
-# -------------------------------
-# Define VARIABLE to the location where catalog files will
-# be installed by po/Makefile.
-glib_DEFUN(GLIB_DEFINE_LOCALEDIR,
-[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
-glib_save_prefix="$prefix"
-glib_save_exec_prefix="$exec_prefix"
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-test "x$exec_prefix" = xNONE && exec_prefix=$prefix
-if test "x$CATOBJEXT" = "x.mo" ; then
-  localedir=`eval echo "${libdir}/locale"`
-else
-  localedir=`eval echo "${datadir}/locale"`
-fi
-prefix="$glib_save_prefix"
-exec_prefix="$glib_save_exec_prefix"
-AC_DEFINE_UNQUOTED($1, "$localedir",
-  [Define the location where the catalogs will be installed])
-])
-
-dnl
-dnl Now the definitions that aclocal will find
-dnl
-ifdef(glib_configure_in,[],[
-AC_DEFUN(AM_GLIB_GNU_GETTEXT,[GLIB_GNU_GETTEXT($@)])
-AC_DEFUN(AM_GLIB_DEFINE_LOCALEDIR,[GLIB_DEFINE_LOCALEDIR($@)])
-])dnl
diff --git a/packages/gtk+/gtk+-2.2.4/libtool-lossage.patch b/packages/gtk+/gtk+-2.2.4/libtool-lossage.patch
deleted file mode 100644
index d291cbdd69..0000000000
--- a/packages/gtk+/gtk+-2.2.4/libtool-lossage.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.in.orig	2004-03-14 23:30:31.000000000 +0000
-+++ configure.in	2004-03-15 00:00:51.000000000 +0000
-@@ -340,7 +340,7 @@
- AC_MSG_CHECKING([Whether to write dependencies into .pc files])
- case $enable_explicit_deps in
-   auto)
--    deplib_check_method=`(./libtool --config; echo eval echo \\$deplib_check_method) | sh`
-+    deplib_check_method=`($host_alias-libtool --config; echo eval echo \\$deplib_check_method) | sh`
-     if test "X$deplib_check_method" = Xnone || test "x$enable_static" = xyes ; then
-       enable_explicit_deps=yes  
-     else
-@@ -664,7 +664,7 @@
-     dnl Now we check to see if our libtool supports shared lib deps
-     dnl (in a rather ugly way even)
-     if $dynworks; then
--        pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config"
-+        pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} $host_alias-libtool --config"
-         pixbuf_deplibs_check=`$pixbuf_libtool_config | \
-             grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
-             sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
diff --git a/packages/gtk+/gtk+-2.2.4/no-demos.patch b/packages/gtk+/gtk+-2.2.4/no-demos.patch
deleted file mode 100644
index 7a44943d4a..0000000000
--- a/packages/gtk+/gtk+-2.2.4/no-demos.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- gtk+-2.2.4/Makefile.am~no-demos	2003-01-30 22:40:35.000000000 +0100
-+++ gtk+-2.2.4/Makefile.am	2004-03-11 11:49:43.000000000 +0100
-@@ -1,6 +1,6 @@
- ## Makefile.am for GTK+
- 
--SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests contrib
-+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests contrib
- SUBDIRS = po $(SRC_SUBDIRS) docs build m4macros
- 
- # require automake 1.4
diff --git a/packages/gtk+/gtk+-2.2.4/no-xwc.patch b/packages/gtk+/gtk+-2.2.4/no-xwc.patch
deleted file mode 100644
index e1ee5cb5c8..0000000000
--- a/packages/gtk+/gtk+-2.2.4/no-xwc.patch
+++ /dev/null
@@ -1,148 +0,0 @@
---- gdk/x11/gdkdrawable-x11.c~	2003-08-18 17:02:39.000000000 +0100
-+++ gdk/x11/gdkdrawable-x11.c	2004-03-29 21:30:17.000000000 +0100
-@@ -636,12 +636,14 @@
- 			 GDK_GC_GET_XGC (gc), x, y, (XChar2b *) text, text_length / 2);
- 	}
-     }
-+#ifdef HAVE_XWC
-   else if (font->type == GDK_FONT_FONTSET)
-     {
-       XFontSet fontset = (XFontSet) GDK_FONT_XFONT (font);
-       XmbDrawString (xdisplay, impl->xid,
- 		     fontset, GDK_GC_GET_XGC (gc), x, y, text, text_length);
-     }
-+#endif
-   else
-     g_error("undefined font type\n");
- }
-@@ -673,6 +675,7 @@
-                    GDK_GC_GET_XGC (gc), x, y, text_8bit, text_length);
-       g_free (text_8bit);
-     }
-+#ifdef HAVE_XWC
-   else if (font->type == GDK_FONT_FONTSET)
-     {
-       if (sizeof(GdkWChar) == sizeof(wchar_t))
-@@ -693,7 +696,8 @@
- 	  g_free (text_wchar);
- 	}
-     }
-+#endif
-   else
-     g_error("undefined font type\n");
- }
-
---- gdk/x11/gdkim-x11.c~	2002-11-01 00:45:32.000000000 +0000
-+++ gdk/x11/gdkim-x11.c	2004-03-29 21:28:30.000000000 +0100
-@@ -51,6 +51,7 @@
- void
- _gdk_x11_initialize_locale (void)
- {
-+#ifdef HAVE_XWC
-   wchar_t result;
-   gchar *current_locale;
-   static char *last_locale = NULL;
-@@ -96,6 +97,7 @@
-   GDK_NOTE (XIM,
- 	    g_message ("%s multi-byte string functions.", 
- 		       gdk_use_mb ? "Using" : "Not using"));
-+#endif
-   
-   return;
- }
-@@ -139,6 +141,7 @@
- {
-   gchar *mbstr;
- 
-+#ifdef HAVE_XWC
-   if (gdk_use_mb)
-     {
-       GdkDisplay *display = find_a_display ();
-@@ -177,6 +180,7 @@
-       XFree (tpr.value);
-     }
-   else
-+#endif
-     {
-       gint length = 0;
-       gint i;
-@@ -209,6 +213,7 @@
- gint
- gdk_mbstowcs (GdkWChar *dest, const gchar *src, gint dest_max)
- {
-+#ifdef HAVE_XWC
-   if (gdk_use_mb)
-     {
-       GdkDisplay *display = find_a_display ();
-@@ -241,7 +246,8 @@
-       return len_cpy;
-     }
-   else
-+#endif
-     {
-       gint i;
- 
-
---- gdk/x11/gdkfont-x11.c~	2003-03-06 20:17:55.000000000 +0000
-+++ gdk/x11/gdkfont-x11.c	2004-03-29 21:29:40.000000000 +0100
-@@ -594,10 +594,12 @@
- 	  width = XTextWidth16 (xfont, (XChar2b *) text, text_length / 2);
- 	}
-       break;
-+#ifdef HAVE_XWC
-     case GDK_FONT_FONTSET:
-       fontset = (XFontSet) private->xfont;
-       width = XmbTextEscapement (fontset, text, text_length);
-       break;
-+#endif
-     default:
-       width = 0;
-     }
-@@ -647,6 +649,7 @@
-           width = 0;
-         }
-       break;
-+#ifdef HAVE_XWC
-     case GDK_FONT_FONTSET:
-       if (sizeof(GdkWChar) == sizeof(wchar_t))
- 	{
-@@ -664,6 +667,7 @@
- 	  g_free (text_wchar);
- 	}
-       break;
-+#endif
-     default:
-       width = 0;
-     }
-@@ -736,6 +740,7 @@
-       if (descent)
- 	*descent = overall.descent;
-       break;
-+#ifdef HAVE_XWC
-     case GDK_FONT_FONTSET:
-       fontset = (XFontSet) private->xfont;
-       XmbTextExtents (fontset, text, text_length, &ink, &logical);
-@@ -750,6 +755,7 @@
-       if (descent)
- 	*descent = ink.y + ink.height;
-       break;
-+#endif
-     }
- 
- }
-@@ -822,6 +828,7 @@
- 	  *descent = overall.descent;
- 	break;
-       }
-+#ifdef HAVE_XWC
-     case GDK_FONT_FONTSET:
-       fontset = (XFontSet) private->xfont;
- 
-@@ -849,6 +856,7 @@
-       if (descent)
- 	*descent = ink.y + ink.height;
-       break;
-+#endif
-     }
- 
- }
diff --git a/packages/gtk+/gtk+-2.4.13/automake-lossage.patch b/packages/gtk+/gtk+-2.4.13/automake-lossage.patch
deleted file mode 100644
index 0d423ddbb9..0000000000
--- a/packages/gtk+/gtk+-2.4.13/automake-lossage.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- gtk+-2.4.1/docs/tutorial/Makefile.am~	2003-05-06 22:54:20.000000000 +0100
-+++ gtk+-2.4.1/docs/tutorial/Makefile.am	2004-05-08 12:31:41.000000000 +0100
-@@ -52,21 +52,5 @@
- 
- dist-hook: html
- 	cp -Rp $(srcdir)/html $(distdir)
--else
--html:
--	echo "***"
--	echo "*** Warning: Tutorial not built"
--	echo "***"
--
--pdf:
--	echo "***"
--	echo "*** Warning: Tutorial not built"
--	echo "***"
--
--dist-hook:
--	echo "***"
--	echo "*** Warning: Tutorial not built"
--	echo "*** DISTRIBUTION IS INCOMPLETE"
--	echo "***"
- endif
- 
diff --git a/packages/gtk+/gtk+-2.4.13/disable-tooltips.patch b/packages/gtk+/gtk+-2.4.13/disable-tooltips.patch
deleted file mode 100644
index d71d839c3c..0000000000
--- a/packages/gtk+/gtk+-2.4.13/disable-tooltips.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gtk+-2.4.3/gtk/gtktooltips.c.old	2004-07-04 18:52:04.000000000 +0100
-+++ gtk+-2.4.3/gtk/gtktooltips.c	2004-07-04 18:52:08.000000000 +0100
-@@ -118,7 +118,7 @@
-   tooltips->tips_data_list = NULL;
-   
-   tooltips->delay = DEFAULT_DELAY;
--  tooltips->enabled = TRUE;
-+  tooltips->enabled = FALSE;
-   tooltips->timer_tag = 0;
-   tooltips->use_sticky_delay = FALSE;
-   tooltips->last_popdown.tv_sec = -1;
diff --git a/packages/gtk+/gtk+-2.4.13/gtk+-handhelds.patch b/packages/gtk+/gtk+-2.4.13/gtk+-handhelds.patch
deleted file mode 100644
index 20481f059b..0000000000
--- a/packages/gtk+/gtk+-2.4.13/gtk+-handhelds.patch
+++ /dev/null
@@ -1,236 +0,0 @@
---- gtk+-2.4.1/gtk/gtkarrow.c	2004-03-13 09:51:13.000000000 +1100
-+++ gtk+-2.4.1/gtk/gtkarrow.c	2004-05-26 14:52:17.000000000 +1000
-@@ -29,7 +29,7 @@
- #include "gtkarrow.h"
- #include "gtkintl.h"
- 
--#define MIN_ARROW_SIZE  15
-+#define MIN_ARROW_SIZE  7
- 
- enum {
-   PROP_0,
-@@ -53,6 +53,8 @@
- 				    guint            prop_id,
- 				    GValue          *value,
- 				    GParamSpec      *pspec);
-+static void gtk_arrow_size_request (GtkWidget *arrow, 
-+				    GtkRequisition *requisition);
- 
- GType
- gtk_arrow_get_type (void)
-@@ -111,6 +113,7 @@
-                                                       G_PARAM_READABLE | G_PARAM_WRITABLE));
-   
-   widget_class->expose_event = gtk_arrow_expose;
-+  widget_class->size_request = gtk_arrow_size_request;
- }
- 
- static void
-@@ -166,13 +169,18 @@
- }
- 
- static void
-+gtk_arrow_size_request (GtkWidget *arrow, 
-+			GtkRequisition *requisition)
-+{
-+  requisition->width = MIN_ARROW_SIZE + GTK_MISC (arrow)->xpad * 2;
-+  requisition->height = MIN_ARROW_SIZE + GTK_MISC (arrow)->ypad * 2;
-+}
-+
-+static void
- gtk_arrow_init (GtkArrow *arrow)
- {
-   GTK_WIDGET_SET_FLAGS (arrow, GTK_NO_WINDOW);
- 
--  GTK_WIDGET (arrow)->requisition.width = MIN_ARROW_SIZE + GTK_MISC (arrow)->xpad * 2;
--  GTK_WIDGET (arrow)->requisition.height = MIN_ARROW_SIZE + GTK_MISC (arrow)->ypad * 2;
--
-   arrow->arrow_type = GTK_ARROW_RIGHT;
-   arrow->shadow_type = GTK_SHADOW_OUT;
- }
---- gtk+-2.4.1/gtk/gtkcalendar.c	2004-03-06 14:37:26.000000000 +1100
-+++ gtk+-2.4.1/gtk/gtkcalendar.c	2004-05-26 14:58:57.000000000 +1000
-@@ -340,6 +340,9 @@
- static void gtk_calendar_select_and_focus_day (GtkCalendar *calendar,
- 					       guint        day);
- 
-+static void gtk_calendar_do_select_day (GtkCalendar *calendar,
-+					guint	      day);
-+
- static void gtk_calendar_paint_arrow	(GtkWidget    *widget,
- 					 guint	       arrow);
- static void gtk_calendar_paint_day_num	(GtkWidget    *widget,
-@@ -861,13 +864,13 @@
-   if (month_len < calendar->selected_day)
-     {
-       calendar->selected_day = 0;
--      gtk_calendar_select_day (calendar, month_len);
-+      gtk_calendar_do_select_day (calendar, month_len);
-     }
-   else
-     {
-       if (calendar->selected_day < 0)
- 	calendar->selected_day = calendar->selected_day + 1 + month_length[leap (calendar->year)][calendar->month + 1];
--      gtk_calendar_select_day (calendar, calendar->selected_day);
-+      gtk_calendar_do_select_day (calendar, calendar->selected_day);
-     }
- 
-   gtk_widget_queue_draw (GTK_WIDGET (calendar));
-@@ -908,10 +911,10 @@
-   if (month_len < calendar->selected_day)
-     {
-       calendar->selected_day = 0;
--      gtk_calendar_select_day (calendar, month_len);
-+      gtk_calendar_do_select_day (calendar, month_len);
-     }
-   else
--    gtk_calendar_select_day (calendar, calendar->selected_day);
-+    gtk_calendar_do_select_day (calendar, calendar->selected_day);
- 
-   gtk_widget_queue_draw (GTK_WIDGET (calendar));
-   gtk_calendar_thaw (calendar);
-@@ -939,10 +942,10 @@
-   if (month_len < calendar->selected_day)
-     {
-       calendar->selected_day = 0;
--      gtk_calendar_select_day (calendar, month_len);
-+      gtk_calendar_do_select_day (calendar, month_len);
-     }
-   else
--    gtk_calendar_select_day (calendar, calendar->selected_day);
-+    gtk_calendar_do_select_day (calendar, calendar->selected_day);
-   
-   gtk_widget_queue_draw (GTK_WIDGET (calendar));
-   gtk_calendar_thaw (calendar);
-@@ -974,10 +977,10 @@
-   if (month_len < calendar->selected_day)
-     {
-       calendar->selected_day = 0;
--      gtk_calendar_select_day (calendar, month_len);
-+      gtk_calendar_do_select_day (calendar, month_len);
-     }
-   else
--    gtk_calendar_select_day (calendar, calendar->selected_day);
-+    gtk_calendar_do_select_day (calendar, calendar->selected_day);
-   
-   gtk_widget_queue_draw (GTK_WIDGET (calendar));
-   gtk_calendar_thaw (calendar);
-@@ -2480,9 +2483,9 @@
-   return TRUE;
- }
- 
--void
--gtk_calendar_select_day (GtkCalendar *calendar,
--			 guint	      day)
-+static void
-+gtk_calendar_do_select_day (GtkCalendar *calendar,
-+			    guint	      day)
- {
-   g_return_if_fail (GTK_IS_CALENDAR (calendar));
-   g_return_if_fail (day <= 31);
-@@ -2499,6 +2502,13 @@
-       if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (calendar)))
- 	gtk_calendar_paint_day_num (GTK_WIDGET (calendar), selected_day);
-     }
-+}
-+
-+void
-+gtk_calendar_select_day (GtkCalendar *calendar,
-+			 guint	      day)
-+{
-+  gtk_calendar_do_select_day (calendar, day);
-   
-   calendar->selected_day = day;
-   
---- gtk+-2.4.1/gtk/gtkentry.c	2004-04-22 08:08:08.000000000 +1000
-+++ gtk+-2.4.1/gtk/gtkentry.c	2004-05-26 14:52:17.000000000 +1000
-@@ -557,6 +557,15 @@
- 						       0.0,
- 						       G_PARAM_READABLE | G_PARAM_WRITABLE));
-   
-+  gtk_widget_class_install_style_property (widget_class,
-+					   g_param_spec_int ("min_width",
-+                                                             _("Minimum width"),
-+                                                             _("Minimum width of the entry field"),
-+                                                             0,
-+                                                             G_MAXINT,
-+                                                             MIN_ENTRY_WIDTH,
-+                                                             G_PARAM_READABLE));
-+
-   signals[POPULATE_POPUP] =
-     g_signal_new ("populate_popup",
- 		  G_OBJECT_CLASS_TYPE (gobject_class),
-@@ -1124,7 +1133,7 @@
- {
-   GtkEntry *entry = GTK_ENTRY (widget);
-   PangoFontMetrics *metrics;
--  gint xborder, yborder;
-+  gint xborder, yborder, min_width;
-   PangoContext *context;
-   
-   gtk_widget_ensure_style (widget);
-@@ -1140,9 +1149,11 @@
-   
-   xborder += INNER_BORDER;
-   yborder += INNER_BORDER;
--  
-+
-+  gtk_widget_style_get (widget, "min_width", &min_width, NULL);
-+
-   if (entry->width_chars < 0)
--    requisition->width = MIN_ENTRY_WIDTH + xborder * 2;
-+    requisition->width = min_width + xborder * 2;
-   else
-     {
-       gint char_width = pango_font_metrics_get_approximate_char_width (metrics);
---- gtk+-2.4.1/gtk/gtkrange.c	2004-03-06 14:38:08.000000000 +1100
-+++ gtk+-2.4.1/gtk/gtkrange.c	2004-05-26 14:52:17.000000000 +1000
-@@ -180,6 +180,7 @@
- static GtkWidgetClass *parent_class = NULL;
- static guint signals[LAST_SIGNAL];
- 
-+static GdkAtom recognize_protocols_atom, atom_atom;
- 
- GType
- gtk_range_get_type (void)
-@@ -220,6 +221,9 @@
-   object_class = (GtkObjectClass*) class;
-   widget_class = (GtkWidgetClass*) class;
- 
-+  recognize_protocols_atom = gdk_atom_intern ("RECOGNIZE_PROTOCOLS", FALSE);
-+  atom_atom = gdk_atom_intern ("ATOM", FALSE);
-+
-   parent_class = g_type_class_peek_parent (class);
- 
-   gobject_class->set_property = gtk_range_set_property;
-@@ -815,6 +819,12 @@
- 					&attributes, attributes_mask);
-   gdk_window_set_user_data (range->event_window, range);
- 
-+  gdk_property_change (range->event_window,
-+		       recognize_protocols_atom,
-+		       atom_atom,
-+		       32, GDK_PROP_MODE_REPLACE,
-+		       NULL, 0);
-+
-   widget->style = gtk_style_attach (widget->style, widget->window);
- }
- 
-@@ -1186,7 +1196,7 @@
- 
-   /* ignore presses when we're already doing something else. */
-   if (range->layout->grab_location != MOUSE_OUTSIDE)
--    return FALSE;
-+    return TRUE;
- 
-   range->layout->mouse_x = event->x;
-   range->layout->mouse_y = event->y;
-@@ -1364,7 +1374,7 @@
-       return TRUE;
-     }
- 
--  return FALSE;
-+  return TRUE;
- }
- 
- /**
diff --git a/packages/gtk+/gtk+-2.4.13/gtk-doc.m4 b/packages/gtk+/gtk+-2.4.13/gtk-doc.m4
deleted file mode 100644
index 3ec41666b2..0000000000
--- a/packages/gtk+/gtk+-2.4.13/gtk-doc.m4
+++ /dev/null
@@ -1,53 +0,0 @@
-dnl -*- mode: autoconf -*-
-
-# serial 1
-
-dnl Usage:
-dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
-AC_DEFUN([GTK_DOC_CHECK],
-[
-  AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
-  AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
-  dnl for overriding the documentation installation directory
-  AC_ARG_WITH(html-dir,
-    AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
-    [with_html_dir='${datadir}/gtk-doc/html'])
-  HTML_DIR="$with_html_dir"
-  AC_SUBST(HTML_DIR)
-
-  dnl enable/disable documentation building
-  AC_ARG_ENABLE(gtk-doc,
-    AC_HELP_STRING([--enable-gtk-doc],
-                   [use gtk-doc to build documentation [default=no]]),,
-    enable_gtk_doc=no)
-
-  have_gtk_doc=no
-  if test -z "$PKG_CONFIG"; then
-    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-  fi
-  if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
-    have_gtk_doc=yes
-  fi
-
-  dnl do we want to do a version check?
-ifelse([$1],[],,
-  [gtk_doc_min_version=$1
-  if test "$have_gtk_doc" = yes; then
-    AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
-    if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then
-      AC_MSG_RESULT(yes)
-    else
-      AC_MSG_RESULT(no)
-      have_gtk_doc=no
-    fi
-  fi
-])
-  if test x$enable_gtk_doc = xyes; then
-    if test "$have_gtk_doc" != yes; then
-      enable_gtk_doc=no
-    fi
-  fi
-
-  AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
-  AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL")
-])
diff --git a/packages/gtk+/gtk+-2.4.13/gtklabel-resize-patch b/packages/gtk+/gtk+-2.4.13/gtklabel-resize-patch
deleted file mode 100644
index df29656343..0000000000
--- a/packages/gtk+/gtk+-2.4.13/gtklabel-resize-patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gtk+-2.4.3/gtk/gtklabel.c~	2004-06-11 13:50:34.000000000 +0100
-+++ gtk+-2.4.3/gtk/gtklabel.c	2004-07-05 13:33:57.000000000 +0100
-@@ -1623,6 +1623,7 @@
- 
-   /* We have to clear the layout, fonts etc. may have changed */
-   gtk_label_clear_layout (label);
-+  gtk_widget_queue_resize (GTK_WIDGET (label));
- }
- 
- static void 
diff --git a/packages/gtk+/gtk+-2.4.13/hardcoded_libtool.patch b/packages/gtk+/gtk+-2.4.13/hardcoded_libtool.patch
deleted file mode 100644
index 9da8dd8cf1..0000000000
--- a/packages/gtk+/gtk+-2.4.13/hardcoded_libtool.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- gtk+-2.4.1/configure.in	2004-05-01 02:02:06.000000000 +1000
-+++ gtk+-2.4.1/configure.in	2004-06-03 13:26:41.000000000 +1000
-@@ -350,7 +350,7 @@
- AC_MSG_CHECKING([Whether to write dependencies into .pc files])
- case $enable_explicit_deps in
-   auto)
--    deplib_check_method=`(./libtool --config; echo eval echo \\$deplib_check_method) | sh`
-+    deplib_check_method=`($host_alias-libtool --config; echo eval echo \\$deplib_check_method) | sh`
-     if test "X$deplib_check_method" = Xnone || test "x$enable_static" = xyes ; then
-       enable_explicit_deps=yes  
-     else
-@@ -669,7 +669,7 @@
-     dnl Now we check to see if our libtool supports shared lib deps
-     dnl (in a rather ugly way even)
-     if $dynworks; then
--        pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config"
-+        pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh}  $host_alias-libtool --config"
-         pixbuf_deplibs_check=`$pixbuf_libtool_config | \
-             grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
-             sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
-@@ -1441,7 +1441,7 @@
- #  export list from -export-symbols-regex is ignored and everything
- #  is exported
- #	
--export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
-+export_dynamic=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
- if test -n "$export_dynamic"; then
-   GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"`
-   GDK_PIXBUF_XLIB_DEP_LIBS=`echo $GDK_PIXBUF_XLIB_DEP_LIBS | sed -e "s/$export_dynamic//"`
diff --git a/packages/gtk+/gtk+-2.4.13/menu-deactivate.patch b/packages/gtk+/gtk+-2.4.13/menu-deactivate.patch
deleted file mode 100644
index 29e665fbf3..0000000000
--- a/packages/gtk+/gtk+-2.4.13/menu-deactivate.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- gtk+-2.4.4/gtk/gtkmenushell.c.old	Thu Aug 26 23:45:28 2004
-+++ gtk+-2.4.4/gtk/gtkmenushell.c	Fri Aug 27 00:13:33 2004
-@@ -37,7 +37,7 @@
- #include "gtktearoffmenuitem.h"
- #include "gtkwindow.h"
- 
--#define MENU_SHELL_TIMEOUT   500
-+#define MENU_SHELL_TIMEOUT   2000
- 
- enum {
-   DEACTIVATE,
-@@ -156,6 +156,7 @@
- static GtkContainerClass *parent_class = NULL;
- static guint menu_shell_signals[LAST_SIGNAL] = { 0 };
- 
-+static int last_crossing_time;
- 
- GType
- gtk_menu_shell_get_type (void)
-@@ -418,6 +419,7 @@
-       gtk_grab_add (GTK_WIDGET (menu_shell));
-       menu_shell->have_grab = TRUE;
-       menu_shell->active = TRUE;
-+      last_crossing_time = 0;
-     }
- }
- 
-@@ -545,6 +547,13 @@
- 	  menu_shell->activate_time = 0;
- 	  deactivate = FALSE;
- 	}
-+
-+      if (last_crossing_time != 0
-+	  && ((event->time - last_crossing_time) < 500))
-+	{
-+	  last_crossing_time = 0;
-+	  deactivate = FALSE;
-+	}
-       
-       if (deactivate)
- 	{
-@@ -597,6 +606,8 @@
-   if (menu_shell->active)
-     {
-       menu_item = gtk_get_event_widget ((GdkEvent*) event);
-+
-+      last_crossing_time = event->time;
- 
-       if (!menu_item ||
- 	  (GTK_IS_MENU_ITEM (menu_item) && 
diff --git a/packages/gtk+/gtk+-2.4.13/no-demos.patch b/packages/gtk+/gtk+-2.4.13/no-demos.patch
deleted file mode 100644
index 2f10a30dda..0000000000
--- a/packages/gtk+/gtk+-2.4.13/no-demos.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gtk+-2.4.1/Makefile.am~	2004-01-17 22:15:56.000000000 +0000
-+++ gtk+-2.4.1/Makefile.am	2004-05-08 12:25:32.000000000 +0100
-@@ -1,6 +1,6 @@
- ## Makefile.am for GTK+
- 
--SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests contrib
-+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests contrib
- SUBDIRS = po po-properties $(SRC_SUBDIRS) docs build m4macros
- 
- # require automake 1.4
diff --git a/packages/gtk+/gtk+-2.4.13/no-xwc.patch b/packages/gtk+/gtk+-2.4.13/no-xwc.patch
deleted file mode 100644
index e1ee5cb5c8..0000000000
--- a/packages/gtk+/gtk+-2.4.13/no-xwc.patch
+++ /dev/null
@@ -1,148 +0,0 @@
---- gdk/x11/gdkdrawable-x11.c~	2003-08-18 17:02:39.000000000 +0100
-+++ gdk/x11/gdkdrawable-x11.c	2004-03-29 21:30:17.000000000 +0100
-@@ -636,12 +636,14 @@
- 			 GDK_GC_GET_XGC (gc), x, y, (XChar2b *) text, text_length / 2);
- 	}
-     }
-+#ifdef HAVE_XWC
-   else if (font->type == GDK_FONT_FONTSET)
-     {
-       XFontSet fontset = (XFontSet) GDK_FONT_XFONT (font);
-       XmbDrawString (xdisplay, impl->xid,
- 		     fontset, GDK_GC_GET_XGC (gc), x, y, text, text_length);
-     }
-+#endif
-   else
-     g_error("undefined font type\n");
- }
-@@ -673,6 +675,7 @@
-                    GDK_GC_GET_XGC (gc), x, y, text_8bit, text_length);
-       g_free (text_8bit);
-     }
-+#ifdef HAVE_XWC
-   else if (font->type == GDK_FONT_FONTSET)
-     {
-       if (sizeof(GdkWChar) == sizeof(wchar_t))
-@@ -693,7 +696,8 @@
- 	  g_free (text_wchar);
- 	}
-     }
-+#endif
-   else
-     g_error("undefined font type\n");
- }
-
---- gdk/x11/gdkim-x11.c~	2002-11-01 00:45:32.000000000 +0000
-+++ gdk/x11/gdkim-x11.c	2004-03-29 21:28:30.000000000 +0100
-@@ -51,6 +51,7 @@
- void
- _gdk_x11_initialize_locale (void)
- {
-+#ifdef HAVE_XWC
-   wchar_t result;
-   gchar *current_locale;
-   static char *last_locale = NULL;
-@@ -96,6 +97,7 @@
-   GDK_NOTE (XIM,
- 	    g_message ("%s multi-byte string functions.", 
- 		       gdk_use_mb ? "Using" : "Not using"));
-+#endif
-   
-   return;
- }
-@@ -139,6 +141,7 @@
- {
-   gchar *mbstr;
- 
-+#ifdef HAVE_XWC
-   if (gdk_use_mb)
-     {
-       GdkDisplay *display = find_a_display ();
-@@ -177,6 +180,7 @@
-       XFree (tpr.value);
-     }
-   else
-+#endif
-     {
-       gint length = 0;
-       gint i;
-@@ -209,6 +213,7 @@
- gint
- gdk_mbstowcs (GdkWChar *dest, const gchar *src, gint dest_max)
- {
-+#ifdef HAVE_XWC
-   if (gdk_use_mb)
-     {
-       GdkDisplay *display = find_a_display ();
-@@ -241,7 +246,8 @@
-       return len_cpy;
-     }
-   else
-+#endif
-     {
-       gint i;
- 
-
---- gdk/x11/gdkfont-x11.c~	2003-03-06 20:17:55.000000000 +0000
-+++ gdk/x11/gdkfont-x11.c	2004-03-29 21:29:40.000000000 +0100
-@@ -594,10 +594,12 @@
- 	  width = XTextWidth16 (xfont, (XChar2b *) text, text_length / 2);
- 	}
-       break;
-+#ifdef HAVE_XWC
-     case GDK_FONT_FONTSET:
-       fontset = (XFontSet) private->xfont;
-       width = XmbTextEscapement (fontset, text, text_length);
-       break;
-+#endif
-     default:
-       width = 0;
-     }
-@@ -647,6 +649,7 @@
-           width = 0;
-         }
-       break;
-+#ifdef HAVE_XWC
-     case GDK_FONT_FONTSET:
-       if (sizeof(GdkWChar) == sizeof(wchar_t))
- 	{
-@@ -664,6 +667,7 @@
- 	  g_free (text_wchar);
- 	}
-       break;
-+#endif
-     default:
-       width = 0;
-     }
-@@ -736,6 +740,7 @@
-       if (descent)
- 	*descent = overall.descent;
-       break;
-+#ifdef HAVE_XWC
-     case GDK_FONT_FONTSET:
-       fontset = (XFontSet) private->xfont;
-       XmbTextExtents (fontset, text, text_length, &ink, &logical);
-@@ -750,6 +755,7 @@
-       if (descent)
- 	*descent = ink.y + ink.height;
-       break;
-+#endif
-     }
- 
- }
-@@ -822,6 +828,7 @@
- 	  *descent = overall.descent;
- 	break;
-       }
-+#ifdef HAVE_XWC
-     case GDK_FONT_FONTSET:
-       fontset = (XFontSet) private->xfont;
- 
-@@ -849,6 +856,7 @@
-       if (descent)
- 	*descent = ink.y + ink.height;
-       break;
-+#endif
-     }
- 
- }
diff --git a/packages/gtk+/gtk+-2.4.13/scroll-timings.patch b/packages/gtk+/gtk+-2.4.13/scroll-timings.patch
deleted file mode 100644
index a38b21dcc2..0000000000
--- a/packages/gtk+/gtk+-2.4.13/scroll-timings.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- gtk+-2.4.4/gtk/gtkrange.c~	2004-08-23 01:50:22.000000000 +0100
-+++ gtk+-2.4.4/gtk/gtkrange.c	2004-08-27 15:48:49.000000000 +0100
-@@ -35,9 +35,9 @@
- #include "gtkintl.h"
- #include "gtkscrollbar.h"
- 
--#define SCROLL_INITIAL_DELAY 250  /* must hold button this long before ... */
--#define SCROLL_LATER_DELAY   100  /* ... it starts repeating at this rate  */
--#define UPDATE_DELAY         300  /* Delay for queued update */
-+#define SCROLL_INITIAL_DELAY 500  /* must hold button this long before ... */
-+#define SCROLL_LATER_DELAY   200  /* ... it starts repeating at this rate  */
-+#define UPDATE_DELAY         1000  /* Delay for queued update */
- 
- enum {
-   PROP_0,
diff --git a/packages/gtk+/gtk+-2.4.13/single-click.patch b/packages/gtk+/gtk+-2.4.13/single-click.patch
deleted file mode 100644
index 21adb9b7b0..0000000000
--- a/packages/gtk+/gtk+-2.4.13/single-click.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -urNd ../gtk+-2.4.4-r7/gtk+-2.4.4/gtk/gtkcalendar.c gtk+-2.4.4/gtk/gtkcalendar.c
---- ../gtk+-2.4.4-r7/gtk+-2.4.4/gtk/gtkcalendar.c	2004-07-10 05:02:10.000000000 +0100
-+++ gtk+-2.4.4/gtk/gtkcalendar.c	2004-09-18 12:41:28.000000000 +0100
-@@ -1026,9 +1026,8 @@
-       private_data->drag_start_y = y;
- 
-       gtk_calendar_select_and_focus_day (calendar, day);
--    }
--  else if (event->type == GDK_2BUTTON_PRESS)
--    {
-+
-+	  // Double-click action follows
-       private_data->in_drag = 0;
-       if (day_month == MONTH_CURRENT)
- 	g_signal_emit (calendar,
-diff -urNd ../gtk+-2.4.4-r7/gtk+-2.4.4/gtk/gtktreeview.c gtk+-2.4.4/gtk/gtktreeview.c
---- ../gtk+-2.4.4-r7/gtk+-2.4.4/gtk/gtktreeview.c	2004-07-10 05:02:11.000000000 +0100
-+++ gtk+-2.4.4/gtk/gtktreeview.c	2004-09-18 13:49:23.000000000 +0100
-@@ -2180,7 +2180,8 @@
-       tree_view->priv->focus_column = column;
- 
-       /* decide if we edit */
--      if (event->type == GDK_BUTTON_PRESS && event->button == 1 &&
-+      /* Changed from button 1 to 2 so as not to conflict with the single-click activation */
-+      if (event->type == GDK_BUTTON_PRESS && event->button == 2 &&
- 	  !(event->state & gtk_accelerator_get_default_mod_mask ()))
- 	{
- 	  GtkTreePath *anchor;
-@@ -2305,16 +2306,13 @@
-       /* Test if a double click happened on the same row. */
-       if (event->button == 1)
-         {
--          /* We also handle triple clicks here, because a user could have done
--           * a first click and a second double click on different rows.
-+          /* Replaced double/triple click with single-click for PDAs.
-            */
--          if ((event->type == GDK_2BUTTON_PRESS
--               || event->type == GDK_3BUTTON_PRESS)
--              && tree_view->priv->last_button_press)
-+          if (event->type == GDK_BUTTON_PRESS)
-             {
-               GtkTreePath *lsc;
- 
--              lsc = gtk_tree_row_reference_get_path (tree_view->priv->last_button_press);
-+              lsc = gtk_tree_row_reference_get_path (tree_view->priv->cursor);
- 
-               if (lsc)
-                 {
diff --git a/packages/gtk+/gtk+-2.4.13/small-gtkfilesel.patch b/packages/gtk+/gtk+-2.4.13/small-gtkfilesel.patch
deleted file mode 100644
index 20bf4cf366..0000000000
--- a/packages/gtk+/gtk+-2.4.13/small-gtkfilesel.patch
+++ /dev/null
@@ -1,267 +0,0 @@
-diff -urNd ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c gtk+-2.4.4/gtk/gtkfilesel.c
---- ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c	2004-07-10 05:02:10.000000000 +0100
-+++ gtk+-2.4.4/gtk/gtkfilesel.c	2004-09-13 13:40:09.000000000 +0100
-@@ -68,6 +68,7 @@
- #include "gtkprivate.h"
- #include "gtkscrolledwindow.h"
- #include "gtkstock.h"
-+#include "gtksignal.h"
- #include "gtktreeselection.h"
- #include "gtktreeview.h"
- #include "gtkvbox.h"
-@@ -77,6 +78,7 @@
- #include "gtkmessagedialog.h"
- #include "gtkdnd.h"
- #include "gtkeventbox.h"
-+#include "gtkimage.h"
- 
- #undef GTK_DISABLE_DEPRECATED
- #include "gtkoptionmenu.h"
-@@ -245,7 +247,8 @@
- };
- 
- enum {
--  DIR_COLUMN
-+  DIR_COLUMN,
-+  ISFILE_COLUMN
- };
- 
- enum {
-@@ -400,6 +403,12 @@
- 					      GtkTreePath       *path,
- 					      GtkTreeViewColumn *column,
- 					      gpointer           user_data);
-+
-+static void gtk_file_selection_activate (GtkTreeView       *tree_view,
-+					 GtkTreePath       *path,
-+					 GtkTreeViewColumn *column,
-+					 gpointer           user_data);
-+
- static void gtk_file_selection_file_changed  (GtkTreeSelection  *selection,
- 					      gpointer           user_data);
- static void gtk_file_selection_dir_activate  (GtkTreeView       *tree_view,
-@@ -419,6 +428,7 @@
- static void gtk_file_selection_create_dir  (GtkWidget *widget, gpointer data);
- static void gtk_file_selection_delete_file (GtkWidget *widget, gpointer data);
- static void gtk_file_selection_rename_file (GtkWidget *widget, gpointer data);
-+static void gtk_file_selection_style_set (GtkWidget *widget, GtkStyle  *prev_style);
- 
- static void free_selected_names (GPtrArray *names);
- 
-@@ -578,6 +588,23 @@
- 							 G_PARAM_WRITABLE));
-   object_class->destroy = gtk_file_selection_destroy;
-   widget_class->map = gtk_file_selection_map;
-+  widget_class->style_set = gtk_file_selection_style_set;
-+
-+  gtk_widget_class_install_style_property (widget_class,
-+					   g_param_spec_boolean ("show_fileops_default",
-+								 _("Show fileop buttons by default"),
-+								 _("Whether file operation buttons are shown by default"),
-+								 TRUE,
-+								 G_PARAM_READABLE));
-+
-+  gtk_widget_class_install_style_property (widget_class,
-+					   g_param_spec_int ("border_width",
-+                                                             _("Border width"),
-+                                                             _("Width of border around the main dialog area"),
-+                                                             0,
-+                                                             G_MAXINT,
-+                                                             10,
-+                                                             G_PARAM_READABLE));
- }
- 
- static void gtk_file_selection_set_property (GObject         *object,
-@@ -649,7 +676,29 @@
-   gtk_widget_grab_default (widget);
-   return FALSE;
- }
--     
-+
-+static void
-+gtk_file_selection_style_set (GtkWidget *filesel,
-+			      GtkStyle  *prev_style)
-+{     
-+  gboolean show_fileops;
-+  gint border_width;
-+
-+  gtk_widget_style_get (filesel,
-+                        "show_fileops_default",
-+                        &show_fileops,
-+			"border_width",
-+			&border_width,
-+			NULL);
-+
-+  gtk_container_set_border_width (GTK_CONTAINER (filesel), border_width);
-+
-+  if (show_fileops)
-+    gtk_file_selection_show_fileop_buttons (GTK_FILE_SELECTION (filesel));
-+  else
-+    gtk_file_selection_hide_fileop_buttons (GTK_FILE_SELECTION (filesel));
-+}
-+
- static void
- gtk_file_selection_init (GtkFileSelection *filesel)
- {
-@@ -674,17 +723,15 @@
- 
-   /* The dialog-sized vertical box  */
-   filesel->main_vbox = dialog->vbox;
--  gtk_container_set_border_width (GTK_CONTAINER (filesel), 10);
- 
-   /* The horizontal box containing create, rename etc. buttons */
-   filesel->button_area = gtk_hbutton_box_new ();
-   gtk_button_box_set_layout (GTK_BUTTON_BOX (filesel->button_area), GTK_BUTTONBOX_START);
--  gtk_box_set_spacing (GTK_BOX (filesel->button_area), 0);
-   gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->button_area, 
- 		      FALSE, FALSE, 0);
-   gtk_widget_show (filesel->button_area);
-   
--  gtk_file_selection_show_fileop_buttons (filesel);
-+  gtk_file_selection_style_set (GTK_WIDGET (filesel), NULL);
- 
-   /* hbox for pulldown menu */
-   pulldown_hbox = gtk_hbox_new (TRUE, 5);
-@@ -723,25 +770,32 @@
-   
-   /* The directories list */
- 
--  model = gtk_list_store_new (1, G_TYPE_STRING);
-+  model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_BOOLEAN); /* MA */
-   filesel->dir_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model));
-   g_object_unref (model);
- 
--  column = gtk_tree_view_column_new_with_attributes (_("Folders"),
-+  column = gtk_tree_view_column_new_with_attributes (/*_("Folders")*/ NULL,
- 						     gtk_cell_renderer_text_new (),
- 						     "text", DIR_COLUMN,
- 						     NULL);
-   label = gtk_label_new_with_mnemonic (_("Fol_ders"));
-   gtk_label_set_mnemonic_widget (GTK_LABEL (label), filesel->dir_list);
-   gtk_widget_show (label);
--  gtk_tree_view_column_set_widget (column, label);
-+
-+  /* gtk_tree_view_column_set_widget (column, label); */
-+  gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (filesel->dir_list), FALSE);
-+
-   gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
-   gtk_tree_view_append_column (GTK_TREE_VIEW (filesel->dir_list), column);
- 
-   gtk_widget_set_size_request (filesel->dir_list,
- 			       DIR_LIST_WIDTH, DIR_LIST_HEIGHT);
-   g_signal_connect (filesel->dir_list, "row_activated",
--		    G_CALLBACK (gtk_file_selection_dir_activate), filesel);
-+		    G_CALLBACK (gtk_file_selection_activate), filesel);
-+
-+  g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (filesel->dir_list)), "changed",
-+		    G_CALLBACK (gtk_file_selection_file_changed), filesel);
-+
- 
-   /*  gtk_clist_column_titles_passive (GTK_CLIST (filesel->dir_list)); */
- 
-@@ -758,41 +812,6 @@
-   gtk_widget_show (filesel->dir_list);
-   gtk_widget_show (scrolled_win);
- 
--  /* The files list */
--  model = gtk_list_store_new (1, G_TYPE_STRING);
--  filesel->file_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model));
--  g_object_unref (model);
--
--  column = gtk_tree_view_column_new_with_attributes (_("Files"),
--						     gtk_cell_renderer_text_new (),
--						     "text", FILE_COLUMN,
--						     NULL);
--  label = gtk_label_new_with_mnemonic (_("_Files"));
--  gtk_label_set_mnemonic_widget (GTK_LABEL (label), filesel->file_list);
--  gtk_widget_show (label);
--  gtk_tree_view_column_set_widget (column, label);
--  gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
--  gtk_tree_view_append_column (GTK_TREE_VIEW (filesel->file_list), column);
--
--  gtk_widget_set_size_request (filesel->file_list,
--			       FILE_LIST_WIDTH, FILE_LIST_HEIGHT);
--  g_signal_connect (filesel->file_list, "row_activated",
--		    G_CALLBACK (gtk_file_selection_file_activate), filesel);
--  g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (filesel->file_list)), "changed",
--		    G_CALLBACK (gtk_file_selection_file_changed), filesel);
--
--  /* gtk_clist_column_titles_passive (GTK_CLIST (filesel->file_list)); */
--
--  scrolled_win = gtk_scrolled_window_new (NULL, NULL);
--  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_win), GTK_SHADOW_IN);
--  gtk_container_add (GTK_CONTAINER (scrolled_win), filesel->file_list);
--  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
--				  GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
--  gtk_container_set_border_width (GTK_CONTAINER (scrolled_win), 0);
--  gtk_container_add (GTK_CONTAINER (list_container), scrolled_win);
--  gtk_widget_show (filesel->file_list);
--  gtk_widget_show (scrolled_win);
--
-   /* action area for packing buttons into. */
-   filesel->action_area = gtk_hbox_new (TRUE, 0);
-   gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->action_area, 
-@@ -2008,6 +2027,23 @@
- }
- 
- static void
-+gtk_file_selection_activate (GtkTreeView       *tree_view,
-+			     GtkTreePath       *path,
-+			     GtkTreeViewColumn *column,
-+			     gpointer           user_data)
-+{
-+  GtkTreeModel *model = gtk_tree_view_get_model (tree_view);
-+  GtkTreeIter iter;  
-+  gboolean is_file;
-+
-+  gtk_tree_model_get_iter (model, &iter, path);
-+  gtk_tree_model_get (model, &iter, ISFILE_COLUMN, &is_file, -1);
-+
-+  if (! is_file)
-+    gtk_file_selection_dir_activate (tree_view, path, column, user_data);
-+}
-+
-+static void
- gtk_file_selection_file_activate (GtkTreeView       *tree_view,
- 				  GtkTreePath       *path,
- 				  GtkTreeViewColumn *column,
-@@ -2103,7 +2139,6 @@
-   PossibleCompletion* poss;
-   GtkTreeIter iter;
-   GtkListStore *dir_model;
--  GtkListStore *file_model;
-   gchar* filename;
-   gchar* rem_path = rel_path;
-   gchar* sel_text;
-@@ -2125,10 +2160,8 @@
-   g_assert (cmpl_state->reference_dir);
- 
-   dir_model = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (fs->dir_list)));
--  file_model = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (fs->file_list)));
- 
-   gtk_list_store_clear (dir_model);
--  gtk_list_store_clear (file_model);
- 
-   /* Set the dir list to include ./ and ../ */
-   gtk_list_store_append (dir_model, &iter);
-@@ -2150,13 +2183,17 @@
-                   strcmp (filename, ".." G_DIR_SEPARATOR_S) != 0)
- 		{
- 		  gtk_list_store_append (dir_model, &iter);
--		  gtk_list_store_set (dir_model, &iter, DIR_COLUMN, filename, -1);
-+		  gtk_list_store_set (dir_model, &iter, 
-+				      DIR_COLUMN, filename, 
-+				      ISFILE_COLUMN, FALSE, -1);
- 		}
- 	    }
-           else
- 	    {
--	      gtk_list_store_append (file_model, &iter);
--	      gtk_list_store_set (file_model, &iter, DIR_COLUMN, filename, -1);
-+	      gtk_list_store_append (dir_model, &iter);
-+	      gtk_list_store_set (dir_model, &iter, 
-+				  DIR_COLUMN, filename, 
-+				  ISFILE_COLUMN, TRUE, -1);
-             }
- 	}
- 
diff --git a/packages/gtk+/gtk+-2.4.13/spinbutton.patch b/packages/gtk+/gtk+-2.4.13/spinbutton.patch
deleted file mode 100644
index 8ad7507af0..0000000000
--- a/packages/gtk+/gtk+-2.4.13/spinbutton.patch
+++ /dev/null
@@ -1,128 +0,0 @@
---- gtk+-2.4.3/gtk/gtkspinbutton.c.old	2004-04-22 14:49:27.000000000 +0100
-+++ gtk+-2.4.3/gtk/gtkspinbutton.c	2004-06-30 21:48:18.000000000 +0100
-@@ -733,7 +733,7 @@
- 
-   spin = GTK_SPIN_BUTTON (widget);
-   arrow_size = spin_button_get_arrow_size (spin);
--  panel_width = arrow_size + 2 * widget->style->xthickness;
-+  panel_width = (2 * arrow_size) + 4 * widget->style->xthickness;
-   
-   widget->allocation = *allocation;
-   
-@@ -866,19 +866,16 @@
-     {
-       width = spin_button_get_arrow_size (spin_button) + 2 * widget->style->xthickness;
- 
-+      y = widget->style->ythickness;
-+      height = widget->requisition.height - (2 * y);
-+
-       if (arrow_type == GTK_ARROW_UP)
- 	{
- 	  x = 0;
--	  y = 0;
--
--	  height = widget->requisition.height / 2;
- 	}
-       else
- 	{
--	  x = 0;
--	  y = widget->requisition.height / 2;
--
--	  height = (widget->requisition.height + 1) / 2;
-+	  x = width;
- 	}
- 
-       if (spin_button_at_limit (spin_button, arrow_type))
-@@ -908,32 +905,17 @@
- 	      shadow_type = GTK_SHADOW_OUT;
- 	    }
- 	}
--      
-+
-       gtk_paint_box (widget->style, spin_button->panel,
- 		     state_type, shadow_type,
- 		     NULL, widget,
--		     (arrow_type == GTK_ARROW_UP)? "spinbutton_up" : "spinbutton_down",
-+		     NULL,
- 		     x, y, width, height);
- 
-       height = widget->requisition.height;
- 
--      if (arrow_type == GTK_ARROW_DOWN)
--	{
--	  y = height / 2;
--	  height = height - y - 2;
--	}
--      else
--	{
--	  y = 2;
--	  height = height / 2 - 2;
--	}
--
-       width -= 3;
--
--      if (widget && gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
--	x = 2;
--      else
--	x = 1;
-+      height -= 3;
- 
-       w = width / 2;
-       w -= w % 2 - 1; /* force odd */
-@@ -1108,7 +1090,7 @@
- 	  if (GTK_ENTRY (widget)->editable)
- 	    gtk_spin_button_update (spin);
- 	  
--	  if (event->y <= widget->requisition.height / 2)
-+	  if (event->x <= (spin_button_get_arrow_size (spin) + widget->style->xthickness))
- 	    {
- 	      if (event->button == 1)
- 		start_spinning (spin, GTK_ARROW_UP, spin->adjustment->step_increment);
-@@ -1143,44 +1125,11 @@
- 
-   arrow_size = spin_button_get_arrow_size (spin);
- 
--  if (event->button == spin->button)
--    {
--      int click_child = spin->click_child;
-+  gtk_spin_button_stop_spinning (spin);
- 
--      gtk_spin_button_stop_spinning (spin);
--
--      if (event->button == 3)
--	{
--	  if (event->y >= 0 && event->x >= 0 && 
--	      event->y <= widget->requisition.height &&
--	      event->x <= arrow_size + 2 * widget->style->xthickness)
--	    {
--	      if (click_child == GTK_ARROW_UP &&
--		  event->y <= widget->requisition.height / 2)
--		{
--		  gdouble diff;
--
--		  diff = spin->adjustment->upper - spin->adjustment->value;
--		  if (diff > EPSILON)
--		    gtk_spin_button_real_spin (spin, diff);
--		}
--	      else if (click_child == GTK_ARROW_DOWN &&
--		       event->y > widget->requisition.height / 2)
--		{
--		  gdouble diff;
--
--		  diff = spin->adjustment->value - spin->adjustment->lower;
--		  if (diff > EPSILON)
--		    gtk_spin_button_real_spin (spin, -diff);
--		}
--	    }
--	}		  
--      spin_button_redraw (spin);
-+  spin_button_redraw (spin);
- 
--      return TRUE;
--    }
--  else
--    return GTK_WIDGET_CLASS (parent_class)->button_release_event (widget, event);
-+  return TRUE;
- }
- 
- static gint
diff --git a/packages/gtk+/gtk+-2.4.13/xsettings.patch b/packages/gtk+/gtk+-2.4.13/xsettings.patch
deleted file mode 100644
index b63e262d34..0000000000
--- a/packages/gtk+/gtk+-2.4.13/xsettings.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- gtk+-2.4.4/gdk/x11/gdkevents-x11.c.old	Sun Aug 22 17:14:00 2004
-+++ gtk+-2.4.4/gdk/x11/gdkevents-x11.c	Sun Aug 22 17:14:00 2004
-@@ -2827,10 +2827,9 @@
- {
-   GdkScreenX11 *screen = data;
-   
--  if (xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent))
--    return GDK_FILTER_REMOVE;
--  else
--    return GDK_FILTER_CONTINUE;
-+  xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent);
-+
-+  return GDK_FILTER_CONTINUE;
- }
- 
- static void 
diff --git a/packages/gtk+/gtk+_2.2.4.bb b/packages/gtk+/gtk+_2.2.4.bb
deleted file mode 100644
index eb308edca2..0000000000
--- a/packages/gtk+/gtk+_2.2.4.bb
+++ /dev/null
@@ -1,77 +0,0 @@
-LICENSE = "LGPL"
-DESCRIPTION = "GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \
-set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites."
-HOMEPAGE = "http://www.gtk.org"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "pango atk jpeg libpng libxext"
-
-SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/2.2/gtk+-${PV}.tar.bz2 \
-           http://handhelds.org/packages/gtk-2.0/gtk+-2.2.4.diff.bz2;patch=1;pnum=1 \
-           file://automake-lossage.patch;patch=1;pnum=0 \
-           file://configure-lossage.patch;patch=1;pnum=0 \
-           file://no-demos.patch;patch=1 \
-           file://libtool-lossage.patch;patch=1;pnum=0 \
-           file://no-xwc.patch;patch=1;pnum=0 \
-           file://glib-2.0.m4 \
-           file://glib-gettext.m4"
-
-inherit autotools  pkgconfig
-
-do_configure_prepend() {
-	install -d m4
-	install ${WORKDIR}/glib-2.0.m4 m4/
-	install ${WORKDIR}/glib-gettext.m4 m4/
-}
-
-EXTRA_OECONF = "--without-libtiff --enable-debug=no --disable-cruft"
-
-LIBV = "2.2.0"
-
-gtk_include = "gtk.h gtkaccelgroup.h gtkaccellabel.h gtkaccelmap.h gtkaccessible.h gtkadjustment.h gtkalignment.h gtkarrow.h gtkaspectframe.h gtkbbox.h gtkbin.h gtkbindings.h gtkbox.h gtkbutton.h gtkcalendar.h gtkcelleditable.h gtkcellrenderer.h gtkcellrendererpixbuf.h gtkcellrenderertext.h gtkcellrenderertoggle.h gtkcheckbutton.h gtkcheckmenuitem.h gtkclipboard.h gtkclist.h gtkcolorsel.h gtkcolorseldialog.h gtkcombo.h gtkcontainer.h gtkctree.h gtkcurve.h gtkdebug.h gtkdialog.h gtkdnd.h gtkdrawingarea.h gtkeditable.h gtkentry.h gtkenums.h gtkeventbox.h gtkfilesel.h gtkfixed.h gtkfontsel.h gtkframe.h gtkgamma.h gtkgc.h gtkhandlebox.h gtkhbbox.h gtkhbox.h gtkhpaned.h gtkhruler.h gtkhscale.h gtkhscrollbar.h gtkhseparator.h gtkiconfactory.h gtkimage.h gtkimagemenuitem.h gtkimcontext.h gtkimcontextsimple.h gtkimmodule.h gtkimmulticontext.h gtkinputdialog.h gtkinvisible.h gtkitem.h gtkitemfactory.h gtklabel.h gtklayout.h gtklist.h gtklistitem.h gtkliststore.h gtkmain.h gtkmarshal.h gtkmenu.h gtkmenubar.h gtkmenuitem.h gtkmenushell.h gtkmessagedialog.h gtkmisc.h gtknotebook.h gtkobject.h gtkoldeditable.h gtkoptionmenu.h gtkpaned.h gtkpixmap.h gtkplug.h gtkpreview.h gtkprivate.h gtkprogress.h gtkprogressbar.h gtkradiobutton.h gtkradiomenuitem.h gtkrange.h gtkrc.h gtkruler.h gtkscale.h gtkscrollbar.h gtkscrolledwindow.h gtkselection.h gtkseparator.h gtkseparatormenuitem.h gtksettings.h gtksignal.h gtksizegroup.h gtksocket.h gtkspinbutton.h gtkstatusbar.h gtkstock.h gtkstyle.h gtktable.h gtktearoffmenuitem.h gtktext.h gtktextbuffer.h gtktextchild.h gtktextdisplay.h gtktextiter.h gtktextlayout.h gtktextmark.h gtktexttag.h gtktexttagtable.h gtktextview.h gtktipsquery.h gtktogglebutton.h gtktoolbar.h gtktooltips.h gtktree.h gtktreednd.h gtktreeitem.h gtktreemodel.h gtktreemodelsort.h gtktreeselection.h gtktreesortable.h gtktreestore.h gtktreeview.h gtktreeviewcolumn.h gtktypebuiltins.h gtktypeutils.h gtkvbbox.h gtkvbox.h gtkversion.h gtkviewport.h gtkvpaned.h gtkvruler.h gtkvscale.h gtkvscrollbar.h gtkvseparator.h gtkwidget.h gtkwindow.h"
-gdk_include = "gdk.h gdkcolor.h gdkcursor.h gdkdisplay.h gdkdisplaymanager.h gdkdnd.h gdkdrawable.h gdkenumtypes.h gdkevents.h gdkfont.h gdkgc.h gdki18n.h gdkimage.h gdkinput.h gdkkeys.h gdkkeysyms.h gdkpango.h gdkpixbuf.h gdkpixmap.h gdkprivate.h gdkproperty.h gdkregion.h gdkrgb.h gdkscreen.h gdkselection.h gdktypes.h gdkvisual.h gdkwindow.h x11/gdkx.h"
-gdk_pixbuf_include = "gdk-pixbuf-animation.h gdk-pixbuf-enum-types.h gdk-pixbuf-features.h gdk-pixbuf-io.h gdk-pixbuf-loader.h gdk-pixbuf-marshal.h gdk-pixbuf.h gdk-pixdata.h"
-
-do_stage () {
-	oe_libinstall -so -C gtk libgtk-x11-2.0 ${STAGING_LIBDIR}
-	oe_libinstall -so -C gdk libgdk-x11-2.0 ${STAGING_LIBDIR}
-	oe_libinstall -so -C contrib/gdk-pixbuf-xlib libgdk_pixbuf_xlib-2.0 ${STAGING_LIBDIR}
-	oe_libinstall -so -C gdk-pixbuf libgdk_pixbuf-2.0 ${STAGING_LIBDIR}
-
-	mkdir -p ${STAGING_INCDIR}/gtk-2.0/gtk
-	for i in ${gtk_include}; do
-		install -m 0644 gtk/$i ${STAGING_INCDIR}/gtk-2.0/gtk/$i
-	done
-
-	mkdir -p ${STAGING_INCDIR}/gtk-2.0/gdk
-	for i in ${gdk_include}; do
-		install -m 0644 gdk/$i ${STAGING_INCDIR}/gtk-2.0/gdk/`basename $i`
-	done
-
-	mkdir -p ${STAGING_INCDIR}/gtk-2.0/gdk-pixbuf
-	for i in ${gdk_pixbuf_include}; do
-		install -m 0644 gdk-pixbuf/$i ${STAGING_INCDIR}/gtk-2.0/gdk-pixbuf/$i
-	done
-
-	mkdir -p ${STAGING_LIBDIR}/gtk-2.0/include
-	install -m 0644 gdk/gdkconfig.h ${STAGING_LIBDIR}/gtk-2.0/include/gdkconfig.h
-
-	install -m 0644 m4macros/gtk-2.0.m4 ${STAGING_DATADIR}/aclocal/
-}
-
-do_install_append () {
-	install -d ${D}${sysconfdir}/gtk-2.0
-}
-
-PACKAGES_DYNAMIC = "gdk-pixbuf-loader-* gtk-immodule-*"
-
-python populate_packages_prepend () {
-	import os.path
-
-	gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d)
-	loaders_root = os.path.join(gtk_libdir, 'loaders')
-	immodules_root = os.path.join(gtk_libdir, 'immodules')
-
-	do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders')
-	do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', 'gtk-query-immodules > /etc/gtk-2.0/gtk.immodules')
-}
diff --git a/packages/gtk+/gtk+_2.4.13.bb b/packages/gtk+/gtk+_2.4.13.bb
deleted file mode 100644
index 83f6be1982..0000000000
--- a/packages/gtk+/gtk+_2.4.13.bb
+++ /dev/null
@@ -1,78 +0,0 @@
-LICENSE = "LGPL"
-DESCRIPTION = "GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \
-set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites."
-HOMEPAGE = "http://www.gtk.org"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor"
-PR = "r7"
-
-SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/gtk+-${PV}.tar.bz2 \
-           file://no-demos.patch;patch=1 \
-           file://no-xwc.patch;patch=1;pnum=0 \
-           file://automake-lossage.patch;patch=1 \
-           file://gtk+-handhelds.patch;patch=1 \
-           file://hardcoded_libtool.patch;patch=1 \
-	   file://spinbutton.patch;patch=1 \
-	   file://disable-tooltips.patch;patch=1 \
-	   file://gtklabel-resize-patch;patch=1 \
-	   file://menu-deactivate.patch;patch=1 \
-	   file://xsettings.patch;patch=1 \
-	   file://scroll-timings.patch;patch=1 \
-	   file://gtk-doc.m4 \
-	   file://small-gtkfilesel.patch;patch=1 \
-	   file://single-click.patch;patch=1"
-
-inherit autotools pkgconfig flow-lossage
-
-do_configure_prepend() {
-	install -d m4
-	install ${WORKDIR}/gtk-doc.m4 m4/
-}
-
-FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
-	${bindir}/gtk-query-immodules-2.0 \
-	${libdir}/lib*.so.* \
-	${datadir}/themes ${sysconfdir}"
-FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource"
-
-RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1 ttf-dejavu-sans"
-
-EXTRA_OECONF = "--without-libtiff --disable-xkb"
-# --disable-cruft
-
-LIBV = "2.4.0"
-
-do_stage () {
-	oe_libinstall -so -C gtk libgtk-x11-2.0 ${STAGING_LIBDIR}
-	oe_libinstall -so -C gdk libgdk-x11-2.0 ${STAGING_LIBDIR}
-	oe_libinstall -so -C contrib/gdk-pixbuf-xlib libgdk_pixbuf_xlib-2.0 ${STAGING_LIBDIR}
-	oe_libinstall -so -C gdk-pixbuf libgdk_pixbuf-2.0 ${STAGING_LIBDIR}
-
-	autotools_stage_includes
-
-	mkdir -p ${STAGING_LIBDIR}/gtk-2.0/include
-	install -m 0644 gdk/gdkconfig.h ${STAGING_LIBDIR}/gtk-2.0/include/gdkconfig.h
-
-	install -m 0644 m4macros/gtk-2.0.m4 ${STAGING_DATADIR}/aclocal/
-}
-
-do_install_append () {
-	install -d ${D}${sysconfdir}/gtk-2.0
-}
-
-PACKAGES_DYNAMIC = "gdk-pixbuf-loader-* gtk-immodule-*"
-
-python populate_packages_prepend () {
-	import os.path
-
-	gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d)
-	loaders_root = os.path.join(gtk_libdir, 'loaders')
-	immodules_root = os.path.join(gtk_libdir, 'immodules')
-
-	do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders')
-	do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', 'gtk-query-immodules > /etc/gtk-2.0/gtk.immodules')
-
-        if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
-                bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d)
-}
diff --git a/packages/images/poky-base-image.bb b/packages/images/x11-sato-image.bb
index 0980fc46bf..1204f22496 100644
--- a/packages/images/poky-base-image.bb
+++ b/packages/images/x11-sato-image.bb
@@ -22,7 +22,7 @@ IMAGE_INSTALL = "\
 	settings-daemon \
 "
 
-export IMAGE_BASENAME = "poky-base-image"
+export IMAGE_BASENAME = "${PN}"
 IMAGE_LINGUAS = ""
 
 inherit image
diff --git a/packages/linux/mainstone-kernel/mainstone_defconfig b/packages/linux/mainstone-kernel/mainstone_defconfig
index a1c7d97cf8..41abfbfeac 100644
--- a/packages/linux/mainstone-kernel/mainstone_defconfig
+++ b/packages/linux/mainstone-kernel/mainstone_defconfig
@@ -1,74 +1,113 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.11
-# Sat Mar  5 10:39:38 2005
+# Linux kernel version: 2.6.18
+# Wed Dec 19 15:51:05 2007
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
-CONFIG_UID16=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_IOMAP=y
+CONFIG_ARCH_MTD_XIP=y
+CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
 # Code maturity level options
 #
 CONFIG_EXPERIMENTAL=y
-CONFIG_CLEAN_COMPILE=y
 CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
 
 #
 # General setup
 #
 CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
-CONFIG_SYSCTL=y
+# CONFIG_TASKSTATS is not set
 # CONFIG_AUDIT is not set
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_HOTPLUG=y
-CONFIG_KOBJECT_UEVENT=y
 # CONFIG_IKCONFIG is not set
+# CONFIG_RELAY is not set
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SHMEM=y
-CONFIG_CC_ALIGN_FUNCTIONS=0
-CONFIG_CC_ALIGN_LABELS=0
-CONFIG_CC_ALIGN_LOOPS=0
-CONFIG_CC_ALIGN_JUMPS=0
+CONFIG_SLAB=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+# CONFIG_SLOB is not set
 
 #
 # Loadable module support
 #
 CONFIG_MODULES=y
 # CONFIG_MODULE_UNLOAD is not set
-CONFIG_OBSOLETE_MODPARM=y
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
-# CONFIG_KMOD is not set
+CONFIG_KMOD=y
+
+#
+# Block layer
+#
+# CONFIG_BLK_DEV_IO_TRACE is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_DEFAULT_AS is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
 
 #
 # System Type
 #
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_AT91 is not set
 # CONFIG_ARCH_CLPS7500 is not set
 # CONFIG_ARCH_CLPS711X is not set
 # CONFIG_ARCH_CO285 is not set
 # CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_CAMELOT is not set
+# CONFIG_ARCH_EP93XX is not set
 # CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IMX is not set
 # CONFIG_ARCH_IOP3XX is not set
 # CONFIG_ARCH_IXP4XX is not set
 # CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_IXP23XX is not set
 # CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_PNX4008 is not set
 CONFIG_ARCH_PXA=y
 # CONFIG_ARCH_RPC is not set
 # CONFIG_ARCH_SA1100 is not set
@@ -76,17 +115,16 @@ CONFIG_ARCH_PXA=y
 # CONFIG_ARCH_SHARK is not set
 # CONFIG_ARCH_LH7A40X is not set
 # CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_H720X is not set
 
 #
 # Intel PXA2xx Implementations
 #
 # CONFIG_ARCH_LUBBOCK is not set
+# CONFIG_MACH_LOGICPD_PXA270 is not set
 CONFIG_MACH_MAINSTONE=y
 # CONFIG_ARCH_PXA_IDP is not set
 # CONFIG_PXA_SHARPSL is not set
+# CONFIG_MACH_TRIZEPS4 is not set
 CONFIG_PXA27x=y
 CONFIG_IWMMXT=y
 
@@ -99,7 +137,6 @@ CONFIG_CPU_32v5=y
 CONFIG_CPU_ABRT_EV5T=y
 CONFIG_CPU_CACHE_VIVT=y
 CONFIG_CPU_TLB_V4WBI=y
-CONFIG_CPU_MINICACHE=y
 
 #
 # Processor Features
@@ -108,59 +145,255 @@ CONFIG_CPU_MINICACHE=y
 CONFIG_XSCALE_PMU=y
 
 #
-# General setup
+# Bus support
 #
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-# CONFIG_XIP_KERNEL is not set
 
 #
 # PCCARD (PCMCIA/CardBus) support
 #
-# CONFIG_PCCARD is not set
+CONFIG_PCCARD=m
+# CONFIG_PCMCIA_DEBUG is not set
+CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_PCMCIA_IOCTL=y
 
 #
 # PC-card bridges
 #
+CONFIG_PCMCIA_PXA2XX=m
+
+#
+# Kernel Features
+#
+# CONFIG_PREEMPT is not set
+# CONFIG_NO_IDLE_HZ is not set
+CONFIG_HZ=100
+# CONFIG_AEABI is not set
+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4096
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_LEDS=y
+CONFIG_LEDS_TIMER=y
+CONFIG_LEDS_CPU=y
+CONFIG_ALIGNMENT_TRAP=y
+
+#
+# Boot options
+#
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=jffs2 console=ttyS0,115200 mem=64M"
+# CONFIG_XIP_KERNEL is not set
+
+#
+# Floating point emulation
+#
 
 #
-# At least one math emulation must be selected
+# At least one emulation must be selected
 #
 CONFIG_FPE_NWFPE=y
 # CONFIG_FPE_NWFPE_XP is not set
 # CONFIG_FPE_FASTFPE is not set
+
+#
+# Userspace binary formats
+#
 CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_AOUT is not set
 # CONFIG_BINFMT_MISC is not set
+# CONFIG_ARTHUR is not set
+
+#
+# Power management options
+#
+CONFIG_PM=y
+CONFIG_PM_LEGACY=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_APM=y
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+# CONFIG_NETDEBUG is not set
+# CONFIG_PACKET is not set
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_BIC=y
+# CONFIG_IPV6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETFILTER is not set
+
+#
+# DCCP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP is not set
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+
+#
+# TIPC Configuration (EXPERIMENTAL)
+#
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+CONFIG_IRDA=m
+
+#
+# IrDA protocols
+#
+# CONFIG_IRLAN is not set
+# CONFIG_IRNET is not set
+# CONFIG_IRCOMM is not set
+# CONFIG_IRDA_ULTRA is not set
+
+#
+# IrDA options
+#
+# CONFIG_IRDA_CACHE_LAST_LSAP is not set
+# CONFIG_IRDA_FAST_RR is not set
+# CONFIG_IRDA_DEBUG is not set
+
+#
+# Infrared-port device drivers
+#
+
+#
+# SIR device drivers
+#
+# CONFIG_IRTTY_SIR is not set
+
+#
+# Dongle support
+#
+
+#
+# Old SIR device drivers
+#
+# CONFIG_IRPORT_SIR is not set
+
+#
+# Old Serial dongle support
+#
+
+#
+# FIR device drivers
+#
+# CONFIG_USB_IRDA is not set
+# CONFIG_SIGMATEL_FIR is not set
+# CONFIG_PXA_FICP is not set
+# CONFIG_MCS_FIR is not set
+CONFIG_BT=m
+# CONFIG_BT_L2CAP is not set
+# CONFIG_BT_SCO is not set
+
+#
+# Bluetooth device drivers
+#
+# CONFIG_BT_HCIUSB is not set
+# CONFIG_BT_HCIUART is not set
+# CONFIG_BT_HCIBCM203X is not set
+# CONFIG_BT_HCIBPA10X is not set
+# CONFIG_BT_HCIBFUSB is not set
+# CONFIG_BT_HCIDTL1 is not set
+# CONFIG_BT_HCIBT3C is not set
+# CONFIG_BT_HCIBLUECARD is not set
+# CONFIG_BT_HCIBTUART is not set
+# CONFIG_BT_HCIVHCI is not set
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+CONFIG_IEEE80211_CRYPT_WEP=m
+# CONFIG_IEEE80211_CRYPT_CCMP is not set
+CONFIG_IEEE80211_SOFTMAC=m
+# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
+CONFIG_WIRELESS_EXT=y
+
+#
+# Device Drivers
+#
 
 #
 # Generic Driver Options
 #
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
-# CONFIG_FW_LOADER is not set
+CONFIG_FW_LOADER=m
 # CONFIG_DEBUG_DRIVER is not set
-# CONFIG_PM is not set
-# CONFIG_PREEMPT is not set
-# CONFIG_ARTHUR is not set
-CONFIG_CMDLINE="root=/dev/nfs ip=dhcp console=ttyS0,115200 mem=64M"
-CONFIG_LEDS=y
-CONFIG_LEDS_TIMER=y
-CONFIG_LEDS_CPU=y
-CONFIG_ALIGNMENT_TRAP=y
+# CONFIG_SYS_HYPERVISOR is not set
 
 #
-# Parallel port support
+# Connector - unified userspace <-> kernelspace linker
 #
-# CONFIG_PARPORT is not set
+# CONFIG_CONNECTOR is not set
 
 #
 # Memory Technology Devices (MTD)
 #
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
-CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
 CONFIG_MTD_REDBOOT_PARTS=y
 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
@@ -176,6 +409,7 @@ CONFIG_MTD_BLOCK=y
 # CONFIG_FTL is not set
 # CONFIG_NFTL is not set
 # CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
 
 #
 # RAM/ROM/Flash chip drivers
@@ -198,6 +432,7 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y
 CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_CFI_I4 is not set
 # CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_OTP is not set
 CONFIG_MTD_CFI_INTELEXT=y
 # CONFIG_MTD_CFI_AMDSTD is not set
 # CONFIG_MTD_CFI_STAA is not set
@@ -205,6 +440,7 @@ CONFIG_MTD_CFI_UTIL=y
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_ABSENT is not set
+# CONFIG_MTD_OBSOLETE_CHIPS is not set
 # CONFIG_MTD_XIP is not set
 
 #
@@ -212,9 +448,10 @@ CONFIG_MTD_CFI_UTIL=y
 #
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 # CONFIG_MTD_PHYSMAP is not set
+CONFIG_MTD_MAINSTONE=y
 # CONFIG_MTD_ARM_INTEGRATOR is not set
-# CONFIG_MTD_EDB7312 is not set
 # CONFIG_MTD_SHARP_SL is not set
+# CONFIG_MTD_PLATRAM is not set
 
 #
 # Self-contained MTD device drivers
@@ -222,7 +459,6 @@ CONFIG_MTD_CFI_UTIL=y
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_PHRAM is not set
 # CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_BLKMTD is not set
 # CONFIG_MTD_BLOCK2MTD is not set
 
 #
@@ -238,180 +474,189 @@ CONFIG_MTD_CFI_UTIL=y
 # CONFIG_MTD_NAND is not set
 
 #
+# OneNAND Flash Device Drivers
+#
+# CONFIG_MTD_ONENAND is not set
+
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+
+#
 # Plug and Play support
 #
 
 #
 # Block devices
 #
-# CONFIG_BLK_DEV_FD is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set
-# CONFIG_BLK_DEV_LOOP is not set
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_CRYPTOLOOP=m
 # CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_UB is not set
 # CONFIG_BLK_DEV_RAM is not set
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_INITRAMFS_SOURCE=""
+CONFIG_BLK_DEV_INITRD=y
 # CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
 
 #
-# IO Schedulers
+# ATA/ATAPI/MFM/RLL support
 #
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-# CONFIG_ATA_OVER_ETH is not set
+CONFIG_IDE=y
+CONFIG_BLK_DEV_IDE=y
 
 #
-# Multi-device support (RAID and LVM)
+# Please see Documentation/ide.txt for help/info on IDE drives
 #
-# CONFIG_MD is not set
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_BLK_DEV_IDEDISK=y
+# CONFIG_IDEDISK_MULTI_MODE is not set
+CONFIG_BLK_DEV_IDECS=m
+# CONFIG_BLK_DEV_IDECD is not set
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDEFLOPPY is not set
+# CONFIG_BLK_DEV_IDESCSI is not set
+# CONFIG_IDE_TASK_IOCTL is not set
 
 #
-# Networking support
+# IDE chipset support/bugfixes
 #
-CONFIG_NET=y
+# CONFIG_IDE_GENERIC is not set
+# CONFIG_IDE_ARM is not set
+# CONFIG_BLK_DEV_IDEDMA is not set
+# CONFIG_IDEDMA_AUTO is not set
+# CONFIG_BLK_DEV_HD is not set
 
 #
-# Networking options
+# SCSI device support
 #
-# CONFIG_PACKET is not set
-# CONFIG_NETLINK_DEV is not set
-CONFIG_UNIX=y
-# CONFIG_NET_KEY is not set
-CONFIG_INET=y
-# CONFIG_IP_MULTICAST is not set
-# CONFIG_IP_ADVANCED_ROUTER is not set
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-# CONFIG_IP_PNP_RARP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
-# CONFIG_ARPD is not set
-# CONFIG_SYN_COOKIES is not set
-# CONFIG_INET_AH is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_TUNNEL is not set
-CONFIG_IP_TCPDIAG=y
-# CONFIG_IP_TCPDIAG_IPV6 is not set
-# CONFIG_IPV6 is not set
-# CONFIG_NETFILTER is not set
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=m
+CONFIG_SCSI_PROC_FS=y
 
 #
-# SCTP Configuration (EXPERIMENTAL)
+# SCSI support type (disk, tape, CD-ROM)
 #
-# CONFIG_IP_SCTP is not set
-# CONFIG_ATM is not set
-# CONFIG_BRIDGE is not set
-# CONFIG_VLAN_8021Q is not set
-# CONFIG_DECNET is not set
-# CONFIG_LLC2 is not set
-# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_NET_DIVERT is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
+# CONFIG_BLK_DEV_SD is not set
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+# CONFIG_BLK_DEV_SR is not set
+# CONFIG_CHR_DEV_SG is not set
+# CONFIG_CHR_DEV_SCH is not set
 
 #
-# QoS and/or fair queueing
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
 #
-# CONFIG_NET_SCHED is not set
-# CONFIG_NET_CLS_ROUTE is not set
+# CONFIG_SCSI_MULTI_LUN is not set
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
 
 #
-# Network testing
+# SCSI Transport Attributes
 #
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_NETPOLL is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_HAMRADIO is not set
-# CONFIG_IRDA is not set
-# CONFIG_BT is not set
-CONFIG_NETDEVICES=y
-# CONFIG_DUMMY is not set
-# CONFIG_BONDING is not set
-# CONFIG_EQUALIZER is not set
-# CONFIG_TUN is not set
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_ATTRS is not set
 
 #
-# Ethernet (10 or 100Mbit)
+# SCSI low-level drivers
 #
-CONFIG_NET_ETHERNET=y
-CONFIG_MII=y
-CONFIG_SMC91X=y
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_SCSI_SATA is not set
+# CONFIG_SCSI_DEBUG is not set
 
 #
-# Ethernet (1000 Mbit)
+# PCMCIA SCSI adapter support
 #
+# CONFIG_PCMCIA_AHA152X is not set
+# CONFIG_PCMCIA_FDOMAIN is not set
+# CONFIG_PCMCIA_NINJA_SCSI is not set
+# CONFIG_PCMCIA_QLOGIC is not set
+# CONFIG_PCMCIA_SYM53C500 is not set
 
 #
-# Ethernet (10000 Mbit)
+# Multi-device support (RAID and LVM)
 #
+# CONFIG_MD is not set
 
 #
-# Token Ring devices
+# Fusion MPT device support
 #
+# CONFIG_FUSION is not set
 
 #
-# Wireless LAN (non-hamradio)
+# IEEE 1394 (FireWire) support
 #
-# CONFIG_NET_RADIO is not set
 
 #
-# Wan interfaces
+# I2O device support
 #
-# CONFIG_WAN is not set
-# CONFIG_PPP is not set
-# CONFIG_SLIP is not set
-# CONFIG_SHAPER is not set
-# CONFIG_NETCONSOLE is not set
 
 #
-# ATA/ATAPI/MFM/RLL support
+# Network device support
 #
-CONFIG_IDE=y
-CONFIG_BLK_DEV_IDE=y
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
 
 #
-# Please see Documentation/ide.txt for help/info on IDE drives
+# PHY device support
 #
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_IDEDISK=y
-# CONFIG_IDEDISK_MULTI_MODE is not set
-# CONFIG_BLK_DEV_IDECD is not set
-# CONFIG_BLK_DEV_IDETAPE is not set
-# CONFIG_BLK_DEV_IDEFLOPPY is not set
-# CONFIG_IDE_TASK_IOCTL is not set
+# CONFIG_PHYLIB is not set
 
 #
-# IDE chipset support/bugfixes
+# Ethernet (10 or 100Mbit)
 #
-# CONFIG_IDE_GENERIC is not set
-# CONFIG_IDE_ARM is not set
-# CONFIG_BLK_DEV_IDEDMA is not set
-# CONFIG_IDEDMA_AUTO is not set
-# CONFIG_BLK_DEV_HD is not set
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+CONFIG_SMC91X=y
+# CONFIG_DM9000 is not set
+# CONFIG_SMC911X is not set
 
 #
-# SCSI device support
+# Ethernet (1000 Mbit)
 #
-# CONFIG_SCSI is not set
 
 #
-# Fusion MPT device support
+# Ethernet (10000 Mbit)
 #
 
 #
-# IEEE 1394 (FireWire) support
+# Token Ring devices
 #
 
 #
-# I2O device support
+# Wireless LAN (non-hamradio)
+#
+# CONFIG_NET_RADIO is not set
+
+#
+# PCMCIA network device support
+#
+# CONFIG_NET_PCMCIA is not set
+
+#
+# Wan interfaces
 #
+# CONFIG_WAN is not set
+CONFIG_PPP=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_MPPE=m
+CONFIG_PPPOE=m
+# CONFIG_SLIP is not set
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
 
 #
 # ISDN subsystem
@@ -436,17 +681,6 @@ CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_EVBUG is not set
 
 #
-# Input I/O drivers
-#
-# CONFIG_GAMEPORT is not set
-CONFIG_SOUND_GAMEPORT=y
-CONFIG_SERIO=y
-# CONFIG_SERIO_SERPORT is not set
-# CONFIG_SERIO_CT82C710 is not set
-CONFIG_SERIO_LIBPS2=y
-# CONFIG_SERIO_RAW is not set
-
-#
 # Input Device Drivers
 #
 CONFIG_INPUT_KEYBOARD=y
@@ -461,11 +695,21 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_INPUT_MISC is not set
 
 #
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+# CONFIG_SERIO_SERPORT is not set
+CONFIG_SERIO_LIBPS2=y
+# CONFIG_SERIO_RAW is not set
+# CONFIG_GAMEPORT is not set
+
+#
 # Character devices
 #
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
 # CONFIG_SERIAL_NONSTANDARD is not set
 
 #
@@ -482,7 +726,7 @@ CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=256
+CONFIG_LEGACY_PTY_COUNT=16
 
 #
 # IPMI
@@ -493,52 +737,333 @@ CONFIG_LEGACY_PTY_COUNT=256
 # Watchdog Cards
 #
 # CONFIG_WATCHDOG is not set
+CONFIG_HW_RANDOM=y
 # CONFIG_NVRAM is not set
-# CONFIG_RTC is not set
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 
 #
 # Ftape, the floppy tape device driver
 #
-# CONFIG_DRM is not set
+
+#
+# PCMCIA character devices
+#
+# CONFIG_SYNCLINK_CS is not set
+# CONFIG_CARDMAN_4000 is not set
+# CONFIG_CARDMAN_4040 is not set
 # CONFIG_RAW_DRIVER is not set
 
 #
+# TPM devices
+#
+# CONFIG_TCG_TPM is not set
+# CONFIG_TELCLOCK is not set
+
+#
 # I2C support
 #
 # CONFIG_I2C is not set
 
 #
+# SPI support
+#
+# CONFIG_SPI is not set
+# CONFIG_SPI_MASTER is not set
+
+#
+# Dallas's 1-wire bus
+#
+
+#
+# Hardware Monitoring support
+#
+CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
+# CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Misc devices
+#
+
+#
+# LED devices
+#
+# CONFIG_NEW_LEDS is not set
+
+#
+# LED drivers
+#
+
+#
+# LED Triggers
+#
+
+#
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+CONFIG_VIDEO_V4L2=y
 
 #
 # Digital Video Broadcasting Devices
 #
 # CONFIG_DVB is not set
+# CONFIG_USB_DABUSB is not set
+
+#
+# Graphics support
+#
+CONFIG_FIRMWARE_EDID=y
+CONFIG_FB=y
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_BACKLIGHT is not set
+# CONFIG_FB_MODE_HELPERS is not set
+# CONFIG_FB_TILEBLITTING is not set
+# CONFIG_FB_S1D13XXX is not set
+CONFIG_FB_PXA=y
+# CONFIG_FB_PXA_PARAMETERS is not set
+# CONFIG_FB_MBX is not set
+# CONFIG_FB_VIRTUAL is not set
+
+#
+# Console display driver support
+#
+# CONFIG_VGA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+
+#
+# Logo configuration
+#
+CONFIG_LOGO=y
+CONFIG_LOGO_LINUX_MONO=y
+CONFIG_LOGO_LINUX_VGA16=y
+CONFIG_LOGO_LINUX_CLUT224=y
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=m
+CONFIG_BACKLIGHT_DEVICE=y
+CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_LCD_DEVICE=y
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+
+#
+# USB support
+#
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+# CONFIG_USB_ARCH_HAS_EHCI is not set
+CONFIG_USB=m
+# CONFIG_USB_DEBUG is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+# CONFIG_USB_BANDWIDTH is not set
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_SUSPEND is not set
+# CONFIG_USB_OTG is not set
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_OHCI_HCD is not set
+# CONFIG_USB_SL811_HCD is not set
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_PRINTER is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# may also be needed; see USB_STORAGE Help for more information
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=m
+CONFIG_USB_HIDINPUT=y
+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
+# CONFIG_HID_FF is not set
+# CONFIG_USB_HIDDEV is not set
+
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+# CONFIG_USB_AIPTEK is not set
+# CONFIG_USB_WACOM is not set
+# CONFIG_USB_ACECAD is not set
+# CONFIG_USB_KBTAB is not set
+# CONFIG_USB_POWERMATE is not set
+# CONFIG_USB_TOUCHSCREEN is not set
+# CONFIG_USB_YEALINK is not set
+# CONFIG_USB_XPAD is not set
+# CONFIG_USB_ATI_REMOTE is not set
+# CONFIG_USB_ATI_REMOTE2 is not set
+# CONFIG_USB_KEYSPAN_REMOTE is not set
+# CONFIG_USB_APPLETOUCH is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET is not set
+CONFIG_USB_MON=y
+
+#
+# USB port drivers
+#
+
+#
+# USB Serial Converter support
+#
+# CONFIG_USB_SERIAL is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGETKIT is not set
+# CONFIG_USB_PHIDGETSERVO is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TEST is not set
+
+#
+# USB DSL modem support
+#
+
+#
+# USB Gadget Support
+#
+CONFIG_USB_GADGET=m
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+CONFIG_USB_GADGET_SELECTED=y
+# CONFIG_USB_GADGET_NET2280 is not set
+# CONFIG_USB_GADGET_PXA2XX is not set
+# CONFIG_USB_GADGET_GOKU is not set
+# CONFIG_USB_GADGET_LH7A40X is not set
+# CONFIG_USB_GADGET_OMAP is not set
+# CONFIG_USB_GADGET_AT91 is not set
+CONFIG_USB_GADGET_DUMMY_HCD=y
+CONFIG_USB_DUMMY_HCD=m
+CONFIG_USB_GADGET_DUALSPEED=y
+# CONFIG_USB_ZERO is not set
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_RNDIS=y
+# CONFIG_USB_GADGETFS is not set
+CONFIG_USB_FILE_STORAGE=m
+# CONFIG_USB_FILE_STORAGE_TEST is not set
+# CONFIG_USB_G_SERIAL is not set
+
+#
+# MMC/SD Card support
+#
+CONFIG_MMC=m
+# CONFIG_MMC_DEBUG is not set
+CONFIG_MMC_BLOCK=m
+CONFIG_MMC_PXA=m
+
+#
+# Real Time Clock
+#
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+
+#
+# RTC drivers
+#
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+CONFIG_RTC_DRV_SA1100=y
+# CONFIG_RTC_DRV_TEST is not set
+# CONFIG_RTC_DRV_V3020 is not set
 
 #
 # File systems
 #
 CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
 # CONFIG_EXT3_FS is not set
-# CONFIG_JBD is not set
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
-
-#
-# XFS support
-#
+# CONFIG_FS_POSIX_ACL is not set
 # CONFIG_XFS_FS is not set
+# CONFIG_OCFS2_FS is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_ROMFS_FS is not set
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
 # CONFIG_QUOTA is not set
 CONFIG_DNOTIFY=y
 # CONFIG_AUTOFS_FS is not set
 # CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
 
 #
 # CD-ROM/DVD Filesystems
@@ -560,11 +1085,10 @@ CONFIG_FAT_DEFAULT_CODEPAGE=437
 #
 CONFIG_PROC_FS=y
 CONFIG_SYSFS=y
-# CONFIG_DEVFS_FS is not set
-# CONFIG_DEVPTS_FS_XATTR is not set
 # CONFIG_TMPFS is not set
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_RAMFS=y
+# CONFIG_CONFIGFS_FS is not set
 
 #
 # Miscellaneous filesystems
@@ -579,13 +1103,14 @@ CONFIG_RAMFS=y
 # CONFIG_JFFS_FS is not set
 CONFIG_JFFS2_FS=y
 CONFIG_JFFS2_FS_DEBUG=0
-# CONFIG_JFFS2_FS_NAND is not set
-# CONFIG_JFFS2_FS_NOR_ECC is not set
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+CONFIG_JFFS2_SUMMARY=y
+# CONFIG_JFFS2_FS_XATTR is not set
 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
 CONFIG_JFFS2_ZLIB=y
 CONFIG_JFFS2_RTIME=y
 # CONFIG_JFFS2_RUBIN is not set
-# CONFIG_CRAMFS is not set
+CONFIG_CRAMFS=m
 # CONFIG_VXFS_FS is not set
 # CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
@@ -602,6 +1127,7 @@ CONFIG_NFS_FS=y
 # CONFIG_NFSD is not set
 CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
+CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
@@ -610,6 +1136,7 @@ CONFIG_SUNRPC=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
+# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -667,77 +1194,32 @@ CONFIG_NLS_ISO8859_1=y
 # CONFIG_PROFILING is not set
 
 #
-# Graphics support
-#
-CONFIG_FB=y
-# CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_TILEBLITTING is not set
-CONFIG_FB_PXA=y
-# CONFIG_FB_PXA_PARAMETERS is not set
-# CONFIG_FB_VIRTUAL is not set
-
-#
-# Console display driver support
-#
-# CONFIG_VGA_CONSOLE is not set
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-
-#
-# Logo configuration
-#
-CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_MONO=y
-CONFIG_LOGO_LINUX_VGA16=y
-CONFIG_LOGO_LINUX_CLUT224=y
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-
-#
-# Sound
-#
-# CONFIG_SOUND is not set
-
-#
-# Misc devices
-#
-
-#
-# USB support
-#
-# CONFIG_USB is not set
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-
-#
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
-#
-
-#
-# USB Gadget Support
-#
-# CONFIG_USB_GADGET is not set
-
-#
-# MMC/SD Card support
-#
-# CONFIG_MMC is not set
-
-#
 # Kernel hacking
 #
-CONFIG_DEBUG_KERNEL=y
+# CONFIG_PRINTK_TIME is not set
 CONFIG_MAGIC_SYSRQ=y
+# CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_DEBUG_KERNEL=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_RWSEMS is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_KOBJECT is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_FS is not set
+# CONFIG_DEBUG_VM is not set
 CONFIG_FRAME_POINTER=y
+# CONFIG_UNWIND_INFO is not set
+CONFIG_FORCED_INLINING=y
+# CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_DEBUG_USER=y
 # CONFIG_DEBUG_WAITQ is not set
 CONFIG_DEBUG_ERRORS=y
@@ -753,7 +1235,31 @@ CONFIG_DEBUG_LL=y
 #
 # Cryptographic options
 #
-# CONFIG_CRYPTO is not set
+CONFIG_CRYPTO=y
+# CONFIG_CRYPTO_HMAC is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_MD4 is not set
+# CONFIG_CRYPTO_MD5 is not set
+CONFIG_CRYPTO_SHA1=m
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_DES is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_TEA is not set
+CONFIG_CRYPTO_ARC4=m
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_TEST is not set
 
 #
 # Hardware crypto devices
@@ -762,8 +1268,10 @@ CONFIG_DEBUG_LL=y
 #
 # Library routines
 #
-# CONFIG_CRC_CCITT is not set
+CONFIG_CRC_CCITT=m
+# CONFIG_CRC16 is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
+CONFIG_PLIST=y
diff --git a/packages/linux/mainstone-kernel_2.6.18.bb b/packages/linux/mainstone-kernel_2.6.18.bb
index f487e1f38a..0e80721489 100644
--- a/packages/linux/mainstone-kernel_2.6.18.bb
+++ b/packages/linux/mainstone-kernel_2.6.18.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for the Mainstone (PXA270 ref design)"
 LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \
            file://mainstone_defconfig"
diff --git a/packages/matchbox-applet-cards/matchbox-applet-cards_1.0.2.bb b/packages/matchbox-applet-cards/matchbox-applet-cards_1.0.2.bb
index ca40ea572c..8fbf5e3578 100644
--- a/packages/matchbox-applet-cards/matchbox-applet-cards_1.0.2.bb
+++ b/packages/matchbox-applet-cards/matchbox-applet-cards_1.0.2.bb
@@ -4,7 +4,7 @@ DEPENDS = "matchbox-wm libmatchbox"
 SECTION = "x11/wm"
 PR = "r1"
 
-SRC_URI = "http://212.10.30.205/rc12/src/mb-applet-cards-${PV}.tar.bz2 \
+SRC_URI = "http://distro.ibiblio.org/pub/linux/distributions/pdaxrom/src/mb-applet-cards-${PV}.tar.bz2 \
 	file://oz-gpe.patch;patch=1 \
 	file://gpe-applet-cards \
 	file://cf_mount.png \
diff --git a/packages/openmoko2/openmoko-dialer2_svn.bb b/packages/openmoko2/openmoko-dialer2_svn.bb
index 5d2683e0fd..171815ef18 100644
--- a/packages/openmoko2/openmoko-dialer2_svn.bb
+++ b/packages/openmoko2/openmoko-dialer2_svn.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "The OpenMoko Dialer"
 SECTION = "openmoko/pim"
-DEPENDS = "libjana libmokogsmd2 libmokoui2 libmokojournal2 pulseaudio"
+DEPENDS = "libjana libmokogsmd2 libmokoui2 libmokojournal2 pulseaudio libnotify"
 PV = "0.1.0+svnr${SRCREV}"
-PR = "r5"
+PR = "r6"
 PE = "1"
 
 inherit openmoko2
diff --git a/packages/pimlico/contacts-0.7/.mtn2git_empty b/packages/pimlico/contacts-0.7/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/pimlico/contacts-0.7/.mtn2git_empty
+++ /dev/null
diff --git a/packages/atk/atk-1.2.0/.mtn2git_empty b/packages/pimlico/contacts-0.8/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/atk/atk-1.2.0/.mtn2git_empty
+++ b/packages/pimlico/contacts-0.8/.mtn2git_empty
diff --git a/packages/pimlico/contacts-0.7/contacts-owl-window-menu.patch b/packages/pimlico/contacts-0.8/contacts-owl-window-menu.patch
index 1fbf1dcc2a..1fbf1dcc2a 100644
--- a/packages/pimlico/contacts-0.7/contacts-owl-window-menu.patch
+++ b/packages/pimlico/contacts-0.8/contacts-owl-window-menu.patch
diff --git a/packages/pimlico/contacts_0.7.bb b/packages/pimlico/contacts_0.8.bb
index d596d45659..d596d45659 100644
--- a/packages/pimlico/contacts_0.7.bb
+++ b/packages/pimlico/contacts_0.8.bb
diff --git a/packages/pimlico/contacts_svn.bb b/packages/pimlico/contacts_svn.bb
index 90a37287d1..0257046e88 100644
--- a/packages/pimlico/contacts_svn.bb
+++ b/packages/pimlico/contacts_svn.bb
@@ -4,9 +4,9 @@ require contacts.inc
 #RDEPENDS += "gnome-vfs-plugin-file"
 #RRECOMMENDS += "gnome-vfs-plugin-http"
 
-PV = "0.5+svnr${SRCREV}"
+PV = "0.8+svnr${SRCREV}"
 
-#DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
 	   file://stock_contact.png \
diff --git a/packages/pimlico/dates_0.4.4.bb b/packages/pimlico/dates_0.4.5.bb
index 9e5451f522..9e5451f522 100644
--- a/packages/pimlico/dates_0.4.4.bb
+++ b/packages/pimlico/dates_0.4.5.bb
diff --git a/packages/pimlico/dates_svn.bb b/packages/pimlico/dates_svn.bb
index d392031abb..0ba1b07dc0 100644
--- a/packages/pimlico/dates_svn.bb
+++ b/packages/pimlico/dates_svn.bb
@@ -2,7 +2,7 @@ require dates.inc
 
 DEFAULT_PREFERENCE = "-1"
 
-PV = "0.4.4+svnr${SRCREV}"
+PV = "0.4.5+svnr${SRCREV}"
 S = "${WORKDIR}/trunk"
 
 SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
diff --git a/packages/pimlico/files/dates-owl-window-menu.patch b/packages/pimlico/files/dates-owl-window-menu.patch
index d47875dd65..6bde252ac3 100644
--- a/packages/pimlico/files/dates-owl-window-menu.patch
+++ b/packages/pimlico/files/dates-owl-window-menu.patch
@@ -1,21 +1,30 @@
-Index: trunk/src/Makefile.am
-===================================================================
---- trunk.orig/src/Makefile.am	2007-07-11 22:16:15.000000000 +0100
-+++ trunk/src/Makefile.am	2007-07-13 08:21:11.000000000 +0100
-@@ -47,7 +47,7 @@
- libgtkdatesviewinclude_HEADERS = \
- 	dates_view.h
+---
+ src/Makefile.am      |    2 +-
+ src/dates_gtk.c      |    5 -----
+ src/dates_main.c     |    5 +++++
+ src/dates_platform.h |    2 +-
+ 4 files changed, 7 insertions(+), 7 deletions(-)
+
+--- dates-0.4.5.orig/src/Makefile.am
++++ dates-0.4.5/src/Makefile.am
+@@ -33,11 +33,11 @@ dates_SOURCES = $(platform) 	\
+ 	dates_callbacks.h 	\
+ 	dates_callbacks.c 	\
+ 	gconf-bridge.h		\
+ 	gconf-bridge.c
  
--dates_LDADD   = $(DATES_LIBS) libgtkdatesview.la
-+dates_LDADD   = $(DATES_LIBS) libgtkdatesview.la -lowl
+-dates_LDADD = $(DATES_LIBS) libgtkdatesview.la
++dates_LDADD = $(DATES_LIBS) libgtkdatesview.la -lowl
  
  if USE_OWL
  dates_LDADD += $(top_builddir)/libowl/libowl.la
-Index: trunk/src/dates_gtk.c
-===================================================================
---- trunk.orig/src/dates_gtk.c	2007-07-11 22:16:15.000000000 +0100
-+++ trunk/src/dates_gtk.c	2007-07-13 08:33:48.000000000 +0100
-@@ -32,10 +32,6 @@
+ endif 
+ 
+--- dates-0.4.5.orig/src/dates_gtk.c
++++ dates-0.4.5/src/dates_gtk.c
+@@ -30,14 +30,10 @@
+ #ifdef WITH_HILDON
+ #include <hildon/hildon-color-button.h>
  #endif
  
  #ifndef DATES_PLATFORM_create_main_window
@@ -26,7 +35,11 @@ Index: trunk/src/dates_gtk.c
  static GtkWidget *
  create_main_window (DatesData * d, GtkWidget * toolbar,
  					GtkWidget * menu, GtkAccelGroup * accel_group)
-@@ -57,7 +53,6 @@
+ {
+ 	GtkWidget *main_vbox;
+@@ -55,11 +51,10 @@ create_main_window (DatesData * d, GtkWi
+ 	main_vbox = gtk_vbox_new (FALSE, 0);
+ 	gtk_widget_show (main_vbox);
  	gtk_container_add (GTK_CONTAINER (d->main_window), main_vbox);
  
  	gtk_widget_show (menu);
@@ -34,24 +47,13 @@ Index: trunk/src/dates_gtk.c
  
  	gtk_box_pack_end (GTK_BOX (main_vbox), toolbar, FALSE, FALSE, 0);
  	gtk_container_set_border_width (GTK_CONTAINER (toolbar), 3);
-Index: trunk/src/dates_platform.h
-===================================================================
---- trunk.orig/src/dates_platform.h	2007-07-11 22:16:15.000000000 +0100
-+++ trunk/src/dates_platform.h	2007-07-13 08:21:11.000000000 +0100
-@@ -20,7 +20,7 @@
  
- #include "dates_types.h"
  
--#ifdef WITH_HILDON
-+#if 1
- #define DATES_MENU_WITHOUT_BAR 1
- #endif
- 
-Index: trunk/src/dates_main.c
-===================================================================
---- trunk.orig/src/dates_main.c	2007-07-11 22:16:15.000000000 +0100
-+++ trunk/src/dates_main.c	2007-07-13 08:36:11.000000000 +0100
-@@ -25,6 +25,8 @@
+--- dates-0.4.5.orig/src/dates_main.c
++++ dates-0.4.5/src/dates_main.c
+@@ -23,10 +23,12 @@
+ #include <math.h>
+ #include <libecal/e-cal-time-util.h>
  #include <libical/icaltime.h>
  #include <gconf/gconf-client.h>
  
@@ -60,7 +62,11 @@ Index: trunk/src/dates_main.c
  #include "dates_types.h"
  #include "dates_platform.h"
  #include "dates_callbacks.h"
-@@ -566,6 +568,9 @@
+ 
+ #include "gconf-bridge.h"
+@@ -564,10 +566,13 @@ main (int argc, char **argv)
+ 		gtk_widget_show (plug_widget);
+ 	} else {
  		gtk_widget_show (data.main_window);
  	}
  
@@ -70,3 +76,20 @@ Index: trunk/src/dates_main.c
  	gtk_main ();
  
  	/* clean up */
+ 	g_option_context_free (context);
+ 	
+--- dates-0.4.5.orig/src/dates_platform.h
++++ dates-0.4.5/src/dates_platform.h
+@@ -18,11 +18,11 @@
+ #ifndef DATES_UI_GTK_H
+ #define DATES_UI_GTK_H
+ 
+ #include "dates_types.h"
+ 
+-#ifdef WITH_HILDON
++#if 1
+ #define DATES_MENU_WITHOUT_BAR 1
+ #endif
+ 
+ struct DatesData;
+ 
diff --git a/packages/pimlico/tasks-0.12/.mtn2git_empty b/packages/pimlico/tasks-0.12/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/pimlico/tasks-0.12/.mtn2git_empty
+++ /dev/null
diff --git a/packages/atk/atk-1.6.0/.mtn2git_empty b/packages/pimlico/tasks-0.13/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/atk/atk-1.6.0/.mtn2git_empty
+++ b/packages/pimlico/tasks-0.13/.mtn2git_empty
diff --git a/packages/pimlico/tasks-0.12/tasks-owl.diff b/packages/pimlico/tasks-0.13/tasks-owl.diff
index ce1ed9db7e..ce1ed9db7e 100644
--- a/packages/pimlico/tasks-0.12/tasks-owl.diff
+++ b/packages/pimlico/tasks-0.13/tasks-owl.diff
diff --git a/packages/pimlico/tasks_0.12.bb b/packages/pimlico/tasks_0.13.bb
index ff8da563e6..ff8da563e6 100644
--- a/packages/pimlico/tasks_0.12.bb
+++ b/packages/pimlico/tasks_0.13.bb
diff --git a/packages/pimlico/tasks_svn.bb b/packages/pimlico/tasks_svn.bb
index 5ad983ad97..dc998d2508 100644
--- a/packages/pimlico/tasks_svn.bb
+++ b/packages/pimlico/tasks_svn.bb
@@ -2,9 +2,8 @@ require tasks.inc
 
 DEFAULT_PREFERENCE = "-1"
 
-PV = "0.12+svnr${SRCREV}"
+PV = "0.13+svnr${SRCREV}"
 S = "${WORKDIR}/trunk"
 
 SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
-        file://tasks-single.diff;patch=1 \
         file://tasks-owl.diff;patch=1"
diff --git a/packages/qt/qt4-x11-free_4.1.2.bb b/packages/qt/qt4-x11-free_4.1.2.bb
index 91ac3f68cf..77fa6dba12 100644
--- a/packages/qt/qt4-x11-free_4.1.2.bb
+++ b/packages/qt/qt4-x11-free_4.1.2.bb
@@ -70,6 +70,7 @@ PARTS = "3Support Core Designer DesignerComponents Gui Network Sql Svg Test Xml"
 
 do_stage() {
 	oe_runmake install INSTALL_ROOT=/
+	install -d ${STAGING_QT_DIR}
 	install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${STAGING_QT_DIR}/bin/rcc
 	install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${STAGING_QT_DIR}/bin/moc
 	install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${STAGING_QT_DIR}/bin/uic
diff --git a/packages/qt/qt4-x11-free_4.3.2.bb b/packages/qt/qt4-x11-free_4.3.2.bb
index a097c4e9ca..2fa53a4d54 100644
--- a/packages/qt/qt4-x11-free_4.3.2.bb
+++ b/packages/qt/qt4-x11-free_4.3.2.bb
@@ -74,6 +74,7 @@ PARTS = "3Support AssistantClient Core DBus Designer DesignerComponents Gui Netw
 
 do_stage() {
 	oe_runmake install INSTALL_ROOT=/
+	install -d ${STAGING_QT_DIR}
 	install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${STAGING_QT_DIR}/bin/rcc
 	install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${STAGING_QT_DIR}/bin/moc
 	install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${STAGING_QT_DIR}/bin/uic
diff --git a/packages/reiserfsprogs/reiserfsprogs_3.6.19.bb b/packages/reiserfsprogs/reiserfsprogs_3.6.19.bb
index 6a5c01f0fd..fe047aed37 100644
--- a/packages/reiserfsprogs/reiserfsprogs_3.6.19.bb
+++ b/packages/reiserfsprogs/reiserfsprogs_3.6.19.bb
@@ -4,7 +4,9 @@ LICENSE = "GPL"
 RRECOMMENDS_${PN} = "reiserfsprogs-reiserfsck reiserfsprogs-mkreiserfs"
 PR = "r1"
 
-SRC_URI ="ftp://ftp.namesys.com/pub/reiserfsprogs/reiserfsprogs-${PV}.tar.gz \
+#Namesys.com seems to be in trouble.  See bug #3482 for more information
+#SRC_URI ="ftp://ftp.namesys.com/pub/reiserfsprogs/reiserfsprogs-${PV}.tar.gz \
+SRC_URI ="${DEBIAN_MIRROR}/main/r/reiserfsprogs/reiserfsprogs_${PV}.orig.tar.gz \
 	  file://header-fix.patch;patch=1 \
 	  "
 
diff --git a/packages/tasks/task-python-everything.bb b/packages/tasks/task-python-everything.bb
index c81691cd34..65dc7661c9 100644
--- a/packages/tasks/task-python-everything.bb
+++ b/packages/tasks/task-python-everything.bb
@@ -9,7 +9,7 @@ RDEPENDS = "\
 		python-constraint	\
 		python-dbus			\
 		python-dialog		\
-		python-directfb		\
+		python-pydirectfb		\
 		python-efl			\
 		python-pycurl		\
 		python-fam			\
diff --git a/packages/uboot/uboot-openmoko_svn.bb b/packages/uboot/uboot-openmoko_svn.bb
index 2ce92ad4a9..1e59e0746d 100644
--- a/packages/uboot/uboot-openmoko_svn.bb
+++ b/packages/uboot/uboot-openmoko_svn.bb
@@ -5,7 +5,7 @@ SECTION = "bootloader"
 PRIORITY = "optional"
 PROVIDES = "virtual/bootloader"
 LOCALVERSION = "+git${SRCDATE}+svnr${SRCREV}"
-PV = "1.3.0${LOCALVERSION}"
+PV = "1.3.1${LOCALVERSION}"
 PR = "r1"
 
 SRCREV_FORMAT = "patches"