summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-05-05 17:18:48 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-05-09 23:30:14 +0100
commit3eab7234311619d8e79a39ebaccf85a7053ddef7 (patch)
tree0a0710fe9bca8ce8583fc5d995854ac237013cb6
parent7572042364dcb601f8078dff303fb6a3cc4a8466 (diff)
downloadpoky-3eab7234311619d8e79a39ebaccf85a7053ddef7.tar.gz
gdk-pixbuf/pango: replace gtk-doc with gi-docgen
(From OE-Core rev: fe97a89056857e1326b087fb3d4a4b4be28acdc9) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb2
-rw-r--r--meta/recipes-graphics/pango/pango_1.48.2.bb3
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 \
28 28
29SRC_URI[sha256sum] = "c4a6b75b7ed8f58ca48da830b9fa00ed96d668d3ab4b1f723dcf902f78bde77f" 29SRC_URI[sha256sum] = "c4a6b75b7ed8f58ca48da830b9fa00ed96d668d3ab4b1f723dcf902f78bde77f"
30 30
31inherit meson pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gtk-doc lib_package 31inherit meson pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gi-docgen lib_package
32 32
33GIR_MESON_OPTION = 'introspection' 33GIR_MESON_OPTION = 'introspection'
34GIR_MESON_ENABLE_FLAG = "enabled" 34GIR_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"
13 13
14GNOMEBASEBUILDCLASS = "meson" 14GNOMEBASEBUILDCLASS = "meson"
15 15
16inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even gobject-introspection 16inherit gnomebase gi-docgen ptest-gnome upstream-version-is-even gobject-introspection
17 17
18GIR_MESON_ENABLE_FLAG = "enabled" 18GIR_MESON_ENABLE_FLAG = "enabled"
19GIR_MESON_DISABLE_FLAG = "disabled" 19GIR_MESON_DISABLE_FLAG = "disabled"
@@ -31,7 +31,6 @@ PACKAGECONFIG[x11] = ",,virtual/libx11 libxft"
31PACKAGECONFIG[tests] = "-Dinstall-tests=true, -Dinstall-tests=false" 31PACKAGECONFIG[tests] = "-Dinstall-tests=true, -Dinstall-tests=false"
32PACKAGECONFIG[thai] = ",,libthai" 32PACKAGECONFIG[thai] = ",,libthai"
33 33
34GTKDOC_MESON_OPTION = "gtk_doc"
35GIR_MESON_OPTION = 'introspection' 34GIR_MESON_OPTION = 'introspection'
36 35
37do_configure_prepend() { 36do_configure_prepend() {