diff options
author | Ross Burton <ross.burton@intel.com> | 2013-01-09 16:48:06 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-10 23:49:40 +0000 |
commit | 2a311dd992265fefe3022903714e86703e9fd595 (patch) | |
tree | 21e32148fd7bc8b7c127403b4b223e2ed3dea6e2 /meta/recipes-gnome/gtk+/gtk+_2.24.14.bb | |
parent | c8e7c30041879d97f7691e4b2f6ad91b150cf150 (diff) | |
download | poky-2a311dd992265fefe3022903714e86703e9fd595.tar.gz |
gtk+: version installed gtk-update-icon-cache and use alternatives
With GTK+ 3 being added soon we'll have potentially two providers of
gtk-update-icon-cache. Append a version to the binary and use
update-alternatives to ensure that the unversioned name works.
For gtk+-native the alternatives won't take effect, so install a symlink
explicitly. This will break if we have a gtk+3-native but we can fix that if
and when that happens.
(From OE-Core rev: a9e71b41463c6c8e2be50d40403a0017d3cdf146)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gtk+/gtk+_2.24.14.bb')
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+_2.24.14.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.14.bb b/meta/recipes-gnome/gtk+/gtk+_2.24.14.bb index 553196a150..028b2384c1 100644 --- a/meta/recipes-gnome/gtk+/gtk+_2.24.14.bb +++ b/meta/recipes-gnome/gtk+/gtk+_2.24.14.bb | |||
@@ -43,7 +43,7 @@ RRECOMMENDS_${PN}_class-native = "" | |||
43 | DEPENDS_class-native = "glib-2.0-native atk-native pango-native cairo-native gdk-pixbuf-native" | 43 | DEPENDS_class-native = "glib-2.0-native atk-native pango-native cairo-native gdk-pixbuf-native" |
44 | 44 | ||
45 | do_install_append_class-native () { | 45 | do_install_append_class-native () { |
46 | create_wrapper ${D}/${bindir}/gtk-update-icon-cache \ | 46 | create_wrapper ${D}/${bindir}/gtk-update-icon-cache-2.0 \ |
47 | GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache | 47 | GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache |
48 | } | 48 | } |
49 | 49 | ||