From 190b6280c8759fd73281304211298d0ea2fa12ee Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Fri, 9 Oct 2015 19:51:33 -0700 Subject: gtk+3: fix ALTERNATIVE_PRIORITY conflict with gtk+ Conflicts: gtk+3 and gtk+ have the same priority 10 for gtk-update-icon-cache Turn up gtk+3's priority to fix the conflict. [YOCTO #8477] Signed-off-by: Robert Yang --- meta/recipes-gnome/gtk+/gtk+3.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc index 558cdd7340..5bbac07623 100644 --- a/meta/recipes-gnome/gtk+/gtk+3.inc +++ b/meta/recipes-gnome/gtk+/gtk+3.inc @@ -92,6 +92,7 @@ PACKAGES_DYNAMIC += "^gtk3-immodule-.* ^gtk3-printbackend-.*" ALTERNATIVE_${PN} = "gtk-update-icon-cache" ALTERNATIVE_TARGET[gtk-update-icon-cache] = "${bindir}/gtk-update-icon-cache-3.0" +ALTERNATIVE_PRIORITY = "30" python populate_packages_prepend () { import os.path -- cgit 1.2.3-korg