sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

sato-icon-theme: Make sure the native icon mapping script is found and used correctly 

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Richard Purdie 2010-08-12 14:29:12 +01:00
parent 6124cccddf
commit 889c8ed31a
3 changed files with 55 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta/packages/sato-icon-theme/sato-icon-theme.inc
View File

@ -14,6 +14,8 @@ FILES_${PN} += "${datadir}"
PACKAGE_ARCH = "all"
EXTRA_OECONF += "--with-iconmap=${STAGING_LIBDIR_NATIVE}/../libexec/icon-name-mapping"
pkg_postinst_${PN} () {
if [ "x$D" != "x" ]; then
exit 1

51
meta/packages/sato-icon-theme/sato-icon-theme/iconpath-option.patch Normal file
View File

@ -0,0 +1,51 @@
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: sato-icon-theme-0.4.1/configure.ac
===================================================================
--- sato-icon-theme-0.4.1.orig/configure.ac 2010-08-12 12:23:25.000000000 +0100
+++ sato-icon-theme-0.4.1/configure.ac 2010-08-12 12:48:14.000000000 +0100
@@ -11,20 +11,29 @@
UTILS_REQUIRED=0.8.2
-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 sato-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

3
meta/packages/sato-icon-theme/sato-icon-theme_0.4.1.bb
View File

@ -2,4 +2,5 @@ require sato-icon-theme.inc
DEPENDS += "icon-naming-utils-native"
SRC_URI = "http://pokylinux.org/releases/sato/${PN}-${PV}.tar.gz"
SRC_URI = "http://pokylinux.org/releases/sato/${PN}-${PV}.tar.gz \
file://iconpath-option.patch"