diff options
| author | Robert Yang <liezhi.yang@windriver.com> | 2015-10-09 19:51:33 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-11-16 11:39:28 +0000 |
| commit | 0ff3fc751fef3c0ff635fb56163b7ae01852ece0 (patch) | |
| tree | 919e440289cb2ff003a9789dcbcd2cb04d511c0c | |
| parent | eca12a65cb58e11743b287fec77f657d2ff074dc (diff) | |
| download | poky-0ff3fc751fef3c0ff635fb56163b7ae01852ece0.tar.gz | |
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>
| -rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3.inc | 1 |
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 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-.*" | |||
| 94 | 94 | ||
| 95 | ALTERNATIVE_${PN} = "gtk-update-icon-cache" | 95 | ALTERNATIVE_${PN} = "gtk-update-icon-cache" |
| 96 | ALTERNATIVE_TARGET[gtk-update-icon-cache] = "${bindir}/gtk-update-icon-cache-3.0" | 96 | ALTERNATIVE_TARGET[gtk-update-icon-cache] = "${bindir}/gtk-update-icon-cache-3.0" |
| 97 | ALTERNATIVE_PRIORITY = "30" | ||
| 97 | 98 | ||
| 98 | python populate_packages_prepend () { | 99 | python populate_packages_prepend () { |
| 99 | import os.path | 100 | import os.path |