diff options
| author |   Andreas Müller <schnitzeltony@googlemail.com> | 2012-10-24 10:05:17 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-24 12:47:29 +0100 |
| commit | b6bbfcfa329ea2695f1da53f880ae1f2cf2cf2e1 (patch) | |
| tree | 0e4f0886cf53455669526becd7bc3233f5ef73a1 | |
| parent | 61233b05ad299a34b5d3c06fe3c0162cba8fb273 (diff) | |
| download | openembedded-core-b6bbfcfa329ea2695f1da53f880ae1f2cf2cf2e1.tar.gz | |
sato-icon-theme: merge sato-icon-theme.inc into recipe
nothing else needs sato-icon-theme.inc
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc | 24 | ||||
| -rw-r--r-- | meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb | 25 |
2 files changed, 23 insertions, 26 deletions
diff --git a/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc b/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc deleted file mode 100644 index e014a7dbf7..0000000000 --- a/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc +++ /dev/null @@ -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 -} diff --git a/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb b/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb index ead2f7dcfd..cb3b68c16e 100644 --- a/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb +++ b/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb @@ -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 +} |