diff options
author | Richard Purdie <richard@openedhand.com> | 2006-01-19 22:06:23 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2006-01-19 22:06:23 +0000 |
commit | 8fcb232416eea3b811cd361b21471a5f32dd854f (patch) | |
tree | b9b2ff288887d4b7b252d85d6692bb4bc0532d2d /openembedded | |
parent | 6af7d32d07265f75e4f587d07ccaeec8cc4cd8e6 (diff) | |
download | poky-8fcb232416eea3b811cd361b21471a5f32dd854f.tar.gz |
Tweak gnome dbus packages slightly. gconf-dbus_cvs is broken for parallel_make. gnome-vfs-dbus_cvs is not the preferred version and we don't want to depend on samba for gnome-vfs-dbus
git-svn-id: https://svn.o-hand.com/repos/poky@228 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded')
-rw-r--r-- | openembedded/packages/gnome/gconf-dbus_svn.bb | 2 | ||||
-rw-r--r-- | openembedded/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb | 2 | ||||
-rwxr-xr-x | openembedded/packages/gnome/gnome-vfs-dbus_cvs.bb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/openembedded/packages/gnome/gconf-dbus_svn.bb b/openembedded/packages/gnome/gconf-dbus_svn.bb index 675b655412..bf9b46224f 100644 --- a/openembedded/packages/gnome/gconf-dbus_svn.bb +++ b/openembedded/packages/gnome/gconf-dbus_svn.bb | |||
@@ -14,6 +14,8 @@ SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \ | |||
14 | file://gconf-dbus-update.patch;patch=1;pnum=0 \ | 14 | file://gconf-dbus-update.patch;patch=1;pnum=0 \ |
15 | file://69gconfd-dbus" | 15 | file://69gconfd-dbus" |
16 | 16 | ||
17 | PARALLEL_MAKE = "" | ||
18 | |||
17 | inherit pkgconfig autotools | 19 | inherit pkgconfig autotools |
18 | S = "${WORKDIR}/trunk" | 20 | S = "${WORKDIR}/trunk" |
19 | 21 | ||
diff --git a/openembedded/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb b/openembedded/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb index 4f2a861eb2..2e6ac43f8a 100644 --- a/openembedded/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb +++ b/openembedded/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb | |||
@@ -6,7 +6,7 @@ RPROVIDES = "gnome-vfs" | |||
6 | 6 | ||
7 | inherit gnome pkgconfig | 7 | inherit gnome pkgconfig |
8 | 8 | ||
9 | DEPENDS = "libxml2 gconf-dbus dbus bzip2 gnome-mime-data zlib samba-3.0.14a" | 9 | DEPENDS = "libxml2 gconf-dbus dbus bzip2 gnome-mime-data zlib" |
10 | RRECOMMENDS = "gnome-vfs-plugin-file shared-mime-info" | 10 | RRECOMMENDS = "gnome-vfs-plugin-file shared-mime-info" |
11 | 11 | ||
12 | 12 | ||
diff --git a/openembedded/packages/gnome/gnome-vfs-dbus_cvs.bb b/openembedded/packages/gnome/gnome-vfs-dbus_cvs.bb index 87def47a2d..aea9c78358 100755 --- a/openembedded/packages/gnome/gnome-vfs-dbus_cvs.bb +++ b/openembedded/packages/gnome/gnome-vfs-dbus_cvs.bb | |||
@@ -1,5 +1,3 @@ | |||
1 | DEFAULT_PREFERENCE = "-1" | ||
2 | |||
3 | SECTION = "x11/utils" | 1 | SECTION = "x11/utils" |
4 | DEPENDS = "gtk+ glib-2.0 gconf dbus libxml2 zlib bzip2 gnome-mime-data" | 2 | DEPENDS = "gtk+ glib-2.0 gconf dbus libxml2 zlib bzip2 gnome-mime-data" |
5 | DESCRIPTION = "Virtual file system library using DBUS for communication." | 3 | DESCRIPTION = "Virtual file system library using DBUS for communication." |