From patchwork Tue Jun 21 20:16:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 9433 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id B4642CCA473 for ; Tue, 21 Jun 2022 20:16:46 +0000 (UTC) Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) by mx.groups.io with SMTP id smtpd.web09.48606.1655842605458582478 for ; Tue, 21 Jun 2022 13:16:45 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=YzjFEejL; spf=pass (domain: gmail.com, ip: 209.85.218.48, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f48.google.com with SMTP id g26so8452235ejb.5 for ; Tue, 21 Jun 2022 13:16:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=4wlp8GO3qhmf9t34FB67nN+np1mrReFE+aI2b9rURSw=; b=YzjFEejLogzpELLNIi9MhSjhzcqgoSxgiq8nDFOIdyXHo9lUZvpXAqnKntLVqdDncl /QRBdcFxKFfqHzYIJ8Vgnn1aWHOqVrFAFEep18mOHB1jRPgUpthQv87uR/cPGrxQvV5p ZpF5Bf+wnd0xdJzCwjpO8C6ar79qlAM5X2Tjj8EP25e/MnI5jssn8D6aTZJrfxwNPU6B q5MJl9GpFCZWAK+FaDU9+9koS7m86A3IFyspl/Vn9b+0AxD8nAwfOFtkws01C5zwTdGP sBaT9cPkgFXEwOPRtKNSaLRo2+U5N29BJwIlrvlhTqaVX3su/Hmcr5QiP0PRKY39Ixue pGkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=4wlp8GO3qhmf9t34FB67nN+np1mrReFE+aI2b9rURSw=; b=y0Jy/WaccTPrSYqdukPWHci9+DG16AUEJnmKWZwz8K2jq7MasHCitsm458S+UEB7B1 apWv7u1O/b0QyJ1OQjXSN7JKZU5rj3u0NcCCu8xhiZfIViBdQxdasrZVD5ojl5amQmZQ 2SJVpFByL8rpj8HDJSqY3DJu/NFTtUAE6i3Lk6lWdOldIrmAk7cc5wWu5IHRGbulYsGO QbPD+GfcJxwk5eBAxMrn+xUN1e9Ftz8I6fnytOFthTYtFv7URYnwgJxVEMirThksVYUr xqsaPbim+1fslbZ2cJfm+7TWtAZ1/EvfvY+s0qmiM0HlCxsUdvM99fqPB1eTXu8HxFHR f2QA== X-Gm-Message-State: AJIora+QYQqni69B6pXCHDSX/Wiko+QmeVeqvuXpKfXSuXvzfPHjuQ3x mo6iAmuzXCddDw+n9mM+BNy9I2+2O8o0hg== X-Google-Smtp-Source: AGRyM1szdSkkJvPXZUIM/SnO6Sk2Bt24ola45VxwbVZLPihgbdZSCfZ89lkGJuQFQ/Wv9iAYHdH10A== X-Received: by 2002:a17:906:77d2:b0:722:e726:addc with SMTP id m18-20020a17090677d200b00722e726addcmr3373759ejn.96.1655842603780; Tue, 21 Jun 2022 13:16:43 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (ip-109-090-143-203.um36.pools.vodafone-ip.de. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id j8-20020a056402238800b0043590660f16sm3420890eda.35.2022.06.21.13.16.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jun 2022 13:16:43 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 01/18] sato: work around missing icons in adwaita 42.0 Date: Tue, 21 Jun 2022 22:16:20 +0200 Message-Id: <20220621201637.1378306-1-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 21 Jun 2022 20:16:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167169 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). Going forward, 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 --- .../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 | 2 +- .../rxvt-unicode/rxvt-unicode/rxvt.desktop | 2 +- .../shutdown-desktop/shutdown.desktop | 2 +- 10 files changed, 87 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 diff --git a/meta/recipes-multimedia/gstreamer/gst-examples/gst-player.desktop b/meta/recipes-multimedia/gstreamer/gst-examples/gst-player.desktop index 7ddd456a1e..a5df5c9c84 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=multimedia-player-symbolic TryExec=gtk-play Exec=gtk-play StartupNotify=true diff --git a/meta/recipes-sato/matchbox-config-gtk/files/0001-mb-appearance.desktop-update-icon-to-one-available-i.patch b/meta/recipes-sato/matchbox-config-gtk/files/0001-mb-appearance.desktop-update-icon-to-one-available-i.patch new file mode 100644 index 0000000000..7e75fdab9a --- /dev/null +++ b/meta/recipes-sato/matchbox-config-gtk/files/0001-mb-appearance.desktop-update-icon-to-one-available-i.patch @@ -0,0 +1,25 @@ +From ab2c716bb0679a67dc6b0878ef750d3fdd29edb7 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +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 +--- + 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; diff --git a/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb b/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb index d951baf361..c91f9a7cc2 100644 --- a/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb +++ b/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb @@ -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(\d+(\.\d+)+))" S = "${WORKDIR}/git" diff --git a/meta/recipes-sato/matchbox-desktop/files/0001-taku-launcher-tile.c-use-view-refresh-symbolic-icon.patch b/meta/recipes-sato/matchbox-desktop/files/0001-taku-launcher-tile.c-use-view-refresh-symbolic-icon.patch new file mode 100644 index 0000000000..7a4db83da2 --- /dev/null +++ b/meta/recipes-sato/matchbox-desktop/files/0001-taku-launcher-tile.c-use-view-refresh-symbolic-icon.patch @@ -0,0 +1,26 @@ +From 764201dff04a7ca1c3862357ea485a6fc624dd00 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +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 +--- + 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. */ diff --git a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb index b05a9c48ad..c306aba6ec 100644 --- a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb +++ b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb @@ -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" diff --git a/meta/recipes-sato/matchbox-terminal/matchbox-terminal/0001-matchbox-terminal.desktop-use-an-icon-available-in-a.patch b/meta/recipes-sato/matchbox-terminal/matchbox-terminal/0001-matchbox-terminal.desktop-use-an-icon-available-in-a.patch new file mode 100644 index 0000000000..48987f9d31 --- /dev/null +++ b/meta/recipes-sato/matchbox-terminal/matchbox-terminal/0001-matchbox-terminal.desktop-use-an-icon-available-in-a.patch @@ -0,0 +1,25 @@ +From ec16ba4a1cb0e4217910a1b36783f00828bb5dfc Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +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 +--- + 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 diff --git a/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.2.bb b/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.2.bb index 802ffa971b..048e247b89 100644 --- a/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.2.bb +++ b/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.2.bb @@ -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(\d+(\.\d+)+))" S = "${WORKDIR}/git" diff --git a/meta/recipes-sato/puzzles/puzzles_git.bb b/meta/recipes-sato/puzzles/puzzles_git.bb index 0104f2672a..6f038cc475 100644 --- a/meta/recipes-sato/puzzles/puzzles_git.bb +++ b/meta/recipes-sato/puzzles/puzzles_git.bb @@ -37,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; diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.desktop b/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.desktop index 6b7978afc9..84a8ba7dc5 100644 --- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.desktop +++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.desktop @@ -3,7 +3,7 @@ Version=1.0 Name=Terminal Comment=A unicode capable rxvt clone Exec=rxvt -Icon=utilities-terminal +Icon=utilities-terminal-symbolic Terminal=false Type=Application Categories=Utility;TerminalEmulator; diff --git a/meta/recipes-sato/shutdown-desktop/shutdown-desktop/shutdown.desktop b/meta/recipes-sato/shutdown-desktop/shutdown-desktop/shutdown.desktop index 662659afc2..bc437ca2de 100644 --- a/meta/recipes-sato/shutdown-desktop/shutdown-desktop/shutdown.desktop +++ b/meta/recipes-sato/shutdown-desktop/shutdown-desktop/shutdown.desktop @@ -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