From: Robert Yang <liezhi.yang@windriver.com>
Date: Sat, 10 Oct 2015 02:51:33 +0000 (-0700)
Subject: gtk+3: fix ALTERNATIVE_PRIORITY conflict with gtk+
X-Git-Tag: 2016-4~2386
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=44b8ad12042eb4a1161c6f8359479f3dfa31eab9;p=openembedded-core.git

gtk+3: fix ALTERNATIVE_PRIORITY conflict with gtk+

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>
---

diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc
index 22a40d8f05..e0c4ccb11b 100644
--- 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