summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-08-12 14:29:12 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-08-12 14:41:30 +0100
commit889c8ed31ae152c37c8e3285166a800ed6e8c72f (patch)
treecd9dbdfa70ad3d0869fe60d5ccdcb041b8d27911 /meta
parent6124cccddfc202124fa76bb677ad3e06f0fefc70 (diff)
downloadpoky-889c8ed31ae152c37c8e3285166a800ed6e8c72f.tar.gz
sato-icon-theme: Make sure the native icon mapping script is found and used correctly
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/sato-icon-theme/sato-icon-theme.inc2
-rw-r--r--meta/packages/sato-icon-theme/sato-icon-theme/iconpath-option.patch51
-rw-r--r--meta/packages/sato-icon-theme/sato-icon-theme_0.4.1.bb3
3 files changed, 55 insertions, 1 deletions
diff --git a/meta/packages/sato-icon-theme/sato-icon-theme.inc b/meta/packages/sato-icon-theme/sato-icon-theme.inc
index ca99d7a59c..a1669c6f2e 100644
--- a/meta/packages/sato-icon-theme/sato-icon-theme.inc
+++ b/meta/packages/sato-icon-theme/sato-icon-theme.inc
@@ -14,6 +14,8 @@ FILES_${PN} += "${datadir}"
14 14
15PACKAGE_ARCH = "all" 15PACKAGE_ARCH = "all"
16 16
17EXTRA_OECONF += "--with-iconmap=${STAGING_LIBDIR_NATIVE}/../libexec/icon-name-mapping"
18
17pkg_postinst_${PN} () { 19pkg_postinst_${PN} () {
18 if [ "x$D" != "x" ]; then 20 if [ "x$D" != "x" ]; then
19 exit 1 21 exit 1
diff --git a/meta/packages/sato-icon-theme/sato-icon-theme/iconpath-option.patch b/meta/packages/sato-icon-theme/sato-icon-theme/iconpath-option.patch
new file mode 100644
index 0000000000..cfa6a0dd18
--- /dev/null
+++ b/meta/packages/sato-icon-theme/sato-icon-theme/iconpath-option.patch
@@ -0,0 +1,51 @@
1pkg-config will only search the target sysroot and we want the native script. This
2patch adds an option to allow the path to the tool to be specified.
3
4RP - 12/8/10
5
6Index: sato-icon-theme-0.4.1/configure.ac
7===================================================================
8--- sato-icon-theme-0.4.1.orig/configure.ac 2010-08-12 12:23:25.000000000 +0100
9+++ sato-icon-theme-0.4.1/configure.ac 2010-08-12 12:48:14.000000000 +0100
10@@ -11,20 +11,29 @@
11
12 UTILS_REQUIRED=0.8.2
13
14-AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED])
15-PKG_CHECK_EXISTS(icon-naming-utils >= $UTILS_REQUIRED,
16- have_utils=yes, have_utils=no)
17-if test "x$have_utils" = "xyes"; then
18- UTILS_PATH="`$PKG_CONFIG --variable=program_path icon-naming-utils`"
19- ICONMAP="$UTILS_PATH/icon-name-mapping"
20- AC_SUBST(ICONMAP)
21- AC_MSG_RESULT([yes])
22-else
23- AC_MSG_RESULT([no])
24- AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build
25- and install sato-icon-theme])
26+PKG_PROG_PKG_CONFIG()
27+
28+AC_ARG_WITH(iconmap,
29+ AC_HELP_STRING([--with-iconmap=<dir>], [The location of the icon-name-mapping script to use]),
30+ ICONMAP=$withval, ICONMAP="")
31+
32+if test "x$ICONMAP" = "x"; then
33+ AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED])
34+ PKG_CHECK_EXISTS(icon-naming-utils >= $UTILS_REQUIRED,
35+ have_utils=yes, have_utils=no)
36+ if test "x$have_utils" = "xyes"; then
37+ UTILS_PATH="`$PKG_CONFIG --variable=program_path icon-naming-utils`"
38+ ICONMAP="$UTILS_PATH/icon-name-mapping"
39+
40+ AC_MSG_RESULT([yes])
41+ else
42+ AC_MSG_RESULT([no])
43+ AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build
44+ and install sato-icon-theme])
45+ fi
46 fi
47
48+AC_SUBST(ICONMAP)
49
50 AC_CONFIG_FILES([
51 Makefile
diff --git a/meta/packages/sato-icon-theme/sato-icon-theme_0.4.1.bb b/meta/packages/sato-icon-theme/sato-icon-theme_0.4.1.bb
index 1dc8f9381e..aa976b1022 100644
--- a/meta/packages/sato-icon-theme/sato-icon-theme_0.4.1.bb
+++ b/meta/packages/sato-icon-theme/sato-icon-theme_0.4.1.bb
@@ -2,4 +2,5 @@ require sato-icon-theme.inc
2 2
3DEPENDS += "icon-naming-utils-native" 3DEPENDS += "icon-naming-utils-native"
4 4
5SRC_URI = "http://pokylinux.org/releases/sato/${PN}-${PV}.tar.gz" 5SRC_URI = "http://pokylinux.org/releases/sato/${PN}-${PV}.tar.gz \
6 file://iconpath-option.patch"