summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2016-04-26 10:19:45 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-15 18:05:25 +0100
commit73e9f90d0da7b46ef49e421ff9101de98983c2fc (patch)
tree498231bbe8c569c05ed490d191abb18eebe67c2d
parent3abdec98f74fccf0a93a6667bd6dc44e8fd3f7f0 (diff)
downloadpoky-73e9f90d0da7b46ef49e421ff9101de98983c2fc.tar.gz
sato-icon-theme: remove as unused
(From OE-Core rev: 070819c49f1162ead89c5bc5e485551e5c02f22c) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-sato/sato-icon-theme/sato-icon-theme/0001-Inherit-the-GNOME-icon-theme.patch31
-rw-r--r--meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb40
2 files changed, 0 insertions, 71 deletions
diff --git a/meta/recipes-sato/sato-icon-theme/sato-icon-theme/0001-Inherit-the-GNOME-icon-theme.patch b/meta/recipes-sato/sato-icon-theme/sato-icon-theme/0001-Inherit-the-GNOME-icon-theme.patch
deleted file mode 100644
index 2c176ee90f..0000000000
--- a/meta/recipes-sato/sato-icon-theme/sato-icon-theme/0001-Inherit-the-GNOME-icon-theme.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From b9f02989310a3c920589f1aa646bcbf16b2572a0 Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com>
3Date: Wed, 13 Jun 2012 11:07:33 +0100
4Subject: [PATCH] Inherit the GNOME icon theme
5
6If the GNOME icon theme isn't installed this is a no-op, but if it is then
7you'll get fallback from Sato to GNOME for icons that are not in Sato.
8
9As applications that use the full GNOME icon theme depend on gnome-icon-theme,
10this just works.
11
12Upstream-Status: Backport
13---
14 index.theme | 1 +
15 1 file changed, 1 insertion(+)
16
17diff --git a/index.theme b/index.theme
18index c4b03a7..688fbbf 100644
19--- a/index.theme
20+++ b/index.theme
21@@ -1,6 +1,7 @@
22 [Icon Theme]
23 Name=Sato
24 Comment=Sato icon theme
25+Inherits=Adwaita
26
27 Directories=16x16/apps,16x16/status,16x16/stock,16x16/places,16x16/mimetypes,16x16/devices,16x16/actions,22x22/apps,22x22/status,22x22/stock,22x22/places,22x22/mimetypes,22x22/devices,22x22/actions,32x32/apps,32x32/status,32x32/stock,32x32/places,32x32/mimetypes,32x32/devices,32x32/actions,48x48/apps,48x48/status,48x48/stock,48x48/places,48x48/mimetypes,48x48/devices,48x48/actions,64x64/apps,64x64/status,64x64/stock,64x64/places,64x64/mimetypes,64x64/devices,64x64/actions,
28
29--
301.7.10
31
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
deleted file mode 100644
index ced735f001..0000000000
--- a/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb
+++ /dev/null
@@ -1,40 +0,0 @@
1SUMMARY = "Sato icon theme"
2HOMEPAGE = "http://www.o-hand.com"
3BUGTRACKER = "http://bugzilla.yoctoproject.org/"
4
5LICENSE = "CC-BY-SA-3.0"
6LIC_FILES_CHKSUM = "file://COPYING;md5=56a830bbe6e4697fe6cbbae01bb7c2b2"
7SECTION = "x11"
8
9PR = "r6"
10
11DEPENDS = "icon-naming-utils-native libxml-simple-perl-native"
12
13SRC_URI = "http://pokylinux.org/releases/sato/${BPN}-${PV}.tar.gz \
14 file://0001-Inherit-the-GNOME-icon-theme.patch"
15
16SRC_URI[md5sum] = "86a847f3128a43a9cf23b7029a656f50"
17SRC_URI[sha256sum] = "0b0a2807a6a96918ac799a86094ec3e8e2c892be0fd679a4232c2a77f2f61732"
18
19inherit autotools pkgconfig allarch gtk-icon-cache perlnative
20
21# The configure script uses pkg-config to find native binaries to execute, so
22# tell it to use our pkg-config-native wrapper.
23export PKG_CONFIG = "pkg-config-native"
24
25FILES_${PN} += "${datadir}/icons/Sato"
26
27do_install_append() {
28 find ${D}${datadir}/icons/Sato/ -maxdepth 1 -type d -exec ln -s preferences-system.png {}/apps/preferences-desktop.png \;
29 find ${D}${datadir}/icons/Sato/ -maxdepth 1 -type d -exec ln -s file-manager.png {}/apps/system-file-manager.png \;
30 find ${D}${datadir}/icons/Sato/ -maxdepth 1 -type d -exec ln -s ../apps/terminal.png {}/places/computer.png \;
31}
32
33# Explictly setting "Sato" as the default icon theme to avoid flickering from
34# the desktop and settings daemon racing. This shouldn't be done here but in the sato image
35pkg_postinst_${PN} () {
36 mkdir -p $D/etc/gtk-2.0
37
38 grep -s -q -e ^gtk-icon-theme-name.*\"Sato\" $D/etc/gtk-2.0/gtkrc || \
39 echo 'gtk-icon-theme-name = "Sato"' >> $D/etc/gtk-2.0/gtkrc
40}