<div dir="ltr">Acked-by: Martin Jansa <<a href="mailto:Martin.Jansa@gmail.com">Martin.Jansa@gmail.com</a>><div><br></div><div>Thanks</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Jan 22, 2018 at 3:21 PM, Alexander Kanavin <span dir="ltr"><<a href="mailto:alexander.kanavin@linux.intel.com" target="_blank">alexander.kanavin@linux.intel.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Upstream has renamed them all, and folded manpages building<br>
into the overall 'docs' option.<br>
<br>
Signed-off-by: Alexander Kanavin <<a href="mailto:alexander.kanavin@linux.intel.com">alexander.kanavin@linux.<wbr>intel.com</a>><br>
---<br>
meta/recipes-gnome/json-glib/<a href="http://json-glib_1.4.2.bb" rel="noreferrer" target="_blank">j<wbr>son-glib_1.4.2.bb</a> | 13 ++++++-------<br>
1 file changed, 6 insertions(+), 7 deletions(-)<br>
<br>
diff --git a/meta/recipes-gnome/json-<wbr>glib/<a href="http://json-glib_1.4.2.bb" rel="noreferrer" target="_blank">json-glib_1.4.2.bb</a> b/meta/recipes-gnome/json-<wbr>glib/<a href="http://json-glib_1.4.2.bb" rel="noreferrer" target="_blank">json-glib_1.4.2.bb</a><br>
index fad0a2df36d..dd67a8907bd 100644<br>
--- a/meta/recipes-gnome/json-<wbr>glib/<a href="http://json-glib_1.4.2.bb" rel="noreferrer" target="_blank">json-glib_1.4.2.bb</a><br>
+++ b/meta/recipes-gnome/json-<wbr>glib/<a href="http://json-glib_1.4.2.bb" rel="noreferrer" target="_blank">json-glib_1.4.2.bb</a><br>
@@ -14,21 +14,20 @@ SRC_URI[archive.md5sum] = "<wbr>35107e23a7bbbc70f31c34f7b9adf1<wbr>c3"<br>
SRC_URI[archive.sha256sum] = "<wbr>2d7709a44749c7318599a6829322e0<wbr>81915bdc73f5be5045882ed120bb68<wbr>6dc8"<br>
<br>
GNOMEBASEBUILDCLASS = "meson"<br>
-inherit gnomebase lib_package gobject-introspection gtk-doc manpages gettext<br>
+inherit gnomebase lib_package gobject-introspection gtk-doc gettext<br>
<br>
-GTKDOC_ENABLE_FLAG = "-Denable-gtk-doc=true"<br>
-GTKDOC_DISABLE_FLAG = "-Denable-gtk-doc=false"<br>
+# This builds both API docs (via gtk-doc) and manpages<br>
+GTKDOC_ENABLE_FLAG = "-Ddocs=true"<br>
+GTKDOC_DISABLE_FLAG = "-Ddocs=false"<br>
<br>
-GI_ENABLE_FLAG = "-Ddisable_introspection=<wbr>false"<br>
-GI_DISABLE_FLAG = "-Ddisable_introspection=true"<br>
+GI_ENABLE_FLAG = "-Dintrospection=true"<br>
+GI_DISABLE_FLAG = "-Dintrospection=false"<br>
<br>
EXTRA_OEMESON_append_class-<wbr>target = " ${@bb.utils.contains('GTKDOC_<wbr>ENABLED', 'True', '${GTKDOC_ENABLE_FLAG}', \<br>
'${GTKDOC_DISABLE_FLAG}', d)} "<br>
EXTRA_OEMESON_append_class-<wbr>target = " ${@bb.utils.contains('GI_DATA_<wbr>ENABLED', 'True', '${GI_ENABLE_FLAG}', \<br>
'${GI_DISABLE_FLAG}', d)} "<br>
<br>
-PACKAGECONFIG[manpages] = "-Denable-man=true, -Denable-man=false, libxslt-native xmlto-native"<br>
-<br>
do_install_append() {<br>
# FIXME: these need to be provided via ptest<br>
rm -rf ${D}${datadir}/installed-tests ${D}${libexecdir}<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.15.1<br>
<br>
--<br>
______________________________<wbr>_________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.<wbr>openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/<wbr>mailman/listinfo/openembedded-<wbr>core</a><br>
</font></span></blockquote></div><br></div>