From c7319dfb143feedfc5dcc127a35cf1e581330b45 Mon Sep 17 00:00:00 2001 From: Peter Tworek Date: Wed, 9 Nov 2011 00:07:20 +0100 Subject: Inherit pkgconfig instead of explicitly depending on pkgconfig-native. --- recipes-lxde/lxde-common/lxde-common_0.5.5.bb | 4 ++-- recipes-lxde/lxmenu-data/lxmenu-data_0.1.2.bb | 4 ++-- recipes-lxde/lxpanel/lxpanel_0.5.8.bb | 2 +- recipes-lxde/lxsession/lxsession_0.4.6.1.bb | 8 ++++---- recipes-lxde/lxterminal/lxterminal_0.1.11.bb | 4 ++-- recipes-lxde/menu-cache/menu-cache_0.3.2.bb | 4 ++-- recipes-lxde/openbox/openbox_3.5.0.bb | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/recipes-lxde/lxde-common/lxde-common_0.5.5.bb b/recipes-lxde/lxde-common/lxde-common_0.5.5.bb index e1bc7b8..b03b4e5 100644 --- a/recipes-lxde/lxde-common/lxde-common_0.5.5.bb +++ b/recipes-lxde/lxde-common/lxde-common_0.5.5.bb @@ -6,14 +6,14 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=597980c597fe9ce16d7b6b19c44cfced" RDEPENDS = "gtk+ lxde-icon-theme" -DEPENDS = "${RDEPENDS} pkgconfig-native" +DEPENDS = "${RDEPENDS}" SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/${PN}-${PV}.tar.gz \ file://lxde-common-0.5.5-logout.patch" SRC_URI[md5sum] = "e51a6b2a815a89fda1f497b509465a97" SRC_URI[sha256sum] = "ee18a09b64a442b33c1b54f0269649a1b4d9490460c400a07ed785d41bf6dde6" -inherit autotools update-alternatives +inherit autotools pkgconfig update-alternatives FILES_${PN} += "${datadir}/lxde/ ${datadir}/lxpanel ${datadir}/xsessions" diff --git a/recipes-lxde/lxmenu-data/lxmenu-data_0.1.2.bb b/recipes-lxde/lxmenu-data/lxmenu-data_0.1.2.bb index eeb5816..9969a67 100644 --- a/recipes-lxde/lxmenu-data/lxmenu-data_0.1.2.bb +++ b/recipes-lxde/lxmenu-data/lxmenu-data_0.1.2.bb @@ -5,13 +5,13 @@ SECTION = "x11" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b99dd46479fb9eb2899071cd03f6cb86" -DEPENDS = "pkgconfig-native intltool" +DEPENDS = "intltool-native" SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/${PN}-${PV}.tar.gz" SRC_URI[md5sum] = "2184ab3746d572477f1bea7e98e230a8" SRC_URI[sha256sum] = "34c285a0430404e815263a4bb33a79eb47b168c56469be0f7ffb19730a57a045" -inherit autotools gettext +inherit autotools gettext pkgconfig FILES_${PN} += "${datadir}/desktop-directories/" diff --git a/recipes-lxde/lxpanel/lxpanel_0.5.8.bb b/recipes-lxde/lxpanel/lxpanel_0.5.8.bb index 333e3ee..75c89a5 100644 --- a/recipes-lxde/lxpanel/lxpanel_0.5.8.bb +++ b/recipes-lxde/lxpanel/lxpanel_0.5.8.bb @@ -13,7 +13,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/${PN}-${PV}.tar.gz \ SRC_URI[md5sum] = "129fae75d1cd3983fd94542c573a70a1" SRC_URI[sha256sum] = "6a3579d6f384c03a33a03e4d32016428c84eb0f2bc421704f724fe2cc015cddd" -inherit autotools gettext +inherit autotools gettext pkgconfig EXTRA_OECONF += "--enable-alsa --with-x --with-plugins=all" diff --git a/recipes-lxde/lxsession/lxsession_0.4.6.1.bb b/recipes-lxde/lxsession/lxsession_0.4.6.1.bb index abcce5a..1af5148 100644 --- a/recipes-lxde/lxsession/lxsession_0.4.6.1.bb +++ b/recipes-lxde/lxsession/lxsession_0.4.6.1.bb @@ -2,21 +2,21 @@ DESCRIPTION = "LXDE session manager" HOMEPAGE = "http://lxde.sf.net/" SECTION = "x11" +PR = "r1" + LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=a76102f7f48780284bee49e6edaeb5a9" COMMON_DEPENDS = "gtk+ glib-2.0 lxde-common dbus" DEPENDS = "${COMMON_DEPENDS} xproto virtual/libx11" -RDEPENDS = "${COMMON_DEPENDS} upower" +RDEPENDS = "${COMMON_DEPENDS} upower dbus-x11" SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/${PN}-${PV}.tar.gz" SRC_URI[md5sum] = "e456b64c5ab3652a4dec661ec706dc6e" SRC_URI[sha256sum] = "bd6a7ef3c0ba4b9eedf3c58624dbce8bbbba3b179abbc552bf10c2830eec3ee1" -inherit autotools gettext +inherit autotools pkgconfig gettext EXTRA_OECONF += "--enable-dbus" -#RPROVIDES_${PN} = "lxsession-lite" FILES_${PN} += "${datadir}/lxsession" - diff --git a/recipes-lxde/lxterminal/lxterminal_0.1.11.bb b/recipes-lxde/lxterminal/lxterminal_0.1.11.bb index a23d4ba..85712ca 100644 --- a/recipes-lxde/lxterminal/lxterminal_0.1.11.bb +++ b/recipes-lxde/lxterminal/lxterminal_0.1.11.bb @@ -5,11 +5,11 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" RDEPENDS = "gtk+ vte glib-2.0" -DEPENDS = "${RDEPENDS} pkgconfig-native gettext intltool" +DEPENDS = "${RDEPENDS} intltool-native" SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/${PN}-${PV}.tar.gz" SRC_URI[md5sum] = "fd9140b45c0f28d021253c4aeb8c4aea" SRC_URI[sha256sum] = "f495166b308a96e8c30c8892b33ab163f3865253a9bbd4bdac462f974fda7253" -inherit autotools +inherit autotools pkgconfig gettext diff --git a/recipes-lxde/menu-cache/menu-cache_0.3.2.bb b/recipes-lxde/menu-cache/menu-cache_0.3.2.bb index 61ccc7b..81d000d 100644 --- a/recipes-lxde/menu-cache/menu-cache_0.3.2.bb +++ b/recipes-lxde/menu-cache/menu-cache_0.3.2.bb @@ -6,10 +6,10 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" RDEPENDS = "glib-2.0" -DEPENDS = "${RDEPENDS} pkgconfig-native intltool" +DEPENDS = "${RDEPENDS} intltool-native" SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/${PN}-${PV}.tar.gz" SRC_URI[md5sum] = "ac4a9ea77db68d3db3f9f53cc75af66a" SRC_URI[sha256sum] = "6b7c1627b5102d8301a8a3e845f673a7181a71dde32f6455abf22d03e392b89f" -inherit autotools gettext +inherit autotools gettext pkgconfig diff --git a/recipes-lxde/openbox/openbox_3.5.0.bb b/recipes-lxde/openbox/openbox_3.5.0.bb index 74ea833..a1eda8a 100644 --- a/recipes-lxde/openbox/openbox_3.5.0.bb +++ b/recipes-lxde/openbox/openbox_3.5.0.bb @@ -7,14 +7,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" PR = "r3" RDEPENDS = "glib-2.0 libxml2 pango imlib2 startup-notification libxft libxrandr libxt" -DEPENDS = "${RDEPENDS} pkgconfig-native xextproto xf86vidmodeproto" +DEPENDS = "${RDEPENDS} xextproto xf86vidmodeproto" RDEPENDS_${PN} = "openbox-theme-clearlooks" SRC_URI = "http://openbox.org/dist/openbox/openbox-${PV}.tar.gz" SRC_URI[md5sum] = "00441b53cf14c03566c8e82643544ff9" SRC_URI[sha256sum] = "6fa90016530b3aa6102e254079461977439398531fb23e7ec076ff2c140fea0a" -inherit autotools update-alternatives gettext +inherit autotools update-alternatives gettext pkgconfig EXTRA_OECONF += "\ --enable-session-management \ -- cgit v1.2.3