From 9c63433010aae6891149a7605a637bee879dc4ef Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Wed, 17 Apr 2019 15:39:41 +0200 Subject: adwaita-icon-theme: do not delete symbolic svg but pack them in ${PN}-symbolic MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes: * gtk-icon-browser: for symbolic view almost all icons were missing * xfce's thunar: 'home' and 'up' icons were missing. Had a long discussion with XFCE-people [1] and asked here [2]. How could I overlook the most obvious... [1] https://bugzilla.xfce.org/show_bug.cgi?id=14443 [2] http://lists.openembedded.org/pipermail/openembedded-core/2018-November/275815.html (From OE-Core rev: 0911e7d2f5443210b594a198ada8465af7a2fc78) Signed-off-by: Andreas Müller Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- meta/recipes-gnome/gnome/adwaita-icon-theme_3.28.0.bb | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'meta/recipes-gnome') diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme_3.28.0.bb b/meta/recipes-gnome/gnome/adwaita-icon-theme_3.28.0.bb index 40dd35ba30..6e453a0163 100644 --- a/meta/recipes-gnome/gnome/adwaita-icon-theme_3.28.0.bb +++ b/meta/recipes-gnome/gnome/adwaita-icon-theme_3.28.0.bb @@ -18,13 +18,6 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ SRC_URI[md5sum] = "b25b2d82cbebf2cc9cd469457b604f2c" SRC_URI[sha256sum] = "7aae8c1dffd6772fd1a21a3d365a0ea28b7c3988bdbbeafbf8742cda68242150" -do_install_append() { - # Build uses gtk-encode-symbolic-svg to create png versions: - # no need to store the svgs anymore. - rm -f ${D}${prefix}/share/icons/Adwaita/scalable/*/*-symbolic.svg \ - ${D}${prefix}/share/icons/Adwaita/scalable/*/*-symbolic-rtl.svg -} - PACKAGES = "${PN}-cursors ${PN}-symbolic-hires ${PN}-symbolic ${PN}-hires ${PN}" RREPLACES_${PN} = "gnome-icon-theme" @@ -37,7 +30,8 @@ FILES_${PN}-symbolic-hires = "${prefix}/share/icons/Adwaita/96x96/*/*.symbolic.p ${prefix}/share/icons/Adwaita/48x48/*/*.symbolic.png \ ${prefix}/share/icons/Adwaita/32x32/*/*.symbolic.png" FILES_${PN}-symbolic = "${prefix}/share/icons/Adwaita/16x16/*/*.symbolic.png \ - ${prefix}/share/icons/Adwaita/24x24/*/*.symbolic.png" + ${prefix}/share/icons/Adwaita/24x24/*/*.symbolic.png \ + ${prefix}/share/icons/Adwaita/scalable/*/*-symbolic*.svg" FILES_${PN}-hires = "${prefix}/share/icons/Adwaita/256x256/ \ ${prefix}/share/icons/Adwaita/512x512/" FILES_${PN} = "${prefix}/share/icons/Adwaita/ \ -- cgit 1.2.3-korg