diff options
| -rw-r--r-- | meta/packages/gnome/gnome-vfs-2.16.3/gnome-vfs-no-kerberos.patch | 51 | ||||
| -rw-r--r-- | meta/packages/gnome/gnome-vfs_2.16.3.bb | 15 | ||||
| -rw-r--r-- | meta/site/arm-linux | 3 | ||||
| -rw-r--r-- | meta/site/ix86-common | 3 |
4 files changed, 59 insertions, 13 deletions
diff --git a/meta/packages/gnome/gnome-vfs-2.16.3/gnome-vfs-no-kerberos.patch b/meta/packages/gnome/gnome-vfs-2.16.3/gnome-vfs-no-kerberos.patch new file mode 100644 index 0000000000..e25ecdd66f --- /dev/null +++ b/meta/packages/gnome/gnome-vfs-2.16.3/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) diff --git a/meta/packages/gnome/gnome-vfs_2.16.3.bb b/meta/packages/gnome/gnome-vfs_2.16.3.bb index 77cb3a2fdf..808ae27f42 100644 --- a/meta/packages/gnome/gnome-vfs_2.16.3.bb +++ b/meta/packages/gnome/gnome-vfs_2.16.3.bb @@ -1,18 +1,19 @@ LICENSE = "GPL" -PR = "r3" - -inherit gnome - DEPENDS = "libxml2 gconf dbus bzip2 gnome-mime-data zlib" RRECOMMENDS = "gnome-vfs-plugin-file gnome-mime-data shared-mime-info" +PR = "r4" + +inherit gnome + # This is to provide compatibility with the gnome-vfs DBus fork -RPROVIDES = "gnome-vfs-plugin-dbus" +PROVIDES = "gnome-vfs-plugin-dbus" +RREPLACES = "gnome-vfs-dbus" -SRC_URI += "file://gconftool-lossage.patch;patch=1;pnum=1" +SRC_URI += "file://gconftool-lossage.patch;patch=1;pnum=1 \ + file://gnome-vfs-no-kerberos.patch;patch=1;pnum=0" EXTRA_OECONF = "--disable-openssl --disable-samba" -#export KRB5_CONFIG="none" FILES_${PN} += " ${libdir}/vfs" FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/include" diff --git a/meta/site/arm-linux b/meta/site/arm-linux index 7946455b35..9987ff8dc1 100644 --- a/meta/site/arm-linux +++ b/meta/site/arm-linux @@ -313,6 +313,3 @@ ac_cv_func_mmap_fixed_mapped=${ac_cv_func_mmap_fixed_mapped=yes} #dbus ac_cv_have_abstract_sockets=${ac_cv_have_abstract_sockets=no} - -# Nasty hack for gnome-vfs -ac_cv_path_KRB5_CONFIG=${ac_cv_path_KRB5_CONFIG=none} diff --git a/meta/site/ix86-common b/meta/site/ix86-common index b84a7aaa0f..6e6a2c96dd 100644 --- a/meta/site/ix86-common +++ b/meta/site/ix86-common @@ -252,6 +252,3 @@ jm_cv_func_working_readdir=yes # xorg X11R7 ac_cv_sys_linker_h=${ac_cv_sys_linker_h=no} ac_cv_file__usr_share_X11_sgml_defs_ent=${ac_cv_file__usr_share_X11_sgml_defs_ent=no} - -# Nasty hack for gnome-vfs -ac_cv_path_KRB5_CONFIG=${ac_cv_path_KRB5_CONFIG=none} |