mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-03 14:19:52 +00:00
Code Issues Projects Releases Wiki Activity

gnome-themes-extra: fix datadir path

Browse Source 
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 <f_l_k@t-online.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Markus Volk
2023-08-10 21:24:43 +02:00
committed by Khem Raj
parent 9a8cfc75f5
commit ab1f6ee8bf
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-gnome/gnome-themes/gnome-themes-extra_3.28.bb
+4 -4
View File
@@ -21,8 +21,8 @@ EXTRA_OECONF = "--disable-gtk3-engine"
do_install:append() { do_install:append() {
# Only building Adwaita, remove highcontrast files # Only building Adwaita, remove highcontrast files
rm -rf ${D}${prefix}/share/themes/HighContrast \ rm -rf ${D}${datadir}/themes/HighContrast \
${D}${prefix}/share/icons ${D}${datadir}/icons
# The libtool archive file is unneeded with shared libs on modern Linux # 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 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 \ 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" ${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" RDEPENDS:gnome-theme-adwaita-dark = "gnome-theme-adwaita"
# gnome-themes-standard is empty and doesn't exist # gnome-themes-standard is empty and doesn't exist