summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/sato-icon-theme
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2012-10-24 10:05:17 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-24 12:50:48 +0100
commit645ba0309d1adf06de38d8123e5ba23b7d3270bb (patch)
tree1ddfa3ea0e670fbb9a7807c5da3c9b4d449f684b /meta/recipes-sato/sato-icon-theme
parent5b1d45c9fb2394418bb0a8c915c34a8c2fdb0d49 (diff)
downloadpoky-645ba0309d1adf06de38d8123e5ba23b7d3270bb.tar.gz
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>
Diffstat (limited to 'meta/recipes-sato/sato-icon-theme')
-rw-r--r--meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc24
-rw-r--r--meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb25
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 @@
1DESCRIPTION = "Sato Icon Theme"
2HOMEPAGE = "http://www.o-hand.com"
3BUGTRACKER = "http://bugzilla.openedhand.com/"
4
5LICENSE = "CC-BY-SA-3.0"
6LIC_FILES_CHKSUM = "file://COPYING;md5=56a830bbe6e4697fe6cbbae01bb7c2b2"
7
8SECTION = "x11"
9DEPENDS = ""
10
11inherit autotools pkgconfig allarch gtk-icon-cache perlnative
12
13FILES_${PN} += "${datadir}"
14
15EXTRA_OECONF += "--with-iconmap=${@d.getVar('STAGING_LIBEXECDIR_NATIVE', True).replace('sato-icon-theme', 'icon-naming-utils')}/icon-name-mapping"
16
17# Explictly setting "Sato" as the default icon theme to avoid flickering from
18# the desktop and settings daemon racing. This shouldn't be done here but in the sato image
19pkg_postinst_${PN} () {
20 mkdir -p $D/etc/gtk-2.0
21
22 grep -s -q -e ^gtk-icon-theme-name.*\"Sato\" $D/etc/gtk-2.0/gtkrc || \
23 echo 'gtk-icon-theme-name = "Sato"' >> $D/etc/gtk-2.0/gtkrc
24}
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 @@
1require sato-icon-theme.inc 1DESCRIPTION = "Sato Icon Theme"
2HOMEPAGE = "http://www.o-hand.com"
3BUGTRACKER = "http://bugzilla.openedhand.com/"
2 4
3DEPENDS += "icon-naming-utils-native libxml-simple-perl-native" 5LICENSE = "CC-BY-SA-3.0"
6LIC_FILES_CHKSUM = "file://COPYING;md5=56a830bbe6e4697fe6cbbae01bb7c2b2"
7SECTION = "x11"
4 8
5PR = "r6" 9PR = "r6"
6 10
11DEPENDS = "icon-naming-utils-native libxml-simple-perl-native"
12
7SRC_URI = "http://pokylinux.org/releases/sato/${BPN}-${PV}.tar.gz \ 13SRC_URI = "http://pokylinux.org/releases/sato/${BPN}-${PV}.tar.gz \
8 file://iconpath-option.patch \ 14 file://iconpath-option.patch \
9 file://0001-Inherit-the-GNOME-icon-theme.patch" 15 file://0001-Inherit-the-GNOME-icon-theme.patch"
10 16
11SRC_URI[md5sum] = "86a847f3128a43a9cf23b7029a656f50" 17SRC_URI[md5sum] = "86a847f3128a43a9cf23b7029a656f50"
12SRC_URI[sha256sum] = "0b0a2807a6a96918ac799a86094ec3e8e2c892be0fd679a4232c2a77f2f61732" 18SRC_URI[sha256sum] = "0b0a2807a6a96918ac799a86094ec3e8e2c892be0fd679a4232c2a77f2f61732"
19
20inherit autotools pkgconfig allarch gtk-icon-cache perlnative
21
22FILES_${PN} += "${datadir}"
23
24EXTRA_OECONF += "--with-iconmap=${@d.getVar('STAGING_LIBEXECDIR_NATIVE', True).replace('sato-icon-theme', 'icon-naming-utils')}/icon-name-mapping"
25
26# Explictly setting "Sato" as the default icon theme to avoid flickering from
27# the desktop and settings daemon racing. This shouldn't be done here but in the sato image
28pkg_postinst_${PN} () {
29 mkdir -p $D/etc/gtk-2.0
30
31 grep -s -q -e ^gtk-icon-theme-name.*\"Sato\" $D/etc/gtk-2.0/gtkrc || \
32 echo 'gtk-icon-theme-name = "Sato"' >> $D/etc/gtk-2.0/gtkrc
33}