summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2022-07-06 22:47:51 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-07-08 00:09:42 +0100
commitfeed8ab68a5107dc5d4dfbfe685f5bfae63de9e2 (patch)
tree87be697e4ee6f7a7d7b614e4619c14f9b1962292 /meta
parent638bfea9974cf8bf497024152b0d658cf702ec37 (diff)
downloadpoky-feed8ab68a5107dc5d4dfbfe685f5bfae63de9e2.tar.gz
sato-icon-theme: Add back with support for scalable icons
Resurrect sato-icon-theme and move to a version with scalable icons support to replace adwaita-icon-theme which no longer supports the icons we need for the sato desktop. (From OE-Core rev: 6b515037ab710adf7b2c14ae1bb488375655f311) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/maintainers.inc1
-rw-r--r--meta/conf/layer.conf2
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-examples/gst-player.desktop2
-rw-r--r--meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb2
-rw-r--r--meta/recipes-sato/sato-icon-theme/sato-icon-theme_git.bb28
5 files changed, 33 insertions, 2 deletions
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index c55b2a09cf..a69af3d780 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -725,6 +725,7 @@ RECIPE_MAINTAINER:pn-rust-llvm = "Randy MacLeod <Randy.MacLeod@windriver.com>"
725RECIPE_MAINTAINER:pn-rust-tools-cross-canadian-${TRANSLATED_TARGET_ARCH} = "Randy MacLeod <Randy.MacLeod@windriver.com>" 725RECIPE_MAINTAINER:pn-rust-tools-cross-canadian-${TRANSLATED_TARGET_ARCH} = "Randy MacLeod <Randy.MacLeod@windriver.com>"
726RECIPE_MAINTAINER:pn-rxvt-unicode = "Unassigned <unassigned@yoctoproject.org>" 726RECIPE_MAINTAINER:pn-rxvt-unicode = "Unassigned <unassigned@yoctoproject.org>"
727RECIPE_MAINTAINER:pn-sato-screenshot = "Ross Burton <ross.burton@arm.com>" 727RECIPE_MAINTAINER:pn-sato-screenshot = "Ross Burton <ross.burton@arm.com>"
728RECIPE_MAINTAINER:pn-sato-icon-theme = "Richard Purdie <richard.purdie@linuxfoundation.org>"
728RECIPE_MAINTAINER:pn-sbc = "Unassigned <unassigned@yoctoproject.org>" 729RECIPE_MAINTAINER:pn-sbc = "Unassigned <unassigned@yoctoproject.org>"
729RECIPE_MAINTAINER:pn-screen = "Anuj Mittal <anuj.mittal@intel.com>" 730RECIPE_MAINTAINER:pn-screen = "Anuj Mittal <anuj.mittal@intel.com>"
730RECIPE_MAINTAINER:pn-seatd = "Alexander Kanavin <alex.kanavin@gmail.com>" 731RECIPE_MAINTAINER:pn-seatd = "Alexander Kanavin <alex.kanavin@gmail.com>"
diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
index 076cba58d1..1387539734 100644
--- a/meta/conf/layer.conf
+++ b/meta/conf/layer.conf
@@ -82,6 +82,8 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
82 weston-init->kbd \ 82 weston-init->kbd \
83 connman->xl2tpd \ 83 connman->xl2tpd \
84 lttng-tools->lttng-modules \ 84 lttng-tools->lttng-modules \
85 sato-icon-theme->gdk-pixbuf \
86 sato-icon-theme->gtk+3 \
85 adwaita-icon-theme->gdk-pixbuf \ 87 adwaita-icon-theme->gdk-pixbuf \
86 adwaita-icon-theme->gtk+3 \ 88 adwaita-icon-theme->gtk+3 \
87" 89"
diff --git a/meta/recipes-multimedia/gstreamer/gst-examples/gst-player.desktop b/meta/recipes-multimedia/gstreamer/gst-examples/gst-player.desktop
index 7ddd456a1e..d165e5d910 100644
--- a/meta/recipes-multimedia/gstreamer/gst-examples/gst-player.desktop
+++ b/meta/recipes-multimedia/gstreamer/gst-examples/gst-player.desktop
@@ -1,7 +1,7 @@
1[Desktop Entry] 1[Desktop Entry]
2Name=Media Player 2Name=Media Player
3Comment=Basic media player 3Comment=Basic media player
4Icon=multimedia-player 4Icon=video-player
5TryExec=gtk-play 5TryExec=gtk-play
6Exec=gtk-play 6Exec=gtk-play
7StartupNotify=true 7StartupNotify=true
diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
index cfa301a58d..6866a4d738 100644
--- a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
+++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
@@ -31,7 +31,7 @@ RDEPENDS:${PN}-base = "\
31 matchbox-keyboard-im \ 31 matchbox-keyboard-im \
32 matchbox-config-gtk \ 32 matchbox-config-gtk \
33 xcursor-transparent-theme \ 33 xcursor-transparent-theme \
34 adwaita-icon-theme \ 34 sato-icon-theme \
35 settings-daemon \ 35 settings-daemon \
36 shutdown-desktop \ 36 shutdown-desktop \
37 ${NETWORK_MANAGER} \ 37 ${NETWORK_MANAGER} \
diff --git a/meta/recipes-sato/sato-icon-theme/sato-icon-theme_git.bb b/meta/recipes-sato/sato-icon-theme/sato-icon-theme_git.bb
new file mode 100644
index 0000000000..e2140bfdd7
--- /dev/null
+++ b/meta/recipes-sato/sato-icon-theme/sato-icon-theme_git.bb
@@ -0,0 +1,28 @@
1SUMMARY = "Sato icon theme"
2HOMEPAGE = "https://www.yoctoproject.org/"
3BUGTRACKER = "http://bugzilla.yoctoproject.org/"
4
5LICENSE = "CC-BY-SA-3.0"
6LIC_FILES_CHKSUM = "file://COPYING;md5=56a830bbe6e4697fe6cbbae01bb7c2b2"
7SECTION = "x11"
8
9DEPENDS = "icon-naming-utils-native libxml-simple-perl-native"
10
11SRC_URI = "git://git.yoctoproject.org/sato-icon-theme.git;protocol=https;branch=master"
12SRCREV = "d23f04ecb0328f655bf195df8eb04c1b734d53a9"
13
14S = "${WORKDIR}/git"
15
16inherit autotools pkgconfig allarch gtk-icon-cache perlnative
17
18# The configure script uses pkg-config to find native binaries to execute, so
19# tell it to use our pkg-config-native wrapper.
20export PKG_CONFIG = "pkg-config-native"
21
22FILES:${PN} += "${datadir}/icons/Sato"
23
24do_install:append() {
25 find ${D}${datadir}/icons/Sato/ -maxdepth 1 -type d -exec ln -s preferences-system.png {}/apps/preferences-desktop.png \;
26 find ${D}${datadir}/icons/Sato/ -maxdepth 1 -type d -exec ln -s file-manager.png {}/apps/system-file-manager.png \;
27 find ${D}${datadir}/icons/Sato/ -maxdepth 1 -type d -exec ln -s ../apps/terminal.png {}/places/computer.png \;
28}