Signed-off-by: Alexander Kanavin <alex.kana...@gmail.com> --- meta/recipes-gnome/gtk+/gtk+.inc | 5 +---- meta/recipes-gnome/gtk+/gtk+3.inc | 10 ++-------- 2 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/meta/recipes-gnome/gtk+/gtk+.inc b/meta/recipes-gnome/gtk+/gtk+.inc index 14ed8d812ca..eb67db20552 100644 --- a/meta/recipes-gnome/gtk+/gtk+.inc +++ b/meta/recipes-gnome/gtk+/gtk+.inc @@ -28,7 +28,7 @@ PACKAGECONFIG[x11] = "--with-x=yes --with-gdktarget=x11,--with-x=no,${X11DEPENDS PACKAGECONFIG[directfb] = "--with-gdktarget=directfb,,directfb" PACKAGECONFIG[manpages] = "--enable-man --with-xml-catalog=${STAGING_ETCDIR_NATIVE}/xml/catalog.xml, --disable-man, libxslt-native xmlto-native" -inherit autotools gtk-doc pkgconfig update-alternatives gtk-immodules-cache gobject-introspection manpages +inherit autotools gtk-doc pkgconfig gtk-immodules-cache gobject-introspection manpages PACKAGES += "libgail gtk-demo" @@ -70,9 +70,6 @@ GTKGLIBC_RRECOMMENDS ?= "${GTKBASE_RRECOMMENDS} glibc-gconv-iso8859-1" RRECOMMENDS_${PN} = "${GTKBASE_RRECOMMENDS}" RRECOMMENDS_${PN}_libc-glibc = "${GTKGLIBC_RRECOMMENDS}" -ALTERNATIVE_${PN} = "gtk-update-icon-cache" -ALTERNATIVE_TARGET[gtk-update-icon-cache] = "${bindir}/gtk-update-icon-cache-2.0" - do_compile_prepend() { export GIR_EXTRA_LIBS_PATH="${B}/gdk/.libs" } diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc index ecb6abe4b5b..93f19e69944 100644 --- a/meta/recipes-gnome/gtk+/gtk+3.inc +++ b/meta/recipes-gnome/gtk+/gtk+3.inc @@ -10,7 +10,7 @@ DEPENDS = "glib-2.0 cairo pango atk jpeg libpng gdk-pixbuf \ LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+" -inherit autotools gettext pkgconfig gtk-doc update-alternatives gtk-immodules-cache gsettings distro_features_check gobject-introspection +inherit autotools gettext pkgconfig gtk-doc gtk-immodules-cache gsettings distro_features_check gobject-introspection BBCLASSEXTEND = "native nativesdk" @@ -54,8 +54,6 @@ PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,way PACKAGECONFIG[cups] = "--enable-cups,--disable-cups,cups" do_install_append() { - mv ${D}${bindir}/gtk-update-icon-cache ${D}${bindir}/gtk-update-icon-cache-3.0 - # duplicate gtk-query-immodules for post install script update_gtk_immodules_cache mkdir -p ${D}${libexecdir} ln ${D}${bindir}/gtk-query-immodules-3.0 ${D}${libexecdir}/${MLPREFIX}gtk-query-immodules-3.0 @@ -83,7 +81,7 @@ FILES_${PN}-demo = "${bindir}/gtk3-demo \ ${datadir}/icons/hicolor/*/apps/gtk3-demo*.png \ ${datadir}/icons/hicolor/*/apps/gtk3-widget-factory*.png" -FILES_${PN}_append = " ${bindir}/gtk-update-icon-cache-3.0 \ +FILES_${PN}_append = " ${bindir}/gtk-update-icon-cache \ ${bindir}/gtk-query-immodules-3.0 \ ${bindir}/gtk-launch \ ${datadir}/themes ${sysconfdir} ${datadir}/glib-2.0/schemas/ \ @@ -131,10 +129,6 @@ RDEPENDS_${PN}-dev += "${@bb.utils.contains("PACKAGECONFIG", "wayland", "wayland PACKAGES_DYNAMIC += "^gtk3-immodule-.* ^gtk3-printbackend-.*" -ALTERNATIVE_${PN} = "gtk-update-icon-cache" -ALTERNATIVE_TARGET[gtk-update-icon-cache] = "${bindir}/gtk-update-icon-cache-3.0" -ALTERNATIVE_PRIORITY = "30" - python populate_packages_prepend () { import os.path -- 2.17.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core