diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-07 10:52:19 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-12 14:12:10 +0100 |
commit | 77bbc22db44950bc17b95cdb7e039671733574eb (patch) | |
tree | 28a30b1a9ad82019e1d1bba224dbac9dce5cde2e /meta/recipes-gnome | |
parent | d2b4818c5cca291f90c5acc9a2316d807ef9fa26 (diff) | |
download | poky-77bbc22db44950bc17b95cdb7e039671733574eb.tar.gz |
gnome-vfs: This is now unused in OE-Core and deprecated, drop
(From OE-Core rev: 69eb093f526d052f60afd156e9adca4a954be222)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome')
3 files changed, 0 insertions, 116 deletions
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 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | --- gnome-vfs-2.6.0/configure.in~ 2004-03-22 12:36:23.000000000 +0000 | ||
4 | +++ gnome-vfs-2.6.0/configure.in 2004-06-07 16:04:34.000000000 +0100 | ||
5 | @@ -154,7 +154,7 @@ | ||
6 | AC_PATH_PROG(GCONFTOOL, gconftool-2, no) | ||
7 | |||
8 | if test x"$GCONFTOOL" = xno; then | ||
9 | - AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf]) | ||
10 | + AC_MSG_WARN([gconftool-2 executable not found in your path - should be installed with GConf]) | ||
11 | fi | ||
12 | |||
13 | 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 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | removes kerberos completely to avoid conflicts with installed kerberos | ||
4 | --- configure.in.orig 2007-01-05 19:42:26.418541610 +0200 | ||
5 | +++ configure.in 2007-01-05 19:42:56.604261797 +0200 | ||
6 | @@ -436,47 +436,6 @@ | ||
7 | ]) | ||
8 | AM_CONDITIONAL(HAVE_CDDA, test $have_cdda = yes) | ||
9 | AC_SUBST(CDDA_LIBS) | ||
10 | - | ||
11 | -dnl GSSAPI | ||
12 | -dnl Check for Kerberos installation | ||
13 | -have_gssapi=no | ||
14 | -AC_PATH_PROG([KRB5_CONFIG], krb5-config, none, $PATH:/usr/kerberos/bin) | ||
15 | - | ||
16 | -if test "x$KRB5_CONFIG" != "xnone"; then | ||
17 | - GSSAPI_LIBS="`${KRB5_CONFIG} --libs gssapi`" | ||
18 | - GSSAPI_CFLAGS="`${KRB5_CONFIG} --cflags gssapi`" | ||
19 | - | ||
20 | - saved_CPPFLAGS="$CPPFLAGS" | ||
21 | - saved_LIBS="$LIBS" | ||
22 | - LIBS="$LIBS $GSSAPI_LIBS" | ||
23 | - CPPFLAGS="$CPPFLAGS $GSSAPI_CFLAGS" | ||
24 | - # MIT and Heimdal put gssapi.h in different places | ||
25 | - AC_CHECK_HEADERS(gssapi/gssapi.h gssapi.h, [ | ||
26 | - AC_CHECK_FUNCS(gss_init_sec_context, [ | ||
27 | - AC_MSG_NOTICE([GSSAPI authentication support enabled]) | ||
28 | - AC_DEFINE(HAVE_GSSAPI, 1, [Define if GSSAPI support is enabled]) | ||
29 | - AC_CHECK_HEADERS(gssapi/gssapi_generic.h) | ||
30 | - have_gssapi=yes | ||
31 | - | ||
32 | - # MIT Kerberos lacks GSS_C_NT_HOSTBASED_SERVICE | ||
33 | - AC_CHECK_DECL([GSS_C_NT_HOSTBASED_SERVICE],, | ||
34 | - [AC_DEFINE([GSS_C_NT_HOSTBASED_SERVICE], gss_nt_service_name, | ||
35 | - [Define if GSS_C_NT_HOSTBASED_SERVICE is not defined otherwise]) | ||
36 | - ], [ | ||
37 | - #ifdef HAVE_GSSAPI_GSSAPI_H | ||
38 | - #include <gssapi/gssapi.h> | ||
39 | - #else | ||
40 | - #include <gssapi.h> | ||
41 | - #endif | ||
42 | - ]) | ||
43 | - ]) | ||
44 | - break | ||
45 | - ]) | ||
46 | - LIBS="$saved_LIBS" | ||
47 | - CPPFLAGS="$saved_CPPFLAGS" | ||
48 | -fi | ||
49 | -AC_SUBST(GSSAPI_LIBS) | ||
50 | -AC_SUBST(GSSAPI_CFLAGS) | ||
51 | |||
52 | dnl ****************************** | ||
53 | 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 @@ | |||
1 | DESCRIPTION = "a userspace virtual filesystem" | ||
2 | HOMEPAGE = "http://www.gnome.org/" | ||
3 | BUGTRACKER = "https://bugzilla.gnome.org/" | ||
4 | |||
5 | LICENSE = "GPLv2+ & LGPLv2+" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | ||
7 | file://libgnomevfs/gnome-vfs.h;endline=25;md5=17071e69707a8f42887d88413f2623cb \ | ||
8 | file://programs/gnomevfs-ls.c;endline=23;md5=678a2e8bedaef5818ccabe633840196b \ | ||
9 | file://daemon/vfs-daemon.c;endline=21;md5=5f2c61553fb16abb07fc9498ca03fe1f \ | ||
10 | file://modules/cdda-cddb.h;endline=22;md5=20ed324ca64907c366ecd7f22b8e0c54" | ||
11 | |||
12 | DEPENDS = "libxml2 gconf dbus bzip2 gnome-mime-data zlib" | ||
13 | RRECOMMENDS_${PN} = "gnome-vfs-plugin-file shared-mime-info" | ||
14 | # Some legacy packages will require gnome-mime-data to be installed, but use of | ||
15 | # it is deprecated. | ||
16 | PR = "r0" | ||
17 | |||
18 | inherit gnome | ||
19 | |||
20 | # This is to provide compatibility with the gnome-vfs DBus fork | ||
21 | RPROVIDES = "gnome-vfs-plugin-dbus" | ||
22 | |||
23 | SRC_URI += "file://gconftool-lossage.patch \ | ||
24 | file://gnome-vfs-no-kerberos.patch;striplevel=0" | ||
25 | |||
26 | SRC_URI[archive.md5sum] = "a05fab03eeef10a47dd156b758982f2e" | ||
27 | SRC_URI[archive.sha256sum] = "62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa" | ||
28 | |||
29 | EXTRA_OECONF = " --disable-hal \ | ||
30 | --disable-openssl \ | ||
31 | --disable-samba \ | ||
32 | ac_cv_lib_acl_acl_get_file=no \ | ||
33 | ac_cv_lib_sec_acl=no \ | ||
34 | gvfs_cv_HAVE_SOLARIS_ACLS=no \ | ||
35 | gvfs_cv_HAVE_POSIX_ACLS=no \ | ||
36 | " | ||
37 | |||
38 | FILES_${PN} += " ${libdir}/vfs ${datadir}/dbus-1/services" | ||
39 | FILES_${PN}-dbg += " ${libdir}/gnome-vfs-2.0/modules/.debug" | ||
40 | FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/include" | ||
41 | FILES_${PN}-doc += " ${datadir}/gtk-doc" | ||
42 | |||
43 | PACKAGES_DYNAMIC = "gnome-vfs-plugin-*" | ||
44 | |||
45 | python populate_packages_prepend () { | ||
46 | print bb.data.getVar('FILES_gnome-vfs', d, 1) | ||
47 | |||
48 | plugindir = bb.data.expand('${libdir}/gnome-vfs-2.0/modules/', d) | ||
49 | do_split_packages(d, plugindir, '^lib(.*)\.so$', 'gnome-vfs-plugin-%s', 'GNOME VFS plugin for %s') | ||
50 | } | ||