summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2006-12-24 10:50:49 +0000
committerRoss Burton <ross@openedhand.com>2006-12-24 10:50:49 +0000
commit74479b5a4eea4593ff311a0beed425885f43af2a (patch)
treea0a8adb496707407510f2308cac7bbe78fea1907 /meta
parent81b49595078d38239bb3f907a7e7814e5d30bb16 (diff)
downloadpoky-74479b5a4eea4593ff311a0beed425885f43af2a.tar.gz
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
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/gnome/gnome-vfs-2.16.3/gconftool-lossage.patch (renamed from meta/packages/gnome/gnome-vfs-2.12.0/gconftool-lossage.patch)0
-rw-r--r--meta/packages/gnome/gnome-vfs_2.12.0.bb90
-rw-r--r--meta/packages/gnome/gnome-vfs_2.16.3.bb29
3 files changed, 29 insertions, 90 deletions
diff --git a/meta/packages/gnome/gnome-vfs-2.12.0/gconftool-lossage.patch b/meta/packages/gnome/gnome-vfs-2.16.3/gconftool-lossage.patch
index 3dbc130ddc..3dbc130ddc 100644
--- a/meta/packages/gnome/gnome-vfs-2.12.0/gconftool-lossage.patch
+++ b/meta/packages/gnome/gnome-vfs-2.16.3/gconftool-lossage.patch
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 @@
1LICENSE = "GPL"
2PR = "r2"
3
4inherit gnome
5
6DEPENDS = "libxml2 gconf libbonobo bzip2 gnome-mime-data orbit2 zlib samba-3.0.14a"
7RRECOMMENDS = "gnome-vfs-plugin-file gnome-mime-data shared-mime-info"
8
9SRC_URI += "file://gconftool-lossage.patch;patch=1;pnum=1"
10
11ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2"
12
13FILES_${PN} += " ${libdir}/bonobo/servers ${libdir}/bonobo/monikers/*.so ${libdir}/vfs"
14FILES_${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"
15FILES_${PN}-doc += " ${datadir}/gtk-doc"
16
17GNOME_VFS_HEADERS = " \
18gnome-vfs-mime-deprecated.h \
19gnome-vfs-address.h \
20gnome-vfs-dns-sd.h \
21gnome-vfs-mime-info-cache.h \
22gnome-vfs-resolve.h \
23gnome-vfs-utils.h \
24gnome-vfs-application-registry.h \
25gnome-vfs-async-ops.h \
26gnome-vfs-ops.h \
27gnome-vfs-uri.h \
28gnome-vfs-standard-callbacks.h \
29gnome-vfs-module-callback.h \
30gnome-vfs-context.h \
31gnome-vfs-file-info.h \
32gnome-vfs-directory.h \
33gnome-vfs-mime-monitor.h \
34gnome-vfs-mime-handlers.h \
35gnome-vfs-result.h \
36gnome-vfs-job-limit.h \
37gnome-vfs-file-size.h \
38gnome-vfs-mime-utils.h \
39gnome-vfs-find-directory.h \
40gnome-vfs-init.h \
41gnome-vfs-handle.h \
42gnome-vfs.h \
43gnome-vfs-cancellation.h \
44gnome-vfs-xfer.h \
45gnome-vfs-monitor.h \
46gnome-vfs-types.h \
47gnome-vfs-volume-monitor.h \
48gnome-vfs-drive.h \
49gnome-vfs-volume.h \
50gnome-vfs-enum-types.h"
51
52GNOME_VFS_MODULE_HEADERS = " \
53gnome-vfs-mime-info.h \
54gnome-vfs-transform.h \
55gnome-vfs-ssl.h \
56gnome-vfs-inet-connection.h \
57gnome-vfs-socket.h \
58gnome-vfs-parse-ls.h \
59gnome-vfs-method.h \
60gnome-vfs-cancellable-ops.h \
61gnome-vfs-module.h \
62gnome-vfs-module-shared.h \
63gnome-vfs-module-callback-module-api.h \
64gnome-vfs-mime.h \
65gnome-vfs-socket-buffer.h"
66
67do_compile() {
68 oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}"
69}
70
71do_stage() {
72 oe_libinstall -so -C libgnomevfs libgnomevfs-2 ${STAGING_LIBDIR}
73 install -d ${STAGING_INCDIR}/gnome-vfs-2.0/libgnomevfs
74 for i in ${GNOME_VFS_HEADERS}; do install -m 0644 libgnomevfs/$i ${STAGING_INCDIR}/gnome-vfs-2.0/libgnomevfs/; done
75 install -d ${STAGING_INCDIR}/gnome-vfs-module-2.0/libgnomevfs
76 for i in ${GNOME_VFS_MODULE_HEADERS}; do install -m 0644 libgnomevfs/$i ${STAGING_INCDIR}/gnome-vfs-module-2.0/libgnomevfs/; done
77}
78
79do_install() {
80 oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install
81}
82
83PACKAGES_DYNAMIC = "gnome-vfs-plugin-*"
84
85python populate_packages_prepend () {
86 print bb.data.getVar('FILES_gnome-vfs', d, 1)
87
88 plugindir = bb.data.expand('${libdir}/gnome-vfs-2.0/modules/', d)
89 do_split_packages(d, plugindir, '^lib(.*)\.so$', 'gnome-vfs-plugin-%s', 'GNOME VFS plugin for %s')
90}
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 @@
1LICENSE = "GPL"
2PR = "r1"
3
4inherit gnome
5
6DEPENDS = "libxml2 gconf bzip2 gnome-mime-data zlib"
7RRECOMMENDS = "gnome-vfs-plugin-file gnome-mime-data shared-mime-info"
8
9SRC_URI += "file://gconftool-lossage.patch;patch=1;pnum=1"
10
11EXTRA_OECONF = "--disable-openssl"
12#export KRB5_CONFIG="none"
13
14FILES_${PN} += " ${libdir}/vfs"
15FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/include"
16FILES_${PN}-doc += " ${datadir}/gtk-doc"
17
18do_stage () {
19autotools_stage_all
20}
21
22PACKAGES_DYNAMIC = "gnome-vfs-plugin-*"
23
24python populate_packages_prepend () {
25 print bb.data.getVar('FILES_gnome-vfs', d, 1)
26
27 plugindir = bb.data.expand('${libdir}/gnome-vfs-2.0/modules/', d)
28 do_split_packages(d, plugindir, '^lib(.*)\.so$', 'gnome-vfs-plugin-%s', 'GNOME VFS plugin for %s')
29}