From c66704cd6f91044a345096b9e3ab413e14e79319 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Mon, 13 Feb 2006 00:21:13 +0000
Subject: Various misc metadata fixes to enable poky builds again

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@273 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 openembedded/classes/package.bbclass                  | 4 ++--
 openembedded/conf/distro/poky.conf                    | 4 ++++
 openembedded/packages/eds/eds-dbus_svn.bb             | 3 ++-
 openembedded/packages/fontconfig/fontconfig_2.2.95.bb | 4 +++-
 openembedded/packages/gnome/gnome-vfs-dbus_cvs.bb     | 2 ++
 openembedded/packages/gtk+/gtk+_2.6.7.bb              | 2 +-
 6 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/openembedded/classes/package.bbclass b/openembedded/classes/package.bbclass
index fd8d1b7b09..03a533d59a 100644
--- a/openembedded/classes/package.bbclass
+++ b/openembedded/classes/package.bbclass
@@ -84,8 +84,8 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst
 # Function to strip a single file, called from RUNSTRIP below
 # A working 'file' (one which works on the target architecture)
 # is necessary for this stuff to work.
-PACKAGE_DEPENDS ?= "file-native"
-DEPENDS_prepend =+ "${PACKAGE_DEPENDS} "
+#PACKAGE_DEPENDS ?= "file-native"
+#DEPENDS_prepend =+ "${PACKAGE_DEPENDS} "
 #FIXME: this should be "" when any errors are gone!
 IGNORE_STRIP_ERRORS ?= "1"
 
diff --git a/openembedded/conf/distro/poky.conf b/openembedded/conf/distro/poky.conf
index ad35c65b00..a996183c79 100644
--- a/openembedded/conf/distro/poky.conf
+++ b/openembedded/conf/distro/poky.conf
@@ -69,6 +69,8 @@ PREFERRED_PROVIDER_x11 = "diet-x11"
 PREFERRED_PROVIDER_gconf=gconf-dbus
 PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus
 
+PREFERRED_VERSION_gnome-vfs-dbus = "2.12.0+cvs${SRCDATE}"
+
 
 #
 # CVS Dates to use:
@@ -170,3 +172,5 @@ PREFERRED_VERSION_xrdb ?= "0.0+cvs${SRCDATE}"
 PREFERRED_VERSION_xst ?= "0.15"
 
 PREFERRED_VERSION_oprofile ?= "0.0+cvs${SRCDATE}"
+
+PCMCIA_MANAGER = "pcmciautils"
\ No newline at end of file
diff --git a/openembedded/packages/eds/eds-dbus_svn.bb b/openembedded/packages/eds/eds-dbus_svn.bb
index 98658a1fae..a402e65a27 100755
--- a/openembedded/packages/eds/eds-dbus_svn.bb
+++ b/openembedded/packages/eds/eds-dbus_svn.bb
@@ -1,6 +1,7 @@
 LICENSE = "LGPL"
 DEPENDS = "glib-2.0 gtk+ gconf dbus db gnome-common libglade libiconv"
-RDEPENDS = "gconf dbus-1 db libiconv"
+RDEPENDS = "gconf db libiconv"
+#dbus
 MAINTAINER = "Chris Lord <chris@openedhand.com>"
 DESCRIPTION = "Evolution database backend server"
 PV = "1.4.0+svn${SRCDATE}"
diff --git a/openembedded/packages/fontconfig/fontconfig_2.2.95.bb b/openembedded/packages/fontconfig/fontconfig_2.2.95.bb
index 6989b7a053..78b35b1793 100644
--- a/openembedded/packages/fontconfig/fontconfig_2.2.95.bb
+++ b/openembedded/packages/fontconfig/fontconfig_2.2.95.bb
@@ -7,11 +7,13 @@ SRC_URI = "http://pdx.freedesktop.org/fontconfig/release/fontconfig-${PV}.tar.gz
            file://fc-glyphname.patch;patch=1 \
            file://fc-lang.patch;patch=1 \
 	   file://local.conf"
-PR = "r1"
+PR = "r2"
 
 PACKAGES =+ "fontconfig-utils "
 FILES_fontconfig-utils = "${bindir}/*"
 
+PKG_fontconfig-utils=fontconfig-utils
+
 S = "${WORKDIR}/fontconfig-${PV}"
 
 inherit autotools pkgconfig
diff --git a/openembedded/packages/gnome/gnome-vfs-dbus_cvs.bb b/openembedded/packages/gnome/gnome-vfs-dbus_cvs.bb
index 660271d1c0..4a890ac32c 100755
--- a/openembedded/packages/gnome/gnome-vfs-dbus_cvs.bb
+++ b/openembedded/packages/gnome/gnome-vfs-dbus_cvs.bb
@@ -89,6 +89,8 @@ do_stage() {
 	for i in ${GNOME_VFS_PLATFORM_HEADERS}; do install -m 0644 libgnomevfs/$i ${STAGING_INCDIR}/include/libgnomevfs/; done
 }
 
+PACKAGES_DYNAMIC = "gnome-vfs-plugin-*"
+
 python populate_packages_prepend () {
         print bb.data.getVar('FILES_gnome-vfs', d, 1)
 
diff --git a/openembedded/packages/gtk+/gtk+_2.6.7.bb b/openembedded/packages/gtk+/gtk+_2.6.7.bb
index bcfd2b598d..e4e93cacdd 100644
--- a/openembedded/packages/gtk+/gtk+_2.6.7.bb
+++ b/openembedded/packages/gtk+/gtk+_2.6.7.bb
@@ -64,7 +64,7 @@ fi
 
 }
 
-PACKAGES_DYANMIC = "gdk-pixbuf-loader-* gtk-immodule-*"
+PACKAGES_DYNAMIC = "gdk-pixbuf-loader-* gtk-immodule-*"
 
 python populate_packages_prepend () {
 	import os.path
-- 
cgit v1.2.3