From 74479b5a4eea4593ff311a0beed425885f43af2a Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Sun, 24 Dec 2006 10:50:49 +0000 Subject: Upgrade gnome-vfs to 2.16.3, which uses DBus 1.0 git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1093 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- .../gnome/gnome-vfs-2.12.0/gconftool-lossage.patch | 11 --- .../gnome/gnome-vfs-2.16.3/gconftool-lossage.patch | 11 +++ meta/packages/gnome/gnome-vfs_2.12.0.bb | 90 ---------------------- meta/packages/gnome/gnome-vfs_2.16.3.bb | 29 +++++++ 4 files changed, 40 insertions(+), 101 deletions(-) delete mode 100644 meta/packages/gnome/gnome-vfs-2.12.0/gconftool-lossage.patch create mode 100644 meta/packages/gnome/gnome-vfs-2.16.3/gconftool-lossage.patch delete mode 100644 meta/packages/gnome/gnome-vfs_2.12.0.bb create mode 100644 meta/packages/gnome/gnome-vfs_2.16.3.bb diff --git a/meta/packages/gnome/gnome-vfs-2.12.0/gconftool-lossage.patch b/meta/packages/gnome/gnome-vfs-2.12.0/gconftool-lossage.patch deleted file mode 100644 index 3dbc130ddc..0000000000 --- a/meta/packages/gnome/gnome-vfs-2.12.0/gconftool-lossage.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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.16.3/gconftool-lossage.patch b/meta/packages/gnome/gnome-vfs-2.16.3/gconftool-lossage.patch new file mode 100644 index 0000000000..3dbc130ddc --- /dev/null +++ b/meta/packages/gnome/gnome-vfs-2.16.3/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.12.0.bb b/meta/packages/gnome/gnome-vfs_2.12.0.bb deleted file mode 100644 index 1c11f9841f..0000000000 --- a/meta/packages/gnome/gnome-vfs_2.12.0.bb +++ /dev/null @@ -1,90 +0,0 @@ -LICENSE = "GPL" -PR = "r2" - -inherit gnome - -DEPENDS = "libxml2 gconf libbonobo bzip2 gnome-mime-data orbit2 zlib samba-3.0.14a" -RRECOMMENDS = "gnome-vfs-plugin-file gnome-mime-data shared-mime-info" - -SRC_URI += "file://gconftool-lossage.patch;patch=1;pnum=1" - -ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2" - -FILES_${PN} += " ${libdir}/bonobo/servers ${libdir}/bonobo/monikers/*.so ${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 ${libdir}/bonobo/monikers/*.a ${libdir}/bonobo/monikers/*.la" -FILES_${PN}-doc += " ${datadir}/gtk-doc" - -GNOME_VFS_HEADERS = " \ -gnome-vfs-mime-deprecated.h \ -gnome-vfs-address.h \ -gnome-vfs-dns-sd.h \ -gnome-vfs-mime-info-cache.h \ -gnome-vfs-resolve.h \ -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_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_compile() { - oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" -} - -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') -} diff --git a/meta/packages/gnome/gnome-vfs_2.16.3.bb b/meta/packages/gnome/gnome-vfs_2.16.3.bb new file mode 100644 index 0000000000..dc16c5ee7d --- /dev/null +++ b/meta/packages/gnome/gnome-vfs_2.16.3.bb @@ -0,0 +1,29 @@ +LICENSE = "GPL" +PR = "r1" + +inherit gnome + +DEPENDS = "libxml2 gconf bzip2 gnome-mime-data zlib" +RRECOMMENDS = "gnome-vfs-plugin-file gnome-mime-data shared-mime-info" + +SRC_URI += "file://gconftool-lossage.patch;patch=1;pnum=1" + +EXTRA_OECONF = "--disable-openssl" +#export KRB5_CONFIG="none" + +FILES_${PN} += " ${libdir}/vfs" +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') +} -- cgit v1.2.3-54-g00ecf