diff options
author | Andreas Müller <schnitzeltony@googlemail.com> | 2013-03-29 22:19:57 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-02 18:11:06 +0100 |
commit | e1dbbdc729802f1fa5e3a0e97f1bf916011d7d4f (patch) | |
tree | 20e6c6b696722ae5ab261731ec2415a4f4b2e640 /meta/recipes-gnome/gtk+/gtk+.inc | |
parent | 23b9baa21beb0f1e9ac991b308532f57510e94ef (diff) | |
download | poky-e1dbbdc729802f1fa5e3a0e97f1bf916011d7d4f.tar.gz |
gtk+: don't provide native build
The only part required from native build is gtk-update-icon-cache. This is
provided by gtk-update-icon-cache-native_3.4.4. This version works properly
with gtk+. The patch was tested for gnome-icon-theme and hicolor-icon-theme by:
1. building xfce/gtk+ (gtk3-less) image
2. checking for existing icon-theme.cache in rootfs
3. running image / open menus + test applications
4. executing 'gtk-update-icon-cache-2.0 --validate <both icon-themes-dirs>'
5. executing 'gtk-update-icon-cache-2.0 -f <both icon-themes-dirs>' + exact size checking
(From OE-Core rev: 8d6406849bcad2a7bbd4483ccfa4e0f3d9b4ae21)
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gtk+/gtk+.inc')
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+.inc | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+.inc b/meta/recipes-gnome/gtk+/gtk+.inc index f05838a173..84edaf38a6 100644 --- a/meta/recipes-gnome/gtk+/gtk+.inc +++ b/meta/recipes-gnome/gtk+/gtk+.inc | |||
@@ -10,8 +10,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" | |||
10 | 10 | ||
11 | SECTION = "libs" | 11 | SECTION = "libs" |
12 | 12 | ||
13 | PROVIDES_class-native = "virtual/gtk-update-icon-cache-native" | ||
14 | |||
15 | X11DEPENDS = "virtual/libx11 libxext libxcursor libxrandr libxdamage libxrender libxcomposite" | 13 | X11DEPENDS = "virtual/libx11 libxext libxcursor libxrandr libxdamage libxrender libxcomposite" |
16 | DEPENDS = "glib-2.0 pango atk jpeg libpng gdk-pixbuf-native docbook-utils-native \ | 14 | DEPENDS = "glib-2.0 pango atk jpeg libpng gdk-pixbuf-native docbook-utils-native \ |
17 | libgcrypt cairo gdk-pixbuf" | 15 | libgcrypt cairo gdk-pixbuf" |
@@ -81,12 +79,6 @@ do_install () { | |||
81 | mv ${D}${bindir}/gtk-update-icon-cache ${D}${bindir}/gtk-update-icon-cache-2.0 | 79 | mv ${D}${bindir}/gtk-update-icon-cache ${D}${bindir}/gtk-update-icon-cache-2.0 |
82 | } | 80 | } |
83 | 81 | ||
84 | do_install_append_class-native () { | ||
85 | # Ideally we'd use alternatives in the sysroot, but they don't work. | ||
86 | # As we know we don't have a native GTK+ 3 (yet), make a symlink instead. | ||
87 | ln -s gtk-update-icon-cache-2.0 ${D}${bindir}/gtk-update-icon-cache | ||
88 | } | ||
89 | |||
90 | SYSROOT_PREPROCESS_FUNCS += "gtk_sysroot_preprocess" | 82 | SYSROOT_PREPROCESS_FUNCS += "gtk_sysroot_preprocess" |
91 | 83 | ||
92 | gtk_sysroot_preprocess () { | 84 | gtk_sysroot_preprocess () { |