From 6257bf7cb6d144e4335afac6ddbd1c6373c38628 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 16 Jul 2015 23:51:55 +0100 Subject: gnome-icon-theme: clean up icon-naming search Previous this recipe added an argument to specify where the icon-name-mapping binary is installed, to override a failing pkg-config call (as target pkg-config won't find native .pc files), and munged libexecdir as it likely contains PN. This is all very complicated and we have a native pkg-config binary now, so just use pkg-config-native for that section of configure.ac. (From OE-Core rev: bbd1458444b06dafddad70e117eedfe0c85bfcc6) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb') diff --git a/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb b/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb index df117aee80..a6a3afaa76 100644 --- a/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb +++ b/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb @@ -13,12 +13,10 @@ DEPENDS = "icon-naming-utils-native intltool-native libxml-simple-perl-native" inherit allarch autotools perlnative gtk-icon-cache pkgconfig gettext SRC_URI = "${GNOME_MIRROR}/${BPN}/2.31/${BPN}-${PV}.tar.bz2 \ - file://iconpath-option.patch" + file://pkgconfig-native.patch" SRC_URI[md5sum] = "8e727703343d4c18c73c79dd2009f8ed" SRC_URI[sha256sum] = "ea7e05b77ead159379392b3b275ca0c9cbacd7d936014e447cc7c5e27a767982" -EXTRA_OECONF = "--with-iconmap=${@d.getVar('STAGING_LIBEXECDIR_NATIVE', True).replace('gnome-icon-theme', 'icon-naming-utils')}/icon-name-mapping" - FILES_${PN} += "${datadir}/*" RRECOMMENDS_${PN} += "librsvg-gtk" -- cgit v1.2.3-54-g00ecf