diff options
Diffstat (limited to 'meta/recipes-sato/sato-icon-theme')
| -rw-r--r-- | meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc | 15 | ||||
| -rw-r--r-- | meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb | 2 |
2 files changed, 8 insertions, 9 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 index 9fd10126c1..0bd48143a9 100644 --- a/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc +++ b/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc @@ -8,18 +8,17 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=56a830bbe6e4697fe6cbbae01bb7c2b2" SECTION = "x11" DEPENDS = "" -inherit autotools pkgconfig allarch +inherit autotools pkgconfig allarch gtk-icon-cache FILES_${PN} += "${datadir}" EXTRA_OECONF += "--with-iconmap=${STAGING_LIBDIR_NATIVE}/../libexec/icon-name-mapping" -#explictly setting "Sato" as default icon theme to avoid icon missing due to -#tricky race condition +# 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} () { - if [ "x$D" != "x" ]; then - exit 1 - fi - gtk-update-icon-cache -q /usr/share/icons/Sato - echo 'gtk-icon-theme-name = "Sato"' >> /etc/gtk-2.0/gtkrc + 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 108f8e81ae..64053598bc 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 @@ -2,7 +2,7 @@ require sato-icon-theme.inc DEPENDS += "icon-naming-utils-native" -PR = "r3" +PR = "r4" SRC_URI = "http://pokylinux.org/releases/sato/${BPN}-${PV}.tar.gz \ file://iconpath-option.patch \ |