diff options
| author |   Zhai Edwin <edwin.zhai@intel.com> | 2010-12-01 09:04:58 +0800 |
|---|---|---|
| committer |   Richard Purdie <rpurdie@linux.intel.com> | 2010-12-06 22:02:26 +0000 |
| commit | 06aacf6226240d2083185217421696da9683cd86 (patch) | |
| tree | 26ff5db7c7e942bd5575d8df37dce6bae091e80f /meta/recipes-gnome/gnome/gnome-icon-theme/iconpath-option.patch | |
| parent | b8b13dcbb76fdc3c9a2866bb35945dcf949c4b20 (diff) | |
| download | openembedded-core-contrib-06aacf6226240d2083185217421696da9683cd86.tar.gz | |
gnome-icon-theme: Update to 2.31.0
Rebased the patch iconpath-option.patch
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Diffstat (limited to 'meta/recipes-gnome/gnome/gnome-icon-theme/iconpath-option.patch')
| -rw-r--r-- | meta/recipes-gnome/gnome/gnome-icon-theme/iconpath-option.patch | 79 |
1 files changed, 37 insertions, 42 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 index 935b358f9f..8a16d006a3 100644 --- a/meta/recipes-gnome/gnome/gnome-icon-theme/iconpath-option.patch +++ b/meta/recipes-gnome/gnome/gnome-icon-theme/iconpath-option.patch @@ -4,48 +4,43 @@ pkg-config will only search the target sysroot and we want the native script. Th 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 +Index: gnome-icon-theme-2.31.0/configure.ac =================================================================== ---- 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 +--- 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() - 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_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_CONFIG_FILES([ - Makefile - gnome-icon-theme.pc ++ 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" |