summaryrefslogtreecommitdiff
path: root/meta/packages
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2007-08-31 16:13:36 +0000
committerRoss Burton <ross@openedhand.com>2007-08-31 16:13:36 +0000
commitc8c2a9e7d0a11c6cdc23f34a4f10c98a33a75287 (patch)
tree086fb1acfaee541bb59468d3c62629e0cb0fb965 /meta/packages
parenta74c19fd52a96f24953777d641723e41854ee05f (diff)
downloadopenembedded-core-c8c2a9e7d0a11c6cdc23f34a4f10c98a33a75287.tar.gz
openembedded-core-c8c2a9e7d0a11c6cdc23f34a4f10c98a33a75287.tar.bz2
openembedded-core-c8c2a9e7d0a11c6cdc23f34a4f10c98a33a75287.tar.xz
openembedded-core-c8c2a9e7d0a11c6cdc23f34a4f10c98a33a75287.zip
Add new gnome-vfs to poky-bleeding
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2625 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/gnome/gnome-vfs-2.19.91/gconftool-lossage.patch11
-rw-r--r--meta/packages/gnome/gnome-vfs-2.19.91/gnome-vfs-no-kerberos.patch51
-rw-r--r--meta/packages/gnome/gnome-vfs_2.19.91.bb38
3 files changed, 100 insertions, 0 deletions
diff --git a/meta/packages/gnome/gnome-vfs-2.19.91/gconftool-lossage.patch b/meta/packages/gnome/gnome-vfs-2.19.91/gconftool-lossage.patch
new file mode 100644
index 000000000..3dbc130dd
--- /dev/null
+++ b/meta/packages/gnome/gnome-vfs-2.19.91/gconftool-lossage.patch
@@ -0,0 +1,11 @@
+--- 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/packages/gnome/gnome-vfs-2.19.91/gnome-vfs-no-kerberos.patch b/meta/packages/gnome/gnome-vfs-2.19.91/gnome-vfs-no-kerberos.patch
new file mode 100644
index 000000000..e25ecdd66
--- /dev/null
+++ b/meta/packages/gnome/gnome-vfs-2.19.91/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.19.91.bb b/meta/packages/gnome/gnome-vfs_2.19.91.bb
new file mode 100644
index 000000000..335958f1c
--- /dev/null
+++ b/meta/packages/gnome/gnome-vfs_2.19.91.bb
@@ -0,0 +1,38 @@
+LICENSE = "GPL"
+DEPENDS = "libxml2 gconf dbus bzip2 gnome-mime-data zlib"
+RRECOMMENDS = "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 = "r1"
+
+inherit gnome
+
+# This is to provide compatibility with the gnome-vfs DBus fork
+RPROVIDES = "gnome-vfs-plugin-dbus"
+
+SRC_URI += "file://gconftool-lossage.patch;patch=1;pnum=1 \
+ file://gnome-vfs-no-kerberos.patch;patch=1;pnum=0"
+
+EXTRA_OECONF = " \
+ --disable-hal \
+ --disable-openssl \
+ --disable-samba \
+ "
+
+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"
+
+do_stage () {
+autotools_stage_all
+}
+
+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')
+}