From 77bbc22db44950bc17b95cdb7e039671733574eb Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 7 Oct 2011 10:52:19 +0100 Subject: gnome-vfs: This is now unused in OE-Core and deprecated, drop (From OE-Core rev: 69eb093f526d052f60afd156e9adca4a954be222) Signed-off-by: Richard Purdie --- .../gnome/gnome-vfs-2.24.4/gconftool-lossage.patch | 13 ------ .../gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch | 53 ---------------------- meta/recipes-gnome/gnome/gnome-vfs_2.24.4.bb | 50 -------------------- 3 files changed, 116 deletions(-) delete mode 100644 meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gconftool-lossage.patch delete mode 100644 meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch delete mode 100644 meta/recipes-gnome/gnome/gnome-vfs_2.24.4.bb (limited to 'meta/recipes-gnome') diff --git a/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gconftool-lossage.patch b/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gconftool-lossage.patch deleted file mode 100644 index 0f52136e30..0000000000 --- a/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gconftool-lossage.patch +++ /dev/null @@ -1,13 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - ---- 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/recipes-gnome/gnome/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch b/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch deleted file mode 100644 index dabec32c6a..0000000000 --- a/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch +++ /dev/null @@ -1,53 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -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 -- #else -- #include -- #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/recipes-gnome/gnome/gnome-vfs_2.24.4.bb b/meta/recipes-gnome/gnome/gnome-vfs_2.24.4.bb deleted file mode 100644 index c09c8beda2..0000000000 --- a/meta/recipes-gnome/gnome/gnome-vfs_2.24.4.bb +++ /dev/null @@ -1,50 +0,0 @@ -DESCRIPTION = "a userspace virtual filesystem" -HOMEPAGE = "http://www.gnome.org/" -BUGTRACKER = "https://bugzilla.gnome.org/" - -LICENSE = "GPLv2+ & LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://libgnomevfs/gnome-vfs.h;endline=25;md5=17071e69707a8f42887d88413f2623cb \ - file://programs/gnomevfs-ls.c;endline=23;md5=678a2e8bedaef5818ccabe633840196b \ - file://daemon/vfs-daemon.c;endline=21;md5=5f2c61553fb16abb07fc9498ca03fe1f \ - file://modules/cdda-cddb.h;endline=22;md5=20ed324ca64907c366ecd7f22b8e0c54" - -DEPENDS = "libxml2 gconf dbus bzip2 gnome-mime-data zlib" -RRECOMMENDS_${PN} = "gnome-vfs-plugin-file shared-mime-info" -# Some legacy packages will require gnome-mime-data to be installed, but use of -# it is deprecated. -PR = "r0" - -inherit gnome - -# This is to provide compatibility with the gnome-vfs DBus fork -RPROVIDES = "gnome-vfs-plugin-dbus" - -SRC_URI += "file://gconftool-lossage.patch \ - file://gnome-vfs-no-kerberos.patch;striplevel=0" - -SRC_URI[archive.md5sum] = "a05fab03eeef10a47dd156b758982f2e" -SRC_URI[archive.sha256sum] = "62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa" - -EXTRA_OECONF = " --disable-hal \ - --disable-openssl \ - --disable-samba \ - ac_cv_lib_acl_acl_get_file=no \ - ac_cv_lib_sec_acl=no \ - gvfs_cv_HAVE_SOLARIS_ACLS=no \ - gvfs_cv_HAVE_POSIX_ACLS=no \ - " - -FILES_${PN} += " ${libdir}/vfs ${datadir}/dbus-1/services" -FILES_${PN}-dbg += " ${libdir}/gnome-vfs-2.0/modules/.debug" -FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/include" -FILES_${PN}-doc += " ${datadir}/gtk-doc" - -PACKAGES_DYNAMIC = "gnome-vfs-plugin-*" - -python populate_packages_prepend () { - print bb.data.getVar('FILES_gnome-vfs', d, 1) - - plugindir = bb.data.expand('${libdir}/gnome-vfs-2.0/modules/', d) - do_split_packages(d, plugindir, '^lib(.*)\.so$', 'gnome-vfs-plugin-%s', 'GNOME VFS plugin for %s') -} -- cgit v1.2.3-54-g00ecf