diff options
| author | Steve Sakoman <steve@sakoman.com> | 2009-08-09 21:46:59 -0700 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-08-10 11:34:12 +0200 |
| commit | 76069e339ea0eec6794893e146d1361632214fe5 (patch) | |
| tree | 8d37a1f937c476bb48515c2a8b7e9b71a71d55f7 /recipes/gnome/gnome-vfs-2.22.0 | |
| parent | 60f1515945cb56843e8c0f110310aaa2e735f40f (diff) | |
gnome-vfs: add 2.24.1, share patches with 2.22.0
Diffstat (limited to 'recipes/gnome/gnome-vfs-2.22.0')
| -rw-r--r-- | recipes/gnome/gnome-vfs-2.22.0/gconftool-lossage.patch | 11 | ||||
| -rw-r--r-- | recipes/gnome/gnome-vfs-2.22.0/gnome-vfs-no-kerberos.patch | 51 |
2 files changed, 0 insertions, 62 deletions
diff --git a/recipes/gnome/gnome-vfs-2.22.0/gconftool-lossage.patch b/recipes/gnome/gnome-vfs-2.22.0/gconftool-lossage.patch deleted file mode 100644 index 3dbc130ddc..0000000000 --- a/recipes/gnome/gnome-vfs-2.22.0/gconftool-lossage.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gnome-vfs-2.6.0/configure.in~ 2004-03-22 12:36:23.000000000 +0000 -+++ gnome-vfs-2.6.0/configure.in 2004-06-07 16:04:34.000000000 +0100 -@@ -154,7 +154,7 @@ - AC_PATH_PROG(GCONFTOOL, gconftool-2, no) - - if test x"$GCONFTOOL" = xno; then -- AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf]) -+ AC_MSG_WARN([gconftool-2 executable not found in your path - should be installed with GConf]) - fi - - AM_GCONF_SOURCE_2 diff --git a/recipes/gnome/gnome-vfs-2.22.0/gnome-vfs-no-kerberos.patch b/recipes/gnome/gnome-vfs-2.22.0/gnome-vfs-no-kerberos.patch deleted file mode 100644 index e25ecdd66f..0000000000 --- a/recipes/gnome/gnome-vfs-2.22.0/gnome-vfs-no-kerberos.patch +++ /dev/null @@ -1,51 +0,0 @@ -removes kerberos completely to avoid conflicts with installed kerberos ---- configure.in.orig 2007-01-05 19:42:26.418541610 +0200 -+++ configure.in 2007-01-05 19:42:56.604261797 +0200 -@@ -436,47 +436,6 @@ - ]) - AM_CONDITIONAL(HAVE_CDDA, test $have_cdda = yes) - AC_SUBST(CDDA_LIBS) -- --dnl GSSAPI --dnl Check for Kerberos installation --have_gssapi=no --AC_PATH_PROG([KRB5_CONFIG], krb5-config, none, $PATH:/usr/kerberos/bin) -- --if test "x$KRB5_CONFIG" != "xnone"; then -- GSSAPI_LIBS="`${KRB5_CONFIG} --libs gssapi`" -- GSSAPI_CFLAGS="`${KRB5_CONFIG} --cflags gssapi`" -- -- saved_CPPFLAGS="$CPPFLAGS" -- saved_LIBS="$LIBS" -- LIBS="$LIBS $GSSAPI_LIBS" -- CPPFLAGS="$CPPFLAGS $GSSAPI_CFLAGS" -- # MIT and Heimdal put gssapi.h in different places -- AC_CHECK_HEADERS(gssapi/gssapi.h gssapi.h, [ -- AC_CHECK_FUNCS(gss_init_sec_context, [ -- AC_MSG_NOTICE([GSSAPI authentication support enabled]) -- AC_DEFINE(HAVE_GSSAPI, 1, [Define if GSSAPI support is enabled]) -- AC_CHECK_HEADERS(gssapi/gssapi_generic.h) -- have_gssapi=yes -- -- # MIT Kerberos lacks GSS_C_NT_HOSTBASED_SERVICE -- AC_CHECK_DECL([GSS_C_NT_HOSTBASED_SERVICE],, -- [AC_DEFINE([GSS_C_NT_HOSTBASED_SERVICE], gss_nt_service_name, -- [Define if GSS_C_NT_HOSTBASED_SERVICE is not defined otherwise]) -- ], [ -- #ifdef HAVE_GSSAPI_GSSAPI_H -- #include <gssapi/gssapi.h> -- #else -- #include <gssapi.h> -- #endif -- ]) -- ]) -- break -- ]) -- LIBS="$saved_LIBS" -- CPPFLAGS="$saved_CPPFLAGS" --fi --AC_SUBST(GSSAPI_LIBS) --AC_SUBST(GSSAPI_CFLAGS) - - dnl ****************************** - dnl http-method (neon checks) |