diff options
| author | Ross Burton <ross@openedhand.com> | 2007-09-17 18:50:27 +0000 |
|---|---|---|
| committer | Ross Burton <ross@openedhand.com> | 2007-09-17 18:50:27 +0000 |
| commit | 80924d4686ad18f5e7318c7ad44ec37213dd67ec (patch) | |
| tree | 6a5241c88224c55fea8f8e4248735545551f5239 /meta/packages/gnome/gnome-vfs-2.20.0 | |
| parent | 7fb9559757ed06e7e768ee290ada880d27ad285b (diff) | |
| download | openembedded-core-80924d4686ad18f5e7318c7ad44ec37213dd67ec.tar.gz openembedded-core-80924d4686ad18f5e7318c7ad44ec37213dd67ec.tar.bz2 openembedded-core-80924d4686ad18f5e7318c7ad44ec37213dd67ec.zip | |
Upgrade gnome-vfs to 2.20
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2751 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/gnome/gnome-vfs-2.20.0')
| -rw-r--r-- | meta/packages/gnome/gnome-vfs-2.20.0/gconftool-lossage.patch | 11 | ||||
| -rw-r--r-- | meta/packages/gnome/gnome-vfs-2.20.0/gnome-vfs-no-kerberos.patch | 51 |
2 files changed, 62 insertions, 0 deletions
diff --git a/meta/packages/gnome/gnome-vfs-2.20.0/gconftool-lossage.patch b/meta/packages/gnome/gnome-vfs-2.20.0/gconftool-lossage.patch new file mode 100644 index 0000000000..3dbc130ddc --- /dev/null +++ b/meta/packages/gnome/gnome-vfs-2.20.0/gconftool-lossage.patch @@ -0,0 +1,11 @@ +--- 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/meta/packages/gnome/gnome-vfs-2.20.0/gnome-vfs-no-kerberos.patch b/meta/packages/gnome/gnome-vfs-2.20.0/gnome-vfs-no-kerberos.patch new file mode 100644 index 0000000000..e25ecdd66f --- /dev/null +++ b/meta/packages/gnome/gnome-vfs-2.20.0/gnome-vfs-no-kerberos.patch @@ -0,0 +1,51 @@ +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) |