From 3eab7234311619d8e79a39ebaccf85a7053ddef7 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 5 May 2021 17:18:48 +0200 Subject: gdk-pixbuf/pango: replace gtk-doc with gi-docgen (From OE-Core rev: fe97a89056857e1326b087fb3d4a4b4be28acdc9) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb | 2 +- meta/recipes-graphics/pango/pango_1.48.2.bb | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb index 2734a11f96..e28423efd9 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb @@ -28,7 +28,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ SRC_URI[sha256sum] = "c4a6b75b7ed8f58ca48da830b9fa00ed96d668d3ab4b1f723dcf902f78bde77f" -inherit meson pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gtk-doc lib_package +inherit meson pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gi-docgen lib_package GIR_MESON_OPTION = 'introspection' GIR_MESON_ENABLE_FLAG = "enabled" diff --git a/meta/recipes-graphics/pango/pango_1.48.2.bb b/meta/recipes-graphics/pango/pango_1.48.2.bb index aa279bb503..7a4d7fc261 100644 --- a/meta/recipes-graphics/pango/pango_1.48.2.bb +++ b/meta/recipes-graphics/pango/pango_1.48.2.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even gobject-introspection +inherit gnomebase gi-docgen ptest-gnome upstream-version-is-even gobject-introspection GIR_MESON_ENABLE_FLAG = "enabled" GIR_MESON_DISABLE_FLAG = "disabled" @@ -31,7 +31,6 @@ PACKAGECONFIG[x11] = ",,virtual/libx11 libxft" PACKAGECONFIG[tests] = "-Dinstall-tests=true, -Dinstall-tests=false" PACKAGECONFIG[thai] = ",,libthai" -GTKDOC_MESON_OPTION = "gtk_doc" GIR_MESON_OPTION = 'introspection' do_configure_prepend() { -- cgit v1.2.3-54-g00ecf