diff options
| author | Joshua Lock <josh@linux.intel.com> | 2010-10-20 22:25:22 +0100 |
|---|---|---|
| committer | Joshua Lock <josh@linux.intel.com> | 2010-10-20 22:30:01 +0100 |
| commit | 27d06858b5f3138039bddecc0eaaee1e05e21b48 (patch) | |
| tree | c6461c55ae39e9c991e665ab406d1369563cff82 /meta | |
| parent | 980e0cec49edbfa2fceb5b3398cc3c52b30448cc (diff) | |
| download | openembedded-core-27d06858b5f3138039bddecc0eaaee1e05e21b48.tar.gz openembedded-core-27d06858b5f3138039bddecc0eaaee1e05e21b48.tar.bz2 openembedded-core-27d06858b5f3138039bddecc0eaaee1e05e21b48.zip | |
gnome-icon-theme: fix build
Duplicate the patch from sato-icon-theme which enables the path to the
icon-name-mapping tool to be specified.
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-gnome/gnome/gnome-icon-theme/iconpath-option.patch | 51 | ||||
| -rw-r--r-- | meta/recipes-gnome/gnome/gnome-icon-theme_2.22.0.bb | 9 |
2 files changed, 57 insertions, 3 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 new file mode 100644 index 0000000000..935b358f9f --- /dev/null +++ b/meta/recipes-gnome/gnome/gnome-icon-theme/iconpath-option.patch @@ -0,0 +1,51 @@ +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" +Index: gnome-icon-theme-2.22.0/configure.in +=================================================================== +--- gnome-icon-theme-2.22.0.orig/configure.in ++++ gnome-icon-theme-2.22.0/configure.in +@@ -28,20 +28,28 @@ AC_SUBST(themedir, "\${datadir}/icons/gn + + UTILS_REQUIRED=0.8.1 + +-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_SUBST(ICONMAP) +- 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]) ++PKG_PROG_PKG_CONFIG() ++ ++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 + ++AC_SUBST(ICONMAP) ++ + AC_CONFIG_FILES([ + Makefile + gnome-icon-theme.pc diff --git a/meta/recipes-gnome/gnome/gnome-icon-theme_2.22.0.bb b/meta/recipes-gnome/gnome/gnome-icon-theme_2.22.0.bb index f78e6a6e5b..bdf5ee4fc8 100644 --- a/meta/recipes-gnome/gnome/gnome-icon-theme_2.22.0.bb +++ b/meta/recipes-gnome/gnome/gnome-icon-theme_2.22.0.bb @@ -3,12 +3,15 @@ SECTION = "x11/gnome" DEPENDS = "icon-naming-utils-native glib-2.0 intltool-native" RDEPENDS = "hicolor-icon-theme" RRECOMMENDS = "librsvg-gtk" -PR = "r1" +PR = "r2" FILES_${PN} += "${datadir}/*" -EXTRA_OECONF = "--disable-hicolor-check" +SRC_URI = "${GNOME_MIRROR}/${PN}/2.22/${PN}-${PV}.tar.bz2 \ + file://iconpath-option.patch" -inherit gnome +EXTRA_OECONF = "--disable-hicolor-check --with-iconmap=${STAGING_LIBDIR_NATIVE}/../libexec/icon-name-mapping" + +inherit autotools PACKAGE_ARCH = "all" |