mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 00:39:46 +00:00
Code Issues Projects Releases Wiki Activity

sato-icon-theme: use gtk-icon-cache helper class

Browse Source 
Instead of explicitly updating the icon cache use the helper class that also
forces a loader update at the same time.  This eliminates the possibility of
updating the icon cache without any gdk-pixbuf loaders.

Also check that the Sato icon theme isn't already set to avoid appending to the
file every time the postinst runs.

[YOCTO #2399]

(From OE-Core rev: 9d98dbdae4c05fcf50d546f554a04dc3f0bd66c3)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2012-10-04 12:19:03 +01:00
committed by Richard Purdie
parent 09aaad16be
commit cf1f3f552f
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
+7 -8
View File
@@ -8,18 +8,17 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=56a830bbe6e4697fe6cbbae01bb7c2b2"
SECTION = "x11" SECTION = "x11"
DEPENDS = "" DEPENDS = ""
inherit autotools pkgconfig allarch inherit autotools pkgconfig allarch gtk-icon-cache
FILES_${PN} += "${datadir}" FILES_${PN} += "${datadir}"
EXTRA_OECONF += "--with-iconmap=${STAGING_LIBDIR_NATIVE}/../libexec/icon-name-mapping" EXTRA_OECONF += "--with-iconmap=${STAGING_LIBDIR_NATIVE}/../libexec/icon-name-mapping"
#explictly setting "Sato" as default icon theme to avoid icon missing due to # Explictly setting "Sato" as the default icon theme to avoid flickering from
#tricky race condition # the desktop and settings daemon racing. This shouldn't be done here but in the sato image
pkg_postinst_${PN} () { pkg_postinst_${PN} () {
if [ "x$D" != "x" ]; then mkdir -p $D/etc/gtk-2.0
exit 1
fi grep -s -q -e ^gtk-icon-theme-name.*\"Sato\" $D/etc/gtk-2.0/gtkrc || \
gtk-update-icon-cache -q /usr/share/icons/Sato echo 'gtk-icon-theme-name = "Sato"' >> $D/etc/gtk-2.0/gtkrc
echo 'gtk-icon-theme-name = "Sato"' >> /etc/gtk-2.0/gtkrc
} }
meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb
+1 -1
View File
@@ -2,7 +2,7 @@ require sato-icon-theme.inc
DEPENDS += "icon-naming-utils-native" DEPENDS += "icon-naming-utils-native"
PR = "r3" PR = "r4"
SRC_URI = "http://pokylinux.org/releases/sato/${BPN}-${PV}.tar.gz \ SRC_URI = "http://pokylinux.org/releases/sato/${BPN}-${PV}.tar.gz \
file://iconpath-option.patch \ file://iconpath-option.patch \