]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
gtk+3: fix ALTERNATIVE_PRIORITY conflict with gtk+ rbt/alternatives
authorRobert Yang <liezhi.yang@windriver.com>
Sat, 10 Oct 2015 02:51:33 +0000 (19:51 -0700)
committerRobert Yang <liezhi.yang@windriver.com>
Sat, 10 Oct 2015 06:59:47 +0000 (23:59 -0700)
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>
meta/recipes-gnome/gtk+/gtk+3.inc

index 558cdd7340348f72f848bd231e9f59f51963dc8d..5bbac07623219ab0035b7c73df6be20892e55017 100644 (file)
@@ -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