From feed8ab68a5107dc5d4dfbfe685f5bfae63de9e2 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 6 Jul 2022 22:47:51 +0100 Subject: 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 Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 1 + meta/conf/layer.conf | 2 ++ .../gstreamer/gst-examples/gst-player.desktop | 2 +- .../packagegroups/packagegroup-core-x11-sato.bb | 2 +- .../sato-icon-theme/sato-icon-theme_git.bb | 28 ++++++++++++++++++++++ 5 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-sato/sato-icon-theme/sato-icon-theme_git.bb 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 " RECIPE_MAINTAINER:pn-rust-tools-cross-canadian-${TRANSLATED_TARGET_ARCH} = "Randy MacLeod " RECIPE_MAINTAINER:pn-rxvt-unicode = "Unassigned " RECIPE_MAINTAINER:pn-sato-screenshot = "Ross Burton " +RECIPE_MAINTAINER:pn-sato-icon-theme = "Richard Purdie " RECIPE_MAINTAINER:pn-sbc = "Unassigned " RECIPE_MAINTAINER:pn-screen = "Anuj Mittal " RECIPE_MAINTAINER:pn-seatd = "Alexander Kanavin " 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 += " \ weston-init->kbd \ connman->xl2tpd \ lttng-tools->lttng-modules \ + sato-icon-theme->gdk-pixbuf \ + sato-icon-theme->gtk+3 \ adwaita-icon-theme->gdk-pixbuf \ adwaita-icon-theme->gtk+3 \ " 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 @@ [Desktop Entry] Name=Media Player Comment=Basic media player -Icon=multimedia-player +Icon=video-player TryExec=gtk-play Exec=gtk-play StartupNotify=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 = "\ matchbox-keyboard-im \ matchbox-config-gtk \ xcursor-transparent-theme \ - adwaita-icon-theme \ + sato-icon-theme \ settings-daemon \ shutdown-desktop \ ${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 @@ +SUMMARY = "Sato icon theme" +HOMEPAGE = "https://www.yoctoproject.org/" +BUGTRACKER = "http://bugzilla.yoctoproject.org/" + +LICENSE = "CC-BY-SA-3.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=56a830bbe6e4697fe6cbbae01bb7c2b2" +SECTION = "x11" + +DEPENDS = "icon-naming-utils-native libxml-simple-perl-native" + +SRC_URI = "git://git.yoctoproject.org/sato-icon-theme.git;protocol=https;branch=master" +SRCREV = "d23f04ecb0328f655bf195df8eb04c1b734d53a9" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig allarch gtk-icon-cache perlnative + +# The configure script uses pkg-config to find native binaries to execute, so +# tell it to use our pkg-config-native wrapper. +export PKG_CONFIG = "pkg-config-native" + +FILES:${PN} += "${datadir}/icons/Sato" + +do_install:append() { + find ${D}${datadir}/icons/Sato/ -maxdepth 1 -type d -exec ln -s preferences-system.png {}/apps/preferences-desktop.png \; + find ${D}${datadir}/icons/Sato/ -maxdepth 1 -type d -exec ln -s file-manager.png {}/apps/system-file-manager.png \; + find ${D}${datadir}/icons/Sato/ -maxdepth 1 -type d -exec ln -s ../apps/terminal.png {}/places/computer.png \; +} -- cgit v1.2.3-54-g00ecf