From 06aacf6226240d2083185217421696da9683cd86 Mon Sep 17 00:00:00 2001 From: Zhai Edwin Date: Wed, 1 Dec 2010 09:04:58 +0800 Subject: gnome-icon-theme: Update to 2.31.0 Rebased the patch iconpath-option.patch Signed-off-by: Zhai Edwin --- .../gnome/gnome-icon-theme/iconpath-option.patch | 79 ++++++++++------------ .../recipes-gnome/gnome/gnome-icon-theme_2.22.0.bb | 17 ----- .../recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb | 23 +++++++ 3 files changed, 60 insertions(+), 59 deletions(-) delete mode 100644 meta/recipes-gnome/gnome/gnome-icon-theme_2.22.0.bb create mode 100644 meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb 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 935b358f9..8a16d006a 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 patch adds an option to allow the path to the tool to be specified. RP - 12/8/10" -Index: gnome-icon-theme-2.22.0/configure.in +Index: gnome-icon-theme-2.31.0/configure.ac =================================================================== ---- gnome-icon-theme-2.22.0.orig/configure.in -+++ gnome-icon-theme-2.22.0/configure.in -@@ -28,20 +28,28 @@ AC_SUBST(themedir, "\${datadir}/icons/gn +--- gnome-icon-theme-2.31.0.orig/configure.ac 2010-12-01 11:00:22.000000000 +0800 ++++ gnome-icon-theme-2.31.0/configure.ac 2010-12-01 11:02:16.000000000 +0800 +@@ -38,18 +38,24 @@ + ICONMAP="true" + if test "x$enable_mapping" != "xno"; then + UTILS_REQUIRED=0.8.7 ++ PKG_PROG_PKG_CONFIG() - UTILS_REQUIRED=0.8.1 - --AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED]) --PKG_CHECK_EXISTS(icon-naming-utils >= $UTILS_REQUIRED, -- have_utils=yes, have_utils=no) --if test "x$have_utils" = "xyes"; then -- UTILS_PATH="`$PKG_CONFIG --variable=program_path icon-naming-utils`" -- ICONMAP="$UTILS_PATH/icon-name-mapping" -- AC_SUBST(ICONMAP) -- AC_MSG_RESULT([yes]) --else -- AC_MSG_RESULT([no]) -- AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build -- and install gnome-icon-theme]) -+PKG_PROG_PKG_CONFIG() -+ -+AC_ARG_WITH(iconmap, -+ AC_HELP_STRING([--with-iconmap=], [The location of the icon-name-mapping script to use]), -+ ICONMAP=$withval, ICONMAP="") -+if test "x$ICONMAP" = "x"; then -+ AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED]) -+ PKG_CHECK_EXISTS(icon-naming-utils >= $UTILS_REQUIRED, -+ have_utils=yes, have_utils=no) -+ if test "x$have_utils" = "xyes"; then -+ UTILS_PATH="`$PKG_CONFIG --variable=program_path icon-naming-utils`" -+ ICONMAP="$UTILS_PATH/icon-name-mapping" -+ -+ AC_MSG_RESULT([yes]) -+ else -+ AC_MSG_RESULT([no]) -+ AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build and install sato-icon-theme"]) -+ fi - fi - -+AC_SUBST(ICONMAP) +- AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED]) +- PKG_CHECK_EXISTS(icon-naming-utils >= $UTILS_REQUIRED, +- have_utils=yes, have_utils=no) +- if test "x$have_utils" = "xyes"; then +- UTILS_PATH="`$PKG_CONFIG --variable=program_path icon-naming-utils`" +- ICONMAP="$UTILS_PATH/icon-name-mapping" +- AC_MSG_RESULT([yes]) +- else +- AC_MSG_RESULT([no]) +- AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build +- and install gnome-icon-theme]) ++ AC_ARG_WITH(iconmap, ++ AC_HELP_STRING([--with-iconmap=], [The location of the icon-name-mapping script to use]), ++ ICONMAP=$withval, ICONMAP="") ++ if test "x$ICONMAP" = "x"; then ++ AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED]) ++ PKG_CHECK_EXISTS(icon-naming-utils >= $UTILS_REQUIRED, ++ have_utils=yes, have_utils=no) ++ if test "x$have_utils" = "xyes"; then ++ UTILS_PATH="`$PKG_CONFIG --variable=program_path icon-naming-utils`" ++ ICONMAP="$UTILS_PATH/icon-name-mapping" + - AC_CONFIG_FILES([ - Makefile - gnome-icon-theme.pc ++ AC_MSG_RESULT([yes]) ++ else ++ AC_MSG_RESULT([no]) ++ AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build and install sato-icon-theme"]) ++ fi + fi + else + 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.22.0.bb deleted file mode 100644 index bdf5ee4fc..000000000 --- a/meta/recipes-gnome/gnome/gnome-icon-theme_2.22.0.bb +++ /dev/null @@ -1,17 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/gnome" -DEPENDS = "icon-naming-utils-native glib-2.0 intltool-native" -RDEPENDS = "hicolor-icon-theme" -RRECOMMENDS = "librsvg-gtk" -PR = "r2" - -FILES_${PN} += "${datadir}/*" - -SRC_URI = "${GNOME_MIRROR}/${PN}/2.22/${PN}-${PV}.tar.bz2 \ - file://iconpath-option.patch" - -EXTRA_OECONF = "--disable-hicolor-check --with-iconmap=${STAGING_LIBDIR_NATIVE}/../libexec/icon-name-mapping" - -inherit autotools - -PACKAGE_ARCH = "all" diff --git a/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb b/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb new file mode 100644 index 000000000..c8a2db7df --- /dev/null +++ b/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "GNOME 2 default icon themes" +HOMEPAGE = "http://www.gnome.org/" +BUGTRACKER = "https://bugzilla.gnome.org/" + +LICENSE = "LGPLv3 | BY-SAv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=e7e289d90fc8bdceed5e3f142f98229e" + +SECTION = "x11/gnome" +DEPENDS = "icon-naming-utils-native glib-2.0 intltool-native" +RDEPENDS = "hicolor-icon-theme" +RRECOMMENDS = "librsvg-gtk" +PR = "r0" + +FILES_${PN} += "${datadir}/*" + +SRC_URI = "${GNOME_MIRROR}/${PN}/2.31/${PN}-${PV}.tar.bz2 \ + file://iconpath-option.patch" + +EXTRA_OECONF = "--disable-hicolor-check --with-iconmap=${STAGING_LIBDIR_NATIVE}/../libexec/icon-name-mapping" + +inherit autotools + +PACKAGE_ARCH = "all" -- cgit v1.2.3