summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gnome/gnome-icon-theme/iconpath-option.patch
diff options
context:
space:
mode:
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.patch51
1 files changed, 51 insertions, 0 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 @@
1Version of the patch of the same name from sato-icon-theme JL - 20/10/10
2"
3pkg-config will only search the target sysroot and we want the native script. This
4patch adds an option to allow the path to the tool to be specified.
5
6RP - 12/8/10"
7Index: gnome-icon-theme-2.22.0/configure.in
8===================================================================
9--- gnome-icon-theme-2.22.0.orig/configure.in
10+++ gnome-icon-theme-2.22.0/configure.in
11@@ -28,20 +28,28 @@ AC_SUBST(themedir, "\${datadir}/icons/gn
12
13 UTILS_REQUIRED=0.8.1
14
15-AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED])
16-PKG_CHECK_EXISTS(icon-naming-utils >= $UTILS_REQUIRED,
17- have_utils=yes, have_utils=no)
18-if test "x$have_utils" = "xyes"; then
19- UTILS_PATH="`$PKG_CONFIG --variable=program_path icon-naming-utils`"
20- ICONMAP="$UTILS_PATH/icon-name-mapping"
21- AC_SUBST(ICONMAP)
22- AC_MSG_RESULT([yes])
23-else
24- AC_MSG_RESULT([no])
25- AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build
26- and install gnome-icon-theme])
27+PKG_PROG_PKG_CONFIG()
28+
29+AC_ARG_WITH(iconmap,
30+ AC_HELP_STRING([--with-iconmap=<dir>], [The location of the icon-name-mapping script to use]),
31+ ICONMAP=$withval, ICONMAP="")
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 and install sato-icon-theme"])
44+ fi
45 fi
46
47+AC_SUBST(ICONMAP)
48+
49 AC_CONFIG_FILES([
50 Makefile
51 gnome-icon-theme.pc