sato-icon-theme: merge sato-icon-theme.inc into recipe

nothing else needs sato-icon-theme.inc

(From OE-Core rev: b6bbfcfa329ea2695f1da53f880ae1f2cf2cf2e1)

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Andreas Müller 2012-10-24 10:05:17 +02:00 committed by Richard Purdie
parent 5b1d45c9fb
commit 645ba0309d
2 changed files with 23 additions and 26 deletions

View File

@ -1,24 +0,0 @@
DESCRIPTION = "Sato Icon Theme"
HOMEPAGE = "http://www.o-hand.com"
BUGTRACKER = "http://bugzilla.openedhand.com/"
LICENSE = "CC-BY-SA-3.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=56a830bbe6e4697fe6cbbae01bb7c2b2"
SECTION = "x11"
DEPENDS = ""
inherit autotools pkgconfig allarch gtk-icon-cache perlnative
FILES_${PN} += "${datadir}"
EXTRA_OECONF += "--with-iconmap=${@d.getVar('STAGING_LIBEXECDIR_NATIVE', True).replace('sato-icon-theme', 'icon-naming-utils')}/icon-name-mapping"
# Explictly setting "Sato" as the default icon theme to avoid flickering from
# the desktop and settings daemon racing. This shouldn't be done here but in the sato image
pkg_postinst_${PN} () {
mkdir -p $D/etc/gtk-2.0
grep -s -q -e ^gtk-icon-theme-name.*\"Sato\" $D/etc/gtk-2.0/gtkrc || \
echo 'gtk-icon-theme-name = "Sato"' >> $D/etc/gtk-2.0/gtkrc
}

View File

@ -1,12 +1,33 @@
require sato-icon-theme.inc
DESCRIPTION = "Sato Icon Theme"
HOMEPAGE = "http://www.o-hand.com"
BUGTRACKER = "http://bugzilla.openedhand.com/"
DEPENDS += "icon-naming-utils-native libxml-simple-perl-native"
LICENSE = "CC-BY-SA-3.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=56a830bbe6e4697fe6cbbae01bb7c2b2"
SECTION = "x11"
PR = "r6"
DEPENDS = "icon-naming-utils-native libxml-simple-perl-native"
SRC_URI = "http://pokylinux.org/releases/sato/${BPN}-${PV}.tar.gz \
file://iconpath-option.patch \
file://0001-Inherit-the-GNOME-icon-theme.patch"
SRC_URI[md5sum] = "86a847f3128a43a9cf23b7029a656f50"
SRC_URI[sha256sum] = "0b0a2807a6a96918ac799a86094ec3e8e2c892be0fd679a4232c2a77f2f61732"
inherit autotools pkgconfig allarch gtk-icon-cache perlnative
FILES_${PN} += "${datadir}"
EXTRA_OECONF += "--with-iconmap=${@d.getVar('STAGING_LIBEXECDIR_NATIVE', True).replace('sato-icon-theme', 'icon-naming-utils')}/icon-name-mapping"
# Explictly setting "Sato" as the default icon theme to avoid flickering from
# the desktop and settings daemon racing. This shouldn't be done here but in the sato image
pkg_postinst_${PN} () {
mkdir -p $D/etc/gtk-2.0
grep -s -q -e ^gtk-icon-theme-name.*\"Sato\" $D/etc/gtk-2.0/gtkrc || \
echo 'gtk-icon-theme-name = "Sato"' >> $D/etc/gtk-2.0/gtkrc
}