summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-10-20 22:25:22 +0100
committerJoshua Lock <josh@linux.intel.com>2010-10-20 22:30:01 +0100
commit27d06858b5f3138039bddecc0eaaee1e05e21b48 (patch)
treec6461c55ae39e9c991e665ab406d1369563cff82 /meta/recipes-gnome
parent980e0cec49edbfa2fceb5b3398cc3c52b30448cc (diff)
downloadpoky-27d06858b5f3138039bddecc0eaaee1e05e21b48.tar.gz
gnome-icon-theme: fix build
Duplicate the patch from sato-icon-theme which enables the path to the icon-name-mapping tool to be specified. Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r--meta/recipes-gnome/gnome/gnome-icon-theme/iconpath-option.patch51
-rw-r--r--meta/recipes-gnome/gnome/gnome-icon-theme_2.22.0.bb9
2 files changed, 57 insertions, 3 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
diff --git a/meta/recipes-gnome/gnome/gnome-icon-theme_2.22.0.bb b/meta/recipes-gnome/gnome/gnome-icon-theme_2.22.0.bb
index f78e6a6e5b..bdf5ee4fc8 100644
--- a/meta/recipes-gnome/gnome/gnome-icon-theme_2.22.0.bb
+++ b/meta/recipes-gnome/gnome/gnome-icon-theme_2.22.0.bb
@@ -3,12 +3,15 @@ SECTION = "x11/gnome"
3DEPENDS = "icon-naming-utils-native glib-2.0 intltool-native" 3DEPENDS = "icon-naming-utils-native glib-2.0 intltool-native"
4RDEPENDS = "hicolor-icon-theme" 4RDEPENDS = "hicolor-icon-theme"
5RRECOMMENDS = "librsvg-gtk" 5RRECOMMENDS = "librsvg-gtk"
6PR = "r1" 6PR = "r2"
7 7
8FILES_${PN} += "${datadir}/*" 8FILES_${PN} += "${datadir}/*"
9 9
10EXTRA_OECONF = "--disable-hicolor-check" 10SRC_URI = "${GNOME_MIRROR}/${PN}/2.22/${PN}-${PV}.tar.bz2 \
11 file://iconpath-option.patch"
11 12
12inherit gnome 13EXTRA_OECONF = "--disable-hicolor-check --with-iconmap=${STAGING_LIBDIR_NATIVE}/../libexec/icon-name-mapping"
14
15inherit autotools
13 16
14PACKAGE_ARCH = "all" 17PACKAGE_ARCH = "all"