merge of 'aac60b186b977130a688c4d00bfde913fb6221eb'

     and 'f42403739ba7106ebfe92b3af59bf9c81b54f06d'

20 files changed, 298 insertions, 15 deletions

diff --git a/packages/gnome/gail_1.20.0.bb b/packages/gnome/gail_1.20.0.bb
new file mode 100644
index 0000000000..58168a04d5
--- /dev/null
+++ b/packages/gnome/gail_1.20.0.bb
@@ -0,0 +1,18 @@
+LICENSE = "LGPL"
+SECTION = "x11/libs"
+PR = "r0"
+DESCRIPTION = "GNOME Accessibility Implementation Library"
+DEPENDS = "gtk+"
+
+inherit gnome
+
+EXTRA_OECONF = "--disable-gtk-doc"
+
+FILES_${PN} += "${libdir}/gtk-2.0/modules/*.so"
+FILES_${PN}-dbg += "${libdir}/gtk-2.0/modules/.debug"
+
+do_stage() {
+	gnome_stage_includes
+	oe_libinstall -C gail -so libgail ${STAGING_LIBDIR}
+	oe_libinstall -C libgail-util -so libgailutil ${STAGING_LIBDIR}
+}
diff --git a/packages/gnome/gnome-common-2.20.0/.mtn2git_empty b/packages/gnome/gnome-common-2.20.0/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gnome/gnome-common-2.20.0/.mtn2git_empty
diff --git a/packages/gnome/gnome-common-2.20.0/omf.patch b/packages/gnome/gnome-common-2.20.0/omf.patch
new file mode 100644
index 0000000000..0d85b001e0
--- /dev/null
+++ b/packages/gnome/gnome-common-2.20.0/omf.patch
@@ -0,0 +1,13 @@
+--- gnome-common-2.4.0/doc-build/omf.make	2003-05-24 08:16:25.000000000 -0700
++++ gnome-common-2.4.0.new/doc-build/omf.make	2004-11-15 14:01:12.185155192 -0700
+@@ -43,7 +43,9 @@
+ install-data-hook-omf:
+ 	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
+ 	for file in $(omffile); do \
+-		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
++		if [ -f $$file.out ]; then \
++			$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
++		fi; \
+ 	done
+ 	-scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
+ 
diff --git a/packages/gnome/gnome-common_2.20.0.bb b/packages/gnome/gnome-common_2.20.0.bb
new file mode 100644
index 0000000000..2991db81c7
--- /dev/null
+++ b/packages/gnome/gnome-common_2.20.0.bb
@@ -0,0 +1,28 @@
+LICENSE = "GPL"
+SECTION = "x11/gnome"
+PR = "r0"
+DESCRIPTION = "Common macros for building GNOME applications"
+inherit gnome
+
+# The omf.make file failed if scrollkeeper doesn't happen to be
+# installed
+
+SRC_URI += "file://omf.patch;patch=1"
+
+EXTRA_AUTORECONF = ""
+DEPENDS = ""
+
+FILES_${PN} += "${datadir}/aclocal"
+FILES_${PN}-dev = ""
+
+do_stage () {
+	rm -rf ${STAGE_TEMP}
+	mkdir -p ${STAGE_TEMP}
+	make DESTDIR="${STAGE_TEMP}" install
+	cp -pPR ${STAGE_TEMP}${bindir}/* ${STAGING_DIR}/${BUILD_SYS}/bin
+	install -d ${STAGING_DATADIR}/gnome-common
+	install -d ${STAGING_DATADIR}/aclocal
+	cp -pPR ${STAGE_TEMP}${datadir}/gnome-common/* ${STAGING_DATADIR}/gnome-common
+	cp -pPR ${STAGE_TEMP}${datadir}/aclocal/* ${STAGING_DATADIR}/aclocal
+	rm -rf ${STAGE_TEMP}
+}
diff --git a/packages/gnome/gnome-doc-utils_0.12.0.bb b/packages/gnome/gnome-doc-utils_0.12.0.bb
new file mode 100644
index 0000000000..f190a5ae13
--- /dev/null
+++ b/packages/gnome/gnome-doc-utils_0.12.0.bb
@@ -0,0 +1,16 @@
+LICENSE = "GPL/LGPL"
+DEPENDS = "libxml2 libxslt"
+
+PR = "r1"
+
+inherit gnome
+
+EXTRA_OECONF = "--disable-scrollkeeper"
+
+FILES_${PN} += "${datadir}/xml*"
+
+do_stage() {
+	mkdir -p  ${STAGING_DATADIR}/xml/gnome/xslt/
+	cp -pPr ${S}/xslt/* ${STAGING_DATADIR}/xml/gnome/xslt/
+	autotools_stage_all
+}
diff --git a/packages/gnome/gnome-keyring/.mtn2git_empty b/packages/gnome/gnome-keyring/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gnome/gnome-keyring/.mtn2git_empty
diff --git a/packages/gnome/gnome-keyring/org.gnome.keyring.service b/packages/gnome/gnome-keyring/org.gnome.keyring.service
new file mode 100644
index 0000000000..96ea061cfb
--- /dev/null
+++ b/packages/gnome/gnome-keyring/org.gnome.keyring.service
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.gnome.keyring
+Exec=/usr/bin/gnome-keyring-daemon
diff --git a/packages/gnome/gnome-keyring_0.8.1.bb b/packages/gnome/gnome-keyring_0.8.1.bb
new file mode 100644
index 0000000000..6489cbee21
--- /dev/null
+++ b/packages/gnome/gnome-keyring_0.8.1.bb
@@ -0,0 +1,12 @@
+LICENSE = "GPL"
+SECTION = "x11/gnome"
+
+inherit autotools gnome pkgconfig
+
+DEPENDS = "gtk+"
+
+EXTRA_OECONF = "--disable-gtk-doc"
+
+do_stage() {
+        autotools_stage_all
+}
diff --git a/packages/gnome/gnome-keyring_2.20.0.bb b/packages/gnome/gnome-keyring_2.20.0.bb
new file mode 100644
index 0000000000..2f72c5dfb1
--- /dev/null
+++ b/packages/gnome/gnome-keyring_2.20.0.bb
@@ -0,0 +1,23 @@
+LICENSE = "GPL"
+SECTION = "x11/gnome"
+
+PR = "r2"
+
+inherit autotools gnome pkgconfig
+
+DEPENDS = "gtk+ libgcrypt"
+
+EXTRA_OECONF = "--disable-gtk-doc"
+
+SRC_URI += "file://org.gnome.keyring.service"
+
+do_install_append () {
+	install -d ${D}${datadir}/dbus-1/services
+	install -m 0644 ${WORKDIR}/org.gnome.keyring.service ${D}${datadir}/dbus-1/services
+}
+
+FILES_${PN} += "${datadir}/dbus-1/services"
+
+do_stage() {
+        autotools_stage_all
+}
diff --git a/packages/gnome/gnome-mime-data_2.18.0.bb b/packages/gnome/gnome-mime-data_2.18.0.bb
new file mode 100644
index 0000000000..a9797d2298
--- /dev/null
+++ b/packages/gnome/gnome-mime-data_2.18.0.bb
@@ -0,0 +1,7 @@
+LICENSE = "GPL"
+inherit gnome
+
+DEPENDS += "shared-mime-info intltool-native"
+RDEPENDS = "shared-mime-info"
+
+FILES_${PN}-dev += "${datadir}/pkgconfig/*.pc"
diff --git a/packages/gnome/gnome-vfs-2.20.0/.mtn2git_empty b/packages/gnome/gnome-vfs-2.20.0/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gnome/gnome-vfs-2.20.0/.mtn2git_empty
diff --git a/packages/gnome/gnome-vfs-2.20.0/gconftool-lossage.patch b/packages/gnome/gnome-vfs-2.20.0/gconftool-lossage.patch
new file mode 100644
index 0000000000..3dbc130ddc
--- /dev/null
+++ b/packages/gnome/gnome-vfs-2.20.0/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/packages/gnome/gnome-vfs-2.20.0/gnome-vfs-no-kerberos.patch b/packages/gnome/gnome-vfs-2.20.0/gnome-vfs-no-kerberos.patch
new file mode 100644
index 0000000000..e25ecdd66f
--- /dev/null
+++ b/packages/gnome/gnome-vfs-2.20.0/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/packages/gnome/gnome-vfs_2.18.1.bb b/packages/gnome/gnome-vfs_2.18.1.bb
index 4ae7406a46..8a3e460119 100644
--- a/packages/gnome/gnome-vfs_2.18.1.bb
+++ b/packages/gnome/gnome-vfs_2.18.1.bb
@@ -2,7 +2,7 @@ LICENSE = "GPL"
 DEPENDS = "libxml2 gconf gnutls avahi dbus bzip2 gnome-mime-data zlib"
 RRECOMMENDS = "gnome-vfs-plugin-file gnome-mime-data shared-mime-info"
 
-PR = "r0"
+PR = "r1"
 
 inherit gnome
 
@@ -20,7 +20,7 @@ EXTRA_OECONF = " \
                  --with-samba-includes=${STAGING_INCDIR} \
                "
 
-FILES_${PN} += " ${libdir}/vfs"
+FILES_${PN} += " ${libdir}/vfs ${datadir}/dbus-1/services"
 FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/include"
 FILES_${PN}-doc += " ${datadir}/gtk-doc"
 
diff --git a/packages/gnome/gnome-vfs_2.20.0.bb b/packages/gnome/gnome-vfs_2.20.0.bb
new file mode 100644
index 0000000000..5631a9c960
--- /dev/null
+++ b/packages/gnome/gnome-vfs_2.20.0.bb
@@ -0,0 +1,42 @@
+LICENSE = "GPL"
+DEPENDS = "libxml2 gconf gnutls avahi 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 = "r0"
+
+inherit gnome
+
+SRC_URI += "file://gconftool-lossage.patch;patch=1;pnum=1 \
+	    file://gnome-vfs-no-kerberos.patch;patch=1;pnum=0"
+
+# This is to provide compatibility with the gnome-vfs DBus fork
+PROVIDES = "gnome-vfs-plugin-dbus"
+RREPLACES = "gnome-vfs-dbus"
+
+EXTRA_OECONF = " \
+                 --disable-openssl \
+                 --enable-gnutls \
+                 --enable-avahi \
+                 --with-samba-includes=${STAGING_INCDIR} \
+               "
+
+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')
+}
+
+
diff --git a/packages/gnome/libart-lgpl/Makefile.am.patch b/packages/gnome/libart-lgpl/Makefile.am.patch
index 749de32e2a..edeed0a6e5 100644
--- a/packages/gnome/libart-lgpl/Makefile.am.patch
+++ b/packages/gnome/libart-lgpl/Makefile.am.patch
@@ -1,13 +1,7 @@
 --- libart_lgpl-2.3.16/Makefile.am.old	2004-06-26 18:57:07.000000000 +0100
 +++ libart_lgpl-2.3.16/Makefile.am	2004-06-26 18:57:12.000000000 +0100
-@@ -5,8 +5,8 @@
- 
- BUILT_SOURCES = art_config.h
- 
--art_config.h:	gen_art_config
+@@ -5,2 +5,2 @@
+-art_config.h:	gen_art_config$(EXEEXT)
 -	./gen_art_config > art_config.h
-+#art_config.h:	gen_art_config
++#art_config.h:	gen_art_config$(EXEEXT)
 +#	./gen_art_config > art_config.h
- 
- EXTRA_DIST = 			\
- 	libart-config.in	\
diff --git a/packages/gnome/libart-lgpl_2.3.19.bb b/packages/gnome/libart-lgpl_2.3.19.bb
new file mode 100644
index 0000000000..a37b392593
--- /dev/null
+++ b/packages/gnome/libart-lgpl_2.3.19.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "Library of functions for 2D graphics"
+SECTION = "x11/gnome"
+LICENSE = "LGPL"
+
+ART_CONFIG = "${HOST_ARCH}/art_config.h"
+
+# can't use gnome.oeclass due to _ in filename
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/libart_lgpl-${PV}.tar.bz2 \
+       file://${ART_CONFIG} \
+       file://Makefile.am.patch;patch=1"
+
+inherit autotools pkgconfig
+
+DEPENDS = ""
+
+FILES_${PN} = "${libdir}/*.so.*"
+FILES_${PN}-dev += "${bindir}/libart2-config"
+
+S = "${WORKDIR}/libart_lgpl-${PV}"
+
+do_configure_prepend() {
+	cp ${WORKDIR}/${ART_CONFIG} ${S}/art_config.h
+}
+
+EXTRA_OECONF = "--disable-gtk-doc"
+
+do_stage() {
+	autotools_stage_includes
+	oe_libinstall -a -so libart_lgpl_2 ${STAGING_LIBDIR}
+}
diff --git a/packages/gnome/libgnomecanvas_2.14.0.bb b/packages/gnome/libgnomecanvas_2.14.0.bb
new file mode 100644
index 0000000000..df183bb674
--- /dev/null
+++ b/packages/gnome/libgnomecanvas_2.14.0.bb
@@ -0,0 +1,17 @@
+LICENSE = "GPL"
+SECTION = "x11/gnome/libs"
+DESCRIPTION = "A powerful object-oriented display"
+
+inherit gnome
+
+DEPENDS = "libglade libart-lgpl"
+
+EXTRA_OECONF = "--disable-gtk-doc"
+
+FILES_${PN} += "${libdir}/libglade/*/libcanvas.so"
+FILES_${PN}-dbg += "${libdir}/libglade/*/.debug/"
+FILES_${PN}-dev += "${libdir}/libglade/*/libcanvas.*a"
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/gnome/libgnomecanvas_2.20.0.bb b/packages/gnome/libgnomecanvas_2.20.0.bb
new file mode 100644
index 0000000000..8e13c9562b
--- /dev/null
+++ b/packages/gnome/libgnomecanvas_2.20.0.bb
@@ -0,0 +1,17 @@
+LICENSE = "GPL"
+SECTION = "x11/gnome/libs"
+DESCRIPTION = "A powerful object-oriented display"
+
+inherit gnome
+
+DEPENDS = "libglade libart-lgpl gail"
+
+EXTRA_OECONF = "--disable-gtk-doc"
+
+FILES_${PN} += "${libdir}/libglade/*/libcanvas.so"
+FILES_${PN}-dbg += "${libdir}/libglade/*/.debug/"
+FILES_${PN}-dev += "${libdir}/libglade/*/libcanvas.*a"
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/gnome/libsoup_2.2.100.bb b/packages/gnome/libsoup_2.2.100.bb
index e829ad39ca..e642b83cc7 100644
--- a/packages/gnome/libsoup_2.2.100.bb
+++ b/packages/gnome/libsoup_2.2.100.bb
@@ -1,18 +1,19 @@
 DESCRIPTION = "An HTTP library implementation in C"
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
+
 DEPENDS = "glib-2.0 gnutls libxml2"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.2/${PN}-${PV}.tar.bz2"
 
 inherit autotools pkgconfig
 
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev = "${includedir}/ ${libdir}/"
+FILES_${PN}-doc = "${datadir}/"
+
 do_stage() {
 	rm -f ${PKG_CONFIG_DIR}/libsoup*
 	autotools_stage_all
 	ln -sf ${PKG_CONFIG_DIR}/libsoup.pc ${PKG_CONFIG_DIR}/libsoup-2.2.pc
 }
-
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev = "${includedir}/ ${libdir}/"
-FILES_${PN}-doc = "${datadir}/"