3 files changed, 29 insertions, 52 deletions

diff --git a/meta/recipes-gnome/gnome/gnome-icon-theme/iconpath-option.patch b/meta/recipes-gnome/gnome/gnome-icon-theme/iconpath-option.patch
deleted file mode 100644
index f840fca599..0000000000
--- a/meta/recipes-gnome/gnome/gnome-icon-theme/iconpath-option.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Version of the patch of the same name from sato-icon-theme JL - 20/10/10
-"
-pkg-config will only search the target sysroot and we want the native script. This 
-patch adds an option to allow the path to the tool to be specified.
-
-RP - 12/8/10"
-
-Upstream-Status: Pending
-
-Index: gnome-icon-theme-2.31.0/configure.ac
-===================================================================
---- gnome-icon-theme-2.31.0.orig/configure.ac   2010-12-01 11:00:22.000000000 +0800
-+++ gnome-icon-theme-2.31.0/configure.ac        2010-12-01 11:02:16.000000000 +0800
-@@ -38,18 +38,24 @@
- ICONMAP="true"
- if test "x$enable_mapping" != "xno"; then
-    UTILS_REQUIRED=0.8.7
-+   PKG_PROG_PKG_CONFIG()
- 
--   AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED])
--   PKG_CHECK_EXISTS(icon-naming-utils >= $UTILS_REQUIRED,
--                    have_utils=yes, have_utils=no)
--   if test "x$have_utils" = "xyes"; then
--      UTILS_PATH="`$PKG_CONFIG --variable=program_path icon-naming-utils`"
--      ICONMAP="$UTILS_PATH/icon-name-mapping"
--      AC_MSG_RESULT([yes])
--   else
--      AC_MSG_RESULT([no])
--      AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build
--                    and install gnome-icon-theme])
-+   AC_ARG_WITH(iconmap,
-+           AC_HELP_STRING([--with-iconmap=<dir>], [The location of the icon-name-mapping script to use]),
-+           ICONMAP=$withval, ICONMAP="")
-+   if test "x$ICONMAP" = "x"; then
-+      AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED])
-+      PKG_CHECK_EXISTS(icon-naming-utils >= $UTILS_REQUIRED,
-+                   have_utils=yes, have_utils=no)
-+      if test "x$have_utils" = "xyes"; then
-+         UTILS_PATH="`$PKG_CONFIG --variable=program_path icon-naming-utils`"
-+         ICONMAP="$UTILS_PATH/icon-name-mapping"
-+
-+         AC_MSG_RESULT([yes])
-+      else
-+         AC_MSG_RESULT([no])
-+         AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build and install sato-icon-theme"])
-+      fi
-    fi
- else
-    ICONMAP="false"
diff --git a/meta/recipes-gnome/gnome/gnome-icon-theme/pkgconfig-native.patch b/meta/recipes-gnome/gnome/gnome-icon-theme/pkgconfig-native.patch
new file mode 100644
index 0000000000..6139eaba0f
--- /dev/null
+++ b/meta/recipes-gnome/gnome/gnome-icon-theme/pkgconfig-native.patch
@@ -0,0 +1,28 @@
+icon-naming-utils is a native dependency so we need to use the native pkg-config
+to find it.  Simply perform the old switcheroonie on $PKG_CONFIG so
+pkg-config-native is used temporarily.
+
+Upstream-Status: Inappropriate (OE-specific)
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+
+diff --git a/configure.ac b/configure.ac
+index 6074f2c..3d38e49 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -40,6 +40,8 @@ if test "x$enable_mapping" != "xno"; then
+    UTILS_REQUIRED=0.8.7
+ 
+    AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED])
++   save_PKG_CONFIG=$PKG_CONFIG
++   PKG_CONFIG=pkg-config-native
+    PKG_CHECK_EXISTS(icon-naming-utils >= $UTILS_REQUIRED,
+                     have_utils=yes, have_utils=no)
+    if test "x$have_utils" = "xyes"; then
+@@ -51,6 +53,7 @@ if test "x$enable_mapping" != "xno"; then
+       AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build
+                     and install gnome-icon-theme])
+    fi
++   PKG_CONFIG=save_PKG_CONFIG
+ else
+    ICONMAP="false"
+ fi
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"