From ab1f6ee8bf4835fabdf02cb0e30b20e4ff11e5fb Mon Sep 17 00:00:00 2001 From: Markus Volk Date: Thu, 10 Aug 2023 21:24:43 +0200 Subject: [PATCH] gnome-themes-extra: fix datadir path This fixes do_rootfs error if gtk2 is installed Running transaction test Error: Transaction test error: file /usr conflicts between attempted installs of gnome-theme-adwaita-3.28-r0.corei7_64 and pipewire-modules-zeroconf-discover-0.3.77-r0.corei7_64 file /usr/lib conflicts between attempted installs of gnome-theme-adwaita-3.28-r0.corei7_64 and pipewire-modules-zeroconf-discover-0.3.77-r0.corei7_64 file /usr/lib/gtk-2.0 conflicts between attempted installs of gnome-theme-adwaita-3.28-r0.corei7_64 and at-spi2-core-2.48.3-r0.corei7_64 file /usr/share conflicts between attempted installs of gnome-theme-adwaita-3.28-r0.corei7_64 and ghostscript-10.01.2-r0.corei7_64 file /usr conflicts between attempted installs of libgtk-2.0-2.24.33-r0.corei7_64 and gnome-theme-adwaita-3.28-r0.corei7_64 file /usr/lib conflicts between attempted installs of libgtk-2.0-2.24.33-r0.corei7_64 and gnome-theme-adwaita-3.28-r0.corei7_64 file /usr/lib/gtk-2.0 conflicts between attempted installs of libgtk-2.0-2.24.33-r0.corei7_64 and gnome-theme-adwaita-3.28-r0.corei7_64 file /usr/lib/gtk-2.0/2.10.0 conflicts between attempted installs of libgtk-2.0-2.24.33-r0.corei7_64 and gnome-theme-adwaita-3.28-r0.corei7_64 file /usr/lib/gtk-2.0/2.10.0/engines conflicts between attempted installs of libgtk-2.0-2.24.33-r0.corei7_64 and gnome-theme-adwaita-3.28-r0.corei7_64 file /usr/share conflicts between attempted installs of libgtk-2.0-2.24.33-r0.corei7_64 and gnome-theme-adwaita-3.28-r0.corei7_64 file /usr/share/themes conflicts between attempted installs of libgtk-2.0-2.24.33-r0.corei7_64 and gnome-theme-adwaita-3.28-r0.corei7_64 Signed-off-by: Markus Volk Signed-off-by: Khem Raj --- .../recipes-gnome/gnome-themes/gnome-themes-extra_3.28.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-oe/recipes-gnome/gnome-themes/gnome-themes-extra_3.28.bb b/meta-oe/recipes-gnome/gnome-themes/gnome-themes-extra_3.28.bb index d7e422cc97..227422d90c 100644 --- a/meta-oe/recipes-gnome/gnome-themes/gnome-themes-extra_3.28.bb +++ b/meta-oe/recipes-gnome/gnome-themes/gnome-themes-extra_3.28.bb @@ -21,8 +21,8 @@ EXTRA_OECONF = "--disable-gtk3-engine" do_install:append() { # Only building Adwaita, remove highcontrast files - rm -rf ${D}${prefix}/share/themes/HighContrast \ - ${D}${prefix}/share/icons + rm -rf ${D}${datadir}/themes/HighContrast \ + ${D}${datadir}/icons # The libtool archive file is unneeded with shared libs on modern Linux rm -rf ${D}${libdir}/gtk-2.0/2.10.0/engines/libadwaita.la @@ -34,10 +34,10 @@ PACKAGES += "gnome-theme-adwaita \ gnome-theme-adwaita-dark \ " -FILES:gnome-theme-adwaita = "${prefix}/share/themes/Adwaita \ +FILES:gnome-theme-adwaita = "${datadir}/themes/Adwaita \ ${libdir}/gtk-2.0/2.10.0/engines/libadwaita.so" -FILES:gnome-theme-adwaita-dark = "${prefix}/share/themes/Adwaita-dark" +FILES:gnome-theme-adwaita-dark = "${datadir}/themes/Adwaita-dark" RDEPENDS:gnome-theme-adwaita-dark = "gnome-theme-adwaita" # gnome-themes-standard is empty and doesn't exist