From 7e437aa3e0ec862aac69a4434be0b2b652d26972 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Fri, 29 Mar 2013 22:19:58 +0100 Subject: remove gtk-update-icon-cache-native virtuals MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit gtk-update-icon-cache-native is the only provider now Signed-off-by: Andreas Müller Signed-off-by: Richard Purdie --- meta/classes/gtk-icon-cache.bbclass | 2 +- meta/conf/distro/include/default-providers.inc | 1 - meta/recipes-gnome/gtk+/gtk-update-icon-cache-native_3.4.4.bb | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass index a5d642c954..6d205a1473 100644 --- a/meta/classes/gtk-icon-cache.bbclass +++ b/meta/classes/gtk-icon-cache.bbclass @@ -1,6 +1,6 @@ FILES_${PN} += "${datadir}/icons/hicolor" -DEPENDS += "${@['hicolor-icon-theme', '']['${BPN}' == 'hicolor-icon-theme']} virtual/gtk-update-icon-cache-native" +DEPENDS += "${@['hicolor-icon-theme', '']['${BPN}' == 'hicolor-icon-theme']} gtk-update-icon-cache-native" # # On host, the postinstall MUST return 1 because we do not know if the intercept diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc index e3a44e69fb..4b665225ac 100644 --- a/meta/conf/distro/include/default-providers.inc +++ b/meta/conf/distro/include/default-providers.inc @@ -12,7 +12,6 @@ PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg" PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native" PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" PREFERRED_PROVIDER_xf86-video-intel ?= "xf86-video-intel" -PREFERRED_PROVIDER_virtual/gtk-update-icon-cache-native ?= "gtk-update-icon-cache-native" # # Default virtual runtime providers diff --git a/meta/recipes-gnome/gtk+/gtk-update-icon-cache-native_3.4.4.bb b/meta/recipes-gnome/gtk+/gtk-update-icon-cache-native_3.4.4.bb index ea99c14901..93c30a75b1 100644 --- a/meta/recipes-gnome/gtk+/gtk-update-icon-cache-native_3.4.4.bb +++ b/meta/recipes-gnome/gtk+/gtk-update-icon-cache-native_3.4.4.bb @@ -2,8 +2,6 @@ SUMMARY = "gtk-update-icon-cache built natively" DESCRIPTION = "Just gtk-update-icon-cache built from GTK+ natively, for on-host postinst script execution." SECTION = "libs" -PROVIDES = "virtual/gtk-update-icon-cache-native" - DEPENDS = "gdk-pixbuf-native" LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+" -- cgit 1.2.3-korg