@@ -1,7 +1,7 @@
[Desktop Entry]
Name=Media Player
Comment=Basic media player
-Icon=multimedia-player
+Icon=multimedia-player-symbolic
TryExec=gtk-play
Exec=gtk-play
StartupNotify=true
new file mode 100644
@@ -0,0 +1,25 @@
+From ab2c716bb0679a67dc6b0878ef750d3fdd29edb7 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Wed, 13 Apr 2022 22:19:11 +0200
+Subject: [PATCH] mb-appearance.desktop: update icon to one available in
+ adwaita 42.0
+
+Upstream-Status: Inappropriate [apps need their own icons as of 42.0]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ appearance/mb-appearance.desktop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/appearance/mb-appearance.desktop b/appearance/mb-appearance.desktop
+index 4db2bbc..cfa5142 100644
+--- a/appearance/mb-appearance.desktop
++++ b/appearance/mb-appearance.desktop
+@@ -2,7 +2,7 @@
+ Name=Appearance
+ Comment=Change the appearance
+ Exec=matchbox-appearance
+-Icon=preferences-desktop-theme
++Icon=preferences-desktop-appearance-symbolic
+ Terminal=false
+ Type=Application
+ Categories=GTK;Settings;DesktopSettings;
@@ -12,7 +12,9 @@ RDEPENDS:${PN} = "settings-daemon"
# SRCREV tagged 0.2
SRCREV = "ef2192ce98d9374ffdad5f78544c3f8f353c16aa"
SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master \
- file://no-handed.patch"
+ file://no-handed.patch \
+ file://0001-mb-appearance.desktop-update-icon-to-one-available-i.patch \
+ "
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
S = "${WORKDIR}/git"
new file mode 100644
@@ -0,0 +1,26 @@
+From 764201dff04a7ca1c3862357ea485a6fc624dd00 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Wed, 13 Apr 2022 22:01:30 +0200
+Subject: [PATCH] taku-launcher-tile.c: use view-refresh-symbolic icon
+
+Plain view-refresh is no longer provided in latest adwaita icon theme.
+
+Upstream-Status: Inappropriate [apps need their own icons as of 42.0]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ libtaku/taku-launcher-tile.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libtaku/taku-launcher-tile.c b/libtaku/taku-launcher-tile.c
+index e7f58f3..8bbf2f7 100644
+--- a/libtaku/taku-launcher-tile.c
++++ b/libtaku/taku-launcher-tile.c
+@@ -185,7 +185,7 @@ taku_launcher_tile_new_from_item (TakuMenuItem *item)
+ taku_icon_tile_set_secondary (TAKU_ICON_TILE (tile),
+ taku_menu_item_get_description (item));
+ taku_icon_tile_set_pixbuf (TAKU_ICON_TILE (tile),
+- get_icon ("view-refresh", size));
++ get_icon ("view-refresh-symbolic", size));
+
+ /* Don't need to update the icon here, because we'll get a style-set signal
+ when the widget is realised which will update the icon. */
@@ -15,6 +15,7 @@ SECTION = "x11/wm"
SRCREV = "6bc67d09da4147e5552fe30011a05a2c59d2f777"
SRC_URI = "git://git.yoctoproject.org/${BPN}-2;branch=master \
file://vfolders/ \
+ file://0001-taku-launcher-tile.c-use-view-refresh-symbolic-icon.patch \
"
EXTRA_OECONF = "--enable-startup-notification --with-dbus"
new file mode 100644
@@ -0,0 +1,25 @@
+From ec16ba4a1cb0e4217910a1b36783f00828bb5dfc Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Wed, 13 Apr 2022 22:24:50 +0200
+Subject: [PATCH] matchbox-terminal.desktop: use an icon available in adwaita
+ 42.0
+
+Upstream-Status: Inappropriate [apps need their own icons as of 42.0]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ matchbox-terminal.desktop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/matchbox-terminal.desktop b/matchbox-terminal.desktop
+index c84a24c..fedaf10 100644
+--- a/matchbox-terminal.desktop
++++ b/matchbox-terminal.desktop
+@@ -3,7 +3,7 @@ Type=Application
+ Name=Terminal
+ Comment=When all else fails.
+ Exec=matchbox-terminal
+-Icon=utilities-terminal
++Icon=utilities-terminal-symbolic
+ Terminal=false
+ Categories=GTK;Utility;
+ StartupNotify=true
@@ -11,7 +11,9 @@ SECTION = "x11/utils"
#SRCREV tagged 0.2
SRCREV = "161276d0f5d1be8187010fd0d9581a6feca70ea5"
-SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master"
+SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master \
+ file://0001-matchbox-terminal.desktop-use-an-icon-available-in-a.patch \
+ "
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
S = "${WORKDIR}/git"
@@ -23,6 +23,7 @@ DEPENDS += "gtk+3"
do_install:append () {
# net conflicts with Samba, so rename it
mv ${D}${bindir}/net ${D}${bindir}/puzzles-net
+ rm ${D}/${datadir}/applications/net.desktop
# Create desktop shortcuts
install -d ${D}/${datadir}/applications/
@@ -36,7 +37,7 @@ do_install:append () {
[Desktop Entry]
Name=$title
Exec=${bindir}/$prog
-Icon=applications-games
+Icon=applications-games-symbolic
Terminal=false
Type=Application
Categories=Game;
@@ -3,7 +3,7 @@ Version=1.0
Name=Terminal
Comment=A unicode capable rxvt clone
Exec=rxvt
-Icon=terminal
+Icon=utilities-terminal-symbolic
Terminal=false
Type=Application
Categories=Utility;TerminalEmulator;
@@ -4,7 +4,7 @@ Type=Application
Name=Shutdown
Comment=Close down the machine safely
Exec=poweroff
-Icon=system-shutdown
+Icon=system-shutdown-symbolic
Terminal=false
Categories=Utility;
StartupNotify=true
adwaita icon theme upstream has done significant trimming around app category icons (fullcolour versions gone completely, 'symbolic' b&w versions still around but marked as legacy). We can use the symbolic icons for now, but going forwards, apps would need to provide their own icons. Given that sato is likely to be deprecated in favour of wayland/weston rather soon, let's use the symbolic icons for now. [YOCTO #14782] Signed-off-by: Alexander Kanavin <alex@linutronix.de> --- .../gstreamer/gst-examples/gst-player.desktop | 2 +- ...sktop-update-icon-to-one-available-i.patch | 25 ++++++++++++++++++ .../matchbox-config-gtk_0.2.bb | 4 ++- ...ile.c-use-view-refresh-symbolic-icon.patch | 26 +++++++++++++++++++ .../matchbox-desktop/matchbox-desktop_2.2.bb | 1 + ...l.desktop-use-an-icon-available-in-a.patch | 25 ++++++++++++++++++ .../matchbox-terminal_0.2.bb | 4 ++- meta/recipes-sato/puzzles/puzzles_git.bb | 3 ++- .../rxvt-unicode/rxvt-unicode/rxvt.desktop | 2 +- .../shutdown-desktop/shutdown.desktop | 2 +- 10 files changed, 88 insertions(+), 6 deletions(-) create mode 100644 meta/recipes-sato/matchbox-config-gtk/files/0001-mb-appearance.desktop-update-icon-to-one-available-i.patch create mode 100644 meta/recipes-sato/matchbox-desktop/files/0001-taku-launcher-tile.c-use-view-refresh-symbolic-icon.patch create mode 100644 meta/recipes-sato/matchbox-terminal/matchbox-terminal/0001-matchbox-terminal.desktop-use-an-icon-available-in-a.patch