fixes: | ERROR: Multiple .bb files are due to be built which each provide virtual/gtk-update-icon-cache-native | (/home/Superandy/data/oe-core/sources/openembedded-core/meta/recipes-gnome/gtk+/gtk-update-icon-cache-native_3.4.4.bb | virtual:native:/home/Superandy/data/oe-core/sources/openembedded-core/meta/recipes-gnome/gtk+/gtk+_2.24.15.bb). | This usually means one provides something the other doesn't and should.
gtk-update-icon-cache-native_3.4.4 provides a version working with gtk+. This 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 Signed-off-by: Andreas Müller <[email protected]> --- meta/recipes-gnome/gtk+/gtk+.inc | 8 -------- meta/recipes-gnome/gtk+/gtk+_2.24.15.bb | 5 ----- 2 files changed, 0 insertions(+), 13 deletions(-) diff --git a/meta/recipes-gnome/gtk+/gtk+.inc b/meta/recipes-gnome/gtk+/gtk+.inc index f05838a..84edaf3 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" SECTION = "libs" -PROVIDES_class-native = "virtual/gtk-update-icon-cache-native" - X11DEPENDS = "virtual/libx11 libxext libxcursor libxrandr libxdamage libxrender libxcomposite" DEPENDS = "glib-2.0 pango atk jpeg libpng gdk-pixbuf-native docbook-utils-native \ libgcrypt cairo gdk-pixbuf" @@ -81,12 +79,6 @@ do_install () { mv ${D}${bindir}/gtk-update-icon-cache ${D}${bindir}/gtk-update-icon-cache-2.0 } -do_install_append_class-native () { - # Ideally we'd use alternatives in the sysroot, but they don't work. - # As we know we don't have a native GTK+ 3 (yet), make a symlink instead. - ln -s gtk-update-icon-cache-2.0 ${D}${bindir}/gtk-update-icon-cache -} - SYSROOT_PREPROCESS_FUNCS += "gtk_sysroot_preprocess" gtk_sysroot_preprocess () { diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.15.bb b/meta/recipes-gnome/gtk+/gtk+_2.24.15.bb index 4e045e4..3a76393 100644 --- a/meta/recipes-gnome/gtk+/gtk+_2.24.15.bb +++ b/meta/recipes-gnome/gtk+/gtk+_2.24.15.bb @@ -42,11 +42,6 @@ BBCLASSEXTEND = "native" RRECOMMENDS_${PN}_class-native = "" DEPENDS_class-native = "glib-2.0-native atk-native pango-native cairo-native gdk-pixbuf-native" -do_install_append_class-native () { - create_wrapper ${D}/${bindir}/gtk-update-icon-cache-2.0 \ - GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache -} - python populate_packages_prepend () { gtk_libdir = d.expand('${libdir}/gtk-2.0/${LIBV}') immodules_root = os.path.join(gtk_libdir, 'immodules') -- 1.7.4.4 _______________________________________________ Openembedded-core mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
