<div dir="ltr">This also inherits upstream-version-is-even so this is a development snapshot.<div><br></div><div>Ross</div></div><div class="gmail_extra"><br><div class="gmail_quote">On 23 January 2018 at 14:05, Maxin B. John <span dir="ltr"><<a href="mailto:maxin.john@intel.com" target="_blank">maxin.john@intel.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Remove backported patch:<br>
0001-Drop-introspection-<wbr>macros-from-acinclude.m4.patch<br>
<br>
Signed-off-by: Maxin B. John <<a href="mailto:maxin.john@intel.com">maxin.john@intel.com</a>><br>
---<br>
...op-introspection-macros-<wbr>from-acinclude.m4.patch | 120 ---------------------<br>
.../pango/{<a href="http://pango_1.40.12.bb" rel="noreferrer" target="_blank">pango_1.40.12.bb</a> => <a href="http://pango_1.41.0.bb" rel="noreferrer" target="_blank">pango_1.41.0.bb</a>} | 5 +-<br>
2 files changed, 2 insertions(+), 123 deletions(-)<br>
delete mode 100644 meta/recipes-graphics/pango/<wbr>pango/0001-Drop-introspection-<wbr>macros-from-acinclude.m4.patch<br>
rename meta/recipes-graphics/pango/{<a href="http://pango_1.40.12.bb" rel="noreferrer" target="_blank">p<wbr>ango_1.40.12.bb</a> => <a href="http://pango_1.41.0.bb" rel="noreferrer" target="_blank">pango_1.41.0.bb</a>} (88%)<br>
<br>
diff --git a/meta/recipes-graphics/pango/<wbr>pango/0001-Drop-introspection-<wbr>macros-from-acinclude.m4.patch b/meta/recipes-graphics/pango/<wbr>pango/0001-Drop-introspection-<wbr>macros-from-acinclude.m4.patch<br>
deleted file mode 100644<br>
index 9e1626e..0000000<br>
--- a/meta/recipes-graphics/pango/<wbr>pango/0001-Drop-introspection-<wbr>macros-from-acinclude.m4.patch<br>
+++ /dev/null<br>
@@ -1,120 +0,0 @@<br>
-From 867a512eddbeb1899d3e7096df3da1<wbr>dd0ce3e7b7 Mon Sep 17 00:00:00 2001<br>
-From: Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com">alex.kanavin@gmail.com</a>><br>
-Date: Fri, 23 Oct 2015 14:06:17 +0300<br>
-Subject: [PATCH] Drop introspection macros from acinclude.m4<br>
-<br>
-They take precendence over our customized macros, and so<br>
-introspection doesn't work correctly.<br>
-<br>
-Upstream-Status: Backport [upstream 5ccfe0]<br>
-Signed-off-by: Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com">alex.kanavin@gmail.com</a>><br>
----<br>
- acinclude.m4 | 96 ------------------------------<wbr>------------------------------<br>
- 1 file changed, 96 deletions(-)<br>
-<br>
-diff --git a/acinclude.m4 b/acinclude.m4<br>
-index 8899c7c..48fd5d8 100644<br>
---- a/acinclude.m4<br>
-+++ b/acinclude.m4<br>
-@@ -55,99 +55,3 @@ AC_DEFUN([JH_CHECK_XML_<wbr>CATALOG],<br>
- ])<br>
-<br>
-<br>
--dnl REMOVE THIS WHEN introspection.m4 is widely available<br>
--dnl<br>
--dnl -*- mode: autoconf -*-<br>
--dnl Copyright 2009 Johan Dahlin<br>
--dnl<br>
--dnl This file is free software; the author(s) gives unlimited<br>
--dnl permission to copy and/or distribute it, with or without<br>
--dnl modifications, as long as this notice is preserved.<br>
--dnl<br>
--<br>
--# serial 1<br>
--<br>
--m4_define([_GOBJECT_<wbr>INTROSPECTION_CHECK_INTERNAL],<br>
--[<br>
-- AC_BEFORE([AC_PROG_LIBTOOL],[$<wbr>0])dnl setup libtool first<br>
-- AC_BEFORE([AM_PROG_LIBTOOL],[$<wbr>0])dnl setup libtool first<br>
-- AC_BEFORE([LT_INIT],[$0])dnl setup libtool first<br>
--<br>
-- dnl enable/disable introspection<br>
-- m4_if([$2], [require],<br>
-- [dnl<br>
-- enable_introspection=yes<br>
-- ],[dnl<br>
-- AC_ARG_ENABLE(introspection,<br>
-- AS_HELP_STRING([--enable-<wbr>introspection[=@<:@no/auto/<wbr>yes@:>@]],<br>
-- [Enable introspection for this build]),,<br>
-- [enable_introspection=auto])<br>
-- ])dnl<br>
--<br>
-- AC_MSG_CHECKING([for gobject-introspection])<br>
--<br>
-- dnl presence/version checking<br>
-- AS_CASE([$enable_<wbr>introspection],<br>
-- [no], [dnl<br>
-- found_introspection="no (disabled, use --enable-introspection to enable)"<br>
-- ],dnl<br>
-- [yes],[dnl<br>
-- PKG_CHECK_EXISTS([gobject-<wbr>introspection-1.0],,<br>
-- AC_MSG_ERROR([gobject-<wbr>introspection-1.0 is not installed]))<br>
-- PKG_CHECK_EXISTS([gobject-<wbr>introspection-1.0 >= $1],<br>
-- found_introspection=yes,<br>
-- AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))<br>
-- ],dnl<br>
-- [auto],[dnl<br>
-- PKG_CHECK_EXISTS([gobject-<wbr>introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)<br>
-- ],dnl<br>
-- [dnl<br>
-- AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])<br>
-- ])dnl<br>
--<br>
-- AC_MSG_RESULT([$found_<wbr>introspection])<br>
--<br>
-- INTROSPECTION_SCANNER=<br>
-- INTROSPECTION_COMPILER=<br>
-- INTROSPECTION_GENERATE=<br>
-- INTROSPECTION_GIRDIR=<br>
-- INTROSPECTION_TYPELIBDIR=<br>
-- if test "x$found_introspection" = "xyes"; then<br>
-- INTROSPECTION_SCANNER=`$PKG_<wbr>CONFIG --variable=g_ir_scanner gobject-introspection-1.0`<br>
-- INTROSPECTION_COMPILER=`$PKG_<wbr>CONFIG --variable=g_ir_compiler gobject-introspection-1.0`<br>
-- INTROSPECTION_GENERATE=`$PKG_<wbr>CONFIG --variable=g_ir_generate gobject-introspection-1.0`<br>
-- INTROSPECTION_GIRDIR=`$PKG_<wbr>CONFIG --variable=girdir gobject-introspection-1.0`<br>
-- INTROSPECTION_TYPELIBDIR="$($<wbr>PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"<br>
-- INTROSPECTION_CFLAGS=`$PKG_<wbr>CONFIG --cflags gobject-introspection-1.0`<br>
-- INTROSPECTION_LIBS=`$PKG_<wbr>CONFIG --libs gobject-introspection-1.0`<br>
-- INTROSPECTION_MAKEFILE=`$PKG_<wbr>CONFIG --variable=datadir gobject-introspection-1.0`/<wbr>gobject-introspection-1.0/<wbr>Makefile.introspection<br>
-- fi<br>
-- AC_SUBST(INTROSPECTION_<wbr>SCANNER)<br>
-- AC_SUBST(INTROSPECTION_<wbr>COMPILER)<br>
-- AC_SUBST(INTROSPECTION_<wbr>GENERATE)<br>
-- AC_SUBST(INTROSPECTION_GIRDIR)<br>
-- AC_SUBST(INTROSPECTION_<wbr>TYPELIBDIR)<br>
-- AC_SUBST(INTROSPECTION_CFLAGS)<br>
-- AC_SUBST(INTROSPECTION_LIBS)<br>
-- AC_SUBST(INTROSPECTION_<wbr>MAKEFILE)<br>
--<br>
-- AM_CONDITIONAL(HAVE_<wbr>INTROSPECTION, test "x$found_introspection" = "xyes")<br>
--])<br>
--<br>
--<br>
--dnl Usage:<br>
--dnl GOBJECT_INTROSPECTION_CHECK([<wbr>minimum-g-i-version])<br>
--<br>
--AC_DEFUN([GOBJECT_<wbr>INTROSPECTION_CHECK],<br>
--[<br>
-- _GOBJECT_INTROSPECTION_CHECK_<wbr>INTERNAL([$1])<br>
--])<br>
--<br>
--dnl Usage:<br>
--dnl GOBJECT_INTROSPECTION_REQUIRE(<wbr>[minimum-g-i-version])<br>
--<br>
--<br>
--AC_DEFUN([GOBJECT_<wbr>INTROSPECTION_REQUIRE],<br>
--[<br>
-- _GOBJECT_INTROSPECTION_CHECK_<wbr>INTERNAL([$1], [require])<br>
--])<br>
---<br>
-2.1.4<br>
diff --git a/meta/recipes-graphics/pango/<a href="http://pango_1.40.12.bb" rel="noreferrer" target="_blank"><wbr>pango_1.40.12.bb</a> b/meta/recipes-graphics/pango/<a href="http://pango_1.41.0.bb" rel="noreferrer" target="_blank"><wbr>pango_1.41.0.bb</a><br>
similarity index 88%<br>
rename from meta/recipes-graphics/pango/<a href="http://pango_1.40.12.bb" rel="noreferrer" target="_blank">pa<wbr>ngo_1.40.12.bb</a><br>
rename to meta/recipes-graphics/pango/<a href="http://pango_1.41.0.bb" rel="noreferrer" target="_blank">pa<wbr>ngo_1.41.0.bb</a><br>
index cbad9a9..726b8c4 100644<br>
--- a/meta/recipes-graphics/pango/<a href="http://pango_1.40.12.bb" rel="noreferrer" target="_blank"><wbr>pango_1.40.12.bb</a><br>
+++ b/meta/recipes-graphics/pango/<a href="http://pango_1.41.0.bb" rel="noreferrer" target="_blank"><wbr>pango_1.41.0.bb</a><br>
@@ -14,11 +14,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=<wbr>3bf50002aefd002f49e7bb854063f7<wbr>e7"<br>
inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even gobject-introspection<br>
<br>
SRC_URI += "file://run-ptest \<br>
- file://0001-Drop-<wbr>introspection-macros-from-<wbr>acinclude.m4.patch \<br>
file://0001-Enforce-<wbr>recreation-of-docs-pango.<wbr>types-it-is-build-c.patch \<br>
"<br>
-SRC_URI[archive.sha256sum] = "<wbr>75f1a9a8e4e2b28cbc078b50c1fa92<wbr>7ee4ded994d1ade97c5603e2d1f316<wbr>1cfc"<br>
-SRC_URI[archive.md5sum] = "<wbr>9aae7dd5ecc1c2ade4e6951b85004c<wbr>ee"<br>
+SRC_URI[archive.md5sum] = "<wbr>f3c0d6931aefd40f5afac2566faf27<wbr>17"<br>
+SRC_URI[archive.sha256sum] = "<wbr>1f76ef95953dc58ee5d6a53e5f1cb6<wbr>db913f3e0eb489713ee9266695cae5<wbr>80ba"<br>
<br>
DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz"<br>
<span class="HOEnZb"><font color="#888888"><br>
--<br>
2.4.0<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>