diff options
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 | 49 |
1 files changed, 0 insertions, 49 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 deleted file mode 100644 index f840fca599..0000000000 --- a/meta/recipes-gnome/gnome/gnome-icon-theme/iconpath-option.patch +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
1 | Version of the patch of the same name from sato-icon-theme JL - 20/10/10 | ||
2 | " | ||
3 | pkg-config will only search the target sysroot and we want the native script. This | ||
4 | patch adds an option to allow the path to the tool to be specified. | ||
5 | |||
6 | RP - 12/8/10" | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | |||
10 | Index: gnome-icon-theme-2.31.0/configure.ac | ||
11 | =================================================================== | ||
12 | --- gnome-icon-theme-2.31.0.orig/configure.ac 2010-12-01 11:00:22.000000000 +0800 | ||
13 | +++ gnome-icon-theme-2.31.0/configure.ac 2010-12-01 11:02:16.000000000 +0800 | ||
14 | @@ -38,18 +38,24 @@ | ||
15 | ICONMAP="true" | ||
16 | if test "x$enable_mapping" != "xno"; then | ||
17 | UTILS_REQUIRED=0.8.7 | ||
18 | + PKG_PROG_PKG_CONFIG() | ||
19 | |||
20 | - AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED]) | ||
21 | - PKG_CHECK_EXISTS(icon-naming-utils >= $UTILS_REQUIRED, | ||
22 | - have_utils=yes, have_utils=no) | ||
23 | - if test "x$have_utils" = "xyes"; then | ||
24 | - UTILS_PATH="`$PKG_CONFIG --variable=program_path icon-naming-utils`" | ||
25 | - ICONMAP="$UTILS_PATH/icon-name-mapping" | ||
26 | - AC_MSG_RESULT([yes]) | ||
27 | - else | ||
28 | - AC_MSG_RESULT([no]) | ||
29 | - AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build | ||
30 | - and install gnome-icon-theme]) | ||
31 | + AC_ARG_WITH(iconmap, | ||
32 | + AC_HELP_STRING([--with-iconmap=<dir>], [The location of the icon-name-mapping script to use]), | ||
33 | + ICONMAP=$withval, ICONMAP="") | ||
34 | + if test "x$ICONMAP" = "x"; then | ||
35 | + AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED]) | ||
36 | + PKG_CHECK_EXISTS(icon-naming-utils >= $UTILS_REQUIRED, | ||
37 | + have_utils=yes, have_utils=no) | ||
38 | + if test "x$have_utils" = "xyes"; then | ||
39 | + UTILS_PATH="`$PKG_CONFIG --variable=program_path icon-naming-utils`" | ||
40 | + ICONMAP="$UTILS_PATH/icon-name-mapping" | ||
41 | + | ||
42 | + AC_MSG_RESULT([yes]) | ||
43 | + else | ||
44 | + AC_MSG_RESULT([no]) | ||
45 | + AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build and install sato-icon-theme"]) | ||
46 | + fi | ||
47 | fi | ||
48 | else | ||
49 | ICONMAP="false" | ||