diff options
author | Ross Burton <ross@openedhand.com> | 2008-06-13 16:35:37 +0000 |
---|---|---|
committer | Ross Burton <ross@openedhand.com> | 2008-06-13 16:35:37 +0000 |
commit | 74df02ea329d70423714e6ed7247c1d78faa7000 (patch) | |
tree | ae0a0167987c0749329d46b71fad031ed51ddffc /meta/packages/gnome | |
parent | 9745db65a7c91ca890234832abfeb2b09496d762 (diff) | |
download | poky-74df02ea329d70423714e6ed7247c1d78faa7000.tar.gz |
gnome-vfs: remove 2.18.1, unused now
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4648 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/gnome')
3 files changed, 0 insertions, 100 deletions
diff --git a/meta/packages/gnome/gnome-vfs-2.18.1/gconftool-lossage.patch b/meta/packages/gnome/gnome-vfs-2.18.1/gconftool-lossage.patch deleted file mode 100644 index 3dbc130ddc..0000000000 --- a/meta/packages/gnome/gnome-vfs-2.18.1/gconftool-lossage.patch +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | --- gnome-vfs-2.6.0/configure.in~ 2004-03-22 12:36:23.000000000 +0000 | ||
2 | +++ gnome-vfs-2.6.0/configure.in 2004-06-07 16:04:34.000000000 +0100 | ||
3 | @@ -154,7 +154,7 @@ | ||
4 | AC_PATH_PROG(GCONFTOOL, gconftool-2, no) | ||
5 | |||
6 | if test x"$GCONFTOOL" = xno; then | ||
7 | - AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf]) | ||
8 | + AC_MSG_WARN([gconftool-2 executable not found in your path - should be installed with GConf]) | ||
9 | fi | ||
10 | |||
11 | AM_GCONF_SOURCE_2 | ||
diff --git a/meta/packages/gnome/gnome-vfs-2.18.1/gnome-vfs-no-kerberos.patch b/meta/packages/gnome/gnome-vfs-2.18.1/gnome-vfs-no-kerberos.patch deleted file mode 100644 index e25ecdd66f..0000000000 --- a/meta/packages/gnome/gnome-vfs-2.18.1/gnome-vfs-no-kerberos.patch +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | removes kerberos completely to avoid conflicts with installed kerberos | ||
2 | --- configure.in.orig 2007-01-05 19:42:26.418541610 +0200 | ||
3 | +++ configure.in 2007-01-05 19:42:56.604261797 +0200 | ||
4 | @@ -436,47 +436,6 @@ | ||
5 | ]) | ||
6 | AM_CONDITIONAL(HAVE_CDDA, test $have_cdda = yes) | ||
7 | AC_SUBST(CDDA_LIBS) | ||
8 | - | ||
9 | -dnl GSSAPI | ||
10 | -dnl Check for Kerberos installation | ||
11 | -have_gssapi=no | ||
12 | -AC_PATH_PROG([KRB5_CONFIG], krb5-config, none, $PATH:/usr/kerberos/bin) | ||
13 | - | ||
14 | -if test "x$KRB5_CONFIG" != "xnone"; then | ||
15 | - GSSAPI_LIBS="`${KRB5_CONFIG} --libs gssapi`" | ||
16 | - GSSAPI_CFLAGS="`${KRB5_CONFIG} --cflags gssapi`" | ||
17 | - | ||
18 | - saved_CPPFLAGS="$CPPFLAGS" | ||
19 | - saved_LIBS="$LIBS" | ||
20 | - LIBS="$LIBS $GSSAPI_LIBS" | ||
21 | - CPPFLAGS="$CPPFLAGS $GSSAPI_CFLAGS" | ||
22 | - # MIT and Heimdal put gssapi.h in different places | ||
23 | - AC_CHECK_HEADERS(gssapi/gssapi.h gssapi.h, [ | ||
24 | - AC_CHECK_FUNCS(gss_init_sec_context, [ | ||
25 | - AC_MSG_NOTICE([GSSAPI authentication support enabled]) | ||
26 | - AC_DEFINE(HAVE_GSSAPI, 1, [Define if GSSAPI support is enabled]) | ||
27 | - AC_CHECK_HEADERS(gssapi/gssapi_generic.h) | ||
28 | - have_gssapi=yes | ||
29 | - | ||
30 | - # MIT Kerberos lacks GSS_C_NT_HOSTBASED_SERVICE | ||
31 | - AC_CHECK_DECL([GSS_C_NT_HOSTBASED_SERVICE],, | ||
32 | - [AC_DEFINE([GSS_C_NT_HOSTBASED_SERVICE], gss_nt_service_name, | ||
33 | - [Define if GSS_C_NT_HOSTBASED_SERVICE is not defined otherwise]) | ||
34 | - ], [ | ||
35 | - #ifdef HAVE_GSSAPI_GSSAPI_H | ||
36 | - #include <gssapi/gssapi.h> | ||
37 | - #else | ||
38 | - #include <gssapi.h> | ||
39 | - #endif | ||
40 | - ]) | ||
41 | - ]) | ||
42 | - break | ||
43 | - ]) | ||
44 | - LIBS="$saved_LIBS" | ||
45 | - CPPFLAGS="$saved_CPPFLAGS" | ||
46 | -fi | ||
47 | -AC_SUBST(GSSAPI_LIBS) | ||
48 | -AC_SUBST(GSSAPI_CFLAGS) | ||
49 | |||
50 | dnl ****************************** | ||
51 | dnl http-method (neon checks) | ||
diff --git a/meta/packages/gnome/gnome-vfs_2.18.1.bb b/meta/packages/gnome/gnome-vfs_2.18.1.bb deleted file mode 100644 index 335958f1ce..0000000000 --- a/meta/packages/gnome/gnome-vfs_2.18.1.bb +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | LICENSE = "GPL" | ||
2 | DEPENDS = "libxml2 gconf dbus bzip2 gnome-mime-data zlib" | ||
3 | RRECOMMENDS = "gnome-vfs-plugin-file shared-mime-info" | ||
4 | # Some legacy packages will require gnome-mime-data to be installed, but use of | ||
5 | # it is deprecated. | ||
6 | PR = "r1" | ||
7 | |||
8 | inherit gnome | ||
9 | |||
10 | # This is to provide compatibility with the gnome-vfs DBus fork | ||
11 | RPROVIDES = "gnome-vfs-plugin-dbus" | ||
12 | |||
13 | SRC_URI += "file://gconftool-lossage.patch;patch=1;pnum=1 \ | ||
14 | file://gnome-vfs-no-kerberos.patch;patch=1;pnum=0" | ||
15 | |||
16 | EXTRA_OECONF = " \ | ||
17 | --disable-hal \ | ||
18 | --disable-openssl \ | ||
19 | --disable-samba \ | ||
20 | " | ||
21 | |||
22 | FILES_${PN} += " ${libdir}/vfs ${datadir}/dbus-1/services" | ||
23 | FILES_${PN}-dbg += " ${libdir}/gnome-vfs-2.0/modules/.debug" | ||
24 | FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/include" | ||
25 | FILES_${PN}-doc += " ${datadir}/gtk-doc" | ||
26 | |||
27 | do_stage () { | ||
28 | autotools_stage_all | ||
29 | } | ||
30 | |||
31 | PACKAGES_DYNAMIC = "gnome-vfs-plugin-*" | ||
32 | |||
33 | python populate_packages_prepend () { | ||
34 | print bb.data.getVar('FILES_gnome-vfs', d, 1) | ||
35 | |||
36 | plugindir = bb.data.expand('${libdir}/gnome-vfs-2.0/modules/', d) | ||
37 | do_split_packages(d, plugindir, '^lib(.*)\.so$', 'gnome-vfs-plugin-%s', 'GNOME VFS plugin for %s') | ||
38 | } | ||