<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On 17 August 2017 at 08:50, Huang Qiyu <span dir="ltr"><<a href="mailto:huangqy.fnst@cn.fujitsu.com" target="_blank">huangqy.fnst@cn.fujitsu.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">1) Upgrade pango from 1.40.6 to 1.40.10.<br>
2) Modify 0001-Enforce-recreation-of-<wbr>docs-pango.types-it-is-build-<wbr>c.patch for pango 1.40.10.<br></blockquote><div><br></div><div>I admit I didn't understand the patch even before this but especially now that pango.types is apparently no longer shipped, how does the patch do what it claims to do?</div><div><br></div><div>Jussi</div><div><br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Signed-off-by: Huang Qiyu <<a href="mailto:huangqy.fnst@cn.fujitsu.com">huangqy.fnst@cn.fujitsu.com</a>><br>
---<br>
...reation-of-docs-pango.<wbr>types-it-is-build-c.patch | 104 ++-------------------<br>
.../pango/{<a href="http://pango_1.40.6.bb" rel="noreferrer" target="_blank">pango_1.40.6.bb</a> => <a href="http://pango_1.40.10.bb" rel="noreferrer" target="_blank">pango_1.40.10.bb</a>} | 4 +-<br>
2 files changed, 10 insertions(+), 98 deletions(-)<br>
rename meta/recipes-graphics/pango/{<a href="http://pango_1.40.6.bb" rel="noreferrer" target="_blank">p<wbr>ango_1.40.6.bb</a> => <a href="http://pango_1.40.10.bb" rel="noreferrer" target="_blank">pango_1.40.10.bb</a>} (92%)<br>
<br>
diff --git a/meta/recipes-graphics/pango/<wbr>pango/0001-Enforce-recreation-<wbr>of-docs-pango.types-it-is-<wbr>build-c.patch b/meta/recipes-graphics/pango/<wbr>pango/0001-Enforce-recreation-<wbr>of-docs-pango.types-it-is-<wbr>build-c.patch<br>
index 6784a10..481f267 100644<br>
--- a/meta/recipes-graphics/pango/<wbr>pango/0001-Enforce-recreation-<wbr>of-docs-pango.types-it-is-<wbr>build-c.patch<br>
+++ b/meta/recipes-graphics/pango/<wbr>pango/0001-Enforce-recreation-<wbr>of-docs-pango.types-it-is-<wbr>build-c.patch<br>
@@ -1,6 +1,3 @@<br>
-From 526a6a9fc9a1cfe75c521c8bb39b61<wbr>754fe42fe8 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, 2 Sep 2016 14:00:24 +0300<br>
Subject: [PATCH] Enforce recreation of docs/pango.types; it is build<br>
configuration-specific.<br>
<br>
@@ -8,14 +5,15 @@ In particular, it needs to exclude references to PangoXft if Xft is not availabl<br>
<br>
Upstream-Status: Pending<br>
Signed-off-by: Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com">alex.kanavin@gmail.com</a>><br>
+<br>
+Update for pango 1.40.10.<br>
+Signed-off-by: Huang Qiyu <<a href="mailto:huangqy.fnst@cn.fujitsu.com">huangqy.fnst@cn.fujitsu.com</a>><br>
---<br>
- docs/Makefile.am | 17 ++++--------<br>
- docs/pango.types | 80 ------------------------------<wbr>--------------------------<br>
- 2 files changed, 5 insertions(+), 92 deletions(-)<br>
- delete mode 100644 docs/pango.types<br>
+ docs/Makefile.am | 17 +++++------------<br>
+ 1 file changed, 5 insertions(+), 12 deletions(-)<br>
<br>
diff --git a/docs/Makefile.am b/docs/Makefile.am<br>
-index f5f1317..8947a99 100644<br>
+index f5f1317..76b8661 100644<br>
--- a/docs/Makefile.am<br>
+++ b/docs/Makefile.am<br>
@@ -49,6 +49,10 @@ IGNORE_HFILES= \<br>
@@ -52,96 +50,10 @@ index f5f1317..8947a99 100644<br>
<a href="http://version.xml.in" rel="noreferrer" target="_blank">version.xml.in</a> \<br>
- check.docs \<br>
- pango.types<br>
-+ check.docs<br>
++ check.docs<br>
<br>
# force doc rebulid after configure<br>
dist-hook-local: dist-local-check-no-cross-<wbr>references all-local<br>
-diff --git a/docs/pango.types b/docs/pango.types<br>
-deleted file mode 100644<br>
-index 7d93cda..0000000<br>
---- a/docs/pango.types<br>
-+++ /dev/null<br>
-@@ -1,80 +0,0 @@<br>
--#include <pango/pango-attributes.h><br>
--#include <pango/pango-context.h><br>
--#include <pango/pango-engine.h><br>
--#include <pango/pango-enum-types.h><br>
--#include <pango/pango-font.h><br>
--#include <pango/pango-fontmap.h><br>
--#include <pango/pango-fontset.h><br>
--#include <pango/pango-glyph-item.h><br>
--#include <pango/pango-glyph.h><br>
--#include <pango/pango-item.h><br>
--#include <pango/pango-language.h><br>
--#include <pango/pango-layout.h><br>
--#include <pango/pango-matrix.h><br>
--#include <pango/pango-ot.h><br>
--#include <pango/pango-renderer.h><br>
--#include <pango/pango-tabs.h><br>
--#include <pango/pangocairo-fc.h><br>
--#include <pango/pangocairo.h><br>
--#include <pango/pangofc-decoder.h><br>
--#include <pango/pangofc-font.h><br>
--#include <pango/pangofc-fontmap.h><br>
--#include <pango/pangoft2.h><br>
--#include <pango/pangoxft-render.h><br>
--#include <pango/pangoxft.h><br>
--<br>
--pango_alignment_get_type<br>
--pango_attr_list_get_type<br>
--pango_attr_type_get_type<br>
--pango_bidi_type_get_type<br>
--pango_cairo_fc_font_map_get_<wbr>type<br>
--pango_cairo_font_get_type<br>
--pango_cairo_font_map_get_<wbr>type<br>
--pango_color_get_type<br>
--pango_context_get_type<br>
--pango_coverage_level_get_<wbr>type<br>
--pango_direction_get_type<br>
--pango_ellipsize_mode_get_<wbr>type<br>
--pango_engine_get_type<br>
--pango_engine_lang_get_type<br>
--pango_engine_shape_get_type<br>
--pango_fc_decoder_get_type<br>
--pango_fc_font_get_type<br>
--pango_fc_font_map_get_type<br>
--pango_font_description_get_<wbr>type<br>
--pango_font_face_get_type<br>
--pango_font_family_get_type<br>
--pango_font_get_type<br>
--pango_font_map_get_type<br>
--pango_font_mask_get_type<br>
--pango_font_metrics_get_type<br>
--pango_fontset_get_type<br>
--pango_fontset_simple_get_<wbr>type<br>
--pango_ft2_font_map_get_type<br>
--pango_glyph_item_get_type<br>
--pango_glyph_item_iter_get_<wbr>type<br>
--pango_glyph_string_get_type<br>
--pango_gravity_get_type<br>
--pango_gravity_hint_get_type<br>
--pango_item_get_type<br>
--pango_language_get_type<br>
--pango_layout_get_type<br>
--pango_layout_iter_get_type<br>
--pango_layout_line_get_type<br>
--pango_matrix_get_type<br>
--pango_ot_info_get_type<br>
--pango_ot_ruleset_get_type<br>
--pango_render_part_get_type<br>
--pango_renderer_get_type<br>
--pango_script_get_type<br>
--pango_stretch_get_type<br>
--pango_style_get_type<br>
--pango_tab_align_get_type<br>
--pango_tab_array_get_type<br>
--pango_underline_get_type<br>
--pango_variant_get_type<br>
--pango_weight_get_type<br>
--pango_wrap_mode_get_type<br>
--pango_xft_font_get_type<br>
--pango_xft_font_map_get_type<br>
--pango_xft_renderer_get_type<br>
--<br>
-2.9.3<br>
+2.7.4<br>
<br>
diff --git a/meta/recipes-graphics/pango/<a href="http://pango_1.40.6.bb" rel="noreferrer" target="_blank"><wbr>pango_1.40.6.bb</a> b/meta/recipes-graphics/pango/<a href="http://pango_1.40.10.bb" rel="noreferrer" target="_blank"><wbr>pango_1.40.10.bb</a><br>
similarity index 92%<br>
rename from meta/recipes-graphics/pango/<a href="http://pango_1.40.6.bb" rel="noreferrer" target="_blank">pa<wbr>ngo_1.40.6.bb</a><br>
rename to meta/recipes-graphics/pango/<a href="http://pango_1.40.10.bb" rel="noreferrer" target="_blank">pa<wbr>ngo_1.40.10.bb</a><br>
index 31c3d2a..e5ce6cd 100644<br>
--- a/meta/recipes-graphics/pango/<a href="http://pango_1.40.6.bb" rel="noreferrer" target="_blank"><wbr>pango_1.40.6.bb</a><br>
+++ b/meta/recipes-graphics/pango/<a href="http://pango_1.40.10.bb" rel="noreferrer" target="_blank"><wbr>pango_1.40.10.bb</a><br>
@@ -17,8 +17,8 @@ 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.md5sum] = "<wbr>507c6746fbf53fc9d48c577f1e265d<wbr>e3"<br>
-SRC_URI[archive.sha256sum] = "<wbr>ca152b7383a1e9f7fd74ae96023dc6<wbr>770dc5043414793bfe768ff06b6759<wbr>e573"<br>
+SRC_URI[archive.md5sum] = "<wbr>a612e445157c688a3efe878938e7f4<wbr>c6"<br>
+SRC_URI[archive.sha256sum] = "<wbr>5d41d94a1f70e92ba5808e13f2bf3e<wbr>f198901ddc0dc7e74e5afde9947244<wbr>66f6"<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.7.4<br>
<br>
<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></div>