summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2010-12-01 09:04:58 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-12-06 22:02:26 +0000
commit06aacf6226240d2083185217421696da9683cd86 (patch)
tree26ff5db7c7e942bd5575d8df37dce6bae091e80f /meta/recipes-gnome
parentb8b13dcbb76fdc3c9a2866bb35945dcf949c4b20 (diff)
downloadpoky-06aacf6226240d2083185217421696da9683cd86.tar.gz
gnome-icon-theme: Update to 2.31.0
Rebased the patch iconpath-option.patch Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r--meta/recipes-gnome/gnome/gnome-icon-theme/iconpath-option.patch79
-rw-r--r--meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb (renamed from meta/recipes-gnome/gnome/gnome-icon-theme_2.22.0.bb)12
2 files changed, 46 insertions, 45 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
index 935b358f9f..8a16d006a3 100644
--- a/meta/recipes-gnome/gnome/gnome-icon-theme/iconpath-option.patch
+++ b/meta/recipes-gnome/gnome/gnome-icon-theme/iconpath-option.patch
@@ -4,48 +4,43 @@ pkg-config will only search the target sysroot and we want the native script. Th
4patch adds an option to allow the path to the tool to be specified. 4patch adds an option to allow the path to the tool to be specified.
5 5
6RP - 12/8/10" 6RP - 12/8/10"
7Index: gnome-icon-theme-2.22.0/configure.in 7Index: gnome-icon-theme-2.31.0/configure.ac
8=================================================================== 8===================================================================
9--- gnome-icon-theme-2.22.0.orig/configure.in 9--- gnome-icon-theme-2.31.0.orig/configure.ac 2010-12-01 11:00:22.000000000 +0800
10+++ gnome-icon-theme-2.22.0/configure.in 10+++ gnome-icon-theme-2.31.0/configure.ac 2010-12-01 11:02:16.000000000 +0800
11@@ -28,20 +28,28 @@ AC_SUBST(themedir, "\${datadir}/icons/gn 11@@ -38,18 +38,24 @@
12 ICONMAP="true"
13 if test "x$enable_mapping" != "xno"; then
14 UTILS_REQUIRED=0.8.7
15+ PKG_PROG_PKG_CONFIG()
12 16
13 UTILS_REQUIRED=0.8.1 17- AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED])
14 18- PKG_CHECK_EXISTS(icon-naming-utils >= $UTILS_REQUIRED,
15-AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED]) 19- have_utils=yes, have_utils=no)
16-PKG_CHECK_EXISTS(icon-naming-utils >= $UTILS_REQUIRED, 20- if test "x$have_utils" = "xyes"; then
17- have_utils=yes, have_utils=no) 21- UTILS_PATH="`$PKG_CONFIG --variable=program_path icon-naming-utils`"
18-if test "x$have_utils" = "xyes"; then 22- ICONMAP="$UTILS_PATH/icon-name-mapping"
19- UTILS_PATH="`$PKG_CONFIG --variable=program_path icon-naming-utils`" 23- AC_MSG_RESULT([yes])
20- ICONMAP="$UTILS_PATH/icon-name-mapping" 24- else
21- AC_SUBST(ICONMAP) 25- AC_MSG_RESULT([no])
22- AC_MSG_RESULT([yes]) 26- AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build
23-else 27- and install gnome-icon-theme])
24- AC_MSG_RESULT([no]) 28+ AC_ARG_WITH(iconmap,
25- AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build 29+ AC_HELP_STRING([--with-iconmap=<dir>], [The location of the icon-name-mapping script to use]),
26- and install gnome-icon-theme]) 30+ ICONMAP=$withval, ICONMAP="")
27+PKG_PROG_PKG_CONFIG() 31+ if test "x$ICONMAP" = "x"; then
28+ 32+ AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED])
29+AC_ARG_WITH(iconmap, 33+ PKG_CHECK_EXISTS(icon-naming-utils >= $UTILS_REQUIRED,
30+ AC_HELP_STRING([--with-iconmap=<dir>], [The location of the icon-name-mapping script to use]), 34+ have_utils=yes, have_utils=no)
31+ ICONMAP=$withval, ICONMAP="") 35+ if test "x$have_utils" = "xyes"; then
32+if test "x$ICONMAP" = "x"; then 36+ UTILS_PATH="`$PKG_CONFIG --variable=program_path icon-naming-utils`"
33+ AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED]) 37+ ICONMAP="$UTILS_PATH/icon-name-mapping"
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+ 38+
49 AC_CONFIG_FILES([ 39+ AC_MSG_RESULT([yes])
50 Makefile 40+ else
51 gnome-icon-theme.pc 41+ AC_MSG_RESULT([no])
42+ AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build and install sato-icon-theme"])
43+ fi
44 fi
45 else
46 ICONMAP="false"
diff --git a/meta/recipes-gnome/gnome/gnome-icon-theme_2.22.0.bb b/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb
index bdf5ee4fc8..c8a2db7dfb 100644
--- a/meta/recipes-gnome/gnome/gnome-icon-theme_2.22.0.bb
+++ b/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb
@@ -1,13 +1,19 @@
1LICENSE = "GPL" 1DESCRIPTION = "GNOME 2 default icon themes"
2HOMEPAGE = "http://www.gnome.org/"
3BUGTRACKER = "https://bugzilla.gnome.org/"
4
5LICENSE = "LGPLv3 | BY-SAv3"
6LIC_FILES_CHKSUM = "file://COPYING;md5=e7e289d90fc8bdceed5e3f142f98229e"
7
2SECTION = "x11/gnome" 8SECTION = "x11/gnome"
3DEPENDS = "icon-naming-utils-native glib-2.0 intltool-native" 9DEPENDS = "icon-naming-utils-native glib-2.0 intltool-native"
4RDEPENDS = "hicolor-icon-theme" 10RDEPENDS = "hicolor-icon-theme"
5RRECOMMENDS = "librsvg-gtk" 11RRECOMMENDS = "librsvg-gtk"
6PR = "r2" 12PR = "r0"
7 13
8FILES_${PN} += "${datadir}/*" 14FILES_${PN} += "${datadir}/*"
9 15
10SRC_URI = "${GNOME_MIRROR}/${PN}/2.22/${PN}-${PV}.tar.bz2 \ 16SRC_URI = "${GNOME_MIRROR}/${PN}/2.31/${PN}-${PV}.tar.bz2 \
11 file://iconpath-option.patch" 17 file://iconpath-option.patch"
12 18
13EXTRA_OECONF = "--disable-hicolor-check --with-iconmap=${STAGING_LIBDIR_NATIVE}/../libexec/icon-name-mapping" 19EXTRA_OECONF = "--disable-hicolor-check --with-iconmap=${STAGING_LIBDIR_NATIVE}/../libexec/icon-name-mapping"