diff options
| author |   Chris Lord <chris@openedhand.com> | 2005-09-23 13:12:36 +0000 |
|---|---|---|
| committer | Chris Lord <chris@openedhand.com> | 2005-09-23 13:12:36 +0000 |
| commit | f7b6fee10f06be9f3ee04b179b9677d5eef0dca9 (patch) | |
| tree | 1445a4aef0c5feb63e475d0ba4878c8c617006cf | |
| parent | ac9e4d68a2e766a0f0bf387adb834fab04000de6 (diff) | |
| download | openembedded-core-f7b6fee10f06be9f3ee04b179b9677d5eef0dca9.tar.gz | |
Disable gconf-dbus for now
git-svn-id: https://svn.o-hand.com/repos/poky@31 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -rw-r--r-- | openembedded/conf/distro/maemo-1.0.conf | 2 | ||||
| -rw-r--r-- | openembedded/conf/distro/poky-additions.inc | 2 | ||||
| -rw-r--r-- | openembedded/conf/distro/preferred-gpe-versions-2.6.inc | 2 | ||||
| -rw-r--r-- | openembedded/conf/distro/preferred-gpe-versions.inc | 2 | ||||
| -rwxr-xr-x | openembedded/packages/gnome/gconf-dbus_cvs.bb | 2 |
5 files changed, 6 insertions, 4 deletions
diff --git a/openembedded/conf/distro/maemo-1.0.conf b/openembedded/conf/distro/maemo-1.0.conf index 15ec45f34e..f8211dc3c7 100644 --- a/openembedded/conf/distro/maemo-1.0.conf +++ b/openembedded/conf/distro/maemo-1.0.conf @@ -28,7 +28,7 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" # PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" -PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" +#PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" PREFERRED_PROVIDER_x11 = "diet-x11" include conf/distro/preferred-gpe-versions.inc diff --git a/openembedded/conf/distro/poky-additions.inc b/openembedded/conf/distro/poky-additions.inc index 278c07abbe..c72d959d0c 100644 --- a/openembedded/conf/distro/poky-additions.inc +++ b/openembedded/conf/distro/poky-additions.inc @@ -7,7 +7,7 @@ DISTRO_VERSION = "0.0-snapshot-${DATE}" DISTRO_TYPE = "debug" # DISTRO_TYPE = "release" -PREFERRED_PROVIDER_gconf=gconf-dbus +#PREFERRED_PROVIDER_gconf=gconf-dbus PREFERRED_VERSION_libmatchbox = "1.7" PREFERRED_VERSION_matchbox = "0.9.1" diff --git a/openembedded/conf/distro/preferred-gpe-versions-2.6.inc b/openembedded/conf/distro/preferred-gpe-versions-2.6.inc index 98c1a969fa..504d495c15 100644 --- a/openembedded/conf/distro/preferred-gpe-versions-2.6.inc +++ b/openembedded/conf/distro/preferred-gpe-versions-2.6.inc @@ -9,7 +9,7 @@ CVSDATE_cairo=20050330 CVSDATE_xext=20050222 #set some preferred providers: -PREFERRED_PROVIDER_gconf=gconf-dbus +#PREFERRED_PROVIDER_gconf=gconf-dbus #specify versions, as the header says :) PREFERRED_VERSION_libmatchbox ?= "1.6" diff --git a/openembedded/conf/distro/preferred-gpe-versions.inc b/openembedded/conf/distro/preferred-gpe-versions.inc index b68eb32c2a..de4fdb15bf 100644 --- a/openembedded/conf/distro/preferred-gpe-versions.inc +++ b/openembedded/conf/distro/preferred-gpe-versions.inc @@ -6,7 +6,7 @@ #CVSDATE_xext=20050222 #set some preferred providers: -PREFERRED_PROVIDER_gconf=gconf-dbus +#PREFERRED_PROVIDER_gconf=gconf-dbus PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus #specify versions, as the header says :) diff --git a/openembedded/packages/gnome/gconf-dbus_cvs.bb b/openembedded/packages/gnome/gconf-dbus_cvs.bb index a403fae24c..39908692ec 100755 --- a/openembedded/packages/gnome/gconf-dbus_cvs.bb +++ b/openembedded/packages/gnome/gconf-dbus_cvs.bb @@ -1,3 +1,5 @@ +DEFAULT_PREFERENCE = "-1" + SECTION = "x11/utils" DEPENDS = "gtk+ glib-2.0 dbus libxml2 popt" DESCRIPTION = "Settings daemon using DBUS for communication." |