From bd9190c53157c64620fb08f0349d8d7d6a64fb79 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Wed, 21 Oct 2009 20:40:28 +0000 Subject: many recipes: Recipes must not depend on gconf-dbus directly, only dbus can be referred: * Only PREFERRED_PROVIDER_gconf in distro definition can refer to gconf-dbus. * Both gconf-dbus and gconf provide than same interface. * New gconf packages already provide defaults settings via dbus. * Increment PR to rebuild against correct package. --- recipes/geoclue/geoclue_git.bb | 1 + recipes/gkdial/gkdial_1.8.1.bb | 6 +++--- recipes/gpephone/firewall_svn.bb | 4 ++-- recipes/gpephone/libsettings_0.3.bb | 3 ++- recipes/gpephone/libsettings_svn.bb | 3 ++- recipes/maemo4/libhildon.inc | 2 +- recipes/moblin/mojito_git.bb | 4 ++-- recipes/networkmanager/networkmanager.inc | 2 +- recipes/networkmanager/networkmanager_0.6.4.bb | 4 ++-- recipes/packagekit/gnome-packagekit_2.27.1.bb | 4 ++-- recipes/tasks/task-gmae.bb | 4 ++-- recipes/tasks/task-sdk-extra.bb | 6 +++--- recipes/tinymail/libtinymail.inc | 2 +- recipes/tinymail/libtinymail_0.0.1.bb | 3 ++- recipes/tinymail/libtinymail_svn.bb | 4 ++-- recipes/tinymail/tmut_1.1.0.bb | 4 ++-- recipes/tinymail/tmut_svn.bb | 4 ++-- 17 files changed, 32 insertions(+), 28 deletions(-) diff --git a/recipes/geoclue/geoclue_git.bb b/recipes/geoclue/geoclue_git.bb index 2cdaa25742..b7950a9c12 100644 --- a/recipes/geoclue/geoclue_git.bb +++ b/recipes/geoclue/geoclue_git.bb @@ -5,6 +5,7 @@ DEPENDS = "libgpsmgr libgpsbt gtk+ gypsy libxml2 gconf libsoup dbus-glib" SRCREV = "3a31d260074397a968afaf1065856ab763befb01" PV = "0.11.1" +PR = "r1" PR_append = "+gitr${SRCREV}" PE = "1" diff --git a/recipes/gkdial/gkdial_1.8.1.bb b/recipes/gkdial/gkdial_1.8.1.bb index 3208a06f00..53caca388e 100644 --- a/recipes/gkdial/gkdial_1.8.1.bb +++ b/recipes/gkdial/gkdial_1.8.1.bb @@ -1,12 +1,12 @@ inherit autotools pkgconfig gconf DESCRIPTION = "GTK PPP dialing tool" -DEPENDS = "gconf-dbus gtk+ libglade gettext ppp gpe-su" -RDEPENDS = "ppp gconf-dbus gpe-su" +DEPENDS = "gconf gtk+ libglade gettext ppp gpe-su" +RDEPENDS = "ppp gconf gpe-su" SECTION = "gpe" PRIORITY = "optional" -PR = "r3gpe1" +PR = "r4" SRC_URI = "http://familiar.handhelds.org/source/v0.8.2/${PN}-${PV}.tar.gz \ file://gkdial-pgpe.patch;patch=1 \ diff --git a/recipes/gpephone/firewall_svn.bb b/recipes/gpephone/firewall_svn.bb index b3d7aee848..6c3ed64b26 100644 --- a/recipes/gpephone/firewall_svn.bb +++ b/recipes/gpephone/firewall_svn.bb @@ -2,12 +2,12 @@ LICENSE = "LiPS" DESCRIPTION = "Cellphone firewall tool" SECTION = "gpe" PRIORITY = "optional" -PR = "r0" +PR = "r1" PV = "0.0+svnr-${SRCREV}" DEFAULT_PREFERENCE = "-1" -DEPENDS = "gtk+ libmsgenabler libabenabler libiac libgpewidget libgpephone gconf-dbus" +DEPENDS = "gtk+ libmsgenabler libabenabler libiac libgpewidget libgpephone gconf" inherit gpephone autotools pkgconfig diff --git a/recipes/gpephone/libsettings_0.3.bb b/recipes/gpephone/libsettings_0.3.bb index 22f8c4f3e0..3c9794edc2 100644 --- a/recipes/gpephone/libsettings_0.3.bb +++ b/recipes/gpephone/libsettings_0.3.bb @@ -2,7 +2,8 @@ DESCRIPTION = "G(PE)^2 settings API library" SECTION = "gpe/libs" PRIORITY = "required" LICENSE = "LiPS" -DEPENDS = "glib-2.0 gconf-dbus" +DEPENDS = "glib-2.0 gconf" +PR = "r1" inherit gpephone pkgconfig autotools diff --git a/recipes/gpephone/libsettings_svn.bb b/recipes/gpephone/libsettings_svn.bb index 74e1190c5a..770fe8cce6 100644 --- a/recipes/gpephone/libsettings_svn.bb +++ b/recipes/gpephone/libsettings_svn.bb @@ -2,8 +2,9 @@ DESCRIPTION = "G(PE)^2 settings API library" SECTION = "gpe/libs" PRIORITY = "required" LICENSE = "LiPS" -DEPENDS = "glib-2.0 gconf-dbus" +DEPENDS = "glib-2.0 gconf" PV = "0.0+svnr-${SRCREV}" +PR = "r1" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/maemo4/libhildon.inc b/recipes/maemo4/libhildon.inc index bab16cf062..534603d640 100644 --- a/recipes/maemo4/libhildon.inc +++ b/recipes/maemo4/libhildon.inc @@ -1,7 +1,7 @@ DESCRIPTION = "Hildon widget library" LICENSE = "LGPL" -DEPENDS = "gconf-dbus esound gtk+" +DEPENDS = "gconf esound gtk+" inherit autotools pkgconfig lib_package diff --git a/recipes/moblin/mojito_git.bb b/recipes/moblin/mojito_git.bb index b29aaed33d..f9104a9371 100644 --- a/recipes/moblin/mojito_git.bb +++ b/recipes/moblin/mojito_git.bb @@ -1,9 +1,9 @@ SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git" PV = "0.0+git${SRCREV}" -PR = "r2" +PR = "r3" -DEPENDS = "libsoup-2.4 gconf-dbus librest glib-2.0 twitter-glib sqlite3 gnome-keyring" +DEPENDS = "libsoup-2.4 gconf librest glib-2.0 twitter-glib sqlite3 gnome-keyring" S = "${WORKDIR}/git" diff --git a/recipes/networkmanager/networkmanager.inc b/recipes/networkmanager/networkmanager.inc index ead854ca58..c159883bfd 100644 --- a/recipes/networkmanager/networkmanager.inc +++ b/recipes/networkmanager/networkmanager.inc @@ -3,7 +3,7 @@ SECTION = "net/misc" LICENSE = "GPL" HOMEPAGE = "http://www.gnome.org" PRIORITY = "optional" -DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools ppp" +DEPENDS = "libnl dbus dbus-glib hal gconf wireless-tools ppp" RDEPENDS = "hal wpa-supplicant iproute2 dhcp-client dhcdbd" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.6/NetworkManager-${PV}.tar.bz2 \ diff --git a/recipes/networkmanager/networkmanager_0.6.4.bb b/recipes/networkmanager/networkmanager_0.6.4.bb index 737d9544d0..f41449c610 100644 --- a/recipes/networkmanager/networkmanager_0.6.4.bb +++ b/recipes/networkmanager/networkmanager_0.6.4.bb @@ -3,10 +3,10 @@ SECTION = "network/misc" LICENSE = "GPL" HOMEPAGE = "http://www.gnome.org" PRIORITY = "optional" -DEPENDS = "libnl dbus dbus-glib libhal-nm libgpewidget gnome-keyring gconf-dbus wireless-tools libglade" +DEPENDS = "libnl dbus dbus-glib libhal-nm libgpewidget gnome-keyring gconf wireless-tools libglade" RDEPENDS = "wpa-supplicant iproute2 dhcdbd gnome-keyring hicolor-icon-theme" -PR = "r5" +PR = "r6" SRC_URI="http://www.handhelds.org/~mmp/files/NetworkManager-${PV}-gpe.tar.gz \ file://dbus-api-fix.patch;patch=1 \ diff --git a/recipes/packagekit/gnome-packagekit_2.27.1.bb b/recipes/packagekit/gnome-packagekit_2.27.1.bb index 2bb6f95e87..1949d3d3a2 100644 --- a/recipes/packagekit/gnome-packagekit_2.27.1.bb +++ b/recipes/packagekit/gnome-packagekit_2.27.1.bb @@ -1,9 +1,9 @@ DESCRIPTION = "GNOME frontend for packagekit" LICENSE = "GPL" -DEPENDS = "packagekit libsexy gconf-dbus policykit policykit-gnome libunique gnome-menus" +DEPENDS = "packagekit libsexy gconf policykit policykit-gnome libunique gnome-menus" -PR = "r1" +PR = "r2" inherit gnome diff --git a/recipes/tasks/task-gmae.bb b/recipes/tasks/task-gmae.bb index 73710f8ffa..1638c98e33 100644 --- a/recipes/tasks/task-gmae.bb +++ b/recipes/tasks/task-gmae.bb @@ -1,5 +1,5 @@ DESCRIPTION = "GNOME Mobile & Embedded Initiative" -PR = "r1" +PR = "r2" inherit task @@ -28,7 +28,7 @@ RDEPENDS_gmae-user = " \ avahi-utils \ gstreamer \ matchbox-wm matchbox-panel \ - gconf-dbus \ + gconf \ gnome-vfs \ " diff --git a/recipes/tasks/task-sdk-extra.bb b/recipes/tasks/task-sdk-extra.bb index 98234cea1c..db6a2fb3f8 100644 --- a/recipes/tasks/task-sdk-extra.bb +++ b/recipes/tasks/task-sdk-extra.bb @@ -1,5 +1,5 @@ DESCRIPTION = "SDK packages" -PR = "r10" +PR = "r11" LICENSE = "MIT" ALLOW_EMPTY = "1" @@ -11,7 +11,7 @@ PACKAGES = "\ RDEPENDS_task-sdk-x11 = "\ atk-dev \ cairo-dev \ - gconf-dbus-dev \ + gconf-dev \ gtk+-dev \ gtk-engines-dev \ libsvg-cairo-dev \ @@ -50,4 +50,4 @@ RDEPENDS_task-sdk-gpe = "\ libgpewidget-dev \ libhandoff-dev \ libxi-dev \ - gconf-dbus-dev" + gconf-dev" diff --git a/recipes/tinymail/libtinymail.inc b/recipes/tinymail/libtinymail.inc index 29c3f4d1d1..7abb8a6df7 100644 --- a/recipes/tinymail/libtinymail.inc +++ b/recipes/tinymail/libtinymail.inc @@ -1,7 +1,7 @@ DESCRIPTION = "TinyMail is an attempt to create an E-mail framework for mobile devices" SECTION = "x11/utils" LICENSE = "LGPL" -DEPENDS = "gtk+ glib-2.0 gnome-vfs gconf-dbus libgnomeui" +DEPENDS = "gtk+ glib-2.0 gnome-vfs gconf libgnomeui" EXTRA_OECONF=" --disable-gnome --with-platform=gpe --with-html-component=none" diff --git a/recipes/tinymail/libtinymail_0.0.1.bb b/recipes/tinymail/libtinymail_0.0.1.bb index 06f53d3799..77c20097f8 100644 --- a/recipes/tinymail/libtinymail_0.0.1.bb +++ b/recipes/tinymail/libtinymail_0.0.1.bb @@ -1,7 +1,8 @@ DESCRIPTION = "TinyMail is an attempt to create an E-mail framework for mobile devices" SECTION = "x11/utils" LICENSE = "LGPL" -DEPENDS = "gtk+ glib-2.0 gnome-vfs gconf-dbus libgnomeui" +DEPENDS = "gtk+ glib-2.0 gnome-vfs gconf libgnomeui" +PR = "r1" EXTRA_OECONF=" --disable-gnome --with-platform=gpe --with-html-component=none" diff --git a/recipes/tinymail/libtinymail_svn.bb b/recipes/tinymail/libtinymail_svn.bb index 7d396fe968..06cc447af5 100644 --- a/recipes/tinymail/libtinymail_svn.bb +++ b/recipes/tinymail/libtinymail_svn.bb @@ -1,9 +1,9 @@ DESCRIPTION = "TinyMail is an attempt to create an E-mail framework for mobile devices" SECTION = "x11/utils" LICENSE = "LGPL" -DEPENDS = "gtk+ glib-2.0 gnome-vfs gconf-dbus libgnomeui" +DEPENDS = "gtk+ glib-2.0 gnome-vfs gconf libgnomeui" PV = "0.0.5+svnr${SRCREV}" -PR = "r3" +PR = "r4" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/tinymail/tmut_1.1.0.bb b/recipes/tinymail/tmut_1.1.0.bb index d3f84f057a..69f69a401f 100644 --- a/recipes/tinymail/tmut_1.1.0.bb +++ b/recipes/tinymail/tmut_1.1.0.bb @@ -1,8 +1,8 @@ DESCRIPTION = "Tmut is a really small E-Mail client based on Tinymail" SECTION = "x11/utils" LICENSE = "LGPL" -DEPENDS = "gtk+ glib-2.0 gnome-vfs gconf-dbus libtinymail" -PR = "r0" +DEPENDS = "gtk+ glib-2.0 gnome-vfs gconf libtinymail" +PR = "r1" SRC_URI = "http://tinymail.org/files/tmut/releases/v1.1/v${PV}/${PN}-${PV}.tar.bz2" diff --git a/recipes/tinymail/tmut_svn.bb b/recipes/tinymail/tmut_svn.bb index abe7417898..11fcb0a1f0 100644 --- a/recipes/tinymail/tmut_svn.bb +++ b/recipes/tinymail/tmut_svn.bb @@ -1,9 +1,9 @@ DESCRIPTION = "Tmut is a really small E-Mail client based on Tinymail" SECTION = "x11/utils" LICENSE = "LGPL" -DEPENDS = "gtk+ glib-2.0 gnome-vfs gconf-dbus libtinymail" +DEPENDS = "gtk+ glib-2.0 gnome-vfs gconf libtinymail" PV = "0.0.0+svnr${SRCREV}" -PR = "r2" +PR = "r3" DEFAULT_PREFERENCE = "-1" -- cgit 1.2.3-korg