summaryrefslogtreecommitdiffstats
path: root/meta/packages/gnome
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2007-01-27 20:59:37 +0000
committerRoss Burton <ross@openedhand.com>2007-01-27 20:59:37 +0000
commitdec4a3c1795e92d651def9a5f686aa6c753e1c64 (patch)
treeef921b3caaf92676f370cebe2a4ee81966b2652c /meta/packages/gnome
parent02aa1079f87f11951ce83e7f698014ed7910635f (diff)
downloadpoky-dec4a3c1795e92d651def9a5f686aa6c753e1c64.tar.gz
Update gnome-vfs partially from OE, removing the krb hack
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1210 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/gnome')
-rw-r--r--meta/packages/gnome/gnome-vfs-2.16.3/gnome-vfs-no-kerberos.patch51
-rw-r--r--meta/packages/gnome/gnome-vfs_2.16.3.bb15
2 files changed, 59 insertions, 7 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 @@
1removes 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.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 @@
1LICENSE = "GPL" 1LICENSE = "GPL"
2PR = "r3"
3
4inherit gnome
5
6DEPENDS = "libxml2 gconf dbus bzip2 gnome-mime-data zlib" 2DEPENDS = "libxml2 gconf dbus bzip2 gnome-mime-data zlib"
7RRECOMMENDS = "gnome-vfs-plugin-file gnome-mime-data shared-mime-info" 3RRECOMMENDS = "gnome-vfs-plugin-file gnome-mime-data shared-mime-info"
8 4
5PR = "r4"
6
7inherit gnome
8
9# This is to provide compatibility with the gnome-vfs DBus fork 9# This is to provide compatibility with the gnome-vfs DBus fork
10RPROVIDES = "gnome-vfs-plugin-dbus" 10PROVIDES = "gnome-vfs-plugin-dbus"
11RREPLACES = "gnome-vfs-dbus"
11 12
12SRC_URI += "file://gconftool-lossage.patch;patch=1;pnum=1" 13SRC_URI += "file://gconftool-lossage.patch;patch=1;pnum=1 \
14 file://gnome-vfs-no-kerberos.patch;patch=1;pnum=0"
13 15
14EXTRA_OECONF = "--disable-openssl --disable-samba" 16EXTRA_OECONF = "--disable-openssl --disable-samba"
15#export KRB5_CONFIG="none"
16 17
17FILES_${PN} += " ${libdir}/vfs" 18FILES_${PN} += " ${libdir}/vfs"
18FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/include" 19FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/include"