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 <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 1 insertions, 3 deletions

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"