merge of '0303d4291ff3297fae792050c054f118512fd08d'

     and 'e0d98822d68dfa24d26f2402a78adb2cb0e219c3'

5 files changed, 103 insertions, 0 deletions

diff --git a/packages/obsolete/maemo/.mtn2git_empty b/packages/obsolete/maemo/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/obsolete/maemo/.mtn2git_empty
diff --git a/packages/obsolete/maemo/gconf-osso/.mtn2git_empty b/packages/obsolete/maemo/gconf-osso/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/obsolete/maemo/gconf-osso/.mtn2git_empty
diff --git a/packages/obsolete/maemo/osso-gnome-vfs2/.mtn2git_empty b/packages/obsolete/maemo/osso-gnome-vfs2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/obsolete/maemo/osso-gnome-vfs2/.mtn2git_empty
diff --git a/packages/obsolete/maemo/osso-gnome-vfs2/gconftool-lossage.patch b/packages/obsolete/maemo/osso-gnome-vfs2/gconftool-lossage.patch
new file mode 100644
index 0000000000..3dbc130ddc
--- /dev/null
+++ b/packages/obsolete/maemo/osso-gnome-vfs2/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/obsolete/maemo/osso-gnome-vfs2_2.8.4.4-1.bb b/packages/obsolete/maemo/osso-gnome-vfs2_2.8.4.4-1.bb
new file mode 100644
index 0000000000..e0f258decd
--- /dev/null
+++ b/packages/obsolete/maemo/osso-gnome-vfs2_2.8.4.4-1.bb
@@ -0,0 +1,92 @@
+DESCRIPTION = "The Gnome Virtual File System - OSSO Version"
+LICENSE = "GPL"
+SECTION = "x11/gnome"
+PR = "r4"
+PROVIDES = "virtual/gnome-vfs"
+RPROVIDES = "gnome-vfs"
+
+inherit gnome pkgconfig
+
+DEPENDS = "libxml2 gconf-osso dbus-0.23.1-osso5 bzip2 gnome-mime-data zlib samba osso-gwconnect"
+RRECOMMENDS = "gnome-vfs-plugin-file shared-mime-info"
+
+SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/o/${PN}/${PN}_${PV}.tar.gz \
+           file://gconftool-lossage.patch;patch=1;pnum=1"
+
+EXTRA_OECONF = "--with-ipc=dbus --enable-ext-dbus-daemon --disable-orbit"
+
+S = "${WORKDIR}/${PN}-2.8.4.4"
+
+FILES_${PN} += " ${libdir}/vfs"
+FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/modules/*.a ${libdir}/gnome-vfs-2.0/modules/*.la ${libdir}/gnome-vfs-2.0/include"
+FILES_${PN}-doc += " ${datadir}/gtk-doc"
+
+GNOME_VFS_HEADERS = " \
+gnome-vfs-utils.h \
+gnome-vfs-application-registry.h \
+gnome-vfs-async-ops.h \
+gnome-vfs-ops.h \
+gnome-vfs-uri.h \
+gnome-vfs-standard-callbacks.h \
+gnome-vfs-module-callback.h \
+gnome-vfs-context.h \
+gnome-vfs-file-info.h \
+gnome-vfs-directory.h \
+gnome-vfs-mime-monitor.h \
+gnome-vfs-mime-handlers.h \
+gnome-vfs-result.h \
+gnome-vfs-job-limit.h \
+gnome-vfs-file-size.h \
+gnome-vfs-mime-utils.h \
+gnome-vfs-find-directory.h \
+gnome-vfs-init.h \
+gnome-vfs-handle.h \
+gnome-vfs.h \
+gnome-vfs-cancellation.h \
+gnome-vfs-xfer.h \
+gnome-vfs-monitor.h \
+gnome-vfs-types.h \
+gnome-vfs-volume-monitor.h \
+gnome-vfs-drive.h \
+gnome-vfs-volume.h \
+gnome-vfs-enum-types.h \
+gnome-vfs-address.h \
+gnome-vfs-dns-sd.h \
+gnome-vfs-mime-info-cache.h \
+gnome-vfs-resolve.h"
+
+GNOME_VFS_MODULE_HEADERS = " \
+gnome-vfs-mime-info.h \
+gnome-vfs-transform.h \
+gnome-vfs-ssl.h \
+gnome-vfs-inet-connection.h \
+gnome-vfs-socket.h \
+gnome-vfs-parse-ls.h \
+gnome-vfs-method.h \
+gnome-vfs-cancellable-ops.h \
+gnome-vfs-module.h \
+gnome-vfs-module-shared.h \
+gnome-vfs-module-callback-module-api.h \
+gnome-vfs-mime.h \
+gnome-vfs-socket-buffer.h"
+
+do_stage() {
+	oe_libinstall -so -C libgnomevfs libgnomevfs-2 ${STAGING_LIBDIR}
+	install -d ${STAGING_INCDIR}/gnome-vfs-2.0/libgnomevfs
+	for i in ${GNOME_VFS_HEADERS}; do install -m 0644 libgnomevfs/$i ${STAGING_INCDIR}/gnome-vfs-2.0/libgnomevfs/; done
+	install -d ${STAGING_INCDIR}/gnome-vfs-module-2.0/libgnomevfs
+	for i in ${GNOME_VFS_MODULE_HEADERS}; do install -m 0644 libgnomevfs/$i ${STAGING_INCDIR}/gnome-vfs-module-2.0/libgnomevfs/; done
+}
+
+do_install() {
+	oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install
+}
+
+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')
+}