summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-10-09 19:51:33 -0700
committerRobert Yang <liezhi.yang@windriver.com>2015-10-09 23:59:47 -0700
commit190b6280c8759fd73281304211298d0ea2fa12ee (patch)
tree1e4f496bb1aec37499da55f77ba618a5384431d6
parent620fb7e63f46003e22bda20b3dd3a3add0c961ee (diff)
downloadopenembedded-core-contrib-rbt/alternatives.tar.gz
openembedded-core-contrib-rbt/alternatives.tar.bz2
openembedded-core-contrib-rbt/alternatives.zip
gtk+3: fix ALTERNATIVE_PRIORITY conflict with gtk+rbt/alternatives
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 <liezhi.yang@windriver.com>
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3.inc1
1 files changed, 1 insertions, 0 deletions
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