gtk+3: fix ALTERNATIVE_PRIORITY conflict with gtk+

(From OE-Core rev: 44b8ad12042eb4a1161c6f8359479f3dfa31eab9)

Signed-off-by: Ross Burton <ross.burton@intel.com>
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>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc
index 22a40d8f05b40f18db9cbec008a0feee9ce1e795..e0c4ccb11b24422332409daefd269db095ecab21 100644 (file)
--- a/meta/recipes-gnome/gtk+/gtk+3.inc
+++ b/meta/recipes-gnome/gtk+/gtk+3.inc
@@ -94,6 +94,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