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+_2.24.15.bb | |
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+_2.24.15.bb')
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+_2.24.15.bb | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.15.bb b/meta/recipes-gnome/gtk+/gtk+_2.24.15.bb index 4e045e4fef..02d66f86b9 100644 --- a/meta/recipes-gnome/gtk+/gtk+_2.24.15.bb +++ b/meta/recipes-gnome/gtk+/gtk+_2.24.15.bb | |||
@@ -28,7 +28,7 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.24/gtk+-${PV}.tar.xz \ | |||
28 | # file://combo-arrow-size.patch;striplevel=0 | 28 | # file://combo-arrow-size.patch;striplevel=0 |
29 | # file://configurefix.patch | 29 | # file://configurefix.patch |
30 | 30 | ||
31 | PR = "r0" | 31 | PR = "r1" |
32 | 32 | ||
33 | SRC_URI[md5sum] = "68f034fb4f68086790d7488cf00e71c8" | 33 | SRC_URI[md5sum] = "68f034fb4f68086790d7488cf00e71c8" |
34 | SRC_URI[sha256sum] = "d7e1c6d6ae6baa48c88441fe52b73b0fb6008763644867d59b049bafb0cf771b" | 34 | SRC_URI[sha256sum] = "d7e1c6d6ae6baa48c88441fe52b73b0fb6008763644867d59b049bafb0cf771b" |
@@ -38,14 +38,6 @@ EXTRA_OECONF = "--without-libtiff --without-libjasper --enable-xkb --disable-gli | |||
38 | LIBV = "2.10.0" | 38 | LIBV = "2.10.0" |
39 | 39 | ||
40 | PACKAGES_DYNAMIC += "^gtk-immodule-.* ^gtk-printbackend-.*" | 40 | PACKAGES_DYNAMIC += "^gtk-immodule-.* ^gtk-printbackend-.*" |
41 | BBCLASSEXTEND = "native" | ||
42 | RRECOMMENDS_${PN}_class-native = "" | ||
43 | DEPENDS_class-native = "glib-2.0-native atk-native pango-native cairo-native gdk-pixbuf-native" | ||
44 | |||
45 | do_install_append_class-native () { | ||
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 | ||
48 | } | ||
49 | 41 | ||
50 | python populate_packages_prepend () { | 42 | python populate_packages_prepend () { |
51 | gtk_libdir = d.expand('${libdir}/gtk-2.0/${LIBV}') | 43 | gtk_libdir = d.expand('${libdir}/gtk-2.0/${LIBV}') |