diff options
Diffstat (limited to 'external/poky/meta/recipes-graphics/pango')
| -rw-r--r-- | external/poky/meta/recipes-graphics/pango/pango/0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch | 147 | ||||
| -rw-r--r-- | external/poky/meta/recipes-graphics/pango/pango/0001-Fix-build-reproducibility.patch | 31 | ||||
| -rw-r--r-- | external/poky/meta/recipes-graphics/pango/pango/CVE-2019-1010238.patch | 38 | ||||
| -rw-r--r-- | external/poky/meta/recipes-graphics/pango/pango_1.44.7.bb (renamed from external/poky/meta/recipes-graphics/pango/pango_1.42.4.bb) | 38 |
4 files changed, 51 insertions, 203 deletions
diff --git a/external/poky/meta/recipes-graphics/pango/pango/0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch b/external/poky/meta/recipes-graphics/pango/pango/0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch deleted file mode 100644 index 6784a105..00000000 --- a/external/poky/meta/recipes-graphics/pango/pango/0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch +++ /dev/null @@ -1,147 +0,0 @@ -From 526a6a9fc9a1cfe75c521c8bb39b61754fe42fe8 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Fri, 2 Sep 2016 14:00:24 +0300 -Subject: [PATCH] Enforce recreation of docs/pango.types; it is build - configuration-specific. - -In particular, it needs to exclude references to PangoXft if Xft is not available. - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - docs/Makefile.am | 17 ++++-------- - docs/pango.types | 80 -------------------------------------------------------- - 2 files changed, 5 insertions(+), 92 deletions(-) - delete mode 100644 docs/pango.types - -diff --git a/docs/Makefile.am b/docs/Makefile.am -index f5f1317..8947a99 100644 ---- a/docs/Makefile.am -+++ b/docs/Makefile.am -@@ -49,6 +49,10 @@ IGNORE_HFILES= \ - pangocoretext-private.h \ - pangoatsui-private.h - -+if !HAVE_XFT -+IGNORE_HFILES += pangoxft pangoxft-render.h -+endif -+ - # CFLAGS and LDFLAGS for compiling scan program. Only needed - # if $(DOC_MODULE).types is non-empty. - INCLUDES = \ -@@ -103,16 +107,6 @@ include $(top_srcdir)/gtk-doc.make - # This line really belongs in gtk-doc.mk - $(REPORT_FILES): sgml-build.stamp - --pango.types: -- @echo "Rebuilding $@" -- @LANG=C; LIST=$$(grep 'pango_[_a-zA-Z0-9]*_get_type' $(HFILE_GLOB) | grep -v '\(private\|atsui\|core_text\|win32\)' | sed 's/\([^:]*:\).*\(pango[_a-zA-Z0-9]*_get_type\).*/\1\2/') && \ -- echo "$$LIST" | sed 's/.*\/\(pango\/.*\):.*/#include <\1>/' | sort -u > $@.tmp && \ -- echo >> $@.tmp && \ -- echo "$$LIST" | cut -d : -f 2 | sort -u >> $@.tmp && \ -- mv $@.tmp $@ -- --BUILT_SOURCES = pango.types -- - ######################################################################## - - MAINTAINERCLEANFILES = $(BUILT_SOURCES) -@@ -120,8 +114,7 @@ EXTRA_DIST += \ - layout.fig \ - layout.eps \ - version.xml.in \ -- check.docs \ -- pango.types -+ check.docs - - # force doc rebulid after configure - dist-hook-local: dist-local-check-no-cross-references all-local -diff --git a/docs/pango.types b/docs/pango.types -deleted file mode 100644 -index 7d93cda..0000000 ---- a/docs/pango.types -+++ /dev/null -@@ -1,80 +0,0 @@ --#include <pango/pango-attributes.h> --#include <pango/pango-context.h> --#include <pango/pango-engine.h> --#include <pango/pango-enum-types.h> --#include <pango/pango-font.h> --#include <pango/pango-fontmap.h> --#include <pango/pango-fontset.h> --#include <pango/pango-glyph-item.h> --#include <pango/pango-glyph.h> --#include <pango/pango-item.h> --#include <pango/pango-language.h> --#include <pango/pango-layout.h> --#include <pango/pango-matrix.h> --#include <pango/pango-ot.h> --#include <pango/pango-renderer.h> --#include <pango/pango-tabs.h> --#include <pango/pangocairo-fc.h> --#include <pango/pangocairo.h> --#include <pango/pangofc-decoder.h> --#include <pango/pangofc-font.h> --#include <pango/pangofc-fontmap.h> --#include <pango/pangoft2.h> --#include <pango/pangoxft-render.h> --#include <pango/pangoxft.h> -- --pango_alignment_get_type --pango_attr_list_get_type --pango_attr_type_get_type --pango_bidi_type_get_type --pango_cairo_fc_font_map_get_type --pango_cairo_font_get_type --pango_cairo_font_map_get_type --pango_color_get_type --pango_context_get_type --pango_coverage_level_get_type --pango_direction_get_type --pango_ellipsize_mode_get_type --pango_engine_get_type --pango_engine_lang_get_type --pango_engine_shape_get_type --pango_fc_decoder_get_type --pango_fc_font_get_type --pango_fc_font_map_get_type --pango_font_description_get_type --pango_font_face_get_type --pango_font_family_get_type --pango_font_get_type --pango_font_map_get_type --pango_font_mask_get_type --pango_font_metrics_get_type --pango_fontset_get_type --pango_fontset_simple_get_type --pango_ft2_font_map_get_type --pango_glyph_item_get_type --pango_glyph_item_iter_get_type --pango_glyph_string_get_type --pango_gravity_get_type --pango_gravity_hint_get_type --pango_item_get_type --pango_language_get_type --pango_layout_get_type --pango_layout_iter_get_type --pango_layout_line_get_type --pango_matrix_get_type --pango_ot_info_get_type --pango_ot_ruleset_get_type --pango_render_part_get_type --pango_renderer_get_type --pango_script_get_type --pango_stretch_get_type --pango_style_get_type --pango_tab_align_get_type --pango_tab_array_get_type --pango_underline_get_type --pango_variant_get_type --pango_weight_get_type --pango_wrap_mode_get_type --pango_xft_font_get_type --pango_xft_font_map_get_type --pango_xft_renderer_get_type --- -2.9.3 - diff --git a/external/poky/meta/recipes-graphics/pango/pango/0001-Fix-build-reproducibility.patch b/external/poky/meta/recipes-graphics/pango/pango/0001-Fix-build-reproducibility.patch new file mode 100644 index 00000000..03abf876 --- /dev/null +++ b/external/poky/meta/recipes-graphics/pango/pango/0001-Fix-build-reproducibility.patch @@ -0,0 +1,31 @@ +From f8b32901981a06a8db4169b82a704dcf7e8b6560 Mon Sep 17 00:00:00 2001 +From: Joshua Watt <JPEWhacker@gmail.com> +Date: Wed, 20 Nov 2019 15:43:57 -0600 +Subject: [PATCH] Fix build reproducibility + +Changes the comment in pango-enum-types.c to reference the file basename +instead of the full path. This ensures that the generated file is +reproducible when it is included in source packages meant for debugging. + +Upstream-Status: Pending [https://gitlab.gnome.org/GNOME/pango/merge_requests/159] +Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> +--- + pango/pango-enum-types.c.template | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pango/pango-enum-types.c.template b/pango/pango-enum-types.c.template +index d922c691..0d55ef74 100644 +--- a/pango/pango-enum-types.c.template ++++ b/pango/pango-enum-types.c.template +@@ -6,7 +6,7 @@ + /*** END file-header ***/ + + /*** BEGIN file-production ***/ +-/* enumerations from "@filename@" */ ++/* enumerations from "@basename@" */ + /*** END file-production ***/ + + /*** BEGIN value-header ***/ +-- +2.23.0 + diff --git a/external/poky/meta/recipes-graphics/pango/pango/CVE-2019-1010238.patch b/external/poky/meta/recipes-graphics/pango/pango/CVE-2019-1010238.patch deleted file mode 100644 index 5b0c342f..00000000 --- a/external/poky/meta/recipes-graphics/pango/pango/CVE-2019-1010238.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 490f8979a260c16b1df055eab386345da18a2d54 Mon Sep 17 00:00:00 2001 -From: Matthias Clasen <mclasen@redhat.com> -Date: Wed, 10 Jul 2019 20:26:23 -0400 -Subject: [PATCH] bidi: Be safer against bad input - -Don't run off the end of an array that we -allocated to certain length. - -Closes: https://gitlab.gnome.org/GNOME/pango/issues/342 - -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/pango/commit/490f8979a260c16b1df055eab386345da18a2d54] -CVE: CVE-2019-1010238 -Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> ---- - pango/pango-bidi-type.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/pango/pango-bidi-type.c b/pango/pango-bidi-type.c -index 3e46b66c..5c02dbbb 100644 ---- a/pango/pango-bidi-type.c -+++ b/pango/pango-bidi-type.c -@@ -181,8 +181,11 @@ pango_log2vis_get_embedding_levels (const gchar *text, - for (i = 0, p = text; p < text + length; p = g_utf8_next_char(p), i++) - { - gunichar ch = g_utf8_get_char (p); -- FriBidiCharType char_type; -- char_type = fribidi_get_bidi_type (ch); -+ FriBidiCharType char_type = fribidi_get_bidi_type (ch); -+ -+ if (i == n_chars) -+ break; -+ - bidi_types[i] = char_type; - ored_types |= char_type; - if (FRIBIDI_IS_STRONG (char_type)) --- -2.21.0 - diff --git a/external/poky/meta/recipes-graphics/pango/pango_1.42.4.bb b/external/poky/meta/recipes-graphics/pango/pango_1.44.7.bb index f6a3a5ac..0ee8abcc 100644 --- a/external/poky/meta/recipes-graphics/pango/pango_1.42.4.bb +++ b/external/poky/meta/recipes-graphics/pango/pango_1.44.7.bb @@ -11,37 +11,39 @@ LICENSE = "LGPLv2.0+" LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" +GNOMEBASEBUILDCLASS = "meson" + inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even gobject-introspection SRC_URI += "file://run-ptest \ - file://0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch \ - file://CVE-2019-1010238.patch \ - " - -SRC_URI[archive.md5sum] = "deb171a31a3ad76342d5195a1b5bbc7c" -SRC_URI[archive.sha256sum] = "1d2b74cd63e8bd41961f2f8d952355aa0f9be6002b52c8aa7699d9f5da597c9d" + file://0001-Fix-build-reproducibility.patch" +SRC_URI[archive.md5sum] = "c75cc5b833d934d98e83343832e20e5d" +SRC_URI[archive.sha256sum] = "66a5b6cc13db73efed67b8e933584509f8ddb7b10a8a40c3850ca4a985ea1b1f" DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi" -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" -PACKAGECONFIG[x11] = "--with-xft,--without-xft,virtual/libx11 libxft" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" -LEAD_SONAME = "libpango-1.0*" -LIBV = "1.8.0" +PACKAGECONFIG[x11] = ",,virtual/libx11 libxft" +PACKAGECONFIG[tests] = "-Dinstall-tests=true, -Dinstall-tests=false" +PACKAGECONFIG[thai] = ",,libthai" -# This binary needs to be compiled for the host architecture. This isn't pretty! -do_compile_prepend_class-target () { - if ${@bb.utils.contains('PTEST_ENABLED', '1', 'true', 'false', d)}; then - make CC="${BUILD_CC}" CFLAGS="" LDFLAGS="${BUILD_LDFLAGS}" AM_CPPFLAGS="$(pkg-config-native --cflags glib-2.0)" gen_all_unicode_LDADD="$(pkg-config-native --libs glib-2.0)" -C ${B}/tests gen-all-unicode - fi +GTKDOC_MESON_OPTION = "gtk_doc" +GIR_MESON_OPTION = 'introspection' + +do_configure_prepend_toolchain-clang() { + sed -i -e "/Werror=implicit-fallthrough/d" ${S}/meson.build } +LEAD_SONAME = "libpango-1.0*" + FILES_${PN} = "${bindir}/* ${libdir}/libpango*${SOLIBS}" -FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la" -RDEPENDS_${PN}-ptest += "liberation-fonts cantarell-fonts" +RDEPENDS_${PN}-ptest += "cantarell-fonts" +RDEPENDS_${PN}-ptest_append_libc-glibc = " locale-base-en-us" RPROVIDES_${PN} += "pango-modules pango-module-indic-lang \ pango-module-basic-fc pango-module-arabic-lang" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" |